--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Thu Apr 28 14:00:13 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Fri Apr 29 11:15:30 2011 -0700
@@ -140,7 +140,12 @@
}
__ get_thread(rcx);
__ save_bcp();
- __ g1_write_barrier_pre(rdx, rcx, rsi, rbx, val != noreg);
+ __ g1_write_barrier_pre(rdx /* obj */,
+ rbx /* pre_val */,
+ rcx /* thread */,
+ rsi /* tmp */,
+ val != noreg /* tosca_live */,
+ false /* expand_call */);
// Do the actual store
// noreg means NULL
@@ -149,7 +154,11 @@
// No post barrier for NULL
} else {
__ movl(Address(rdx, 0), val);
- __ g1_write_barrier_post(rdx, rax, rcx, rbx, rsi);
+ __ g1_write_barrier_post(rdx /* store_adr */,
+ val /* new_val */,
+ rcx /* thread */,
+ rbx /* tmp */,
+ rsi /* tmp2 */);
}
__ restore_bcp();