From 2f889a87ef4e11467f71ea3c03676a8d88cccd7b Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Thu, 4 Feb 2010 20:38:05 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=81=94?=
 =?utf8?q?=E3=81=A8=E3=81=AB=E7=95=B0=E3=81=AA=E3=82=8B=E3=82=A8=E3=83=A9?=
 =?utf8?q?=E3=83=BC=E8=A1=A8=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?=
 =?utf8?q?=E3=82=88=E3=81=86=E5=86=85=E9=83=A8=E4=BB=95=E6=A7=98=E5=A4=89?=
 =?utf8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 include/cerr.h |  3 +++
 src/Makefile   |  7 +++++--
 src/cerr.c     | 45 +++++++++------------------------------------
 src/dumpword.c | 10 ++++++++++
 src/struct.c   | 35 ++++++++++++++++++++++++++++++++---
 5 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/include/cerr.h b/include/cerr.h
index 586ab4d..878fd85 100644
--- a/include/cerr.h
+++ b/include/cerr.h
@@ -21,6 +21,9 @@ typedef struct {
     char *msg;
 } CERRARRAY;
 
+/* エラーメッセージ */
+extern CERRARRAY cerr[];
+
 enum {
     MSGSIZE = 60,
 };
diff --git a/src/Makefile b/src/Makefile
index 7e39583..e28e81d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,10 @@
 INCLUDE = ../include
 CC = gcc
 CFLAGS = -g -Wall -I $(INCLUDE)
-COMMONSRC = word.o struct.o hash.o cmd.o cerr.o
+HASHSRC = hash.o
+CERRSRC = cerr.o
+WORDSRC = word.o
+COMMONSRC = $(WORDSRC) $(HASHSRC) $(CERRSRC) struct.o cmd.o
 ASSRC = assemble.o token.o label.o macro.o
 EXECSRC = exec.o dump.o
 .PHPNY: all clean
@@ -10,7 +13,7 @@ all: ../casl2 ../comet2 ../dumpword TAGS
 	$(CC) $(CFLAGS) -o $@ $^
 ../comet2: comet2.o $(COMMONSRC) $(EXECSRC)
 	$(CC) $(CFLAGS) -o $@ $^
-../dumpword: dumpword.o $(COMMONSRC)
+../dumpword: dumpword.o $(WORDSRC) $(CERRSRC)
 	$(CC) $(CFLAGS) -o $@ $^
 %.o: %.c
 	$(CC) -c $(CFLAGS) $<
diff --git a/src/cerr.c b/src/cerr.c
index ceea3af..f7971f6 100644
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -1,36 +1,8 @@
 #include "cerr.h"
 
-CERRARRAY cerr[] = {
-    { 101, "label already defined" },
-    { 102, "label table is full" },
-    { 103, "label not found" },
-    { 104, "label length is too long" },
-    { 105, "no command in the line" },
-    { 106, "operand count mismatch" },
-    { 107, "no label in START" },
-    { 108, "not command of operand \"r\"" },
-    { 109, "not command of operand \"r1,r2\"" },
-    { 110, "not command of operand \"r,adr[,x]\"" },
-    { 111, "not command of operand \"adr[,x]\"" },
-    { 112, "not command of no operand" },
-    { 113, "command not defined" },
-    { 114, "not integer" },
-    { 115, "not hex" },
-    { 116, "out of hex range" },
-    { 117, "operand is too many" },
-    { 118, "operand length is too long" },
-    { 119, "out of COMET II memory" },
-    { 120, "GR0 in operand x" },
-    { 121, "cannot get operand token" },
-    { 122, "cannot create hash table" },
-    { 201, "execute - out of COMET II memory" },
-    { 202, "SVC input - out of Input memory" },
-    { 203, "SVC output - out of COMET II memory" },
-    { 204, "Program Register (PR) - out of COMET II memory" },
-    { 205, "Stack Pointer (SP) - cannot allocate stack buffer" },
-    { 206, "Address - out of COMET II memory" },
-    { 207, "Stack Pointer (SP) - out of COMET II memory" },
-};
+/* エラーメッセージ */
+int cerrno = 0;
+char *cerrmsg;
 
 /* エラー番号とエラーメッセージを設定する */
 void setcerr(int num, const char *val)
@@ -50,12 +22,13 @@ void setcerr(int num, const char *val)
 char *getcerrmsg(int num)
 {
     assert(num > 0);
-    int i;
-    for(i = 0; i < ARRAYSIZE(cerr); i++) {
-        if((&cerr[i])->num == num) {
-            return (&cerr[i])->msg;
+    int i = 0;
+    CERRARRAY *ptr;
+    do {
+        if((ptr = &cerr[i++])->num == num) {
+            return ptr->msg;
         }
-    }
+    } while(ptr->num > 0);
     return "unkown error";
 }
 
diff --git a/src/dumpword.c b/src/dumpword.c
index e78b108..cefbc0f 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -9,6 +9,16 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
+CERRARRAY cerr[] = {
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+    { 0, NULL },
+};
+
+/* レジストリの内容を論理値（0〜65535）で表示する場合はtrue */
+bool logicalmode = false;
+
 int main(int argc, char *argv[])
 {
     int opt;
diff --git a/src/struct.c b/src/struct.c
index 31be1e6..d918c7a 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -6,9 +6,38 @@ WORD *memory;
 /* COMET IIのCPUレジスタ */
 WORD GR[REGSIZE], SP, PR, FR;
 
-/* エラーメッセージ */
-int cerrno = 0;
-char *cerrmsg;
+CERRARRAY cerr[] = {
+    { 101, "label already defined" },
+    { 102, "label table is full" },
+    { 103, "label not found" },
+    { 104, "label length is too long" },
+    { 105, "no command in the line" },
+    { 106, "operand count mismatch" },
+    { 107, "no label in START" },
+    { 108, "not command of operand \"r\"" },
+    { 109, "not command of operand \"r1,r2\"" },
+    { 110, "not command of operand \"r,adr[,x]\"" },
+    { 111, "not command of operand \"adr[,x]\"" },
+    { 112, "not command of no operand" },
+    { 113, "command not defined" },
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+    { 117, "operand is too many" },
+    { 118, "operand length is too long" },
+    { 119, "out of COMET II memory" },
+    { 120, "GR0 in operand x" },
+    { 121, "cannot get operand token" },
+    { 122, "cannot create hash table" },
+    { 201, "execute - out of COMET II memory" },
+    { 202, "SVC input - out of Input memory" },
+    { 203, "SVC output - out of COMET II memory" },
+    { 204, "Program Register (PR) - out of COMET II memory" },
+    { 205, "Stack Pointer (SP) - cannot allocate stack buffer" },
+    { 206, "Address - out of COMET II memory" },
+    { 207, "Stack Pointer (SP) - out of COMET II memory" },
+    { 0, NULL },
+};
 
 /* レジストリの内容を表示する場合はtrue */
 bool tracemode = false;
-- 
2.18.0