From 60d4c2573a30a48520545195b9ef89814fc60708 Mon Sep 17 00:00:00 2001 From: j8takagi <j8takagi@nifty.com> Date: Tue, 26 Apr 2011 09:13:38 +0900 Subject: [PATCH] =?utf8?q?=E3=82=A2=E3=82=BB=E3=83=B3=E3=83=96=E3=83=AB?= =?utf8?q?=E3=81=AE=E3=82=BD=E3=83=BC=E3=82=B9=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- include/assemble.h | 40 ---- include/struct.h | 12 +- src/Makefile | 3 +- src/assemble.c | 517 +++++++++++++++++++++++---------------------- src/cmd.c | 2 +- 5 files changed, 280 insertions(+), 294 deletions(-) diff --git a/include/assemble.h b/include/assemble.h index 112f8d3..1a3c566 100644 --- a/include/assemble.h +++ b/include/assemble.h @@ -45,46 +45,6 @@ typedef struct { extern ASPTR *asptr; -/** - * ã¢ã»ã³ãã©å½ä»¤ã表ãçªå· - */ -typedef enum { - START = 01, - END = 02, - DS = 03, - DC = 04, -} ASCMDID; - -/** - * ã¢ã»ã³ãã©å½ä»¤ã表ãé å - */ -typedef struct { - ASCMDID cmdid; /**<ã¢ã»ã³ãã«å½ä»¤ã®ID */ - int opdc_min; /**<æå°ãªãã©ã³ãæ° */ - int opdc_max; /**<æå¤§ãªãã©ã³ãæ° */ - char *cmd; /**<ã³ãã³ãå */ -} ASCMD; - -/** - * ãã¯ãå½ä»¤ã表ãçªå· - */ -typedef enum { - IN = 011, - OUT = 012, - RPUSH = 013, - RPOP = 014, -} MACROCMDID; - -/** - * ãã¯ãå½ä»¤ã表ãé å - */ -typedef struct { - MACROCMDID cmdid; /**<ãã¯ãå½ä»¤ã®ID */ - int opdc_min; /**<æå°ãªãã©ã³ãæ° */ - int opdc_max; /**<æå¤§ãªãã©ã³ãæ° */ - char *cmd; /**<ã³ãã³ãå */ -} MACROCMD; - /** * ã©ãã«é å */ diff --git a/include/struct.h b/include/struct.h index 61fc03b..a247605 100644 --- a/include/struct.h +++ b/include/struct.h @@ -87,19 +87,27 @@ typedef enum { /** * å½ä»¤ã³ã¼ã表ã®é ç® */ +typedef struct { + char *name; /**<å½ä»¤å */ + const void (*ptr); /**<å½ä»¤ã®é¢æ°ãã¤ã³ã¿ */ +} CMD; + +/** + * COMET IIå½ä»¤ã³ã¼ã表ã®é ç® + */ typedef struct { char *name; /**<å½ä»¤å */ CMDTYPE type; /**<å½ä»¤ã¿ã¤ã */ WORD code; /**<å½ä»¤ã³ã¼ã */ const void (*ptr); /**<å½ä»¤ã®é¢æ°ãã¤ã³ã¿ */ -} CMD; +} COMET2CMD; /** * å½ä»¤ã³ã¼ãã®ããã·ã¥è¡¨ */ typedef struct _CMDTAB { struct _CMDTAB *next; /**<ãªã¹ã次é ç®ã¸ã®ãã¤ã³ã¿ */ - CMD *cmd; /**<å½ä»¤ã³ã¼ã表ã®é ç® */ + COMET2CMD *cmd; /**<å½ä»¤ã³ã¼ã表ã®é ç® */ } CMDTAB; /** diff --git a/src/Makefile b/src/Makefile index 188d00d..b0bcbdf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -33,4 +33,5 @@ TAGS: $(INCLUDE)/*.h *.c @if test `which etags`; then etags $^; fi clean: - @rm -f ../casl2 ../comet2 ../dumpword *.o *.d + @rm -f ../casl2 ../comet2 ../dumpword + @rm -f *.o *.d diff --git a/src/assemble.c b/src/assemble.c index d8d8bc6..99f2f96 100644 --- a/src/assemble.c +++ b/src/assemble.c @@ -36,37 +36,86 @@ static CERR cerr_assemble[] = { { 125, "not GR in operand x" }, }; +void printline(FILE *stream, const char *filename, int lineno, char *line); + WORD getadr(const char *prog, const char *str, PASS pass); WORD getgr(const char *str, bool is_x); WORD getliteral(const char *str, PASS pass); -bool assemblecmd(const CMDLINE *cmdl, PASS pass); +void writememory(WORD word, WORD adr, PASS pass); -bool macrocmd(const CMDLINE *cmdl, PASS pass); +void writestr(const char *str, bool literal, PASS pass); -void writeIN(const char *ibuf, const char *len, PASS pass); +void writedc(const char *str, PASS pass); -void writeOUT(const char *obuf, const char *len, PASS pass); +void assemble_start(const CMDLINE *cmdl, PASS pass); -void writeRPUSH(PASS pass); +void assemble_ds(const CMDLINE *cmdl, PASS pass); -void writeRPOP(PASS pass); +void assemble_end(const CMDLINE *cmdl, PASS pass); -bool cometcmd(const CMDLINE *cmdl, PASS pass); +void assemble_dc(const CMDLINE *cmdl, PASS pass); -void writememory(WORD word, WORD adr, PASS pass); +bool assemble_ascmd(const CMDLINE *cmdl, PASS pass); -void writestr(const char *str, bool literal, PASS pass); +void assemble_in(const CMDLINE *cmdl, PASS pass); + +void assemble_out(const CMDLINE *cmdl, PASS pass); + +void assemble_rpush(const CMDLINE *cmdl, PASS pass); + +void assemble_rpop(const CMDLINE *cmdl, PASS pass); + +bool assemble_macrocmd(const CMDLINE *cmdl, PASS pass); -void writeDC(const char *str, PASS pass); +bool assemble_cometcmd(const CMDLINE *cmdl, PASS pass); bool assembletok(const CMDLINE *cmdl, PASS pass); bool assembleline(const char *line, PASS pass); -void printline(FILE *stream, const char *filename, int lineno, char *line); +/** + * ã¢ã»ã³ãã«ã®ã¨ã©ã¼ãã¨ã©ã¼ãªã¹ãã«è¿½å + */ +void addcerrlist_assemble() +{ + addcerrlist_tok(); + addcerrlist_word(); + addcerrlist_label(); + addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble); +} + +/** + * ãã¡ã¤ã«ã¹ããªã¼ã ã®ç¾å¨è¡ãçªå·ä»ãã§è¡¨ç¤ºãã + */ +void printline(FILE *stream, const char *filename, int lineno, char *line) +{ + fprintf(stream, "%s:%5d:%s", filename, lineno, line); +} + +/** + * ã¢ãã¬ã¹ãè¿ã + * ã¢ãã¬ã¹ã«ã¯ããªãã©ã«ï¼10é²å®æ°ï¼16é²å®æ°ï¼ã¢ãã¬ã¹å®æ°ãå«ã¾ãã + */ +WORD getadr(const char *prog, const char *str, PASS pass) +{ + WORD adr = 0x0; + + if(*str == '=') { + adr = getliteral(str, pass); + } else if(isdigit(*str) || *str == '-' || *str == '#') { + adr = nh2word(str); + } else { + if(pass == SECOND && (adr = getlabel(prog, str)) == 0xFFFF) { + if(prog != NULL) { + setcerr(103, str); /* label not found */ + } + } + } + return adr; +} /** * æ±ç¨ã¬ã¸ã¹ã¿ã表ãæååãGR[0-7]ããããã¬ã¸ã¹ã¿çªå·[0-7]ãWORDå¤ã§è¿ã @@ -111,132 +160,176 @@ WORD getliteral(const char *str, PASS pass) } /** - * ã¢ã»ã³ãã©å½ä»¤ãã¡ã¢ãªã«æ¸è¾¼ - * ã¢ã»ã³ãã©å½ä»¤ã®å ´åã¯trueããã以å¤ã®å ´åã¯falseãè¿ã + * ã¢ãã¬ã¹å¤ãã¡ã¢ãªã«æ¸ãè¾¼ã */ -bool assemblecmd(const CMDLINE *cmdl, PASS pass) +void writememory(WORD word, WORD adr, PASS pass) { - int i = 0; - ASCMDID cmdid = 0; - ASCMD ascmd[] = { - { START, 0, 1, "START" }, - { END, 0, 0, "END" }, - { DC, 1, OPDSIZE, "DC" }, - { DS, 1, 1, "DS" }, - { 0, 0, 0, NULL } - }; - - do { - if(strcmp(cmdl->cmd, ascmd[i].cmd) == 0) { - if(cmdl->opd->opdc < ascmd[i].opdc_min || cmdl->opd->opdc > ascmd[i].opdc_max) { - setcerr(106, NULL); /* operand count mismatch */ - return true; - } - cmdid = ascmd[i].cmdid; + /* ã¡ã¢ãªãªã¼ãã¼ã®å ´åãã¨ã©ã¼çºç */ + if(adr >= sys->memsize) { + setcerr(119, word2n(adr)); /* out of COMET II memory */ + return; + } + (sys->memory)[adr] = word; + if(pass == SECOND && asmode.asdetail == true) { + fprintf(stdout, "\t#%04X\t#%04X\n", adr, word); + } +} + +/** + * æåãã¡ã¢ãªã«æ¸ãè¾¼ã + */ +void writestr(const char *str, bool literal, PASS pass) +{ + assert(*str == '\''); + const char *p = str + 1; + bool lw = false; + + for(; ;) { + /* éãã'ãããªãã¾ã¾æååãçµäºããå ´å */ + if(*p == '\0') { + setcerr(123, str); /* unclosed quote */ break; } - } while(ascmd[++i].cmdid != 0); - /* ã¢ã»ã³ãã©å½ä»¤ */ - switch(cmdid) - { - case START: - if(cmdl->label == NULL) { - setcerr(107, NULL); /* no label in START */ - return true; - } - /* ããã°ã©ã åã®è¨å® */ - asptr->prog = strdup_chk(cmdl->label, "asptr.prog"); - /* ãªãã©ã³ããããå ´åãå®è¡éå§ã¢ãã¬ã¹ãè¨å® */ - if(pass == SECOND && cmdl->opd->opdc == 1) { - if((execptr->start = getlabel(asptr->prog, cmdl->opd->opdv[0])) == 0xFFFF) { - setcerr(103, cmdl->opd->opdv[0]); /* label not found */ - } - } - break; - case END: - /* 1åç®ã®ã¢ã»ã³ãã«ã®å ´åã¯ããªãã©ã«é åéå§ã¢ãã¬ã¹ãè¨å® */ - if(pass == FIRST) { - asptr->lptr = asptr->ptr; + /* ã'ãã®å ´åãæ¬¡ã®æåãã'ãã§ãªãå ´åã¯æ£å¸¸çµäº */ + if(*p == '\'' && *(++p) != '\'') { + break; + } else if(literal == true && lw == true) { + setcerr(124, str); /* more than one character in literal */ + break; } - /* 2åç®ã®ã¢ã»ã³ãã«ã®å ´åã¯ããªãã©ã«é åçµäºã¢ãã¬ã¹ãå®è¡çµäºã¢ãã¬ã¹ã¨ãã¦è¨å® */ - else if(pass == SECOND) { - execptr->end = asptr->lptr; + /*ãªãã©ã«ã®å ´åã¯ãªãã©ã«é åã«æ¸è¾¼ */ + if(literal == true) { + writememory(*(p++), (asptr->lptr)++, pass); + lw = true; + } else { + writememory(*(p++), (asptr->ptr)++, pass); } - FREE(asptr->prog); - break; - case DS: - for(i = 0; i < atoi(cmdl->opd->opdv[0]); i++) { - writememory(0x0, (asptr->ptr)++, pass); - if(cerr->num > 0) { - break; + } +} + +/** + * DCå½ä»¤ãæ¸è¾¼ + */ +void writedc(const char *str, PASS pass) +{ + WORD adr = 0x0; + + if(*str == '\'') { + writestr(str, false, pass); + } else { + if(*str == '#' || isdigit(*str) || *str == '-') { + adr = nh2word(str); + } else { + if(pass == SECOND && (adr = getlabel(asptr->prog, str)) == 0xFFFF) { + setcerr(103, str); /* label not found */ } } - break; - case DC: - for(i = 0; i < cmdl->opd->opdc; i++) { - writeDC(cmdl->opd->opdv[i], pass); - if(cerr->num > 0) { - break; - } + writememory(adr, (asptr->ptr)++, pass); + } +} + +/** + * ã¢ã»ã³ãã«å½ä»¤STARTã®å¦ç + */ +void assemble_start(const CMDLINE *cmdl, PASS pass) +{ + if(cmdl->opd->opdc > 1) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } + if(cmdl->label == NULL) { + setcerr(107, NULL); /* no label in START */ + return; + } + /* ããã°ã©ã åã®è¨å® */ + asptr->prog = strdup_chk(cmdl->label, "asptr.prog"); + /* ãªãã©ã³ããããå ´åãå®è¡éå§ã¢ãã¬ã¹ãè¨å® */ + if(pass == SECOND && cmdl->opd->opdv[0] != NULL) { + if((execptr->start = getlabel(asptr->prog, cmdl->opd->opdv[0])) == 0xFFFF) { + setcerr(103, cmdl->opd->opdv[0]); /* label not found */ } - break; - default: - return false; } - return true; } /** - * macrocmd - * ãã¯ãå½ä»¤ãã¡ã¢ãªã«æ¸è¾¼ - * ãã¯ãå½ä»¤ã®å ´åã¯trueããã以å¤ã®å ´åã¯falseãè¿ã + * ã¢ã»ã³ãã«å½ä»¤ENDã®å¦ç */ -bool macrocmd(const CMDLINE *cmdl, PASS pass) +void assemble_end(const CMDLINE *cmdl, PASS pass) { - int i = 0; - MACROCMDID cmdid = 0; - MACROCMD macrocmd[] = { - { IN, 2, 2, "IN" }, - { OUT, 2, 2, "OUT" }, - { RPUSH, 0, 0, "RPUSH" }, - { RPOP, 0, 0, "RPOP" }, - { 0, 0, 0, NULL } - }; - - do { - if(strcmp(cmdl->cmd, macrocmd[i].cmd) == 0) { - if(cmdl->opd->opdc < macrocmd[i].opdc_min || - cmdl->opd->opdc > macrocmd[i].opdc_max) - { - setcerr(106, NULL); /* operand count mismatch */ - return true; - } - cmdid = macrocmd[i].cmdid; + if(cmdl->opd->opdc > 0) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } + /* 1åç®ã®ã¢ã»ã³ãã«ã®å ´åã¯ããªãã©ã«é åéå§ã¢ãã¬ã¹ãè¨å® */ + if(pass == FIRST) { + asptr->lptr = asptr->ptr; + } + /* 2åç®ã®ã¢ã»ã³ãã«ã®å ´åã¯ããªãã©ã«é åçµäºã¢ãã¬ã¹ãå®è¡çµäºã¢ãã¬ã¹ã¨ãã¦è¨å® */ + else if(pass == SECOND) { + execptr->end = asptr->lptr; + } + FREE(asptr->prog); +} + +/** + * ã¢ã»ã³ãã«å½ä»¤DSã®å¦ç + */ +void assemble_ds(const CMDLINE *cmdl, PASS pass) +{ + int i; + if(cmdl->opd->opdc != 1) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } + for(i = 0; i < atoi(cmdl->opd->opdv[0]); i++) { + writememory(0x0, (asptr->ptr)++, pass); + if(cerr->num > 0) { break; } - } while(macrocmd[++i].cmdid != 0); - switch(cmdid) - { - case IN: - writeIN(cmdl->opd->opdv[0], cmdl->opd->opdv[1], pass); - break; - case OUT: - writeOUT(cmdl->opd->opdv[0], cmdl->opd->opdv[1], pass); - break; - case RPUSH: - writeRPUSH(pass); - break; - case RPOP: - writeRPOP(pass); - break; - default: + } +} + +/** + * ã¢ã»ã³ãã«å½ä»¤DCã®å¦ç + */ +void assemble_dc(const CMDLINE *cmdl, PASS pass) +{ + int i; + if(cmdl->opd->opdc == 0 || cmdl->opd->opdc >= OPDSIZE) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } + for(i = 0; i < cmdl->opd->opdc; i++) { + writedc(cmdl->opd->opdv[i], pass); + if(cerr->num > 0) { + break; + } + } +} + +/** + * ã¢ã»ã³ãã©å½ä»¤ãå¦ç + * ã¢ã»ã³ãã©å½ä»¤ã®å ´åã¯trueããã以å¤ã®å ´åã¯falseãè¿ã + * ã¨ã©ã¼çºçæã¯ãcerrãè¨å® + */ +bool assemble_ascmd(const CMDLINE *cmdl, PASS pass) +{ + if(strcmp(cmdl->cmd, "START") == 0) { + assemble_start(cmdl, pass); + } else if(strcmp(cmdl->cmd, "END") == 0) { + assemble_end(cmdl, pass); + } else if(strcmp(cmdl->cmd, "DS") == 0) { + assemble_ds(cmdl, pass); + } else if(strcmp(cmdl->cmd, "DC") == 0) { + assemble_dc(cmdl, pass); + } else { return false; } return true; } /** - * ãã¯ãå½ä»¤ãIN IBUF,LENããã¡ã¢ãªã«æ¸è¾¼ + * ãã¯ãå½ä»¤ãIN IBUF,LENããã¢ã»ã³ãã« * PUSH 0,GR1 * PUSH 0,GR2 * LAD GR1,IBUF @@ -245,25 +338,27 @@ bool macrocmd(const CMDLINE *cmdl, PASS pass) * POP GR2 * POP GR1 */ -void writeIN(const char *ibuf, const char *len, PASS pass) +void assemble_in(const CMDLINE *cmdl, PASS pass) { - char *line = malloc_chk(LINESIZE + 1, "writeIN.line"); - + char *line = malloc_chk(LINESIZE + 1, "assemble_in.line"); + if(cmdl->opd->opdc == 0 || cmdl->opd->opdc > 2) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } assembleline(" PUSH 0,GR1", pass); assembleline(" PUSH 0,GR2", pass); - sprintf(line, " LAD GR1,%s", ibuf); + sprintf(line, " LAD GR1,%s", cmdl->opd->opdv[0]); assembleline(line, pass); - sprintf(line, " LAD GR2,%s", len); + sprintf(line, " LAD GR2,%s", cmdl->opd->opdv[1]); assembleline(line, pass); assembleline(" SVC 1", pass); assembleline(" POP GR2", pass); assembleline(" POP GR1", pass); - FREE(line); } /** - * ãã¯ãå½ä»¤ãOUT OBUF,LENããã¡ã¢ãªã«æ¸è¾¼ + * ãã¯ãå½ä»¤ãOUT OBUF,LENããã¢ã»ã³ãã« * PUSH 0,GR1 * PUSH 0,GR2 * LAD GR1,OBUF @@ -275,15 +370,18 @@ void writeIN(const char *ibuf, const char *len, PASS pass) * POP GR2 * POP GR1 */ -void writeOUT(const char *obuf, const char *len, PASS pass) +void assemble_out(const CMDLINE *cmdl, PASS pass) { - char *line = malloc_chk(LINESIZE + 1, "writeOUT.line"); - + char *line = malloc_chk(LINESIZE + 1, "assemble_out.line"); + if(cmdl->opd->opdc == 0 || cmdl->opd->opdc > 2) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } assembleline(" PUSH 0,GR1", pass); assembleline(" PUSH 0,GR2", pass); - sprintf(line, " LAD GR1,%s", obuf); + sprintf(line, " LAD GR1,%s", cmdl->opd->opdv[0]); assembleline(line, pass); - sprintf(line, " LAD GR2,%s", len); + sprintf(line, " LAD GR2,%s", cmdl->opd->opdv[1]); assembleline(line, pass); assembleline(" SVC 2", pass); assembleline(" LAD GR1,=#A", pass); @@ -303,11 +401,14 @@ void writeOUT(const char *obuf, const char *len, PASS pass) * PUSH 0,GR6 * PUSH 0,GR7 */ -void writeRPUSH(PASS pass) +void assemble_rpush(const CMDLINE *cmdl, PASS pass) { int i; - char *line = malloc_chk(LINESIZE + 1, "writeRPUSH.line"); - + char *line = malloc_chk(LINESIZE + 1, "assemble_rpush.line"); + if(cmdl->opd->opdc > 0) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } for(i = 1; i <= GRSIZE-1; i++) { sprintf(line, " PUSH 0,GR%d", i); assembleline(line, pass); @@ -326,11 +427,14 @@ void writeRPUSH(PASS pass) * POP GR2 * POP GR1 */ -void writeRPOP(PASS pass) +void assemble_rpop(const CMDLINE *cmdl, PASS pass) { int i; - char *line = malloc_chk(LINESIZE + 1, "writeRPOP.line"); - + char *line = malloc_chk(LINESIZE + 1, "assemble_rpop.line"); + if(cmdl->opd->opdc > 0) { + setcerr(106, NULL); /* operand count mismatch */ + return; + } for(i = GRSIZE-1; i >= 1; i--) { sprintf(line, " POP GR%d", i); assembleline(line, pass); @@ -339,10 +443,32 @@ void writeRPOP(PASS pass) } /** - * æ©æ¢°èªå½ä»¤ãã¡ã¢ãªã«æ¸è¾¼ - * æ¸è¾¼ã«ãæåããå ´åã¯trueã失æããå ´åã¯falseããè¿ã + * assemble_macrocmd + * ãã¯ãå½ä»¤ãã¢ã»ã³ãã« + * ãã¯ãå½ä»¤ã®å ´åã¯trueããã以å¤ã®å ´åã¯falseãè¿ã + * ã¨ã©ã¼çºçæã¯cerrãè¨å® + */ +bool assemble_macrocmd(const CMDLINE *cmdl, PASS pass) +{ + if(strcmp(cmdl->cmd, "IN") == 0) { + assemble_in(cmdl, pass); + } else if(strcmp(cmdl->cmd, "OUT") == 0) { + assemble_out(cmdl, pass); + } else if(strcmp(cmdl->cmd, "RPUSH") == 0) { + assemble_rpush(cmdl, pass); + } else if(strcmp(cmdl->cmd, "RPOP") == 0) { + assemble_rpop(cmdl, pass); + } else { + return false; + } + return true; +} + +/** + * æ©æ¢°èªå½ä»¤ãã¢ã»ã³ãã« + * æåããå ´åã¯trueã失æããå ´åã¯falseãè¿ã */ -bool cometcmd(const CMDLINE *cmdl, PASS pass) +bool assemble_cometcmd(const CMDLINE *cmdl, PASS pass) { WORD cmd, r_r1, x_r2, adr; @@ -429,75 +555,6 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass) return (cerr->num == 0) ? true : false; } -/** - * COMET IIã®ã¡ã¢ãªã«ã¢ãã¬ã¹å¤ãæ¸ãè¾¼ã - */ -void writememory(WORD word, WORD adr, PASS pass) -{ - /* COMET IIã¡ã¢ãªãªã¼ãã¼ã®å ´åãã¨ã©ã¼çºç */ - if(adr >= sys->memsize) { - setcerr(119, word2n(adr)); /* out of COMET II memory */ - return; - } - (sys->memory)[adr] = word; - if(pass == SECOND && asmode.asdetail == true) { - fprintf(stdout, "\t#%04X\t#%04X\n", adr, word); - } -} - -/** - * æåãã¡ã¢ãªã«æ¸ãè¾¼ã - */ -void writestr(const char *str, bool literal, PASS pass) -{ - assert(*str == '\''); - const char *p = str + 1; - bool lw = false; - - for(; ;) { - /* éãã'ãããªãã¾ã¾æååãçµäºããå ´å */ - if(*p == '\0') { - setcerr(123, str); /* unclosed quote */ - break; - } - /* ã'ãã®å ´åãæ¬¡ã®æåãã'ãã§ãªãå ´åã¯æ£å¸¸çµäº */ - if(*p == '\'' && *(++p) != '\'') { - break; - } else if(literal == true && lw == true) { - setcerr(124, str); /* more than one character in literal */ - break; - } - /*ãªãã©ã«ã®å ´åã¯ãªãã©ã«é åã«æ¸è¾¼ */ - if(literal == true) { - writememory(*(p++), (asptr->lptr)++, pass); - lw = true; - } else { - writememory(*(p++), (asptr->ptr)++, pass); - } - } -} - -/** - * DCå½ä»¤ã®å å®¹ãæ¸ãè¾¼ã - */ -void writeDC(const char *str, PASS pass) -{ - WORD adr = 0x0; - - if(*str == '\'') { - writestr(str, false, pass); - } else { - if(*str == '#' || isdigit(*str) || *str == '-') { - adr = nh2word(str); - } else { - if(pass == SECOND && (adr = getlabel(asptr->prog, str)) == 0xFFFF) { - setcerr(103, str); /* label not found */ - } - } - writememory(adr, (asptr->ptr)++, pass); - } -} - /** * ãã¼ã¯ã³ãã¢ã»ã³ãã« */ @@ -508,46 +565,17 @@ bool assembletok(const CMDLINE *cmdl, PASS pass) return true; } /* ã¢ã»ã³ãã©å½ä»¤ã¾ãã¯ãã¯ãå½ä»¤ã®æ¸è¾¼ */ - if(assemblecmd(cmdl, pass) == false && macrocmd(cmdl, pass) == false) { - /* COMET IIå½ä»¤ã®æ¸è¾¼ */ - if(cometcmd(cmdl, pass) == false && cerr->num == 0) { - setcerr(113, cmdl->cmd); /* operand too many in COMET II command */ - } - } - return (cerr->num == 0) ? true : false; -} - -/** - * ãã¡ã¤ã«ã¹ããªã¼ã ã®ç¾å¨è¡ãçªå·ä»ãã§è¡¨ç¤ºãã - */ -void printline(FILE *stream, const char *filename, int lineno, char *line) -{ - fprintf(stream, "%s:%5d:%s", filename, lineno, line); -} - -/** - * ã¢ãã¬ã¹ãè¿ã - * ã¢ãã¬ã¹ã«ã¯ããªãã©ã«ï¼10é²å®æ°ï¼16é²å®æ°ï¼ã¢ãã¬ã¹å®æ°ãå«ã¾ãã - */ -WORD getadr(const char *prog, const char *str, PASS pass) -{ - WORD adr = 0x0; - - if(*str == '=') { - adr = getliteral(str, pass); - } else if(isdigit(*str) || *str == '-' || *str == '#') { - adr = nh2word(str); - } else { - if(pass == SECOND && (adr = getlabel(prog, str)) == 0xFFFF) { - if(prog != NULL) { - setcerr(103, str); /* label not found */ + if(assemble_ascmd(cmdl, pass) == false && assemble_macrocmd(cmdl, pass) == false) { + /* æ©æ¢°èªå½ä»¤ã®æ¸è¾¼ */ + if(assemble_cometcmd(cmdl, pass) == false) { + if(cerr->num == 0) { + setcerr(113, cmdl->cmd); /* operand too many in COMET II command */ } } } - return adr; + return (cerr->num == 0) ? true : false; } - /** * 1è¡ãã¢ã»ã³ãã« * passã1ã®å ´åã¯ã©ãã«ãç»é²ãã2ã®å ´åã¯ã©ãã«ããã¢ãã¬ã¹ãèªã¿è¾¼ã @@ -582,17 +610,6 @@ bool assembleline(const char *line, PASS pass) return stat; } -/** - * ã¢ã»ã³ãã«ã®ã¨ã©ã¼ãã¨ã©ã¼ãªã¹ãã«è¿½å - */ -void addcerrlist_assemble() -{ - addcerrlist_tok(); - addcerrlist_word(); - addcerrlist_label(); - addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble); -} - /** * æå®ãããååã®ãã¡ã¤ã«ãã¢ã»ã³ãã« * ã¢ã»ã³ãã«å®äºæã¯trueãã¨ã©ã¼çºçæã¯falseãè¿ã diff --git a/src/cmd.c b/src/cmd.c index d90abb7..1273a09 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -9,7 +9,7 @@ /** * æ©æ¢°èªå½ä»¤ã®ãªã¹ã */ -static CMD comet2cmd[] = { +static COMET2CMD comet2cmd[] = { { "NOP", NONE, 0x0, nop }, { "LD", R_ADR_X, 0x1000, ld_r_adr_x }, { "ST", R_ADR_X, 0x1100, st }, -- 2.18.0