--- old/src/share/vm/asm/register.hpp	2014-04-24 15:53:08.000000000 -1000
+++ new/src/share/vm/asm/register.hpp	2014-04-24 15:53:08.000000000 -1000
@@ -27,72 +27,30 @@
 
 #include "utilities/top.hpp"
 
-// Use AbstractRegister as shortcut
-class AbstractRegisterImpl;
-typedef AbstractRegisterImpl* AbstractRegister;
-
-
-// The super class for platform specific registers. Instead of using value objects,
-// registers are implemented as pointers. Subclassing is used so all registers can
-// use the debugging suport below. No virtual functions are used for efficiency.
-// They are canonicalized; i.e., registers are equal if their pointers are equal,
-// and vice versa. A concrete implementation may just map the register onto 'this'.
-
-class AbstractRegisterImpl {
- protected:
-  int value() const                              { return (int)(intx)this; }
+/**
+ * The super class for platform specific registers.
+ */
+class AbstractRegister {
+ private:
+  int _encoding;
+
+ public:
+  AbstractRegister(int encoding) : _encoding(encoding) {}
+
+  int encoding() const {
+    return _encoding;
+  }
+
+  bool const operator==(const AbstractRegister& rhs) const {
+    return encoding() == rhs.encoding();
+  }
+
+  bool const operator!=(const AbstractRegister& rhs) const {
+    return encoding() != rhs.encoding();
+  }
 };
 
 
-//
-// Macros for use in defining Register instances.  We'd like to be
-// able to simply define const instances of the RegisterImpl* for each
-// of the registers needed on a system in a header file.  However many
-// compilers don't handle this very well and end up producing a
-// private definition in every file which includes the header file.
-// Along with the static constructors necessary for initialization it
-// can consume a significant amount of space in the result library.
-//
-// The following macros allow us to declare the instance in a .hpp and
-// produce an enumeration value which has the same number.  Then in a
-// .cpp the the register instance can be defined using the enumeration
-// value.  This avoids the use of static constructors and multiple
-// definitions per .cpp.  In addition #defines for the register can be
-// produced so that the constant registers can be inlined.  These
-// macros should not be used inside other macros, because you may get
-// multiple evaluations of the macros which can give bad results.
-//
-// Here are some example uses and expansions.  Note that the macro
-// invocation is terminated with a ;.
-//
-// CONSTANT_REGISTER_DECLARATION(Register, G0, 0);
-//
-// extern const Register G0 ;
-// enum { G0_RegisterEnumValue = 0 } ;
-//
-// REGISTER_DECLARATION(Register, Gmethod, G5);
-//
-// extern const Register Gmethod ;
-// enum { Gmethod_RegisterEnumValue = G5_RegisterEnumValue } ;
-//
-// REGISTER_DEFINITION(Register, G0);
-//
-// const Register G0 = ( ( Register ) G0_RegisterEnumValue ) ;
-//
-
-#define AS_REGISTER(type,name)         ((type)name##_##type##EnumValue)
-
-#define CONSTANT_REGISTER_DECLARATION(type, name, value) \
-extern const type name;                                  \
-enum { name##_##type##EnumValue = (value) }
-
-#define REGISTER_DECLARATION(type, name, value) \
-extern const type name;                         \
-enum { name##_##type##EnumValue = value##_##type##EnumValue }
-
-#define REGISTER_DEFINITION(type, name) \
-const type name = ((type)name##_##type##EnumValue)
-
 #ifdef TARGET_ARCH_x86
 # include "register_x86.hpp"
 #endif
@@ -119,7 +77,7 @@
   assert(
     a != b,
     err_msg_res("registers must be different: a=%d, b=%d",
-                a, b)
+                a.encoding(), b.encoding())
   );
 }
 
@@ -133,7 +91,7 @@
     a != b && a != c
            && b != c,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d",
-                a, b, c)
+                a.encoding(), b.encoding(), c.encoding())
   );
 }
 
@@ -149,7 +107,7 @@
            && b != c && b != d
                      && c != d,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d",
-                a, b, c, d)
+                a.encoding(), b.encoding(), c.encoding(), d.encoding())
   );
 }
 
@@ -167,7 +125,7 @@
                      && c != d && c != e
                                && d != e,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d",
-                a, b, c, d, e)
+                a.encoding(), b.encoding(), c.encoding(), d.encoding(), e.encoding())
   );
 }
 
@@ -187,7 +145,7 @@
                                && d != e && d != f
                                          && e != f,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d",
-                a, b, c, d, e, f)
+                a.encoding(), b.encoding(), c.encoding(), d.encoding(), e.encoding(), f.encoding())
   );
 }
 
@@ -209,7 +167,7 @@
                                          && e != f && e != g
                                                    && f != g,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d",
-                a, b, c, d, e, f, g)
+                a.encoding(), b.encoding(), c.encoding(), d.encoding(), e.encoding(), f.encoding(), g.encoding())
   );
 }
 
@@ -233,7 +191,7 @@
                                                    && f != g && f != h
                                                              && g != h,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d",
-                a, b, c, d, e, f, g, h)
+                a.encoding(), b.encoding(), c.encoding(), d.encoding(), e.encoding(), f.encoding(), g.encoding(), h.encoding())
   );
 }
 
@@ -259,7 +217,7 @@
                                                              && g != h && g != i
                                                                        && h != i,
     err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d, i=%d",
-                a, b, c, d, e, f, g, h, i)
+                a.encoding(), b.encoding(), c.encoding(), d.encoding(), e.encoding(), f.encoding(), g.encoding(), h.encoding(), i.encoding())
   );
 }