1.1 --- a/src/share/vm/opto/runtime.hpp Wed Jun 04 13:51:09 2008 -0700 1.2 +++ b/src/share/vm/opto/runtime.hpp Thu Jun 05 15:57:56 2008 -0700 1.3 @@ -108,6 +108,8 @@ 1.4 static address _multianewarray3_Java; 1.5 static address _multianewarray4_Java; 1.6 static address _multianewarray5_Java; 1.7 + static address _g1_wb_pre_Java; 1.8 + static address _g1_wb_post_Java; 1.9 static address _vtable_must_compile_Java; 1.10 static address _complete_monitor_locking_Java; 1.11 static address _rethrow_Java; 1.12 @@ -140,6 +142,8 @@ 1.13 static void multianewarray3_C(klassOopDesc* klass, int len1, int len2, int len3, JavaThread *thread); 1.14 static void multianewarray4_C(klassOopDesc* klass, int len1, int len2, int len3, int len4, JavaThread *thread); 1.15 static void multianewarray5_C(klassOopDesc* klass, int len1, int len2, int len3, int len4, int len5, JavaThread *thread); 1.16 + static void g1_wb_pre_C(oopDesc* orig, JavaThread* thread); 1.17 + static void g1_wb_post_C(void* card_addr, JavaThread* thread); 1.18 1.19 public: 1.20 // Slow-path Locking and Unlocking 1.21 @@ -195,6 +199,8 @@ 1.22 static address multianewarray3_Java() { return _multianewarray3_Java; } 1.23 static address multianewarray4_Java() { return _multianewarray4_Java; } 1.24 static address multianewarray5_Java() { return _multianewarray5_Java; } 1.25 + static address g1_wb_pre_Java() { return _g1_wb_pre_Java; } 1.26 + static address g1_wb_post_Java() { return _g1_wb_post_Java; } 1.27 static address vtable_must_compile_stub() { return _vtable_must_compile_Java; } 1.28 static address complete_monitor_locking_Java() { return _complete_monitor_locking_Java; } 1.29 1.30 @@ -232,6 +238,8 @@ 1.31 static const TypeFunc* multianewarray3_Type(); // multianewarray 1.32 static const TypeFunc* multianewarray4_Type(); // multianewarray 1.33 static const TypeFunc* multianewarray5_Type(); // multianewarray 1.34 + static const TypeFunc* g1_wb_pre_Type(); 1.35 + static const TypeFunc* g1_wb_post_Type(); 1.36 static const TypeFunc* complete_monitor_enter_Type(); 1.37 static const TypeFunc* complete_monitor_exit_Type(); 1.38 static const TypeFunc* uncommon_trap_Type();