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;
+ int cnt = 0;
+ BPSLIST *p = NULL;
fprintf(stdout, "List of breakpoints\n");
- for(i = 0; i < BPSTABSIZE; i++) {
+ for(int i = 0; i < BPSTABSIZE; i++) {
for(p = bps[i]; p != NULL; p = p->next) {
fprintf(stdout, "#%04X\n", p->adr);
cnt++;
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 *tok, *p, sepc = ' ';
- int i = 0;
+ char *tok = NULL;
+ char *p = NULL;
+ char sepc = ' ';
args->argc = 0;
if(!str || !str[0]) {
}
tok = p = strdup_chk(str, "argstok.p");
do {
- i = strcspn(p, " ");
+ int i = strcspn(p, " ");
sepc = p[i];
args->argv[(args->argc)++] = strndup_chk(p, i, "args->argv[]");
p += i + 1;
- i = 0;
} while(sepc == ' ');
FREE(tok);
return args;
MONCMDLINE *monlinetok(const char *line)
{
- char *tokens, *p;
- int i;
+ char *tokens = NULL;
+ char *p = NULL;
+ int i = 0;
MONCMDLINE *moncmdl = NULL;
if(!line[0] || line[0] == '\n') {
}
}
+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 = NULL;
- int i;
- MONCMDLINE *moncmdl;
+ MONCMDLINE *moncmdl = NULL;
MONCMDTYPE cmdtype = MONREPEAT;
do {
fprintf(stdout, "%s ", monitor_prompt);
buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
fgets(buf, MONINSIZE, stdin);
- fprintf(stdout, "%s", buf);
if(!buf[0]) {
cmdtype = MONQUIT;
}
- if((i = strcspn(buf, "\n")) > 0 || buf[0] == '\n') {
- buf[i] = '\0';
- }
+ strip_end(buf); /* 文字列末尾の改行と空白を削除 */
+ fprintf(stdout, "%s\n", buf);
if((moncmdl = monlinetok(buf)) != NULL) {
cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
free_moncmdline(moncmdl);
}
FREE(buf);
if(cmdtype == MONQUIT) {
- shutdown();
- freebps();
- free_cmdtable(HASH_CMDTYPE);
- freecerr();
- exit(0);
+ exit(monquit());
}
} while(cmdtype == MONREPEAT);
}