Miroirs/crab
1
0
Fork 0
mirror of https://github.com/mattrberry/crab.git synced 2025-02-06 08:45:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix thumb add not setting value, rename var in thumb multiple load/store

Browse source
This commit is contained in:
Matthew Berry 2020-09-30 22:03:33 -07:00
parent 4194dfb6fd
commit 843fb155df
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/crab/thumb/move_compare_add_subtract.cr
View file

@ -7,7 +7,7 @@ module THUMB
case op case op
when 0b00 then res = @r[rd] = offset when 0b00 then res = @r[rd] = offset
when 0b01 then res = sub(@r[rd], offset, true) when 0b01 then res = sub(@r[rd], offset, true)
when 0b10 then res = add(@r[rd], offset, true) when 0b10 then res = @r[rd] = add(@r[rd], offset, true)
when 0b11 then res = @r[rd] = sub(@r[rd], offset, true) when 0b11 then res = @r[rd] = sub(@r[rd], offset, true)
else raise "Invalid move/compare/add/subtract op: #{op}" else raise "Invalid move/compare/add/subtract op: #{op}"
end end

4
src/crab/thumb/multiple_load_store.cr
View file

@ -1,10 +1,10 @@
module THUMB module THUMB
def thumb_multiple_load_store(instr : Word) : Nil def thumb_multiple_load_store(instr : Word) : Nil
load_from_memory = bit?(instr, 11) load = bit?(instr, 11)
rb = bits(instr, 8..10) rb = bits(instr, 8..10)
list = bits(instr, 0..7) list = bits(instr, 0..7)
address = @r[rb] address = @r[rb]
if load_from_memory # ldmia if load # ldmia
8.times do |idx| 8.times do |idx|
if bit?(list, idx) if bit?(list, idx)
@r[idx] = @gba.bus.read_word(address) @r[idx] = @gba.bus.read_word(address)