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

Compare commits

base: paoda:85ffdf44f55f70955f3e862279c2ce8fa76501cf
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things
..
compare: paoda:10255004077e61ef55732827fa8c9d6e35cd5abc
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things

No commits in common. "85ffdf44f55f70955f3e862279c2ce8fa76501cf" and "10255004077e61ef55732827fa8c9d6e35cd5abc" have entirely different histories.
85ffdf44f5 ... 1025500407

2 changed files with 3 additions and 35 deletions
Show Stats Expand all files Collapse all files

27
src/cpu/arm/data_processing.zig
View File

@ -29,18 +29,6 @@ pub fn dataProcessing(comptime I: bool, comptime S: bool, comptime instrKind: u4
} }
switch (instrKind) { switch (instrKind) {
0x2 => {
// SUB
const result = op1 -% op2;
cpu.r[rd] = result;
if (S and rd != 0xF) {
cpu.cpsr.n.write(result >> 31 & 1 == 1);
cpu.cpsr.z.write(result == 0);
cpu.cpsr.c.write(op2 <= op1);
cpu.cpsr.v.write(((op1 ^ result) & (~op2 ^ result)) >> 31 & 1 == 1);
}
},
0x4 => { 0x4 => {
// ADD // ADD
var result: u32 = undefined; var result: u32 = undefined;
@ -79,7 +67,7 @@ pub fn dataProcessing(comptime I: bool, comptime S: bool, comptime instrKind: u4
if (S and rd != 0xF) { if (S and rd != 0xF) {
cpu.cpsr.n.write(op2 >> 31 & 1 == 1); cpu.cpsr.n.write(op2 >> 31 & 1 == 1);
cpu.cpsr.z.write(op2 == 0); cpu.cpsr.z.write(op2 == 0);
// C set by Barrel Shifter, V is unaffected // C set by Barr0x15el Shifter, V is unnafected
} }
}, },
0xA => { 0xA => {
@ -99,18 +87,7 @@ pub fn dataProcessing(comptime I: bool, comptime S: bool, comptime instrKind: u4
if (S and rd != 0xF) { if (S and rd != 0xF) {
cpu.cpsr.n.write(result >> 31 & 1 == 1); cpu.cpsr.n.write(result >> 31 & 1 == 1);
cpu.cpsr.z.write(result == 0); cpu.cpsr.z.write(result == 0);
// C set by Barrel Shifter, V is unaffected // C set by Barr0x15el Shifter, V is unnafected
}
},
0xF => {
// MVN
const result = ~op2;
cpu.r[rd] = result;
if (S and rd != 0xF) {
cpu.cpsr.n.write(result >> 31 & 1 == 1);
cpu.cpsr.z.write(result == 0);
// C set by Barrel Shifter, V is unaffected
} }
}, },
else => std.debug.panic("[CPU] TODO: implement data processing type {}", .{instrKind}), else => std.debug.panic("[CPU] TODO: implement data processing type {}", .{instrKind}),

11
src/cpu/thumb/format3.zig
View File

@ -28,7 +28,6 @@ pub fn format3(comptime op: u2, comptime rd: u3) InstrFn {
cpu.cpsr.v.write(((left ^ result) & (~offset ^ result)) >> 31 & 1 == 1); cpu.cpsr.v.write(((left ^ result) & (~offset ^ result)) >> 31 & 1 == 1);
}, },
0b10 => { 0b10 => {
// ADD
const left = cpu.r[rd]; const left = cpu.r[rd];
var result: u32 = undefined; var result: u32 = undefined;
@ -41,15 +40,7 @@ pub fn format3(comptime op: u2, comptime rd: u3) InstrFn {
cpu.cpsr.v.write(((left ^ result) & (offset ^ result)) >> 31 & 1 == 1); cpu.cpsr.v.write(((left ^ result) & (offset ^ result)) >> 31 & 1 == 1);
}, },
0b11 => { 0b11 => {
// SUB std.debug.panic("TODO: Implement sub R{}, #0x{X:0>2}", .{ rd, offset });
const left = cpu.r[rd];
const result = left -% offset;
cpu.r[rd] = result;
cpu.cpsr.n.write(result >> 31 & 1 == 1);
cpu.cpsr.z.write(result == 0);
cpu.cpsr.c.write(offset <= left);
cpu.cpsr.v.write(((left ^ result) & (~offset ^ result)) >> 31 & 1 == 1);
}, },
} }
} }