*/
static BPSLIST *bps[BPSTABSIZE];
+/**
+ * @brief comet2monitorのプロンプト
+ */
+static char *monitor_prompt = "(comet2 monitor)";
+
unsigned adrhash(WORD adr)
{
HKEY *key[1];
MONARGS *monargstok(const char *str)
{
MONARGS *args = malloc_chk(sizeof(MONARGS), "args");
- char *p, *q, *r, *sepp; /* pは文字列全体の先頭位置、qはトークンの先頭位置、rは文字の位置 */
- int sepc = ' ';
+ char *tok, *p, sepc = ' ';
+ int i = 0;
args->argc = 0;
- if(str == NULL) {
+ if(!str || !str[0]) {
return args;
}
- p = q = r = strdup_chk(str, "argstok.p");
+ tok = p = strdup_chk(str, "argstok.p");
do {
- while(*q == ' ' || *q == '\t'){
- q = ++r;
- }
- sepp = r + strcspn(r, " ");
- sepc = *sepp;
- *sepp = '\0';
- args->argv[++(args->argc)-1] = strdup_chk(q, "args.argv[]");
- q = r = sepp + 1;
+ i = strcspn(p, " ");
+ sepc = p[i];
+ args->argv[(args->argc)++] = strndup_chk(p, i, "args->argv[]");
+ p += i + 1;
+ i = 0;
} while(sepc == ' ');
- FREE(p);
+ FREE(tok);
return args;
}
long l;
MONCMDLINE *moncmdl = NULL;
- if(*line == '\n' || *line == '\0') {
+ if(!line[0] || line[0] == '\n') {
return NULL;
}
p = tokens = strdup_chk(line, "tokens");
void mon_dump(int argc, char *argv[])
{
- int i = 0;
- WORD start = 0, end = 0xFFFF;
+ int i = 0, j;
+ WORD dump_start = 0, dump_end = 0x40;
if(argc > 0 && stracmp(argv[0], 2, (char* []){"a", "auto"})) {
execmode.dump = true;
+ i++;
} 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]);
- }
+ i++;
+ }
+ if(argc > i) {
+ dump_start = execmode.dump_start = nh2word(argv[i++]);
+ if(argc > i) {
+ dump_end = execmode.dump_end = nh2word(argv[i++]);
}
- dumpmemory(start, end);
- if(argc > 2) {
- for(i = 2; i < argc; i++) {
- if(i > 2) {
+ if(argc > i) {
+ for(j = i; j < argc; j++) {
+ if(j > i) {
fprintf(stderr, " ");
}
- fprintf(stderr, "%s", argv[i+1]);
+ fprintf(stderr, "%s", argv[j]);
}
fprintf(stderr, ": ignored.\n");
}
}
+ dumpmemory(dump_start, dump_end);
}
MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
{
MONCMDTYPE cmdtype = MONREPEAT;
- if(stracmp(cmd, 2, (char* []){"b", "break"})) {
+ 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;
cmdtype = MONNEXT;
} else if(stracmp(cmd, 2, (char* []){"d", "dump"})) {
mon_dump(args->argc, args->argv);
+ } else if(stracmp(cmd, 2, (char* []){"l", "load"})) {
+ execptr->end = 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;
if(args->argc == 2) {
disassemble_memory(nh2word(args->argv[0]), nh2word(args->argv[1]));
}
- } else if(stracmp(cmd, 2, (char* []){"s", "step"})) {
- execmode.step = true;
- cmdtype = MONNEXT;
+ } 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, "b[reak] -- Manipulate Breakpoints. See details, `b ?'.\n");
fprintf(stdout, "c[ontinue] -- Continue running your program.\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[tep] -- Step by step running your program until next interaction.\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");
void monitor()
{
- char *buf, *p;
+ char *buf = NULL;
+ int i;
MONCMDLINE *moncmdl;
MONCMDTYPE cmdtype = MONREPEAT;
+
do {
- fprintf(stdout, "COMET II (Type ? for help) > ");
+ fprintf(stdout, "%s ", monitor_prompt);
buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
fgets(buf, MONINSIZE, stdin);
- if((p = strchr(buf, '\n')) != NULL) {
- *p = '\0';
+ fprintf(stdout, "%s", buf);
+ if(!buf[0]) {
+ cmdtype = MONQUIT;
+ }
+ if((i = strcspn(buf, "\n")) > 0 || buf[0] == '\n') {
+ buf[i] = '\0';
}
if((moncmdl = monlinetok(buf)) != NULL) {
cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
if(cmdtype == MONQUIT) {
shutdown();
freebps();
- free_code_cmdtype();
+ free_cmdtable(HASH_CODE);
freecerr();
exit(0);
}
projects / YACASL2.git / blobdiff