Basic x86_64 version

src/hotspot/cpu/x86/x86_64.ad

@@ -12385,18 +12385,19 @@ instruct cmpFastUnlockLightweight(rFlagsReg cr, rRegP object, rax_RegP rax_reg,
 
 // ============================================================================
 // Safepoint Instructions
-instruct safePoint_poll_tls(rFlagsReg cr, rRegP poll)
+instruct safePoint_poll_tls(rax_RegP rax_reg, rFlagsReg cr)
 %{
-  match(SafePoint poll);
-  effect(KILL cr, USE poll);
+  match(SafePoint);
+  effect(KILL cr, KILL rax_reg);
 
-  format %{ "testl   rax, [$poll]\t"
-            "# Safepoint: poll for GC" %}
+  format %{ "mov     rax, [thread, #polling_page_offset]\n\t"
+            "testl   rax, [rax]\t# Safepoint: poll for GC" %}
   ins_cost(125);
   ins_encode %{
+    __ movptr(rax, Address(r15_thread, JavaThread::polling_page_offset()));
     __ relocate(relocInfo::poll_type);
     address pre_pc = __ pc();
-    __ testl(rax, Address($poll$$Register, 0));
+    __ testl(rax, Address(rax, 0));
     assert(nativeInstruction_at(pre_pc)->is_safepoint_poll(), "must emit test %%eax [reg]");
   %}
   ins_pipe(ialu_reg_mem);