Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-11-24 06:34:02 +00:00
Code Issues Projects Releases Wiki Activity

halt_printf, control-c, etc set a halt bit. This now invokes the debugger, asynchronously (ie, after the current instruction finishes execution).

Browse Source
This commit is contained in:
Kelvin Sherlock 2019-02-06 22:53:44 -05:00
parent 68260dcf6a
commit 524d4a27e4
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/debug_shell.re2c
View File

@ -876,6 +876,12 @@ int debug_shell(int code) {
} }
printf("%06x: %0*x\n", g_abort_address, g_abort_bytes * 2, g_abort_value); printf("%06x: %0*x\n", g_abort_address, g_abort_bytes * 2, g_abort_value);
} }
if (code == RET_BRK) {
/* hit a BRK op */
}
if (code == RET_HALT) {
/* halt_printf */
}
do_list(engine.kpc, &psr, 1); do_list(engine.kpc, &psr, 1);

3
src/defcomm.h
View File

@ -88,8 +88,7 @@
#define RET_MVN 0x5 #define RET_MVN 0x5
#define RET_WAI 0x6 #define RET_WAI 0x6
#define RET_STP 0x7 #define RET_STP 0x7
#define RET_ADD_DEC_8 0x8 #define RET_HALT 0x8
#define RET_ADD_DEC_16 0x9
#define RET_C700 0xa #define RET_C700 0xa
#define RET_C70A 0xb #define RET_C70A 0xb
#define RET_C70D 0xc #define RET_C70D 0xc

3
src/engine_c.c
View File

@ -880,7 +880,8 @@ word32 get_itimer() {
} }
void set_halt_act(int val) { void set_halt_act(int val) {
if(val == 1 && g_ignore_halts && !g_user_halt_bad) { extern int g_dbg_shell;
if(val == 1 && g_ignore_halts && !g_user_halt_bad && !g_dbg_shell) {
g_code_red++; g_code_red++;
} else { } else {
halt_sim |= val; halt_sim |= val;

25
src/sim65816.c
View File

@ -1514,11 +1514,11 @@ int run_prog() {
ret >>= 28; ret >>= 28;
} }
if(halt_sim == HALT_EVENT) { if(halt_sim & HALT_EVENT) {
g_engine_halt_event++; g_engine_halt_event++;
/* if we needed to stop to check for interrupts, */ /* if we needed to stop to check for interrupts, */
/* clear halt */ /* clear halt */
halt_sim = 0; halt_sim &= ~HALT_EVENT;
} }
#if 0 #if 0
@ -1535,7 +1535,7 @@ int run_prog() {
this_event = g_event_start.next; this_event = g_event_start.next;
while(dcycs >= this_event->dcycs) { while(dcycs >= this_event->dcycs) {
if(halt_sim != 0 && halt_sim != HALT_EVENT) { if(halt_sim & ~HALT_EVENT) {
break; break;
} }
if(g_stepping) { if(g_stepping) {
@ -1605,9 +1605,7 @@ int run_prog() {
} }
#endif #endif
if(halt_sim != 0 && halt_sim != HALT_EVENT) {
break;
}
if (ret == RET_MP) break; if (ret == RET_MP) break;
if (ret == RET_BP) break; if (ret == RET_BP) break;
engine.flags &= ~(FLAG_IGNORE_BP | FLAG_IGNORE_MP); engine.flags &= ~(FLAG_IGNORE_BP | FLAG_IGNORE_MP);
@ -1615,6 +1613,12 @@ int run_prog() {
ret = 0; ret = 0;
break; break;
} }
if(halt_sim & 0x07) {
halt_sim &= ~0x07;
ret = RET_HALT;
break;
}
} }
#if 0 #if 0
@ -2256,14 +2260,6 @@ void handle_action(word32 ret) {
case RET_C70D: case RET_C70D:
do_c70d(ret); do_c70d(ret);
break; break;
#if 0
case RET_ADD_DEC_8:
do_add_dec_8(ret);
break;
case RET_ADD_DEC_16:
do_add_dec_16(ret);
break;
#endif
case RET_IRQ: case RET_IRQ:
irq_printf("Special fast IRQ response. irq_pending: %x\n", irq_printf("Special fast IRQ response. irq_pending: %x\n",
g_irq_pending); g_irq_pending);
@ -2277,6 +2273,7 @@ void handle_action(word32 ret) {
case RET_BP: case RET_BP:
case RET_MP: case RET_MP:
case RET_BRK: case RET_BRK:
case RET_HALT:
/* handled elsewhere */ /* handled elsewhere */
break; break;
default: default: