Mercurial > hg > truffle
diff src/cpu/x86/vm/nativeInst_x86.hpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 28 May 2015 15:36:48 +0200 |
| parents | 0dac22d266d8 |
| children |
line wrap: on
line diff
--- a/src/cpu/x86/vm/nativeInst_x86.hpp Wed May 27 13:43:27 2015 +0200 +++ b/src/cpu/x86/vm/nativeInst_x86.hpp Thu May 28 15:36:48 2015 +0200 @@ -566,7 +566,7 @@ if (ubyte_at(0) == NativeTstRegMem::instruction_code_memXregl && ubyte_at(1) == 0x05) { // 00 rax 101 address fault = addr_at(6) + int_at(2); - NOT_GRAAL(assert(!Assembler::is_polling_page_far(), "unexpected poll encoding");) + NOT_JVMCI(assert(!Assembler::is_polling_page_far(), "unexpected poll encoding");) return os::is_poll_address(fault); } // Now try decoding a far safepoint: @@ -576,7 +576,7 @@ (ubyte_at(2) & NativeTstRegMem::modrm_mask) == NativeTstRegMem::modrm_reg) || ubyte_at(0) == NativeTstRegMem::instruction_code_memXregl && (ubyte_at(1) & NativeTstRegMem::modrm_mask) == NativeTstRegMem::modrm_reg) { - NOT_GRAAL(assert(Assembler::is_polling_page_far(), "unexpected poll encoding");) + NOT_JVMCI(assert(Assembler::is_polling_page_far(), "unexpected poll encoding");) return true; } return false;