Remove one jump

robehn · Feb 21, 2024 · 113f18c · 113f18c
1 parent 32298a0
commit 113f18c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -875,7 +875,7 @@ void MacroAssembler::jump_link(const address dest, Register ra_reg, Register tem
   }
 }
 
-void MacroAssembler::jump_link(const Address &adr, Register ra_reg, Register temp) {
+void MacroAssembler::jump_link_relocate(const Address &adr, Register ra_reg, Register temp) {
   switch (adr.getMode()) {
     case Address::literal: {
       relocate(adr.rspec(), [&] {
@@ -4341,7 +4341,7 @@ address MacroAssembler::zero_words(Register ptr, Register cnt) {
         return nullptr;
       }
     } else {
-      jump_link(zero_blocks, x1, t0);
+      jump_link_relocate(zero_blocks, x1, t0);
     }
   }
   bind(around);

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -592,11 +592,11 @@ class MacroAssembler: public Assembler {
  private:
   void jump_link_wrap_label(Register Rd, const address dest, Register temp = t0);
   void jump_link(const address dest, Register ra_reg, Register temp);
-  void jump_link(const Address &adr, Register ra_reg, Register temp);
+  void jump_link_relocate(const Address &adr, Register ra_reg, Register temp);
  public:
 
   void j(const address dest, Register temp = t0) {   jump_link(dest, x0, temp); };
-  void j(const Address &adr, Register temp = t0) {   jump_link(adr,  x0, temp); };
+  void j(const Address &adr, Register temp = t0) {   jump_link_relocate(adr,  x0, temp); };
   void j(Label &l, Register temp = t0);
 
   void call(const address dest, Register temp = t0) {