Miroirs/crab
1
0
Fork 0
mirror of https://github.com/mattrberry/crab.git synced 2025-01-29 20:35:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix fake pipeline: actually read words in arm pipeline, read correct regs

Browse source
This commit is contained in:
Matthew Berry 2021-02-12 00:42:38 -08:00
parent b4af85523e
commit f03c90a13b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/crab/cpu.cr
View file

@ -95,12 +95,12 @@ class CPU
def fill_pipeline : Nil
if @cpsr.thumb
pc = @r[15] & ~1
@pipeline.push @gba.bus.read_half(@r[15] &- 2).to_u32!
@pipeline.push @gba.bus.read_half(@r[15]).to_u32!
@pipeline.push @gba.bus.read_half(@r[15] &- 2).to_u32! if @pipeline.size == 0
@pipeline.push @gba.bus.read_half(@r[15]).to_u32! if @pipeline.size == 1
else
pc = @r[15] & ~3
@pipeline.push @gba.bus.read_half(@r[15] &- 4).to_u32!
@pipeline.push @gba.bus.read_half(@r[15]).to_u32!
@pipeline.push @gba.bus.read_word(@r[15] &- 4) if @pipeline.size == 0
@pipeline.push @gba.bus.read_word(@r[15]) if @pipeline.size == 1
end
end