summaryrefslogtreecommitdiff
path: root/debug.c
diff options
context:
space:
mode:
Diffstat (limited to 'debug.c')
-rw-r--r--debug.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/debug.c b/debug.c
index 97bc5cd..fc0b568 100644
--- a/debug.c
+++ b/debug.c
@@ -278,22 +278,22 @@ void debug_print_registers()
printf("Flags: %d %d %d %d %d %d %d %d %d %d %d\n\n",
(SIGN_FLAG != 0),
(ZERO_FLAG != 0),
- (REG_F & UNDOC5_MASK) != 0,
+ (reg_F & UNDOC5_MASK) != 0,
(HALF_CARRY_FLAG != 0),
- (REG_F & UNDOC3_MASK) != 0,
+ (reg_F & UNDOC3_MASK) != 0,
(OVERFLOW_FLAG != 0),
(SUBTRACT_FLAG != 0),
(CARRY_FLAG != 0),
z80_state.iff1, z80_state.iff2, z80_state.interrupt_mode);
printf("A F: %.2x %.2x IX: %.4x AF': %.4x\n",
- REG_A, REG_F, REG_IX, REG_AF_PRIME);
+ reg_A, reg_F, reg_IX, reg_AF_PRIME);
printf("B C: %.2x %.2x IY: %.4x BC': %.4x\n",
- REG_B, REG_C, REG_IY, REG_BC_PRIME);
+ reg_B, reg_C, reg_IY, reg_BC_PRIME);
printf("D E: %.2x %.2x PC: %.4x DE': %.4x\n",
- REG_D, REG_E, REG_PC, REG_DE_PRIME);
+ reg_D, reg_E, reg_PC, reg_DE_PRIME);
printf("H L: %.2x %.2x SP: %.4x HL': %.4x\n",
- REG_H, REG_L, REG_SP, REG_HL_PRIME);
+ reg_H, reg_L, reg_SP, reg_HL_PRIME);
printf("\nT-state counter: %" TSTATE_T_LEN " ", z80_state.t_count);
printf("Delay setting: %d (%s)\n",
@@ -377,7 +377,7 @@ static void debug_run()
stop_signaled = 0;
- t = traps[REG_PC];
+ t = traps[reg_PC];
while(!stop_signaled)
{
if(t)
@@ -385,7 +385,7 @@ static void debug_run()
if(t & TRACE_FLAG)
{
printf("Trace: ");
- disassemble(REG_PC);
+ disassemble(reg_PC);
}
if(t & DISASSEMBLE_ON_FLAG)
{
@@ -397,7 +397,7 @@ static void debug_run()
}
}
- if(print_instructions) disassemble(REG_PC);
+ if(print_instructions) disassemble(reg_PC);
continuous = (!print_instructions && num_traps == 0);
if (z80_run(continuous)) {
@@ -405,7 +405,7 @@ static void debug_run()
stop_signaled = 1;
}
- t = traps[REG_PC];
+ t = traps[reg_PC];
if(t & BREAKPOINT_FLAG)
{
stop_signaled = 1;
@@ -413,7 +413,7 @@ static void debug_run()
if(t & BREAK_ONCE_FLAG)
{
stop_signaled = 1;
- clear_trap_address(REG_PC, BREAK_ONCE_FLAG);
+ clear_trap_address(reg_PC, BREAK_ONCE_FLAG);
}
/*
@@ -452,7 +452,7 @@ static void debug_run()
}
signal(SIGINT, old_signal_handler);
- printf("Stopped at %.4x\n", REG_PC);
+ printf("Stopped at %.4x\n", reg_PC);
}
void debug_shell()
@@ -474,7 +474,7 @@ void debug_shell()
while(!done)
{
printf("\n");
- disassemble(REG_PC);
+ disassemble(reg_PC);
sigemptyset(&set);
sigaddset(&set, SIGALRM);
@@ -523,7 +523,7 @@ void debug_shell()
}
else if(!strcmp(command, "clear"))
{
- clear_trap_address(REG_PC, 0);
+ clear_trap_address(reg_PC, 0);
}
else if(!strcmp(command, "cont"))
{
@@ -569,7 +569,7 @@ void debug_shell()
}
else
{
- start = REG_PC;
+ start = reg_PC;
lines = 10;
}
@@ -591,7 +591,7 @@ void debug_shell()
else if(!strcmp(command, "next") || !strcmp(command, "nextint"))
{
int is_call = 0, is_rst = 0;
- switch(mem_read(REG_PC)) {
+ switch(mem_read(reg_PC)) {
case 0xCD: /* call address */
is_call = 1;
break;
@@ -633,10 +633,10 @@ void debug_shell()
break;
}
if (is_call) {
- set_trap((REG_PC + 3) % ADDRESS_SPACE, BREAK_ONCE_FLAG);
+ set_trap((reg_PC + 3) % ADDRESS_SPACE, BREAK_ONCE_FLAG);
debug_run();
} else if (is_rst) {
- set_trap((REG_PC + 1) % ADDRESS_SPACE, BREAK_ONCE_FLAG);
+ set_trap((reg_PC + 1) % ADDRESS_SPACE, BREAK_ONCE_FLAG);
debug_run();
} else {
z80_run((!strcmp(command, "nextint")) ? 0 : -1);
@@ -674,47 +674,47 @@ void debug_shell()
if(sscanf(input, "%*s $%[a-zA-Z] = %x", regname, &value) == 2)
{
if(!strcasecmp(regname, "a")) {
- REG_A = value;
+ reg_A = value;
} else if(!strcasecmp(regname, "f")) {
- REG_F = value;
+ reg_F = value;
} else if(!strcasecmp(regname, "b")) {
- REG_B = value;
+ reg_B = value;
} else if(!strcasecmp(regname, "c")) {
- REG_C = value;
+ reg_C = value;
} else if(!strcasecmp(regname, "d")) {
- REG_D = value;
+ reg_D = value;
} else if(!strcasecmp(regname, "e")) {
- REG_E = value;
+ reg_E = value;
} else if(!strcasecmp(regname, "h")) {
- REG_H = value;
+ reg_H = value;
} else if(!strcasecmp(regname, "l")) {
- REG_L = value;
+ reg_L = value;
} else if(!strcasecmp(regname, "sp")) {
- REG_SP = value;
+ reg_SP = value;
} else if(!strcasecmp(regname, "pc")) {
- REG_PC = value;
+ reg_PC = value;
} else if(!strcasecmp(regname, "af")) {
- REG_AF = value;
+ reg_AF = value;
} else if(!strcasecmp(regname, "bc")) {
- REG_BC = value;
+ reg_BC = value;
} else if(!strcasecmp(regname, "de")) {
- REG_DE = value;
+ reg_DE = value;
} else if(!strcasecmp(regname, "hl")) {
- REG_HL = value;
+ reg_HL = value;
} else if(!strcasecmp(regname, "af'")) {
- REG_AF_PRIME = value;
+ reg_AF_PRIME = value;
} else if(!strcasecmp(regname, "bc'")) {
- REG_BC_PRIME = value;
+ reg_BC_PRIME = value;
} else if(!strcasecmp(regname, "de'")) {
- REG_DE_PRIME = value;
+ reg_DE_PRIME = value;
} else if(!strcasecmp(regname, "hl'")) {
- REG_HL_PRIME = value;
+ reg_HL_PRIME = value;
} else if(!strcasecmp(regname, "ix")) {
- REG_IX = value;
+ reg_IX = value;
} else if(!strcasecmp(regname, "iy")) {
- REG_IY = value;
+ reg_IY = value;
} else if(!strcasecmp(regname, "i")) {
- REG_I = value;
+ reg_I = value;
} else {
printf("Unrecognized register name %s.\n", regname);
}
@@ -743,7 +743,7 @@ void debug_shell()
if(sscanf(input, "stop at %x", &address) != 1 &&
sscanf(input, "break %x", &address) != 1)
{
- address = REG_PC;
+ address = reg_PC;
}
address %= ADDRESS_SPACE;
set_trap(address, BREAKPOINT_FLAG);
@@ -754,7 +754,7 @@ void debug_shell()
if(sscanf(input, "trace %x", &address) != 1)
{
- address = REG_PC;
+ address = reg_PC;
}
address %= ADDRESS_SPACE;
set_trap(address, TRACE_FLAG);
@@ -889,10 +889,10 @@ test_add(int a, int b)
if(carry_out(a, b, result) & 0x80) flags |= CARRY_MASK;
do_add_flags(a, b, result);
- if(REG_F != flags)
+ if(reg_F != flags)
{
printf("error: %d + %d = %d, expected %.2x, got %.2x\n",
- a, b, result, flags, REG_F);
+ a, b, result, flags, reg_F);
}
}
@@ -919,10 +919,10 @@ test_sub(int a, int b)
do_sub_flags(a, b, result);
- if(REG_F != flags)
+ if(reg_F != flags)
{
printf("error: %d - %d = %d, expected %.2x, got %.2x\n",
- a, b, result, flags, REG_F);
+ a, b, result, flags, reg_F);
}
}