Mercurial > hg > graal-jvmci-8

comparison src/cpu/x86/vm/relocInfo_x86.cpp @ 22298:c28cb37b2e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename JVMCI to INCLUDE_JVMCI.
author twisti
date Wed, 22 Jul 2015 08:56:03 -0700
parents be896a1983c0
children
comparison
equal deleted inserted replaced
22297:571202729bbf 22298:c28cb37b2e1d
179 179
180 void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) { 180 void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
181 #ifdef _LP64 181 #ifdef _LP64
182 typedef Assembler::WhichOperand WhichOperand; 182 typedef Assembler::WhichOperand WhichOperand;
183 WhichOperand which = (WhichOperand) format(); 183 WhichOperand which = (WhichOperand) format();
184 #ifndef JVMCI 184 #if !INCLUDE_JVMCI
185 assert((which == Assembler::disp32_operand) == !Assembler::is_polling_page_far(), "format not set correctly"); 185 assert((which == Assembler::disp32_operand) == !Assembler::is_polling_page_far(), "format not set correctly");
186 #endif 186 #endif
187 if (which == Assembler::disp32_operand) { 187 if (which == Assembler::disp32_operand) {
188 address orig_addr = old_addr_for(addr(), src, dest); 188 address orig_addr = old_addr_for(addr(), src, dest);
189 NativeInstruction* oni = nativeInstruction_at(orig_addr); 189 NativeInstruction* oni = nativeInstruction_at(orig_addr);