6502
/
erc-c
mirror of https://github.com/pevans/erc-c.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move vm_debug fully into apple2

This commit is contained in:
Peter Evans 2018-04-07 00:53:17 -05:00
parent 27d0a15bc5
commit 4b0b8e1a89
5 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/vm_debug.h → include/apple2/debug.h
View File

@ -1,12 +1,12 @@
#ifndef _VM_DEBUG_H_ #ifndef _APPLE2_DEBUG_H_
#define _VM_DEBUG_H_ #define _APPLE2_DEBUG_H_
#include <stdbool.h> #include <stdbool.h>
struct vm_debug_args; struct apple2_debug_args;
typedef struct vm_debug_args vm_debug_args; typedef struct apple2_debug_args apple2_debug_args;
typedef void (*vm_debug_func)(vm_debug_args *); typedef void (*apple2_debug_func)(apple2_debug_args *);
typedef struct { typedef struct {
/* /*
@ -20,7 +20,7 @@ typedef struct {
/* /*
* The function that will do something with the command's input * The function that will do something with the command's input
*/ */
vm_debug_func handler; apple2_debug_func handler;
/* /*
* The number of arguments we expect to see * The number of arguments we expect to see
@ -36,9 +36,9 @@ typedef struct {
* What do we do? * What do we do?
*/ */
char *desc; char *desc;
} vm_debug_cmd; } apple2_debug_cmd;
struct vm_debug_args { struct apple2_debug_args {
/* /*
* Most commands that need an argument will simply use addr1, but a * Most commands that need an argument will simply use addr1, but a
* few have more than one address--hence addr2. * few have more than one address--hence addr2.
@ -60,22 +60,22 @@ struct vm_debug_args {
* The command our arguments are attached to; from here we can call * The command our arguments are attached to; from here we can call
* the handler with ourselves. (Very meta.) * the handler with ourselves. (Very meta.)
*/ */
vm_debug_cmd *cmd; apple2_debug_cmd *cmd;
}; };
#define DEBUG_CMD(x) \ #define DEBUG_CMD(x) \
void vm_debug_cmd_##x (vm_debug_args *args) void apple2_debug_cmd_##x (apple2_debug_args *args)
extern int vm_debug_addr(const char *); extern int apple2_debug_addr(const char *);
extern bool vm_debug_broke(int); extern bool apple2_debug_broke(int);
extern char *vm_debug_next_arg(char **); extern char *apple2_debug_next_arg(char **);
extern char *vm_debug_prompt(); extern char *apple2_debug_prompt();
extern vm_debug_cmd *vm_debug_find_cmd(const char *); extern apple2_debug_cmd *apple2_debug_find_cmd(const char *);
extern void vm_debug_break(int); extern void apple2_debug_break(int);
extern void vm_debug_execute(const char *); extern void apple2_debug_execute(const char *);
extern void vm_debug_quit(); extern void apple2_debug_quit();
extern void vm_debug_unbreak(int); extern void apple2_debug_unbreak(int);
extern void vm_debug_unbreak_all(); extern void apple2_debug_unbreak_all();
extern DEBUG_CMD(break); extern DEBUG_CMD(break);
extern DEBUG_CMD(dblock); extern DEBUG_CMD(dblock);

2
sources.cmake
View File

@ -3,6 +3,7 @@ set(erc_sources
apple2/bank.c apple2/bank.c
apple2/dbuf.c apple2/dbuf.c
apple2/dd.c apple2/dd.c
apple2/debug.c
apple2/dec.c apple2/dec.c
apple2/draw.c apple2/draw.c
apple2/enc.c apple2/enc.c
@ -27,7 +28,6 @@ set(erc_sources
option.c option.c
vm_area.c vm_area.c
vm_bitfont.c vm_bitfont.c
vm_debug.c
vm_di.c vm_di.c
vm_event.c vm_event.c
vm_screen.c vm_screen.c

12
src/apple2/apple2.c
View File

@ -9,13 +9,13 @@
#include <unistd.h> #include <unistd.h>
#include "apple2/apple2.h" #include "apple2/apple2.h"
#include "apple2/debug.h"
#include "apple2/draw.h" #include "apple2/draw.h"
#include "apple2/mem.h" #include "apple2/mem.h"
#include "mos6502/enums.h"
#include "mos6502/dis.h" #include "mos6502/dis.h"
#include "mos6502/enums.h"
#include "objstore.h" #include "objstore.h"
#include "option.h" #include "option.h"
#include "vm_debug.h"
#include "vm_di.h" #include "vm_di.h"
#include "vm_event.h" #include "vm_event.h"
#include "vm_segment.h" #include "vm_segment.h"
@ -353,7 +353,7 @@ apple2_run_loop(apple2 *mach)
i = 0; i = 0;
} }
if (vm_debug_broke(mach->cpu->PC)) { if (apple2_debug_broke(mach->cpu->PC)) {
mach->paused = true; mach->paused = true;
} }
@ -369,10 +369,10 @@ apple2_run_loop(apple2 *mach)
mach->selected_drive->locked = false; mach->selected_drive->locked = false;
} }
char *input = vm_debug_prompt(); char *input = apple2_debug_prompt();
if (input != NULL) { if (input != NULL) {
vm_debug_execute(input); apple2_debug_execute(input);
} }
free(input); free(input);
@ -391,7 +391,7 @@ apple2_run_loop(apple2 *mach)
} }
} }
if (!vm_debug_broke(mach->cpu->PC)) { if (!apple2_debug_broke(mach->cpu->PC)) {
mos6502_execute(mach->cpu); mos6502_execute(mach->cpu);
} }

100
src/vm_debug.c → src/apple2/debug.c
View File

@ -1,5 +1,5 @@
/* /*
* vm_debug.c * apple2_debug.c
*/ */
#include <ctype.h> #include <ctype.h>
@ -10,10 +10,10 @@
#include <strings.h> #include <strings.h>
#include "apple2/apple2.h" #include "apple2/apple2.h"
#include "apple2/debug.h"
#include "apple2/hires.h" #include "apple2/hires.h"
#include "mos6502/mos6502.h"
#include "mos6502/dis.h" #include "mos6502/dis.h"
#include "vm_debug.h" #include "mos6502/mos6502.h"
#include "vm_di.h" #include "vm_di.h"
#include "vm_event.h" #include "vm_event.h"
@ -33,47 +33,47 @@ static bool breakpoints[BREAKPOINTS_MAX];
* A table of commands that we support in the debugger. This list is * A table of commands that we support in the debugger. This list is
* printed out (in somewhat readable form) by the help/h command. * printed out (in somewhat readable form) by the help/h command.
*/ */
vm_debug_cmd cmdtable[] = { apple2_debug_cmd cmdtable[] = {
{ "break", "b", vm_debug_cmd_break, 1, "<addr>", { "break", "b", apple2_debug_cmd_break, 1, "<addr>",
"Add breakpoint at <addr>", }, "Add breakpoint at <addr>", },
{ "dblock", "db", vm_debug_cmd_dblock, 2, "<from> <to>", { "dblock", "db", apple2_debug_cmd_dblock, 2, "<from> <to>",
"Disassemble a block of code", }, "Disassemble a block of code", },
{ "disasm", "d", vm_debug_cmd_disasm, 0, "", { "disasm", "d", apple2_debug_cmd_disasm, 0, "",
"Toggle disassembly", }, "Toggle disassembly", },
{ "help", "h", vm_debug_cmd_help, 0, "", { "help", "h", apple2_debug_cmd_help, 0, "",
"Print out this list of commands", }, "Print out this list of commands", },
{ "hdump", "hd", vm_debug_cmd_hdump, 2, "<from> <to>", { "hdump", "hd", apple2_debug_cmd_hdump, 2, "<from> <to>",
"Hex dump memory in a given region", }, "Hex dump memory in a given region", },
{ "hidump", "hid", vm_debug_cmd_hidump, 1, "<file>", { "hidump", "hid", apple2_debug_cmd_hidump, 1, "<file>",
"Dump hires graphics memory to file", }, "Dump hires graphics memory to file", },
{ "jump", "j", vm_debug_cmd_jump, 1, "<addr>", { "jump", "j", apple2_debug_cmd_jump, 1, "<addr>",
"Jump to <addr> for next execution", }, "Jump to <addr> for next execution", },
{ "printaddr", "pa", vm_debug_cmd_printaddr, 1, "<addr>", { "printaddr", "pa", apple2_debug_cmd_printaddr, 1, "<addr>",
"Print the value at memory address <addr>", }, "Print the value at memory address <addr>", },
{ "printstate", "ps", vm_debug_cmd_printstate, 0, "", { "printstate", "ps", apple2_debug_cmd_printstate, 0, "",
"Print the machine and CPU state", }, "Print the machine and CPU state", },
{ "quit", "q", vm_debug_cmd_quit, 0, "", { "quit", "q", apple2_debug_cmd_quit, 0, "",
"Quit the emulator", }, "Quit the emulator", },
{ "resume", "r", vm_debug_cmd_resume, 0, "", { "resume", "r", apple2_debug_cmd_resume, 0, "",
"Resume execution", }, "Resume execution", },
{ "step", "s", vm_debug_cmd_step, 0, "", { "step", "s", apple2_debug_cmd_step, 0, "",
"Execute the current opcode and break at the next", }, "Execute the current opcode and break at the next", },
{ "unbreak", "u", vm_debug_cmd_unbreak, 1, "<addr>", { "unbreak", "u", apple2_debug_cmd_unbreak, 1, "<addr>",
"Remove breakpoint at <addr>", }, "Remove breakpoint at <addr>", },
{ "writeaddr", "wa", vm_debug_cmd_writeaddr, 2, "<addr> <byte>", { "writeaddr", "wa", apple2_debug_cmd_writeaddr, 2, "<addr> <byte>",
"Write <byte> at <addr>", }, "Write <byte> at <addr>", },
{ "writestate", "ws", vm_debug_cmd_writestate, 2, "<reg> <byte>", { "writestate", "ws", apple2_debug_cmd_writestate, 2, "<reg> <byte>",
"Write <byte> into <reg>", }, "Write <byte> into <reg>", },
}; };
#define CMDTABLE_SIZE (sizeof(cmdtable) / sizeof(vm_debug_cmd)) #define CMDTABLE_SIZE (sizeof(cmdtable) / sizeof(apple2_debug_cmd))
/* /*
* Return the next argument in a string passed in for input with the * Return the next argument in a string passed in for input with the
* debugger. All arguments are space-separated. * debugger. All arguments are space-separated.
*/ */
char * char *
vm_debug_next_arg(char **str) apple2_debug_next_arg(char **str)
{ {
char *tok; char *tok;
@ -94,7 +94,7 @@ vm_debug_next_arg(char **str)
* with. * with.
*/ */
int int
vm_debug_addr(const char *str) apple2_debug_addr(const char *str)
{ {
int addr; int addr;
@ -120,7 +120,7 @@ vm_debug_addr(const char *str)
* Add a breakpoint for addr * Add a breakpoint for addr
*/ */
void void
vm_debug_break(int addr) apple2_debug_break(int addr)
{ {
if (addr < 0 || addr >= BREAKPOINTS_MAX) { if (addr < 0 || addr >= BREAKPOINTS_MAX) {
return; return;
@ -133,7 +133,7 @@ vm_debug_break(int addr)
* Remove a breakpoint for addr, if one is set * Remove a breakpoint for addr, if one is set
*/ */
void void
vm_debug_unbreak(int addr) apple2_debug_unbreak(int addr)
{ {
if (addr < 0 || addr >= BREAKPOINTS_MAX) { if (addr < 0 || addr >= BREAKPOINTS_MAX) {
return; return;
@ -146,7 +146,7 @@ vm_debug_unbreak(int addr)
* Return true if there is a breakpoint set for addr * Return true if there is a breakpoint set for addr
*/ */
bool bool
vm_debug_broke(int addr) apple2_debug_broke(int addr)
{ {
if (addr < 0 || addr >= BREAKPOINTS_MAX) { if (addr < 0 || addr >= BREAKPOINTS_MAX) {
return false; return false;
@ -162,7 +162,7 @@ vm_debug_broke(int addr)
* array when tearing down for a given test. * array when tearing down for a given test.
*/ */
void void
vm_debug_unbreak_all() apple2_debug_unbreak_all()
{ {
memset(breakpoints, false, BREAKPOINTS_MAX); memset(breakpoints, false, BREAKPOINTS_MAX);
} }
@ -174,7 +174,7 @@ vm_debug_unbreak_all()
* Unless you're ok with memory leaks!) * Unless you're ok with memory leaks!)
*/ */
char * char *
vm_debug_prompt() apple2_debug_prompt()
{ {
char buf[256]; char buf[256];
FILE *stream = (FILE *)vm_di_get(VM_OUTPUT); FILE *stream = (FILE *)vm_di_get(VM_OUTPUT);
@ -200,16 +200,16 @@ vm_debug_prompt()
* it (assuming they are space-separated). * it (assuming they are space-separated).
*/ */
void void
vm_debug_execute(const char *str) apple2_debug_execute(const char *str)
{ {
char *tok, *ebuf, *orig; char *tok, *ebuf, *orig;
vm_debug_cmd *cmd; apple2_debug_cmd *cmd;
vm_debug_args args; apple2_debug_args args;
orig = ebuf = strdup(str); orig = ebuf = strdup(str);
cmd = NULL; cmd = NULL;
tok = vm_debug_next_arg(&ebuf); tok = apple2_debug_next_arg(&ebuf);
// No input // No input
if (tok == NULL) { if (tok == NULL) {
@ -217,7 +217,7 @@ vm_debug_execute(const char *str)
return; return;
} }
cmd = vm_debug_find_cmd(tok); cmd = apple2_debug_find_cmd(tok);
// No command found // No command found
if (cmd == NULL) { if (cmd == NULL) {
@ -231,13 +231,13 @@ vm_debug_execute(const char *str)
switch (cmd->nargs) { switch (cmd->nargs) {
case 2: case 2:
args.target = vm_debug_next_arg(&ebuf); args.target = apple2_debug_next_arg(&ebuf);
// This _may_ be -1 if we have a string target for argument // This _may_ be -1 if we have a string target for argument
// 1, as in the writestate command // 1, as in the writestate command
args.addr1 = vm_debug_addr(args.target); args.addr1 = apple2_debug_addr(args.target);
args.addr2 = vm_debug_addr(vm_debug_next_arg(&ebuf)); args.addr2 = apple2_debug_addr(apple2_debug_next_arg(&ebuf));
// But if this is -1, then something went wrong // But if this is -1, then something went wrong
if (args.addr2 == -1) { if (args.addr2 == -1) {
@ -248,8 +248,8 @@ vm_debug_execute(const char *str)
break; break;
case 1: case 1:
args.target = vm_debug_next_arg(&ebuf); args.target = apple2_debug_next_arg(&ebuf);
args.addr1 = vm_debug_addr(args.target); args.addr1 = apple2_debug_addr(args.target);
break; break;
@ -264,15 +264,15 @@ vm_debug_execute(const char *str)
} }
/* /*
* Compare a string key (k) with a vm_debug_cmd (elem) name or abbrev * Compare a string key (k) with a apple2_debug_cmd (elem) name or abbrev
* field. This is the function we use for bsearch() in * field. This is the function we use for bsearch() in
* vm_debug_find_cmd(). * apple2_debug_find_cmd().
*/ */
static int static int
cmd_compar(const void *k, const void *elem) cmd_compar(const void *k, const void *elem)
{ {
const char *key = (const char *)k; const char *key = (const char *)k;
const vm_debug_cmd *cmd = (const vm_debug_cmd *)elem; const apple2_debug_cmd *cmd = (const apple2_debug_cmd *)elem;
if (strlen(key) < 3) { if (strlen(key) < 3) {
return strcmp(key, cmd->abbrev); return strcmp(key, cmd->abbrev);
@ -286,11 +286,11 @@ cmd_compar(const void *k, const void *elem)
* either be an abbreviation (if 1 or 2 characters) or a full name (if * either be an abbreviation (if 1 or 2 characters) or a full name (if
* otherwise). If no matching cmd can be found, return NULL. * otherwise). If no matching cmd can be found, return NULL.
*/ */
vm_debug_cmd * apple2_debug_cmd *
vm_debug_find_cmd(const char *str) apple2_debug_find_cmd(const char *str)
{ {
return (vm_debug_cmd *)bsearch(str, &cmdtable, CMDTABLE_SIZE, return (apple2_debug_cmd *)bsearch(str, &cmdtable, CMDTABLE_SIZE,
sizeof(vm_debug_cmd), cmd_compar); sizeof(apple2_debug_cmd), cmd_compar);
} }
/* /*
@ -298,7 +298,7 @@ vm_debug_find_cmd(const char *str)
*/ */
DEBUG_CMD(break) DEBUG_CMD(break)
{ {
vm_debug_break(args->addr1); apple2_debug_break(args->addr1);
} }
/* /*
@ -307,7 +307,7 @@ DEBUG_CMD(break)
DEBUG_CMD(help) DEBUG_CMD(help)
{ {
FILE *stream = (FILE *)vm_di_get(VM_OUTPUT); FILE *stream = (FILE *)vm_di_get(VM_OUTPUT);
vm_debug_cmd *cmd; apple2_debug_cmd *cmd;
for (int i = 0; i < CMDTABLE_SIZE; i++) { for (int i = 0; i < CMDTABLE_SIZE; i++) {
cmd = &cmdtable[i]; cmd = &cmdtable[i];
@ -325,7 +325,7 @@ DEBUG_CMD(resume)
// If we paused because of a breakpoint, then we need to clear it // If we paused because of a breakpoint, then we need to clear it
// before we can really keep moving. // before we can really keep moving.
vm_debug_unbreak(mach->cpu->PC); apple2_debug_unbreak(mach->cpu->PC);
mach->paused = false; mach->paused = false;
} }
@ -411,7 +411,7 @@ DEBUG_CMD(quit)
*/ */
DEBUG_CMD(unbreak) DEBUG_CMD(unbreak)
{ {
vm_debug_unbreak(args->addr1); apple2_debug_unbreak(args->addr1);
} }
/* /*
@ -422,9 +422,9 @@ DEBUG_CMD(step)
{ {
mos6502 *cpu = (mos6502 *)vm_di_get(VM_CPU); mos6502 *cpu = (mos6502 *)vm_di_get(VM_CPU);
vm_debug_unbreak(cpu->PC); apple2_debug_unbreak(cpu->PC);
mos6502_execute(cpu); mos6502_execute(cpu);
vm_debug_break(cpu->PC); apple2_debug_break(cpu->PC);
} }
/* /*

1
src/mos6502/mos6502.c
View File

@ -14,7 +14,6 @@
#include "log.h" #include "log.h"
#include "mos6502/mos6502.h" #include "mos6502/mos6502.h"
#include "mos6502/dis.h" #include "mos6502/dis.h"
#include "vm_debug.h"
// All of our address modes, instructions, etc. are defined here. // All of our address modes, instructions, etc. are defined here.
#include "mos6502/enums.h" #include "mos6502/enums.h"