folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AltairZ80: Fix HALT stop code conflict with ON ERROR

Browse source 
AltairZ80 uses 0 for the VM-specific HLT instruction stop code.
SCP defines SCPE_OK as 0.
SCP uses 0 to mean all errors ("ON ERROR").

The command "ON 0" will generate "%SIM-ERROR: Invalid argument: 0".

This PR changes the HALT stop code from 0 to 5.
This commit is contained in:
Patrick Linstruth 2022-11-27 06:28:03 -08:00 • committed by Paul Koning
parent e062e2d7c1
commit 3ec3e3aa8f
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AltairZ80/altairz80_defs.h
View file

@ -64,11 +64,11 @@ typedef enum {
} ChipType; } ChipType;
/* simulator stop codes */ /* simulator stop codes */
#define STOP_HALT 0 /* HALT */
#define STOP_IBKPT 1 /* breakpoint (program counter) */ #define STOP_IBKPT 1 /* breakpoint (program counter) */
#define STOP_MEM 2 /* breakpoint (memory access) */ #define STOP_MEM 2 /* breakpoint (memory access) */
#define STOP_INSTR 3 /* breakpoint (instruction access) */ #define STOP_INSTR 3 /* breakpoint (instruction access) */
#define STOP_OPCODE 4 /* invalid operation encountered (8080, Z80, 8086) */ #define STOP_OPCODE 4 /* invalid operation encountered (8080, Z80, 8086) */
#define STOP_HALT 5 /* HALT */
#define UNIT_CPU_V_OPSTOP (UNIT_V_UF+0) /* stop on invalid operation */ #define UNIT_CPU_V_OPSTOP (UNIT_V_UF+0) /* stop on invalid operation */
#define UNIT_CPU_OPSTOP (1 << UNIT_CPU_V_OPSTOP) #define UNIT_CPU_OPSTOP (1 << UNIT_CPU_V_OPSTOP)

5
AltairZ80/altairz80_sys.c
View file

@ -160,11 +160,12 @@ DEVICE *sim_devices[] = {
static char memoryAccessMessage[256]; static char memoryAccessMessage[256];
static char instructionMessage[256]; static char instructionMessage[256];
const char *sim_stop_messages[SCPE_BASE] = { const char *sim_stop_messages[SCPE_BASE] = {
"HALT instruction", "Unknown error", /* 0 is reserved/unknown */
"Breakpoint", "Breakpoint",
memoryAccessMessage, memoryAccessMessage,
instructionMessage, instructionMessage,
"Invalid Opcode" "Invalid Opcode",
"HALT instruction"
}; };
static const char *const Mnemonics8080[] = { static const char *const Mnemonics8080[] = {

2
scp.c
View file

@ -9445,7 +9445,7 @@ t_value pcval;
fputc ('\n', st); /* start on a new line */ fputc ('\n', st); /* start on a new line */
if (v >= SCPE_BASE) /* SCP error? */ if (v == SCPE_OK || v >= SCPE_BASE) /* SCP error? */
fputs (sim_error_text (v), st); /* print it from the SCP list */ fputs (sim_error_text (v), st); /* print it from the SCP list */
else { /* VM error */ else { /* VM error */
if (sim_stop_messages [v]) if (sim_stop_messages [v])