-#include <stdio.h>
-#include <assert.h>
-#include <time.h>
-
#include "exec.h"
-#include "cerr.h"
/**
* @brief プログラムレジスタ(PR)を表すWORD値を文字列に変換
*/
WORD get_val_adr_x(WORD adr, WORD oprx);
-/**
- * @brief 汎用レジスタの番号からレジスタを表す文字列を返す
- *
- * @return 汎用レジスタを表す文字列。「GR0」「GR1」・・・「GR7」のいずれか
- *
- * @param word レジスタ番号[0-7]を表すWORD値
- */
-char *grstr(WORD word);
-
-
/**
* @brief 実行エラーの定義
*/
};
/**
- * @brief アセンブル結果読み込みエラーの定義
+ * @brief 実行モード: trace, logical, dump, dump_start, dump_end, monitor, step
*/
-static CERR cerr_load[] = {
- { 210, "load - memory overflow" },
- { 211, "object file not specified" },
-};
-
-/**
- * @brief 実行モード: trace, logical, dump, debugger
- */
-EXECMODE execmode = {false, false, false, false};
+EXECMODE execmode = {false, false, false, 0, 0xFFFF, false, false};
char *pr2str(WORD pr)
{
return;
}
for(i = 0; i < INSIZE; i++) {
- if(*(buf + i) == '\0' || *(buf + i) == '\n') {
+ if(!buf[i] || buf[i] == '\n') {
--i;
break;
}
setcerr(208, ""); /* SVC input - memory overflow */
break;
}
- sys->memory[sys->cpu->gr[1]+i] = *(buf + i);
+ sys->memory[sys->cpu->gr[1] + i] = buf[i];
}
sys->memory[sys->cpu->gr[2]] = i + 1;
FREE(buf);
WORD get_r_r1(WORD oprx)
{
- WORD r;
- char *s;
+ WORD r = 0;
+ char *s = NULL;
if((r = ((oprx & 0x00F0) >>4)) > GRSIZE - 1) {
setcerr(205, s = pr2str(sys->cpu->pr)); /* r/r1 in word #1 - not GR */
WORD get_x_r2(WORD oprx)
{
- WORD x;
- char *s;
+ WORD x = 0;
+ char *s = NULL;
if((x = (oprx & 0x000F)) > GRSIZE - 1) {
setcerr(206, s = pr2str(sys->cpu->pr)); /* r/r1 in word #1 - not GR */
WORD get_val_adr_x(WORD adr, WORD oprx)
{
- WORD a;
- char *s;
+ WORD a = 0;
+ char *s = NULL;
if((a = get_adr_x(adr, oprx)) >= sys->memsize) {
setcerr(207, s = pr2str(sys->cpu->pr + 1)); /* address in word #2 - out of memory */
}
/* exec.hで定義された関数群 */
-void addcerrlist_load()
-{
- addcerrlist(ARRAYSIZE(cerr_load), cerr_load);
-}
-
void addcerrlist_exec()
{
addcerrlist(ARRAYSIZE(cerr_exec), cerr_exec);
}
-bool loadassemble(const char *file)
+WORD loadassemble(const char *file, WORD start)
{
- FILE *fp;
- bool stat = true;
+ FILE *fp = NULL;
+ WORD end = 0;
assert(file != NULL);
if((fp = fopen(file, "rb")) == NULL) {
perror(file);
- return false;
+ return 0;
}
- execptr->end = execptr->start +
- fread(sys->memory, sizeof(WORD), sys->memsize - execptr->start, fp);
- if(execptr->end == sys->memsize) {
+ end = start + fread(sys->memory + start, sizeof(WORD), sys->memsize - start, fp);
+ if(end == sys->memsize) {
setcerr(210, file); /* load - memory overflow */
fprintf(stderr, "Load error - %d: %s\n", cerr->num, cerr->msg);
- stat = false;
}
fclose(fp);
- return stat;
+ return end;
}
void nop()
void pop()
{
assert(sys->cpu->sp > execptr->end);
- WORD w;
- char *s;
+ WORD w = 0;
+ char *s = NULL;
if(sys->cpu->sp >= sys->memsize) {
setcerr(203, s = pr2str(sys->cpu->pr)); /* Stack Pointer (SP) - stack underflow */
void call()
{
assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
sys->memory[--(sys->cpu->sp)] = sys->cpu->pr + 1;
- sys->cpu->pr = get_adr_x(w[1], w[0]);
+ sys->cpu->pr = get_adr_x(
+ sys->memory[sys->cpu->pr + 1],
+ sys->memory[sys->cpu->pr]
+ );
}
void ret()
void svc()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
- switch(get_adr_x(w[1], w[0]))
+ switch(get_adr_x(
+ sys->memory[sys->cpu->pr + 1],
+ sys->memory[sys->cpu->pr]
+ )
+ )
{
case 0x0: /* STOP */
execptr->stop = true;
sys->cpu->pr += 2;
}
-char *grstr(WORD word)
-{
- assert(word <= 7);
- char *str = malloc_chk(3 + 1, "grstr.str");
- sprintf(str, "GR%d", word);
- return str;
-}
-
-void debugger()
-{
- char *buf = malloc_chk(DBINSIZE + 1, "debugger.buf");
- for( ; ;) {
- fprintf(stdout, "COMET II (Type ? for help) > ");
- fgets(buf, DBINSIZE, stdin);
- if(*buf == 'r') {
- execmode.debugger = false;
- break;
- } else if(*buf == 's') {
- break;
- } else if(*buf == 't') {
- fprintf(stdout, "#%04X: Register::::\n", sys->cpu->pr);
- dspregister();
- } else if(*buf == 'd') {
- dumpmemory();
- } else if(*buf == '?') {
- fprintf(stdout, "r -- Continue running your program.\n");
- fprintf(stdout, "s -- Continue running your program until next interaction.\n");
- fprintf(stdout, "t -- Display CPU register.\n");
- fprintf(stdout, "d -- Display memory dump.\n");
- break;
- }
- }
-}
-
void exec()
{
- clock_t clock_begin, clock_end;
- void (*cmdptr)();
- char *s;
+ clock_t clock_begin = 0;
+ clock_t clock_end = 0;
+ void (*cmdptr)() = NULL;
+ char *s = NULL;
+ const char *monmsg = "COMET II machine code monitor. Type ? for help.\n";
+
+ create_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を作成 */
- create_code_cmdtype(); /* 命令のコードとタイプがキーのハッシュ表を作成 */
if(execmode.trace == true) {
fprintf(stdout, "\nExecuting machine codes\n");
}
}
if(execmode.dump) { /* dumpオプション指定時、メモリを出力 */
fprintf(stdout, "#%04X: Memory::::\n", sys->cpu->pr);
- dumpmemory();
+ dumpmemory(execmode.dump_start, execmode.dump_end);
}
fprintf(stdout, "\n");
}
- /* デバッガーモードの場合、デバッガーを起動 */
- if(execmode.debugger == true) {
- debugger();
+ /* ステップモードまたはブレークポイントの場合、モニターを起動 */
+ if(
+ (execmode.monitor == true && sys->cpu->pr == execptr->start) ||
+ execmode.step == true || getbps(sys->cpu->pr) == true)
+ {
+ if(sys->cpu->pr == execptr->start) {
+ fprintf(stdout, "%s", monmsg);
+ }
+ monitor();
}
/* プログラムレジスタをチェック */
if(sys->cpu->pr >= sys->memsize) {
if(cerr->num > 0) {
goto execfin;
}
- /* 終了フラグがtrueの場合は、正常終了 */
+ /* 終了フラグがtrueの場合は、モニターまたは正常終了 */
if(execptr->stop == true) {
- break;
+ if(execmode.monitor == true) {
+ fprintf(stdout, "Return to top.\n");
+ monitor();
+ } else {
+ break;
+ }
}
/* クロック周波数の設定 */
do {
} while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
}
execfin:
- free_code_cmdtype(); /* 命令のコードとタイプがキーのハッシュ表を解放 */
+ freebps();
+ free_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を解放 */
if(cerr->num > 0) {
fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
}
}
-
-bool disassemble_file(const char *file)
-{
- bool stat = true;
- FILE *fp;
- WORD i = 0, w, cmd, x, adr;
- CMDTYPE cmdtype = 0;
- char *cmdname, *g, *g1, *g2;
-
- assert(file != NULL);
- if((fp = fopen(file, "rb")) == NULL) {
- perror(file);
- return false;
- }
-
- create_code_cmdtype(); /* 命令のコードとタイプがキーのハッシュ表を作成 */
-
- fprintf(stdout, "MAIN\tSTART\n");
- for(; ;) {
- fread(&w, sizeof(WORD), 1, fp);
- if(feof(fp)) {
- break;
- }
- cmd = w & 0xFF00;
- cmdname = getcmdname(cmd);
- cmdtype = getcmdtype(cmd);
- if(cmd == 0xFF00 || (w != 0 && cmd == 0x0000)) {
- fprintf(stdout, "\tDC\t%d\t\t\t\t; #%04X: #%04X :: ", w, i++, w);
- print_dumpword(w, true);
- } else if(cmdtype == R_ADR_X || cmdtype == ADR_X) {
- fread(&adr, sizeof(WORD), 1, fp);
- fprintf(stdout, "\t%s\t", cmdname);
- if(cmdtype == R_ADR_X) {
- g = grstr((w & 0x00F0) >> 4);
- fprintf(stdout, "%s,", g);
- FREE(g);
- }
- fprintf(stdout, "#%04X", adr);
- if((x = w & 0x000F) != 0) {
- fprintf(stdout, ",%s", g = grstr(x));
- FREE(g);
- }
- fprintf(stdout, "\t\t\t\t; #%04X: #%04X #%04X", i, w, adr);
- i += 2;
- } else {
- fprintf(stdout, "\t%s", cmdname);
- if(cmdtype == R1_R2) {
- g1 = grstr((w & 0x00F0) >> 4);
- g2 = grstr(w & 0x000F);
- fprintf(stdout, "\t%s,%s", g1, g2);
- FREE(g1);
- FREE(g2);
- } else if(cmdtype == R_) {
- g = grstr((w & 0x00F0) >> 4);
- fprintf(stdout, "\t%s", g);
- FREE(g);
- }
- fprintf(stdout, "\t\t\t\t; #%04X: #%04X", i++, w);
- }
- fprintf(stdout, "\n");
- }
- fprintf(stdout, "\tEND\n");
- free_code_cmdtype();
- fclose(fp);
- return stat;
-}