temp

src/hotspot/cpu/riscv/nativeInst_riscv.hpp

@@ -212,15 +212,6 @@ class NativeInstruction {
   static bool is_load_pc_relative_at(address branch);
 
   static bool is_call_at(address instr) {
-    const int instr_size = NativeInstruction::instruction_size;
-    uint32_t top = Assembler::ld_instr(instr);
-    uint32_t low = Assembler::ld_instr(instr + instr_size);
-    uint32_t magic = Assembler::ld_instr(instr + (2 * instr_size));
-
-    printf("===>> %x %x %x <<==\n", top, low, magic);
-    if (magic == 0xababababu) {
-      return true;
-    }
     if (is_jal_at(instr) || is_jalr_at(instr)) {
       return true;
     }
@@ -280,10 +271,10 @@ inline NativeCall* nativeCall_at(address addr);
 class NativeCall: public NativeInstruction {
  public:
   enum RISCV_specific_constants {
-    instruction_size            =    4,
+    instruction_size            =    NativeInstruction::instruction_size,
     instruction_offset          =    0,
     displacement_offset         =    0,
-    return_address_offset       =    4
+    return_address_offset       =    NativeInstruction::instruction_size
   };
 
   address instruction_address() const       { return addr_at(instruction_offset); }