X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcmd.c;h=d90abb7abda76f32e4915a267b06f1d33a5467c0;hp=04acd32fdb4abba185eb91a8b4867c219dcc4bae;hb=85a32cf5cc8e39dc5d4f085179559de71ad87cb8;hpb=e8856643e2cc24d7419a587548396cc405ce0f19

diff --git a/src/cmd.c b/src/cmd.c
index 04acd32..d90abb7 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -4,49 +4,50 @@
 #include "hash.h"
 #include "struct.h"
 #include "cmem.h"
+#include "exec.h"
 
 /**
  * 機械語命令のリスト
  */
 static CMD comet2cmd[] = {
-    { "NOP", NONE, 0x0 },
-    { "LD", R_ADR_X_, 0x1000 },
-    { "ST", R_ADR_X, 0x1100 },
-    { "LAD", R_ADR_X, 0x1200 },
-    { "LD", R1_R2, 0x1400 },
-    { "ADDA", R_ADR_X_, 0x2000 },
-    { "SUBA", R_ADR_X_, 0x2100 },
-    { "ADDL", R_ADR_X_, 0x2200 },
-    { "SUBL", R_ADR_X_, 0x2300 },
-    { "ADDA", R1_R2, 0x2400 },
-    { "SUBA", R1_R2, 0x2500 },
-    { "ADDL", R1_R2, 0x2600 },
-    { "SUBL", R1_R2, 0x2700 },
-    { "AND", R_ADR_X_, 0x3000 },
-    { "OR", R_ADR_X_, 0x3100 },
-    { "XOR", R_ADR_X_, 0x3200 },
-    { "AND", R1_R2, 0x3400 },
-    { "OR", R1_R2, 0x3500 },
-    { "XOR", R1_R2, 0x3600 },
-    { "CPA", R_ADR_X_, 0x4000 },
-    { "CPL", R_ADR_X_, 0x4100 },
-    { "CPA", R1_R2, 0x4400 },
-    { "CPL", R1_R2, 0x4500 },
-    { "SLA", R_ADR_X, 0x5000 },
-    { "SRA", R_ADR_X, 0x5100 },
-    { "SLL", R_ADR_X, 0x5200 },
-    { "SRL", R_ADR_X, 0x5300 },
-    { "JMI", ADR_X, 0x6100 },
-    { "JNZ", ADR_X, 0x6200 },
-    { "JZE", ADR_X, 0x6300 },
-    { "JUMP", ADR_X, 0x6400 },
-    { "JPL", ADR_X, 0x6500 },
-    { "JOV", ADR_X, 0x6600 },
-    { "PUSH", ADR_X, 0x7000 },
-    { "POP", R_, 0x7100 },
-    { "CALL", ADR_X, 0x8000 },
-    { "SVC", ADR_X, 0xF000 },
-    { "RET", NONE, 0x8100 },
+    { "NOP", NONE, 0x0, nop },
+    { "LD", R_ADR_X, 0x1000, ld_r_adr_x },
+    { "ST", R_ADR_X, 0x1100, st },
+    { "LAD", R_ADR_X, 0x1200, lad },
+    { "LD", R1_R2, 0x1400, ld_r1_r2 },
+    { "ADDA", R_ADR_X, 0x2000, adda_r_adr_x },
+    { "SUBA", R_ADR_X, 0x2100, suba_r_adr_x },
+    { "ADDL", R_ADR_X, 0x2200, addl_r_adr_x },
+    { "SUBL", R_ADR_X, 0x2300, subl_r_adr_x },
+    { "ADDA", R1_R2, 0x2400, adda_r1_r2 },
+    { "SUBA", R1_R2, 0x2500, suba_r1_r2 },
+    { "ADDL", R1_R2, 0x2600, addl_r1_r2 },
+    { "SUBL", R1_R2, 0x2700, subl_r1_r2 },
+    { "AND", R_ADR_X, 0x3000, and_r_adr_x },
+    { "OR", R_ADR_X, 0x3100, or_r_adr_x },
+    { "XOR", R_ADR_X, 0x3200, xor_r_adr_x },
+    { "AND", R1_R2, 0x3400, and_r1_r2 },
+    { "OR", R1_R2, 0x3500, or_r1_r2 },
+    { "XOR", R1_R2, 0x3600, xor_r1_r2 },
+    { "CPA", R_ADR_X, 0x4000, cpa_r_adr_x },
+    { "CPL", R_ADR_X, 0x4100, cpl_r_adr_x },
+    { "CPA", R1_R2, 0x4400, cpa_r1_r2 },
+    { "CPL", R1_R2, 0x4500, cpl_r1_r2 },
+    { "SLA", R_ADR_X, 0x5000, sla },
+    { "SRA", R_ADR_X, 0x5100, sra },
+    { "SLL", R_ADR_X, 0x5200, sll },
+    { "SRL", R_ADR_X, 0x5300, srl },
+    { "JMI", ADR_X, 0x6100, jmi },
+    { "JNZ", ADR_X, 0x6200, jnz },
+    { "JZE", ADR_X, 0x6300, jze },
+    { "JUMP", ADR_X, 0x6400, jump },
+    { "JPL", ADR_X, 0x6500, jpl },
+    { "JOV", ADR_X, 0x6600, jov },
+    { "PUSH", ADR_X, 0x7000, push },
+    { "POP", R_, 0x7100, pop },
+    { "CALL", ADR_X, 0x8000, call },
+    { "SVC", ADR_X, 0xF000, svc },
+    { "RET", NONE, 0x8100, ret },
 };
 
 /**
@@ -182,21 +183,20 @@ bool create_code_type()
 }
 
 /**
- * 命令コードから命令タイプを返す
- * 無効な場合はNOTCMDを返す
+ * 命令コードから命令の関数ポインタを返す
  */
-CMDTYPE getcmdtype(WORD code)
+const void (*getcmdptr(WORD code))
 {
-    CMDTAB *p;
-    CMDTYPE t = NOTCMD;
+    CMDTAB *t;
+    const void (*ptr);
 
-    for(p = code_type[hash_code(code)]; p != NULL; p = p->next) {
-        if(code == p->cmd->code) {
-            t = p->cmd->type;
+    for(t = code_type[hash_code(code)]; t != NULL; t = t->next) {
+        if(code == t->cmd->code) {
+            ptr = t->cmd->ptr;
             break;
         }
     }
-    return t;
+    return ptr;
 }
 
 /**