-#include <stdio.h>
-#include <assert.h>
-#include <time.h>
-
#include "exec.h"
-#include "cerr.h"
/**
* @brief プログラムレジスタ（PR）を表すWORD値を文字列に変換
};
/**
- * @brief アセンブル結果読み込みエラーの定義
- */
-static CERR cerr_load[] = {
- { 210, "load - memory overflow" },
- { 211, "object file not specified" },
-};
-
-/**
- * @brief 実行モード: trace, logical, dump
+ * @brief 実行モード: trace, logical, dump, dump_start, dump_end, monitor, step
*/
-EXECMODE execmode = {false, false, false};
+EXECMODE execmode = {false, false, false, 0, 0xFFFF, false, false};
char *pr2str(WORD pr)
{
void svcin()
{
int i;
- char *buffer = malloc_chk(INSIZE + 1, "svcin.buffer");
+ char *buf = malloc_chk(INSIZE + 1, "svcin.buf");
- if(fgets(buffer, INSIZE, stdin) == NULL) {
+ if(fgets(buf, INSIZE, stdin) == NULL) {
sys->memory[sys->cpu->gr[1]] = sys->memory[sys->cpu->gr[2]] = 0x0;
return;
}
for(i = 0; i < INSIZE; i++) {
- if(*(buffer + i) == '\0' || *(buffer + i) == '\n') {
+ if(!buf[i] || buf[i] == '\n') {
--i;
break;
}
setcerr(208, ""); /* SVC input - memory overflow */
break;
}
- sys->memory[sys->cpu->gr[1]+i] = *(buffer + i);
+ sys->memory[sys->cpu->gr[1] + i] = buf[i];
}
sys->memory[sys->cpu->gr[2]] = i + 1;
- FREE(buffer);
+ FREE(buf);
}
void svcout()
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()
sys->cpu->pr += 1;
}
-void addl_subl_flagset(long val)
-{
- sys->cpu->fr = 0x0;
-
- if(val > 65535) {
- sys->cpu->fr += OF;
- }
- if(((WORD)(val) & 0x8000) == 0x8000) {
- sys->cpu->fr += SF;
- } else if(val == 0x0) {
- sys->cpu->fr += ZF;
- }
-}
-
-void addl(WORD r, WORD val)
-{
- long s;
-
- s = sys->cpu->gr[r] + val;
- sys->cpu->gr[r] = (WORD)s;
- addl_subl_flagset(s);
-}
-
-void subl(WORD r, WORD val)
+void addl_gr(WORD r, WORD val, bool add)
{
unsigned long o, s;
o = sys->cpu->gr[r];
- if((s = o + (~val + 1)) > 0x10000) {
- s -= 0x10000;
+ sys->cpu->fr = 0x0; /* flag initialize */
+
+ if(add == true) {
+ s = o + val;
+ if(s > 0xFFFF) {
+ sys->cpu->fr += OF;
+ }
+ } else {
+ if(o < val) {
+ sys->cpu->fr += OF;
+ }
+ s = o + (~val + 1);
+ if(s > 0xFFFF) {
+ s &= 0xFFFF;
+ }
}
sys->cpu->gr[r] = (WORD)s;
- addl_subl_flagset(s);
- if(o < val) {
- sys->cpu->fr += OF;
+
+ if((s & 0x8000) == 0x8000) {
+ sys->cpu->fr += SF;
+ }
+ else if(s == 0x0) {
+ sys->cpu->fr += ZF;
}
}
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[sys->cpu->pr + 1];
- addl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
+ addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true);
sys->cpu->pr += 2;
}
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
- addl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
+ addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], true);
sys->cpu->pr += 1;
}
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[sys->cpu->pr + 1];
- subl(get_r_r1(w[0]), (get_val_adr_x(w[1], w[0])));
+ addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), false);
sys->cpu->pr += 2;
}
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
- subl(get_r_r1(w[0]), (sys->cpu->gr[get_x_r2(w[0])]));
+ addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], false);
sys->cpu->pr += 1;
}
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;
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.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) {
setcerr(201, s = pr2str(sys->cpu->pr)); /* Program Register (PR) - memory overflow */
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);
}
projects / YACASL2.git / blobdiff