1.1 --- a/src/cpu/x86/vm/templateTable_x86_32.cpp Tue Apr 05 19:14:03 2011 -0700 1.2 +++ b/src/cpu/x86/vm/templateTable_x86_32.cpp Thu Apr 07 09:53:20 2011 -0700 1.3 @@ -139,7 +139,12 @@ 1.4 } 1.5 __ get_thread(rcx); 1.6 __ save_bcp(); 1.7 - __ g1_write_barrier_pre(rdx, rcx, rsi, rbx, val != noreg); 1.8 + __ g1_write_barrier_pre(rdx /* obj */, 1.9 + rbx /* pre_val */, 1.10 + rcx /* thread */, 1.11 + rsi /* tmp */, 1.12 + val != noreg /* tosca_live */, 1.13 + false /* expand_call */); 1.14 1.15 // Do the actual store 1.16 // noreg means NULL 1.17 @@ -148,7 +153,11 @@ 1.18 // No post barrier for NULL 1.19 } else { 1.20 __ movl(Address(rdx, 0), val); 1.21 - __ g1_write_barrier_post(rdx, rax, rcx, rbx, rsi); 1.22 + __ g1_write_barrier_post(rdx /* store_adr */, 1.23 + val /* new_val */, 1.24 + rcx /* thread */, 1.25 + rbx /* tmp */, 1.26 + rsi /* tmp2 */); 1.27 } 1.28 __ restore_bcp(); 1.29