GuyPerfect/pvbemu
GuyPerfect
/
pvbemu
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPU bug fixes

This commit is contained in:
Guy Perfect 2024-10-13 10:29:54 -05:00
parent 5f563e6cac
commit 7c25a4ac93
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/cpu.c
View File

@ -529,8 +529,7 @@ static uint32_t cpuSetSystemRegister(VB*sim,
} }
/* Addition common processing */ /* Addition common processing */
static int32_t cpuAdd(VB *sim, int32_t b) { static int32_t cpuAdd(VB *sim, int32_t a, int32_t b) {
int32_t a = cpuGetReg2(sim);
int32_t c = a + b; int32_t c = a + b;
sim->cpu.psw.cy = (uint32_t) c < (uint32_t) a; sim->cpu.psw.cy = (uint32_t) c < (uint32_t) a;
sim->cpu.psw.ov = (~(a ^ b) & (a ^ c)) < 0; sim->cpu.psw.ov = (~(a ^ b) & (a ^ c)) < 0;
@ -659,8 +658,7 @@ static int32_t cpuShiftRight(VB *sim, int32_t b) {
} }
/* Subtraction common processing */ /* Subtraction common processing */
static int32_t cpuSubtract(VB *sim, int32_t b) { static int32_t cpuSubtract(VB *sim, int32_t a, int32_t b) {
int32_t a = cpuGetReg2(sim);
int32_t c = a - b; int32_t c = a - b;
sim->cpu.psw.cy = (uint32_t) a < (uint32_t) b; sim->cpu.psw.cy = (uint32_t) a < (uint32_t) b;
sim->cpu.psw.ov = ((a ^ b) & (a ^ c)) < 0; sim->cpu.psw.ov = ((a ^ b) & (a ^ c)) < 0;
@ -735,13 +733,13 @@ static int cpuST_OUT(VB *sim, int type) {
/* ADD immediate */ /* ADD immediate */
static void cpuADDImm(VB *sim) { static void cpuADDImm(VB *sim) {
cpuSetReg2(sim, cpuAdd(sim, cpuGetImm5S(sim))); cpuSetReg2(sim, cpuAdd(sim, cpuGetReg2(sim), cpuGetImm5S(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
/* ADD register */ /* ADD register */
static void cpuADDReg(VB *sim) { static void cpuADDReg(VB *sim) {
cpuSetReg2(sim, cpuAdd(sim, cpuGetReg1(sim))); cpuSetReg2(sim, cpuAdd(sim, cpuGetReg2(sim), cpuGetReg1(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
@ -762,7 +760,7 @@ static void cpuADDF_S(VB *sim) {
/* ADDI */ /* ADDI */
static void cpuADDI(VB *sim) { static void cpuADDI(VB *sim) {
cpuSetReg2(sim, cpuAdd(sim, cpuGetImm16S(sim))); cpuSetReg2(sim, cpuAdd(sim, cpuGetReg1(sim), cpuGetImm16S(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
@ -774,7 +772,7 @@ static void cpuAND(VB *sim) {
/* ANDI */ /* ANDI */
static void cpuANDI(VB *sim) { static void cpuANDI(VB *sim) {
cpuSetReg2(sim, cpuBitwise(sim, cpuGetReg2(sim) & cpuGetImm16U(sim))); cpuSetReg2(sim, cpuBitwise(sim, cpuGetReg1(sim) & cpuGetImm16U(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
@ -803,7 +801,7 @@ static int cpuCAXI(VB *sim) {
/* Update state */ /* Update state */
sim->cpu.clocks += cpuClocks(1); /* TODO: Research */ sim->cpu.clocks += cpuClocks(1); /* TODO: Research */
cpuSubtract(sim, auxData.value); cpuSubtract(sim, cpuGetReg2(sim), auxData.value);
if (sim->cpu.psw.z) if (sim->cpu.psw.z)
auxData.value = sim->cpu.program[30]; auxData.value = sim->cpu.program[30];
@ -832,13 +830,13 @@ static void cpuCLI(VB *sim) {
/* CMP immediate */ /* CMP immediate */
static void cpuCMPImm(VB *sim) { static void cpuCMPImm(VB *sim) {
cpuSubtract(sim, cpuGetImm5S(sim)); cpuSubtract(sim, cpuGetReg2(sim), cpuGetImm5S(sim));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
/* CMP register */ /* CMP register */
static void cpuCMPReg(VB *sim) { static void cpuCMPReg(VB *sim) {
cpuSubtract(sim, cpuGetReg1(sim)); cpuSubtract(sim, cpuGetReg2(sim), cpuGetReg1(sim));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
@ -1148,7 +1146,7 @@ static void cpuOR(VB *sim) {
/* ORI */ /* ORI */
static void cpuORI(VB *sim) { static void cpuORI(VB *sim) {
cpuSetReg2(sim, cpuBitwise(sim, cpuGetReg2(sim) | cpuGetImm16U(sim))); cpuSetReg2(sim, cpuBitwise(sim, cpuGetReg1(sim) | cpuGetImm16U(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
@ -1262,7 +1260,7 @@ static void cpuSTSR(VB *sim) {
/* SUB */ /* SUB */
static void cpuSUB(VB *sim) { static void cpuSUB(VB *sim) {
cpuSetReg2(sim, cpuSubtract(sim, cpuGetReg1(sim))); cpuSetReg2(sim, cpuSubtract(sim, cpuGetReg2(sim), cpuGetReg1(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }
@ -1334,7 +1332,7 @@ static void cpuXOR(VB *sim) {
/* XORI */ /* XORI */
static void cpuXORI(VB *sim) { static void cpuXORI(VB *sim) {
cpuSetReg2(sim, cpuBitwise(sim, cpuGetReg2(sim) ^ cpuGetImm16U(sim))); cpuSetReg2(sim, cpuBitwise(sim, cpuGetReg1(sim) ^ cpuGetImm16U(sim)));
cpuAdvance(sim, cpuClocks(1)); cpuAdvance(sim, cpuClocks(1));
} }