@@ -388,7 +388,7 @@ void MacroAssembler::verify_oop(Register reg, const char* s) {
388
388
// The length of the instruction sequence emitted should be independent
389
389
// of the values of the local char buffer address so that the size of mach
390
390
// nodes for scratch emit and normal emit matches.
391
- mv (t0, (address)b);
391
+ movptr (t0, (address)b);
392
392
393
393
// call indirectly to solve generation ordering problem
394
394
int32_t offset = 0 ;
@@ -427,7 +427,7 @@ void MacroAssembler::verify_oop_addr(Address addr, const char* s) {
427
427
// The length of the instruction sequence emitted should be independent
428
428
// of the values of the local char buffer address so that the size of mach
429
429
// nodes for scratch emit and normal emit matches.
430
- mv (t0, (address)b);
430
+ movptr (t0, (address)b);
431
431
432
432
// call indirectly to solve generation ordering problem
433
433
int32_t offset = 0 ;
@@ -1293,12 +1293,6 @@ void MacroAssembler::mv(Register Rd, Address dest) {
1293
1293
movptr (Rd, dest.target ());
1294
1294
}
1295
1295
1296
- void MacroAssembler::mv (Register Rd, address addr) {
1297
- // Here in case of use with relocation, use fix length instruction
1298
- // movptr instead of li
1299
- movptr (Rd, addr);
1300
- }
1301
-
1302
1296
void MacroAssembler::mv (Register Rd, RegisterOrConstant src) {
1303
1297
if (src.is_register ()) {
1304
1298
mv (Rd, src.as_register ());
@@ -2615,11 +2609,10 @@ void MacroAssembler::get_thread(Register thread) {
2615
2609
RegSet::range (x28, x31) + ra - thread;
2616
2610
push_reg (saved_regs, sp);
2617
2611
2618
- int32_t offset = 0 ;
2619
- movptr_with_offset (ra, CAST_FROM_FN_PTR (address, Thread::current), offset);
2620
- jalr (ra, ra, offset);
2621
- if (thread != x10) {
2622
- mv (thread, x10);
2612
+ mv (ra, CAST_FROM_FN_PTR (address, Thread::current));
2613
+ jalr (ra);
2614
+ if (thread != c_rarg0) {
2615
+ mv (thread, c_rarg0);
2623
2616
}
2624
2617
2625
2618
// restore pushed registers
0 commit comments