--- a/hotspot/src/cpu/x86/vm/assembler_x86_64.hpp	Wed Jun 04 13:51:09 2008 -0700
+++ b/hotspot/src/cpu/x86/vm/assembler_x86_64.hpp	Thu Jun 05 15:57:56 2008 -0700
@@ -222,6 +222,18 @@
   static Address make_raw(int base, int index, int scale, int disp);
 
   static Address make_array(ArrayAddress);
+  Register base() const {
+    return _base;
+  }
+
+  Register index() const {
+    return _index;
+  }
+
+  int disp() const {
+    return _disp;
+  }
+
 
  private:
   bool base_needs_rex() const {
@@ -1194,6 +1206,9 @@
                                                  // location (reg. is
                                                  // destroyed)
 
+  void g1_write_barrier_pre(Register obj, Register tmp, Register tmp2, bool tosca_live );
+  void g1_write_barrier_post(Register store_addr, Register new_val, Register tmp, Register tmp2);
+
   // split store_check(Register obj) to enhance instruction interleaving
   void store_check_part_1(Register obj);
   void store_check_part_2(Register obj);