}
sepp = r + strcspn(r, " ");
sepc = *sepp;
- *sepp = '\0';
+ strcpy(sepp, "");
args->argv[++(args->argc)-1] = strdup_chk(q, "args.argv[]");
q = r = sepp + 1;
} while(sepc == ' ');
long l;
MONCMDLINE *moncmdl = NULL;
- if(*line == '\n' || *line == '\0') {
+ if(!line[0] || line[0] == '\n') {
return NULL;
}
p = tokens = strdup_chk(line, "tokens");
}
}
-bool monitorcmd(char *cmd, MONARGS *args)
+void mon_dump(int argc, char *argv[])
{
- bool next = false;
- if(stracmp(cmd, 2, (char* []){"s", "step"})) {
- execmode.step = true;
- next = true;
+ int i = 0;
+ WORD start = 0, end = 0xFFFF;
+ if(argc > 0 && stracmp(argv[0], 2, (char* []){"a", "auto"})) {
+ execmode.dump = true;
+ } else if(argc > 0 && stracmp(argv[0], 2, (char* []){"no", "noauto"})) {
+ execmode.dump = false;
+ } else {
+ if(argc > 0) {
+ start = nh2word(argv[0]);
+ if(argc > 1) {
+ end = nh2word(argv[1]);
+ }
+ }
+ dumpmemory(start, end);
+ if(argc > 2) {
+ for(i = 2; i < argc; i++) {
+ if(i > 2) {
+ fprintf(stderr, " ");
+ }
+ fprintf(stderr, "%s", argv[i+1]);
+ }
+ fprintf(stderr, ": ignored.\n");
+ }
+ }
+}
+
+MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
+{
+ MONCMDTYPE cmdtype = MONREPEAT;
+ if(stracmp(cmd, 2, (char* []){"a", "assemble"})) {
+ if(args->argc == 0) {
+ fprintf(stderr, "Error: Input file name.\n");
+ } else if(args->argc == 1) {
+ assemble(1, (char* []){args->argv[0]}, 0);
+ } else {
+ assemble(1, (char* []){args->argv[0]}, nh2word(args->argv[1]));
+ }
} else if(stracmp(cmd, 2, (char* []){"b", "break"})) {
mon_break(args->argc, args->argv);
} else if(stracmp(cmd, 2, (char* []){"c", "continue"})) {
execmode.step = false;
- next = true;
+ cmdtype = MONNEXT;
+ } else if(stracmp(cmd, 2, (char* []){"d", "dump"})) {
+ mon_dump(args->argc, args->argv);
+ } else if(stracmp(cmd, 2, (char* []){"l", "load"})) {
+ loadassemble(args->argv[0], nh2word(args->argv[1]));
+ } else if(stracmp(cmd, 2, (char* []){"n", "next"})) {
+ execmode.step = true;
+ cmdtype = MONNEXT;
+ } else if(stracmp(cmd, 2, (char* []){"q", "quit"})) {
+ fprintf(stdout, "Quit: COMET II monitor\n");
+ cmdtype = MONQUIT;
+ } else if(stracmp(cmd, 2, (char* []){"r", "reverse"})) {
+ if(args->argc == 2) {
+ disassemble_memory(nh2word(args->argv[0]), nh2word(args->argv[1]));
+ }
+ } else if(stracmp(cmd, 1, (char* []){"reset"})) {
+ fprintf(stdout, "Reset COMET II.\n");
+ reset(sys->memsize, sys->clocks); /* COMET II仮想マシンのリセット */
} else if(stracmp(cmd, 2, (char* []){"t", "trace"})) {
if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"a", "auto"})) {
execmode.logical = false;
fprintf(stdout, "#%04X: Register::::\n", sys->cpu->pr);
dspregister();
}
- } else if(stracmp(cmd, 2, (char* []){"d", "dump"})) {
- if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"a", "auto"})) {
- execmode.dump = true;
- } else if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"no", "noauto"})) {
- execmode.dump = false;
- } else {
- dumpmemory();
- }
} else if(stracmp(cmd, 3, (char* []){"?", "h", "help"})) {
- fprintf(stdout, "b[reak] -- Manipulate Breakpoints. Details in `b ?'.\n");
- fprintf(stdout, "s[tep] -- Step by step running your program until next interaction.\n");
+ fprintf(stdout, "b[reak] -- Manipulate Breakpoints. See details, `b ?'.\n");
fprintf(stdout, "c[ontinue] -- Continue running your program.\n");
- fprintf(stdout, "t[race] -- Display CPU register. `t[race] a[uto]/n[oauto]' set auto/noauto display. \n");
fprintf(stdout, "d[ump] -- Display memory dump. `d[ump] a[uto]/n[oauto]' set auto/noauto display.\n");
+ fprintf(stdout, "l[oad] -- Load object from a file to the memory. `l[oad] <filepath> <address>' if address is omitted, load to address 0.\n");
+ fprintf(stdout, "n[ext] -- Go next instruction.\n");
+ fprintf(stdout, "q[uit] -- Quit running your program.\n");
+ fprintf(stdout, "reset -- Reset the system.\n");
+ fprintf(stdout, "r[everse] -- Disassemble memory. `r[everse] <start address> <end address>.\n");
+ fprintf(stdout, "s[ave] -- Save object from the memory to a file. `s[ave] <filepath> [<start address1> [<end address>]]' if <start address> and <end address> is omitted, save the whole memory. if <end address> is omitted, save the memory after <start address>.\n");
+ fprintf(stdout, "t[race] -- Display CPU register. `t[race] a[uto]/n[oauto]' set auto/noauto display. \n");
+ fprintf(stdout, "T[race] -- Display CPU register as logical value. `t[race] a[uto]/n[oauto]' set auto/noauto display. \n");
fprintf(stdout, "?/h[elp] -- Display this help.\n");
}
- return next;
+ return cmdtype;
}
void free_moncmdline(MONCMDLINE *moncmdl)
{
char *buf, *p;
MONCMDLINE *moncmdl;
- bool next = false;
+ MONCMDTYPE cmdtype = MONREPEAT;
+
do {
- fprintf(stdout, "COMET II (Type ? for help) > ");
+ fprintf(stdout, "- ");
buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
fgets(buf, MONINSIZE, stdin);
if((p = strchr(buf, '\n')) != NULL) {
- *p = '\0';
+ strcpy(p, "");
}
if((moncmdl = monlinetok(buf)) != NULL) {
- next = monitorcmd(moncmdl->cmd, moncmdl->args);
+ cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
free_moncmdline(moncmdl);
}
FREE(buf);
- } while(next == false);
+ if(cmdtype == MONQUIT) {
+ shutdown();
+ freebps();
+ free_cmdtable(HASH_CODE);
+ freecerr();
+ exit(0);
+ }
+ } while(cmdtype == MONREPEAT);
}
projects / YACASL2.git / blobdiff