Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

BLOAD now takes a bank argument

Browse Source
This commit is contained in:
Aaron Culliney 2014-06-14 10:37:14 -07:00
parent 46f8e711f6
commit 86076697b9
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/meta/debug.l
View File

@ -38,7 +38,7 @@ extern int watchpoints[MAX_BRKPTS]; /* memory watchpoints */
// internal debugger commands
extern void clear_debugger_screen();
extern void bload(FILE*, char*, int);
extern void bload(FILE*, char*, int, int);
extern void show_misc_info();
extern uint8_t get_current_opcode();
extern void dump_mem(int, int, int, int, int);
@ -67,7 +67,7 @@ extern void fb_sha1();
a{scii} {lc1|lc2} {/bank/}{addr} {+}{len}
r{egs}
<addr> {lc1|lc2} : <byteseq>
bload <file> <addrs>
bload <file> /<bank>/<addrs>
bsave <file> /<bank>/<addrs> <len>
(s{tep} | n{ext}) {len}
f{inish}
@ -435,8 +435,8 @@ ADDRS [0-9a-fA-F]+
return SETMEM;
}
{BOS}bload{WS}+{CHAR}+{WS}+{ADDRS}{EOS} {
/* bload <file> <addr> */
{BOS}bload{WS}+{CHAR}+{WS}+{BANK}{ADDRS}{EOS} {
/* bload <file> /<bank>/<addr> */
FILE *fp = NULL;
char *ptr = NULL;
char buf[DEBUG_BUFSZ];
@ -451,8 +451,13 @@ ADDRS [0-9a-fA-F]+
strncpy(buf, ptr, len);
buf[len] = '\0';
/* bload addr */
while (isspace(*debugtext)) ++debugtext;
/* get bank info */
while (*debugtext != '/') ++debugtext;
++debugtext;
int bank = strtol(debugtext, &debugtext, 10);
/* extract addrs */
++debugtext;
arg1 = strtol(debugtext, (char**)NULL, 16);
fp = fopen(buf, "r");
@ -462,7 +467,7 @@ ADDRS [0-9a-fA-F]+
return BLOAD;
}
bload(fp, buf, arg1);
bload(fp, buf, bank, arg1);
fclose(fp);
return BLOAD;
}

4
src/meta/debugger.c
View File

@ -453,7 +453,7 @@ void set_lc_mem(int addrs, int lcbank, char *hexstr) {
same as the set_mem routine. we use the do_write_memory routine to
"safely" set memory...
------------------------------------------------------------------------- */
void bload(FILE *f, char *name, int addrs) {
void bload(FILE *f, char *name, int bank, int addrs) {
uint8_t *hexstr = NULL;
int len = -1;
uint8_t data;
@ -1306,7 +1306,7 @@ void display_help() {
sprintf(second_buf[i++], "(sta{tus} | op{codes}) ");
sprintf(second_buf[i++], "(l{ang} | d{rive} | vm) ");
sprintf(second_buf[i++], "bsave <filename> </bank/addr> <len> ");
sprintf(second_buf[i++], "bload <filename> <addr> ");
sprintf(second_buf[i++], "bload <filename> </bank/addr> ");
sprintf(second_buf[i++], "fr{esh} ");
sprintf(second_buf[i++], "(h{elp} | ?) ");
num_buffer_lines = i;