diff src/share/vm/runtime/sharedRuntime.hpp @ 360:5d254928c888

Merge
author ysr
date Wed, 27 Aug 2008 11:20:46 -0700
parents 1ee8caae33af
children 70998f2e05ef
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.hpp	Wed Aug 27 10:56:33 2008 -0700
+++ b/src/share/vm/runtime/sharedRuntime.hpp	Wed Aug 27 11:20:46 2008 -0700
@@ -99,6 +99,12 @@
   static address raw_exception_handler_for_return_address(address return_address);
   static address exception_handler_for_return_address(address return_address);
 
+#ifndef SERIALGC
+  // G1 write barriers
+  static void g1_wb_pre(oopDesc* orig, JavaThread *thread);
+  static void g1_wb_post(void* card_addr, JavaThread* thread);
+#endif // !SERIALGC
+
   // exception handling and implicit exceptions
   static address compute_compiled_exc_handler(nmethod* nm, address ret_pc, Handle& exception,
                                               bool force_unwind, bool top_frame_only);