comparison src/cpu/x86/vm/templateTable_x86_64.cpp @ 3252:92add02409c9

Merge
author jmasa
date Fri, 08 Apr 2011 14:19:50 -0700
parents 38fea01eb669 e1162778c1c8
children 286c498ae0d4
comparison
equal deleted inserted replaced
2437:4f978fb6c81a 3252:92add02409c9
145 __ movq(rdx, obj.base()); 145 __ movq(rdx, obj.base());
146 } 146 }
147 } else { 147 } else {
148 __ leaq(rdx, obj); 148 __ leaq(rdx, obj);
149 } 149 }
150 __ g1_write_barrier_pre(rdx, r8, rbx, val != noreg); 150 __ g1_write_barrier_pre(rdx /* obj */,
151 rbx /* pre_val */,
152 r15_thread /* thread */,
153 r8 /* tmp */,
154 val != noreg /* tosca_live */,
155 false /* expand_call */);
151 if (val == noreg) { 156 if (val == noreg) {
152 __ store_heap_oop_null(Address(rdx, 0)); 157 __ store_heap_oop_null(Address(rdx, 0));
153 } else { 158 } else {
154 __ store_heap_oop(Address(rdx, 0), val); 159 __ store_heap_oop(Address(rdx, 0), val);
155 __ g1_write_barrier_post(rdx, val, r8, rbx); 160 __ g1_write_barrier_post(rdx /* store_adr */,
161 val /* new_val */,
162 r15_thread /* thread */,
163 r8 /* tmp */,
164 rbx /* tmp2 */);
156 } 165 }
157 166
158 } 167 }
159 break; 168 break;
160 #endif // SERIALGC 169 #endif // SERIALGC