--- old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2014-04-24 15:53:04.000000000 -1000
+++ new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2014-04-24 15:53:04.000000000 -1000
@@ -942,7 +942,7 @@
 
     __ push(0);                       // hole for return address-to-be
     __ pusha();                       // push registers
-    Address next_pc(rsp, RegisterImpl::number_of_registers * BytesPerWord);
+    Address next_pc(rsp, Register::number_of_registers * BytesPerWord);
 
     // FIXME: this probably needs alignment logic
 
@@ -3010,9 +3010,9 @@
 
   // Utility routine for loading a 128-bit key word in little endian format
   // can optionally specify that the shuffle mask is already in an xmmregister
-  void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
+  void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask = xnoreg) {
     __ movdqu(xmmdst, Address(key, offset));
-    if (xmm_shuf_mask != NULL) {
+    if (xmm_shuf_mask != xnoreg) {
       __ pshufb(xmmdst, xmm_shuf_mask);
     } else {
       __ pshufb(xmmdst, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));