equal
deleted
inserted
replaced
1167 const Register pre_val = r0; |
1167 const Register pre_val = r0; |
1168 const Register thread = rthread; |
1168 const Register thread = rthread; |
1169 const Register tmp = rscratch1; |
1169 const Register tmp = rscratch1; |
1170 |
1170 |
1171 Address in_progress(thread, in_bytes(JavaThread::satb_mark_queue_offset() + |
1171 Address in_progress(thread, in_bytes(JavaThread::satb_mark_queue_offset() + |
1172 PtrQueue::byte_offset_of_active())); |
1172 SATBMarkQueue::byte_offset_of_active())); |
1173 |
1173 |
1174 Address queue_index(thread, in_bytes(JavaThread::satb_mark_queue_offset() + |
1174 Address queue_index(thread, in_bytes(JavaThread::satb_mark_queue_offset() + |
1175 PtrQueue::byte_offset_of_index())); |
1175 SATBMarkQueue::byte_offset_of_index())); |
1176 Address buffer(thread, in_bytes(JavaThread::satb_mark_queue_offset() + |
1176 Address buffer(thread, in_bytes(JavaThread::satb_mark_queue_offset() + |
1177 PtrQueue::byte_offset_of_buf())); |
1177 SATBMarkQueue::byte_offset_of_buf())); |
1178 |
1178 |
1179 Label done; |
1179 Label done; |
1180 Label runtime; |
1180 Label runtime; |
1181 |
1181 |
1182 // Can we store original value in the thread's buffer? |
1182 // Can we store original value in the thread's buffer? |
1217 // Must check to see if card is already dirty |
1217 // Must check to see if card is already dirty |
1218 |
1218 |
1219 const Register thread = rthread; |
1219 const Register thread = rthread; |
1220 |
1220 |
1221 Address queue_index(thread, in_bytes(JavaThread::dirty_card_queue_offset() + |
1221 Address queue_index(thread, in_bytes(JavaThread::dirty_card_queue_offset() + |
1222 PtrQueue::byte_offset_of_index())); |
1222 DirtyCardQueue::byte_offset_of_index())); |
1223 Address buffer(thread, in_bytes(JavaThread::dirty_card_queue_offset() + |
1223 Address buffer(thread, in_bytes(JavaThread::dirty_card_queue_offset() + |
1224 PtrQueue::byte_offset_of_buf())); |
1224 DirtyCardQueue::byte_offset_of_buf())); |
1225 |
1225 |
1226 const Register card_addr = rscratch2; |
1226 const Register card_addr = rscratch2; |
1227 ExternalAddress cardtable((address) ct->byte_map_base); |
1227 ExternalAddress cardtable((address) ct->byte_map_base); |
1228 |
1228 |
1229 f.load_argument(0, card_addr); |
1229 f.load_argument(0, card_addr); |