--- old/src/cpu/x86/vm/macroAssembler_x86.cpp	2014-04-24 15:53:01.000000000 -1000
+++ new/src/cpu/x86/vm/macroAssembler_x86.cpp	2014-04-24 15:53:01.000000000 -1000
@@ -766,12 +766,12 @@
                                          Register last_java_fp,
                                          address  last_java_pc) {
   // determine last_java_sp register
-  if (!last_java_sp->is_valid()) {
+  if (!last_java_sp.is_valid()) {
     last_java_sp = rsp;
   }
 
   // last_java_fp is optional
-  if (last_java_fp->is_valid()) {
+  if (last_java_fp.is_valid()) {
     movptr(Address(r15_thread, JavaThread::last_Java_fp_offset()),
            last_java_fp);
   }
@@ -2500,7 +2500,7 @@
                                   int      number_of_arguments,
                                   bool     check_exceptions) {
   // determine java_thread register
-  if (!java_thread->is_valid()) {
+  if (!java_thread.is_valid()) {
 #ifdef _LP64
     java_thread = r15_thread;
 #else
@@ -2509,7 +2509,7 @@
 #endif // LP64
   }
   // determine last_java_sp register
-  if (!last_java_sp->is_valid()) {
+  if (!last_java_sp.is_valid()) {
     last_java_sp = rsp;
   }
   // debugging support
@@ -2587,7 +2587,7 @@
   }
 
   // get oop result if there is one and reset the value in the thread
-  if (oop_result->is_valid()) {
+  if (oop_result.is_valid()) {
     get_vm_result(oop_result, java_thread);
   }
 }
@@ -3790,7 +3790,7 @@
 
 void MacroAssembler::reset_last_Java_frame(Register java_thread, bool clear_fp, bool clear_pc) {
   // determine java_thread register
-  if (!java_thread->is_valid()) {
+  if (!java_thread.is_valid()) {
     java_thread = rdi;
     get_thread(java_thread);
   }
@@ -3846,18 +3846,18 @@
                                          Register last_java_fp,
                                          address  last_java_pc) {
   // determine java_thread register
-  if (!java_thread->is_valid()) {
+  if (!java_thread.is_valid()) {
     java_thread = rdi;
     get_thread(java_thread);
   }
   // determine last_java_sp register
-  if (!last_java_sp->is_valid()) {
+  if (!last_java_sp.is_valid()) {
     last_java_sp = rsp;
   }
 
   // last_java_fp is optional
 
-  if (last_java_fp->is_valid()) {
+  if (last_java_fp.is_valid()) {
     movptr(Address(java_thread, JavaThread::last_Java_fp_offset()), last_java_fp);
   }
 
@@ -3881,7 +3881,7 @@
 }
 
 void MacroAssembler::sign_extend_byte(Register reg) {
-  if (LP64_ONLY(true ||) (VM_Version::is_P6() && reg->has_byte_register())) {
+  if (LP64_ONLY(true ||) (VM_Version::is_P6() && reg.has_byte_register())) {
     movsbl(reg, reg); // movsxb
   } else {
     shll(reg, 24);
@@ -4534,24 +4534,24 @@
                                           Register var_size_in_bytes,
                                           int con_size_in_bytes,
                                           Register t1) {
-  if (!thread->is_valid()) {
+  if (!thread.is_valid()) {
 #ifdef _LP64
     thread = r15_thread;
 #else
-    assert(t1->is_valid(), "need temp reg");
+    assert(t1.is_valid(), "need temp reg");
     thread = t1;
     get_thread(thread);
 #endif
   }
 
 #ifdef _LP64
-  if (var_size_in_bytes->is_valid()) {
+  if (var_size_in_bytes.is_valid()) {
     addq(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), var_size_in_bytes);
   } else {
     addq(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), con_size_in_bytes);
   }
 #else
-  if (var_size_in_bytes->is_valid()) {
+  if (var_size_in_bytes.is_valid()) {
     addl(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), var_size_in_bytes);
   } else {
     addl(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), con_size_in_bytes);
@@ -5150,7 +5150,7 @@
   {
     ResourceMark rm;
     stringStream ss;
-    ss.print("verify_oop: %s: %s", reg->name(), s);
+    ss.print("verify_oop: %s: %s", reg.name(), s);
     b = code_string(ss.as_string());
   }
   BLOCK_COMMENT("verify_oop {");