Valgrindで見つかったメモリー周辺の問題点を修正

[YACASL2.git] / src / struct.c

diff --git a/src/struct.c b/src/struct.c
index 4546648..ef9a844 100644 (file)
--- a/src/struct.c
+++ b/src/struct.c
@@ -1,52 +1,47 @@
-#include "casl2.h"
+#include "struct.h"
+#include "cmem.h"
 
-/* COMET IIのメモリ */
-WORD *memory;
+/**
+ * COMET IIの仮想実行マシンシステム
+ */
+SYSTEM *sys;
 
-/* COMET IIのCPUレジスタ */
-WORD GR[REGSIZE], SP, PR, FR;
+/**
+ * プログラム実行時の開始と終了のアドレス
+ */
+EXECPTR *execptr;
 
-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 },
-};
+/**
+ * COMET II仮想マシンのリセット
+ */
+void reset(int memsize, int clocks)
+{
+    int i;
 
-/* メモリーサイズ */
-int memsize = DEFAULT_MEMSIZE;
+    sys = malloc_chk(sizeof(SYSTEM), "sys");
+    /* メモリサイズを設定 */
+    sys->memsize = memsize;
+    /* クロック周波数を設定 */
+    sys->clocks = clocks;
+    /* メモリを初期化 */
+    sys->memory = calloc_chk(sys->memsize, sizeof(WORD), "memory");
+    /* CPUを初期化 */
+    sys->cpu = malloc_chk(sizeof(CPU), "cpu");
+    for(i = 0; i < GRSIZE; i++) {
+        sys->cpu->gr[i] = 0x0;
+    }
+    sys->cpu->sp = sys->cpu->pr = sys->cpu->fr = 0x0;
+    /* CASL2プログラムの開始と終了のアドレスを初期化 */
+    execptr = malloc_chk(sizeof(execptr), "prog");
+}
 
-/* クロック周波数 */
-int clocks = DEFAULT_CLOCKS;
-
-/* 実行開始番地 */
-WORD startptr = 0x0;
-
-/* 実行終了番地 */
-WORD endptr = 0x0;
+/**
+ * COMET II仮想マシンのシャットダウン
+ */
+void shutdown()
+{
+    FREE(execptr);
+    FREE(sys->memory);
+    FREE(sys->cpu);
+    FREE(sys);
+}