Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-11-27 12:50:04 +00:00
Code Issues Projects Releases Wiki Activity

BRK / COP weren't pushing the current z/neg flags.

Browse Source
This commit is contained in:
Kelvin Sherlock 2019-01-28 23:03:04 -05:00
parent 81c74470ef
commit 0cf532c00d
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/instable.h
View File

@ -81,17 +81,30 @@ brk_testing_SYM
} }
g_num_brk++; g_num_brk++;
INC_KPC_2; INC_KPC_2;
psr = psr & (~0x82);
psr |= (neg << 7);
psr |= ((!zero) << 1);
tmp1 = psr & 0xff;
if(psr & 0x100) { if(psr & 0x100) {
PUSH16(kpc & 0xffff); MMU_CHECK(
PUSH8(psr & 0xff); ((stack - 2) & 0xff) | 0x0100,
(kpc << 8) | tmp1, 3, 1, 1
)
_PUSH16(kpc & 0xffff);
_PUSH8(tmp1);
GET_MEMORY16(0xfffe, kpc, 0); GET_MEMORY16(0xfffe, kpc, 0);
dbank = 0; dbank = 0;
} else { } else {
PUSH8(kpc >> 16); MMU_CHECK(
PUSH16(kpc); (stack - 3) & 0xffff,
PUSH8(psr & 0xff); (kpc << 8) | tmp1, 4, 0, 1
)
_PUSH8(kpc >> 16);
_PUSH16(kpc);
_PUSH8(tmp1);
GET_MEMORY16(0xffe6, kpc, 0); GET_MEMORY16(0xffe6, kpc, 0);
halt_printf("Halting for native break!\n"); //halt_printf("Halting for native break!\n");
} }
kpc = kpc & 0xffff; kpc = kpc & 0xffff;
psr |= 0x4; psr |= 0x4;
@ -155,16 +168,32 @@ cop_native_SYM
#else #else
g_num_cop++; g_num_cop++;
INC_KPC_2; INC_KPC_2;
psr = psr & (~0x82);
psr |= (neg << 7);
psr |= ((!zero) << 1);
tmp1 = psr & 0xff;
if(psr & 0x100) { if(psr & 0x100) {
halt_printf("Halting for emul COP at %04x\n", kpc); //halt_printf("Halting for emul COP at %04x\n", kpc);
PUSH16(kpc & 0xffff); MMU_CHECK(
PUSH8(psr & 0xff); ((stack - 2) & 0xff) | 0x0100,
(kpc << 8) | tmp1, 3, 1, 1
)
_PUSH16(kpc & 0xffff);
_PUSH8(tmp1);
GET_MEMORY16(0xfff4, kpc, 0); GET_MEMORY16(0xfff4, kpc, 0);
dbank = 0; dbank = 0;
} else { } else {
PUSH8(kpc >> 16); MMU_CHECK(
PUSH16(kpc & 0xffff); (stack - 3) & 0xffff,
PUSH8(psr & 0xff); (kpc << 8) | tmp1, 4, 0, 1
)
_PUSH8(kpc >> 16);
_PUSH16(kpc & 0xffff);
_PUSH8(tmp1);
GET_MEMORY16(0xffe4, kpc, 0); GET_MEMORY16(0xffe4, kpc, 0);
} }
kpc = kpc & 0xffff; kpc = kpc & 0xffff;