X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=test%2Funit%2Fgetcmdcode%2Fcmd.c;h=a479173dab57cbc45b919d0e40edc7bea1d31103;hb=HEAD;hp=b8eed2b243b67eac2cdc234ae6ccdf4a624231d6;hpb=9110bf71c8d4f1d1da5327f3afc0d0b1bdab8c02;p=YACASL2.git

diff --git a/test/unit/getcmdcode/cmd.c b/test/unit/getcmdcode/cmd.c
index b8eed2b..a479173 100644
--- a/test/unit/getcmdcode/cmd.c
+++ b/test/unit/getcmdcode/cmd.c
@@ -1,4 +1,8 @@
-#include "casl2.h"
+#include <stdio.h>
+#include "struct.h"
+#include "cerr.h"
+#include "exec.h"
+#include "monitor.h"
 
 int main(){
     int i;
@@ -8,13 +12,13 @@ int main(){
         CMDTYPE type;
     } cmdcodelist[] = {
         { "LD", NONE }, { "LD", 066 }, { "NOEX", R1_R2 },
-        { "NOP", NONE }, { "LD", R_ADR_X_ }, { "ST", R_ADR_X },
-        { "LAD", R_ADR_X }, { "LD", R1_R2 }, { "ADDA", R_ADR_X_ },
-        { "SUBA", R_ADR_X_ }, { "ADDL", R_ADR_X_ }, { "SUBL", R_ADR_X_ },
+        { "NOP", NONE }, { "LD", R_ADR_X }, { "ST", R_ADR_X },
+        { "LAD", R_ADR_X }, { "LD", R1_R2 }, { "ADDA", R_ADR_X },
+        { "SUBA", R_ADR_X }, { "ADDL", R_ADR_X }, { "SUBL", R_ADR_X },
         { "ADDA", R1_R2 }, { "SUBA", R1_R2 }, { "ADDL", R1_R2 },
-        { "SUBL", R1_R2 }, { "AND", R_ADR_X_ }, { "OR", R_ADR_X_ },
-        { "XOR", R_ADR_X_ }, { "AND", R1_R2 }, { "OR", R1_R2 },
-        { "XOR", R1_R2 }, { "CPA", R_ADR_X_ }, { "CPL", R_ADR_X_ },
+        { "SUBL", R1_R2 }, { "AND", R_ADR_X }, { "OR", R_ADR_X },
+        { "XOR", R_ADR_X }, { "AND", R1_R2 }, { "OR", R1_R2 },
+        { "XOR", R1_R2 }, { "CPA", R_ADR_X }, { "CPL", R_ADR_X },
         { "CPA", R1_R2 }, { "CPL", R1_R2 }, { "SLA", R_ADR_X },
         { "SRA", R_ADR_X }, { "SLL", R_ADR_X }, { "SRL", R_ADR_X },
         { "JMI", ADR_X }, { "JNZ", ADR_X }, { "JZE", ADR_X },
@@ -22,8 +26,8 @@ int main(){
         { "PUSH", ADR_X }, { "POP", R_ }, { "CALL", ADR_X },
         { "SVC", ADR_X }, { "RET", NONE }
     };
-    create_cmdtype_code();
-    cerr = malloc_chk(sizeof(CERR), "cerr");    /* エラーの初期化 */
+    create_cmdtable(HASH_CMDTYPE);
+    cerr_init();
     for(i = 0; i < sizeof(cmdcodelist)/sizeof(cmdcodelist[0]); i++) {
         code = getcmdcode(cmdcodelist[i].cmd, cmdcodelist[i].type);
         printf("%s:0%02o ---> #%04X\n", cmdcodelist[i].cmd, cmdcodelist[i].type, code);
@@ -32,6 +36,6 @@ int main(){
         }
     }
     freecerr();
-    free_cmdtype_code();
+    free_cmdtable(HASH_CMDTYPE);
     return 0;
 }