WIP

Author: Grarak

src/jit/assembler/block_asm.rs

@@ -247,35 +247,27 @@ impl<'a> BlockAsm<'a> {
     }
 
     pub fn load_u8(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>) {
-        self.transfer_read(op0, op1, op2, false, MemoryAmount::Byte)
+        self.transfer(BlockTransferOp::Read, op0, op1, op2, false, MemoryAmount::Byte)
     }
 
     pub fn store_u8(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>) {
-        self.transfer_write(op0, op1, op2, false, MemoryAmount::Byte)
+        self.transfer(BlockTransferOp::Write, op0, op1, op2, false, MemoryAmount::Byte)
     }
 
     pub fn load_u16(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>) {
-        self.transfer_read(op0, op1, op2, false, MemoryAmount::Half)
+        self.transfer(BlockTransferOp::Read, op0, op1, op2, false, MemoryAmount::Half)
     }
 
     pub fn store_u16(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>) {
-        self.transfer_write(op0, op1, op2, false, MemoryAmount::Half)
+        self.transfer(BlockTransferOp::Write, op0, op1, op2, false, MemoryAmount::Half)
     }
 
     pub fn load_u32(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>) {
-        self.transfer_read(op0, op1, op2, false, MemoryAmount::Word)
+        self.transfer(BlockTransferOp::Read, op0, op1, op2, false, MemoryAmount::Word)
     }
 
     pub fn store_u32(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>) {
-        self.transfer_write(op0, op1, op2, false, MemoryAmount::Word)
-    }
-
-    pub fn transfer_read(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>, signed: bool, amount: MemoryAmount) {
-        self.transfer(BlockTransferOp::Read, op0, op1, op2, signed, amount)
-    }
-
-    pub fn transfer_write(&mut self, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>, signed: bool, amount: MemoryAmount) {
-        self.transfer(BlockTransferOp::Write, op0, op1, op2, signed, amount)
+        self.transfer(BlockTransferOp::Write, op0, op1, op2, false, MemoryAmount::Word)
     }
 
     fn transfer(&mut self, op: BlockTransferOp, op0: impl Into<BlockReg>, op1: impl Into<BlockReg>, op2: impl Into<BlockOperandShift>, signed: bool, amount: MemoryAmount) {

src/jit/emitter/emit_branch.rs

@@ -180,6 +180,11 @@ impl<'a, const CPU: CpuType> JitAsm<'a, CPU> {
                 block_asm.epilogue_previous_block();
 
                 block_asm.label(no_return_label);
+
+                if DEBUG_LOG {
+                    block_asm.call2(Self::debug_branch_lr_failed as *const (), asm.jit_buf.current_pc, aligned_target_pc_reg);
+                }
+
                 block_asm.mov(return_stack_ptr_reg, 0);
                 block_asm.store_u8(return_stack_ptr_reg, runtime_data_addr_reg, JitRuntimeData::get_return_stack_ptr_offset() as u32);
                 asm.emit_call_jit_addr(block_asm, aligned_target_pc_reg);
@@ -351,4 +356,8 @@ impl<'a, const CPU: CpuType> JitAsm<'a, CPU> {
     extern "C" fn debug_branch_lr(current_pc: u32, target_pc: u32) {
         println!("{CPU:?} branch lr from {current_pc:x} to {target_pc:x}")
     }
+
+    extern "C" fn debug_branch_lr_failed(current_pc: u32, target_pc: u32) {
+        println!("{CPU:?} failed to branch lr from {current_pc:x} to {target_pc:x}")
+    }
 }