feat(cpu): implement THUMB format11
This commit is contained in:
parent
33399e9517
commit
1378c809e6
|
@ -31,6 +31,7 @@ const format6 = @import("cpu/thumb/format6.zig").format6;
|
||||||
const format78 = @import("cpu/thumb/format78.zig").format78;
|
const format78 = @import("cpu/thumb/format78.zig").format78;
|
||||||
const format9 = @import("cpu/thumb/format9.zig").format9;
|
const format9 = @import("cpu/thumb/format9.zig").format9;
|
||||||
const format10 = @import("cpu/thumb/format10.zig").format10;
|
const format10 = @import("cpu/thumb/format10.zig").format10;
|
||||||
|
const format11 = @import("cpu/thumb/format11.zig").format11;
|
||||||
const format12 = @import("cpu/thumb/format12.zig").format12;
|
const format12 = @import("cpu/thumb/format12.zig").format12;
|
||||||
const format13 = @import("cpu/thumb/format13.zig").format13;
|
const format13 = @import("cpu/thumb/format13.zig").format13;
|
||||||
const format14 = @import("cpu/thumb/format14.zig").format14;
|
const format14 = @import("cpu/thumb/format14.zig").format14;
|
||||||
|
@ -486,8 +487,10 @@ fn thumbPopulate() [0x400]ThumbInstrFn {
|
||||||
|
|
||||||
lut[i] = format10(L, offset);
|
lut[i] = format10(L, offset);
|
||||||
} else if (i >> 6 & 0xF == 0b1001) {
|
} else if (i >> 6 & 0xF == 0b1001) {
|
||||||
// Format 11 | SP-relative load / store
|
const L = i >> 5 & 1 == 1;
|
||||||
lut[i] = thumbUndefined;
|
const rd = i >> 2 & 0x3;
|
||||||
|
|
||||||
|
lut[i] = format11(L, rd);
|
||||||
} else if (i >> 6 & 0xF == 0b1010) {
|
} else if (i >> 6 & 0xF == 0b1010) {
|
||||||
const isSP = i >> 5 & 1 == 1;
|
const isSP = i >> 5 & 1 == 1;
|
||||||
const rd = i >> 2 & 0x7;
|
const rd = i >> 2 & 0x7;
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
const std = @import("std");
|
||||||
|
|
||||||
|
const Bus = @import("../../Bus.zig");
|
||||||
|
const Arm7tdmi = @import("../../cpu.zig").Arm7tdmi;
|
||||||
|
const InstrFn = @import("../../cpu.zig").ThumbInstrFn;
|
||||||
|
|
||||||
|
pub fn format11(comptime L: bool, comptime rd: u3) InstrFn {
|
||||||
|
return struct {
|
||||||
|
fn inner(cpu: *Arm7tdmi, bus: *Bus, opcode: u16) void {
|
||||||
|
const offset = (opcode & 0xFF) << 2;
|
||||||
|
const address = cpu.r[13] + offset;
|
||||||
|
|
||||||
|
if (L) {
|
||||||
|
const value = bus.read32(address & 0xFFFF_FFFC);
|
||||||
|
cpu.r[rd] = std.math.rotr(u32, value, 8 * (address & 0x3));
|
||||||
|
} else {
|
||||||
|
bus.write32(address & 0xFFFF_FFFC, cpu.r[rd]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.inner;
|
||||||
|
}
|
Loading…
Reference in New Issue