*/
static BPSLIST *bps[BPSTABSIZE];
+/**
+ * @brief comet2monitorのプロンプト
+ */
+static char *monitor_prompt = "(comet2 monitor)";
+
unsigned adrhash(WORD adr)
{
HKEY *key[1];
bool getbps(WORD adr)
{
- BPSLIST *p;
+ BPSLIST *p = NULL;
for(p = bps[adrhash(adr)]; p != NULL; p = p->next) {
if(p->adr == adr) {
bool addbps(WORD adr)
{
- BPSLIST *p;
- unsigned h;
+ BPSLIST *p = NULL;
+ unsigned h = 0;
/* 登録されたラベルを検索。すでに登録されている場合は終了 */
if(getbps(adr) == true) {
bool delbps(WORD adr)
{
- BPSLIST *p, *q;
- unsigned h;
+ BPSLIST *p = NULL;
+ BPSLIST *q = NULL;
+ unsigned h = 0;
bool res = false;
p = bps[h = adrhash(adr)];
void listbps()
{
int i, cnt = 0;
- BPSLIST *p;
+ BPSLIST *p = NULL;
fprintf(stdout, "List of breakpoints\n");
for(i = 0; i < BPSTABSIZE; i++) {
void freebpslist(BPSLIST *head)
{
- BPSLIST *p, *q;
+ BPSLIST *p = NULL;
+ BPSLIST *q = NULL;
for(p = head; p != NULL; p = q) {
q = p->next;
FREE(p);
void freebps()
{
- int i;
- for(i = 0; i < BPSTABSIZE; i++) {
+ for(int i = 0; i < BPSTABSIZE; i++) {
freebpslist(bps[i]);
bps[i] = NULL;
}
MONARGS *monargstok(const char *str)
{
MONARGS *args = malloc_chk(sizeof(MONARGS), "args");
- char *p, *q, *r, *sepp; /* pは文字列全体の先頭位置、qはトークンの先頭位置、rは文字の位置 */
- int sepc = ' ';
+ char *tok = NULL;
+ char *p = NULL;
+ char sepc = ' ';
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;
- strcpy(sepp, "");
- args->argv[++(args->argc)-1] = strdup_chk(q, "args.argv[]");
- q = r = sepp + 1;
+ int i = strcspn(p, " ");
+ sepc = p[i];
+ args->argv[(args->argc)++] = strndup_chk(p, i, "args->argv[]");
+ p += i + 1;
} while(sepc == ' ');
- FREE(p);
+ FREE(tok);
return args;
}
MONCMDLINE *monlinetok(const char *line)
{
- char *tokens, *p;
- long l;
+ char *tokens = NULL;
+ char *p = NULL;
+ int i = 0;
MONCMDLINE *moncmdl = NULL;
if(!line[0] || line[0] == '\n') {
return NULL;
}
p = tokens = strdup_chk(line, "tokens");
+ /* コメントを削除 */
+ strip_casl2_comment(p);
+ /* 文字列末尾の改行と空白を削除 */
+ strip_end(p);
+
moncmdl = malloc_chk(sizeof(MONCMDLINE), "moncmdl");
/* コマンドの取得 */
- moncmdl->cmd = malloc_chk((l = strcspn(p, " \t\n")) + 1, "moncmdl.cmd");
- strncpy(moncmdl->cmd, p, l);
+ i = strcspn(p, " \t\n");
+ moncmdl->cmd = strndup_chk(p, i, "moncmdl->cmd");
/* コマンドと引数の間の空白をスキップ */
- p += l;
+ p += i;
while(*p == ' ' || *p == '\t') {
p++;
}
/* 引数として、改行までの文字列を取得 */
- if((l = strcspn(p, "\n")) > 0) {
+ if(strcspn(p, "\n") > 0) {
moncmdl->args = monargstok(p);
} else {
moncmdl->args = malloc_chk(sizeof(MONARGS), "moncmdl.args");
return false;
}
+void warn_ignore_arg(int argc, char *argv[])
+{
+ int i;
+ for(i = 0; i < argc; i++) {
+ if(i > 0) {
+ fprintf(stderr, " ");
+ }
+ fprintf(stderr, "%s", argv[i]);
+ }
+ fprintf(stderr, ": ignored.\n");
+}
+
void mon_break(int argc, char *argv[])
{
WORD w;
+ int i = 0;
if(stracmp(argv[0], 2, (char* []){"l", "list"})) {
+ i++;
listbps();
} else if(stracmp(argv[0], 2, (char* []){"r", "reset"})) {
+ i++;
freebps();
fprintf(stdout, "All breakpoints are deleted.\n");
} else {
}
}
if(stracmp(argv[0], 2, (char* []){"a", "add"})) {
+ i += 2;
if(addbps(w) == true) {
fprintf(stdout, "#%04X: breakpoint added\n", w);
} else {
fprintf(stdout, "No breakpoint added\n");
}
} else if(stracmp(argv[0], 2, (char* []){"d", "del"})) {
+ i += 2;
if(delbps(w) == true) {
fprintf(stdout, "#%04X: breakpoint deleted\n", w);
} else {
fprintf(stdout, "No breakpoint deleted\n");
}
} else if(stracmp(argv[0], 3, (char* []){"?", "h", "help"})) {
+ i++;
fprintf(stdout, "breakpoint manipulate:\n");
fprintf(stdout, " b[reak] a[dd] <address>\n");
fprintf(stdout, " b[reak] d[el] <address>\n");
} else {
fprintf(stderr, "%s: Not breakpoint manipulate command. see `b ?'.\n", argv[0]);
}
+ if(argc > i) {
+ warn_ignore_arg(argc - i, argv + i);
+ }
}
}
void mon_dump(int argc, char *argv[])
{
int i = 0;
- WORD start = 0, end = 0xFFFF;
+ 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]);
- }
- }
- dumpmemory(start, end);
- if(argc > 2) {
- for(i = 2; i < argc; i++) {
- if(i > 2) {
- fprintf(stderr, " ");
- }
- fprintf(stderr, "%s", argv[i+1]);
+ i++;
+ }
+ if(argc > i) {
+ dump_start = nh2word(argv[i++]);
+ if(argc > i) {
+ if(argv[i][0] =='+') {
+ dump_end = dump_start + nh2word(argv[i] + 1);
+ } else {
+ dump_end = nh2word(argv[i]);
}
- fprintf(stderr, ": ignored.\n");
+ } else {
+ dump_end += dump_start;
}
+ i++;
}
+ if(argc > i) {
+ warn_ignore_arg(argc - i, argv + i);
+ }
+ dumpmemory(dump_start, dump_end);
+ execmode.dump_start = dump_start;
+ execmode.dump_end = dump_end;
}
MONCMDTYPE monitorcmd(char *cmd, MONARGS *args)
} 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]));
+ execptr->end = loadassemble(args->argv[0], nh2word(args->argv[1]));
} else if(stracmp(cmd, 2, (char* []){"n", "next"})) {
execmode.step = true;
cmdtype = MONNEXT;
}
}
+int monquit()
+{
+ int stat = 0;
+ shutdown();
+ freebps();
+ free_cmdtable(HASH_CMDTYPE);
+ free_cmdtable(HASH_CODE);
+ if(cerr->num > 0) {
+ stat = 1;
+ }
+ freecerr();
+ return stat;
+}
+
void monitor()
{
- char *buf, *p;
- MONCMDLINE *moncmdl;
+ char *buf = NULL;
+ MONCMDLINE *moncmdl = NULL;
MONCMDTYPE cmdtype = MONREPEAT;
do {
- fprintf(stdout, "- ");
+ fprintf(stdout, "%s ", monitor_prompt);
buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
fgets(buf, MONINSIZE, stdin);
- if((p = strchr(buf, '\n')) != NULL) {
- p = '\0';
+ if(!buf[0]) {
+ cmdtype = MONQUIT;
}
+ strip_end(buf); /* 文字列末尾の改行と空白を削除 */
+ fprintf(stdout, "%s\n", buf);
if((moncmdl = monlinetok(buf)) != NULL) {
cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
free_moncmdline(moncmdl);
}
- if(!buf[0] || cmdtype == MONQUIT) {
- FREE(buf);
- shutdown();
- freebps();
- free_cmdtable(HASH_CODE);
- freecerr();
- exit(0);
- }
FREE(buf);
+ if(cmdtype == MONQUIT) {
+ exit(monquit());
+ }
} while(cmdtype == MONREPEAT);
}
projects / YACASL2.git / blobdiff