X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fstruct.c;h=10585671d30e6ee43fa756235468dd5a4ffd456e;hp=3fb9a30db373afbb16020422930abe6662713a83;hb=HEAD;hpb=21b0a348f1e1660a3da0ebf0c4e7009a4ac11c71

diff --git a/src/struct.c b/src/struct.c
index 3fb9a30..1058567 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -4,12 +4,12 @@
 /**
  * COMET IIの仮想実行マシンシステム
  */
-SYSTEM *sys;
+SYSTEM *sys = NULL;
 
 /**
  * プログラム実行時の開始と終了のアドレス
  */
-EXECPTR *execptr;
+EXECPTR *execptr = NULL;
 
 /**
  * システムCOMET IIの命令表
@@ -64,13 +64,13 @@ static int comet2cmdsize = ARRAYSIZE(comet2cmd);
  * ハッシュ表のサイズ
  */
 enum {
-    CMDTABSIZE = 39,
+    CMDTABSIZE = 41,
 };
 
 /**
  * ハッシュ表
  */
-static CMDTAB *cmdtype_code[CMDTABSIZE], *code_cmdtype[CMDTABSIZE];
+static CMDTAB *cmdtab[HASH_MAX][CMDTABSIZE] = {{NULL}};
 
 /**
  * 命令の名前とタイプからハッシュ値を生成する
@@ -87,8 +87,8 @@ unsigned hash_code(WORD code);
  */
 unsigned hash_cmdtype(const char *cmd, CMDTYPE type)
 {
-    HKEY *keys[2];
-    unsigned hashval;
+    HKEY *keys[2] = {NULL};
+    unsigned hashval = 0;
 
     /* 命令名を設定 */
     keys[0] = malloc_chk(sizeof(HKEY), "hash_cmdtype.keys[0]");
@@ -112,37 +112,51 @@ unsigned hash_cmdtype(const char *cmd, CMDTYPE type)
  */
 bool create_cmdtable(CMDTAB_HASH hash)
 {
-    CMDTAB *p;
+    CMDTAB *p = NULL;
     unsigned hashval;
-    int i;
 
-    for(i = 0; i < comet2cmdsize; i++) {
+    for(int i = 0; i < comet2cmdsize; i++) {
         p = malloc_chk(sizeof(CMDTAB), "create_cmdtable.p");
         p->cmd = &comet2cmd[i];
         if(hash == HASH_CMDTYPE) {
             hashval = hash_cmdtype(comet2cmd[i].name, comet2cmd[i].type);
-            p->next = cmdtype_code[hashval];
-            cmdtype_code[hashval] = p;
         } else if(hash == HASH_CODE) {
-            hashval = hash_code((&comet2cmd[i])->code);
-            p->next = code_cmdtype[hashval];
-            code_cmdtype[hashval] = p;
+            hashval = hash_code(comet2cmd[i].code);
         }
+        p->next = cmdtab[hash][hashval];
+        cmdtab[hash][hashval] = p;
     }
     return true;
 }
 
+/**
+ * 命令ハッシュ表を解放する
+ */
+void free_cmdtable(CMDTAB_HASH hash)
+{
+    CMDTAB *p = NULL;
+    CMDTAB *q = NULL;
+
+    for(int i = 0; i < CMDTABSIZE; i++) {
+        for(p = cmdtab[hash][i]; p != NULL; p = q) {
+            q = p->next;
+            FREE(p);
+        }
+        cmdtab[hash][i] = NULL;
+    }
+}
+
 /**
  * 命令の名前とタイプから、命令コードを返す\n
  * 無効な場合は0xFFFFを返す
  */
 WORD getcmdcode(const char *cmd, CMDTYPE type)
 {
-    CMDTAB *p;
+    CMDTAB *p = NULL;
     WORD w = 0xFFFF;
 
     assert(cmd != NULL);
-    for(p = cmdtype_code[hash_cmdtype(cmd, type)]; p != NULL; p = p->next) {
+    for(p = cmdtab[HASH_CMDTYPE][hash_cmdtype(cmd, type)]; p != NULL; p = p->next) {
         if(strcmp(cmd, p->cmd->name) == 0 && type == p->cmd->type) {
             w = p->cmd->code;
             break;
@@ -151,39 +165,13 @@ WORD getcmdcode(const char *cmd, CMDTYPE type)
     return w;
 }
 
-/**
- * 命令ハッシュ表を解放する
- */
-void free_cmdtable(CMDTAB_HASH hash)
-{
-    int i;
-    CMDTAB *p, *q;
-
-    for(i = 0; i < CMDTABSIZE; i++) {
-        if(hash == HASH_CMDTYPE) {
-            p = cmdtype_code[i];
-        } else if(hash == HASH_CODE) {
-            p = code_cmdtype[i];
-        }
-        for( ; p != NULL; p = q) {
-            q = p->next;
-            if(p == cmdtype_code[i]) {
-                cmdtype_code[i] = NULL;
-            } else if (p == code_cmdtype[i]) {
-                code_cmdtype[i] = NULL;
-            }
-            FREE(p);
-        }
-    }
-}
-
 /**
  * 命令コードからハッシュ値を生成する
  */
 unsigned hash_code(WORD code)
 {
-    HKEY *keys[1];
-    unsigned h;
+    HKEY *keys[1] = {NULL};
+    unsigned h = 0;
 
     /* 命令コードを設定 */
     keys[0] = malloc_chk(sizeof(HKEY), "hash_code.key");
@@ -199,10 +187,10 @@ unsigned hash_code(WORD code)
  */
 const void (*getcmdptr(WORD code))
 {
-    CMDTAB *t;
+    CMDTAB *t = NULL;
     const void *ptr = NULL;
 
-    for(t = code_cmdtype[hash_code(code)]; t != NULL; t = t->next) {
+    for(t = cmdtab[HASH_CODE][hash_code(code)]; t != NULL; t = t->next) {
         if(code == t->cmd->code) {
             ptr = t->cmd->ptr;
             break;
@@ -216,10 +204,10 @@ const void (*getcmdptr(WORD code))
  */
 CMDTYPE getcmdtype(WORD code)
 {
-    CMDTAB *t;
+    CMDTAB *t = NULL;
     CMDTYPE type = NONE;
 
-    for(t = code_cmdtype[hash_code(code)]; t != NULL; t = t->next) {
+    for(t = cmdtab[HASH_CODE][hash_code(code)]; t != NULL; t = t->next) {
         if(code == t->cmd->code) {
             type = t->cmd->type;
             break;
@@ -233,10 +221,10 @@ CMDTYPE getcmdtype(WORD code)
  */
 char *getcmdname(WORD code)
 {
-    CMDTAB *t;
+    CMDTAB *t = NULL;
     char *cmd = NULL;
 
-    for(t = code_cmdtype[hash_code(code)]; t != NULL; t = t->next) {
+    for(t = cmdtab[HASH_CODE][hash_code(code)]; t != NULL; t = t->next) {
         if(code == t->cmd->code) {
             cmd = t->cmd->name;
             break;
@@ -252,7 +240,9 @@ char *getcmdname(WORD code)
 char *grstr(WORD word)
 {
     assert(word <= 7);
-    char *str = malloc_chk(3 + 1, "grstr.str");
+    char *str = NULL;
+
+    str = malloc_chk(3 + 1, "grstr.str");
     sprintf(str, "GR%d", word);
     return str;
 }
@@ -262,8 +252,6 @@ char *grstr(WORD word)
  */
 void reset(int memsize, int clocks)
 {
-    int i;
-
     sys = malloc_chk(sizeof(SYSTEM), "sys");
     /* メモリサイズを設定 */
     sys->memsize = memsize;
@@ -273,7 +261,7 @@ void reset(int memsize, int clocks)
     sys->memory = calloc_chk(sys->memsize, sizeof(WORD), "memory");
     /* CPUを初期化 */
     sys->cpu = malloc_chk(sizeof(CPU), "cpu");
-    for(i = 0; i < GRSIZE; i++) {                    /* 汎用レジスタ  */
+    for(int i = 0; i < GRSIZE; i++) {                    /* 汎用レジスタ  */
         sys->cpu->gr[i] = 0x0;
     }
     sys->cpu->sp = sys->memsize;   /* スタックポインタ */