--- a/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Mon Feb 28 13:15:49 2011 +0000
+++ b/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Tue Mar 01 10:10:11 2011 +0000
@@ -150,4 +150,22 @@
 #define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \
                                                 ((VMJavaVal64*)(addr))->l)
 
+// VMSlots implementation
+
+#define VMSLOTS_SLOT(offset)    ((intptr_t*)&vmslots[(offset)])
+#define VMSLOTS_ADDR(offset)    ((address)vmslots[(offset)])
+#define VMSLOTS_INT(offset)     (*((jint*)&vmslots[(offset)]))
+#define VMSLOTS_FLOAT(offset)   (*((jfloat*)&vmslots[(offset)]))
+#define VMSLOTS_OBJECT(offset)  ((oop)vmslots[(offset)])
+#define VMSLOTS_DOUBLE(offset)  (((VMJavaVal64*)&vmslots[(offset) - 1])->d)
+#define VMSLOTS_LONG(offset)    (((VMJavaVal64*)&vmslots[(offset) - 1])->l)
+
+#define SET_VMSLOTS_SLOT(value, offset)   (*(intptr_t*)&vmslots[(offset)] = *(intptr_t *)(value))
+#define SET_VMSLOTS_ADDR(value, offset)   (*((address *)&vmslots[(offset)]) = (value))
+#define SET_VMSLOTS_INT(value, offset)    (*((jint *)&vmslots[(offset)]) = (value))
+#define SET_VMSLOTS_FLOAT(value, offset)  (*((jfloat *)&vmslots[(offset)]) = (value))
+#define SET_VMSLOTS_OBJECT(value, offset) (*((oop *)&vmslots[(offset)]) = (value))
+#define SET_VMSLOTS_DOUBLE(value, offset) (((VMJavaVal64*)&vmslots[(offset) - 1])->d = (value))
+#define SET_VMSLOTS_LONG(value, offset)   (((VMJavaVal64*)&vmslots[(offset) - 1])->l = (value))
+
 #endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP

--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Feb 28 13:15:49 2011 +0000
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Mar 01 10:10:11 2011 +0000
@@ -610,30 +610,6 @@
   return 0;
 }
 
-// XXX put in bytecodeInterpreter_zero.hpp
-#define VMSLOTS_SLOT(offset)    ((intptr_t*)&vmslots[(offset)])
-#define VMSLOTS_ADDR(offset)    ((address)vmslots[(offset)])
-#define VMSLOTS_INT(offset)     (*((jint*)&vmslots[(offset)]))
-#define VMSLOTS_FLOAT(offset)   (*((jfloat*)&vmslots[(offset)]))
-#define VMSLOTS_OBJECT(offset)  ((oop)vmslots[(offset)])
-#define VMSLOTS_DOUBLE(offset)  (((VMJavaVal64*)&vmslots[(offset) - 1])->d)
-#define VMSLOTS_LONG(offset)    (((VMJavaVal64*)&vmslots[(offset) - 1])->l)
-
-#define SET_VMSLOTS_SLOT(value, offset) \
-  (*(intptr_t*)&vmslots[(offset)] = *(intptr_t *)(value))
-#define SET_VMSLOTS_ADDR(value, offset) \
-  (*((address *)&vmslots[(offset)]) = (value))
-#define SET_VMSLOTS_INT(value, offset) \
-  (*((jint *)&vmslots[(offset)]) = (value))
-#define SET_VMSLOTS_FLOAT(value, offset) \
-  (*((jfloat *)&vmslots[(offset)]) = (value))
-#define SET_VMSLOTS_OBJECT(value, offset) \
-  (*((oop *)&vmslots[(offset)]) = (value))
-#define SET_VMSLOTS_DOUBLE(value, offset) \
-  (((VMJavaVal64*)&vmslots[(offset) - 1])->d = (value))
-#define SET_VMSLOTS_LONG(value, offset) \
-  (((VMJavaVal64*)&vmslots[(offset) - 1])->l = (value))
-
 int CppInterpreter::method_handle_entry(methodOop method,
                                         intptr_t UNUSED, TRAPS) {
   JavaThread *thread = (JavaThread *) THREAD;