paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: remove accidental rotation in ldrsh instructions

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-10-21 05:12:35 -03:00
parent c08e331f77
commit 40f3600de2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/arm/half_signed_data_transfer.zig
View File

@ -47,13 +47,11 @@ pub fn halfAndSignedDataTransfer(comptime P: bool, comptime U: bool, comptime I:
}, },
0b11 => { 0b11 => {
// LDRSH // LDRSH
const value = if (address & 1 == 1) blk: { result = if (address & 1 == 1) blk: {
break :blk sext(8, bus.read(u8, address)); break :blk sext(8, bus.read(u8, address));
} else blk: { } else blk: {
break :blk sext(16, bus.read(u16, address)); break :blk sext(16, bus.read(u16, address));
}; };
result = rotr(u32, value, 8 * (address & 1));
}, },
0b00 => unreachable, // SWP 0b00 => unreachable, // SWP
} }

4
src/cpu/thumb/data_transfer.zig
View File

@ -45,13 +45,11 @@ pub fn format78(comptime op: u2, comptime T: bool) InstrFn {
}, },
0b11 => { 0b11 => {
// LDRSH // LDRSH
const value = if (address & 1 == 1) blk: { cpu.r[rd] = if (address & 1 == 1) blk: {
break :blk sext(8, bus.read(u8, address)); break :blk sext(8, bus.read(u8, address));
} else blk: { } else blk: {
break :blk sext(16, bus.read(u16, address)); break :blk sext(16, bus.read(u16, address));
}; };
cpu.r[rd] = rotr(u32, value, 8 * (address & 1));
}, },
} }
} else { } else {