# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1314862716 -7200
# Node ID f79b652d4437c32c46e1f75b5de5a150b5dea260
# Parent  8780fa370aabb00122d52c4573efcfcf3dfc1c99
let hotspot recognize graal's way of doing safepoints (mov instead of test)

diff -r 8780fa370aab -r f79b652d4437 src/cpu/x86/vm/nativeInst_x86.hpp
--- a/src/cpu/x86/vm/nativeInst_x86.hpp	Wed Aug 31 14:55:40 2011 +0200
+++ b/src/cpu/x86/vm/nativeInst_x86.hpp	Thu Sep 01 09:38:36 2011 +0200
@@ -549,8 +549,10 @@
       return false;
     }
   } else {
-    if (ubyte_at(0) == NativeTstRegMem::instruction_code_memXregl &&
-        ubyte_at(1) == 0x05) { // 00 rax 101
+    if (ubyte_at(0) == Assembler::REX_WR && ubyte_at(1) == NativeMovRegMem::instruction_code_mem2reg && ubyte_at(2) == 0x15) { // mov r10, rip[...]
+      address fault = addr_at(7) + int_at(3);
+      return os::is_poll_address(fault);
+    } else if (ubyte_at(0) == NativeTstRegMem::instruction_code_memXregl && ubyte_at(1) == 0x05) { // 00 rax 101
       address fault = addr_at(6) + int_at(2);
       return os::is_poll_address(fault);
     } else {