clear pipeline if rd==15 in thumb hi-reg bx, load/store imm, load/store reg

src/crab/thumb/hi_reg_branch_exchange.cr

@@ -22,5 +22,6 @@ module THUMB
       end
       clear_pipeline
     end
+    clear_pipeline if rd == 15
   end
 end

src/crab/thumb/load_store_immediate_offset.cr

@@ -5,11 +5,16 @@ module THUMB
     rb = bits(instr, 3..5)
     rd = bits(instr, 0..2)
     imm = offset << 2
+    address = @r[rb] &+ (offset << 2)
     case byte_quantity_and_load
-    when 0b00 then @gba.bus[@r[rb] + imm] = @r[rd]
+    when 0b00 then @gba.bus[address] = @r[rd]
-    when 0b01 then @r[rd] = @gba.bus.read_word(@r[rb] + imm)
+    when 0b01
-    when 0b10 then @gba.bus[@r[rb] + imm] = @r[rd].to_u8!
+      @r[rd] = @gba.bus.read_word(address)
-    when 0b11 then @r[rd] = @gba.bus[@r[rb] + imm].to_u32
+      clear_pipeline if rd == 15
+    when 0b10 then @gba.bus[address] = 0xFF_u8 & @r[rd]
+    when 0b11
+      @r[rd] = 0xFFFFFFFF_u32 & @gba.bus[address]
+      clear_pipeline if rd == 15
     end
   end
 end

src/crab/thumb/load_store_register_offset.cr

@@ -8,9 +8,12 @@ module THUMB
     case load_and_byte_quantity
     when 0b00 then @gba.bus[address] = @r[rd]
     when 0b01 then @gba.bus[address] = 0xFF_u8 & @r[rd]
-      when 0b10 then @r[rd] = @gba.bus.read_word address
+    when 0b10
-      when 0b11 then @r[rd] = 0xFFFFFFFF_u32 & @gba.bus[address]
+      @r[rd] = @gba.bus.read_word address
+      clear_pipeline if rd == 15
+    when 0b11
+      @r[rd] = 0xFFFFFFFF_u32 & @gba.bus[address]
+      clear_pipeline if rd == 15
     end
   end
 end
-