ユニットテストの修正

[YACASL2.git] / src / struct.c

diff --git a/src/struct.c b/src/struct.c
index 4546648..1fb4326 100644 (file)
--- a/src/struct.c
+++ b/src/struct.c
@@ -3,50 +3,42 @@
 /* COMET IIのメモリ */
 WORD *memory;
 
-/* COMET IIのCPUレジスタ */
-WORD GR[REGSIZE], SP, PR, FR;
-
-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 },
-};
-
-/* メモリーサイズ */
+/* メモリサイズ */
 int memsize = DEFAULT_MEMSIZE;
 
+/* COMET IIのCPU */
+CPU *cpu;
+
 /* クロック周波数 */
 int clocks = DEFAULT_CLOCKS;
 
-/* 実行開始番地 */
-WORD startptr = 0x0;
+/* CASL2プログラムのプロパティ */
+PROGPROP *progprop;
+
+/* COMET II仮想マシンのリセット */
+void reset()
+{
+    int i;
+
+    /* メモリの初期化 */
+    memory = malloc_chk(memsize * sizeof(WORD), "memory");
+    for(i = 0; i < memsize; i++) {
+        memory[i] = 0x0;
+    }
+    /* CPUの初期化 */
+    cpu = malloc_chk(sizeof(CPU), "cpu");
+    for(i = 0; i < GRSIZE; i++) {
+        cpu->gr[i] = 0x0;
+    }
+    cpu->sp = cpu->pr = cpu->fr = 0x0;
+    /* CASL2プログラムのプロパティ */
+    progprop = malloc_chk(sizeof(PROGPROP), "progprop");
+}
 
-/* 実行終了番地 */
-WORD endptr = 0x0;
+/* COMET II仮想マシンのシャットダウン */
+void shutdown()
+{
+    free(progprop);
+    free(cpu);
+    free(memory);
+}