X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=4851aeac1d15d629eb20db77f76085178d47cba0;hp=29b1afc264367ce9c986599b9ff49d0486d31bc5;hb=dc4c4e843192f433bd0f14d88d5f101ebbd23820;hpb=87da65b534d88b60dcfb59ff1252101daf35e44e

diff --git a/src/exec.c b/src/exec.c
index 29b1afc..4851aea 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,6 +1,9 @@
 #include "casl2.h"
 #include "exec.h"
 
+/* 実行モード: trace, logical, dump */
+EXECMODE execmode = {false, false, false};
+
 /* 標準入力から文字データを読込（SVC 1） */
 void svcin()
 {
@@ -8,11 +11,10 @@ void svcin()
     char *buffer = malloc(INSIZE + 1);
 
     if(fgets(buffer, INSIZE, stdin) == NULL) {
-        memory[GR[1]] = 0x0;
-        memory[GR[2]] = 0x0;
+        memory[GR[1]] = memory[GR[2]] = 0x0;
         return;
     }
-    for(i = 0; i < GR[1] && i < INSIZE; i++) {
+    for(i = 0; i < INSIZE; i++) {
         if(*(buffer + i) == '\0' || *(buffer + i) == '\n') {
             --i;
             break;
@@ -149,7 +151,7 @@ WORD sla(WORD val0, WORD val1)
         last = res & 0x4000;
         res <<= 1;
     }
-    res = sign | res;
+    res = sign | (res & 0x7FFF);
     /* OFに、レジスタから最後に送り出されたビットの値を設定 */
     if(last > 0x0) {
         FR += OF;
@@ -273,7 +275,7 @@ void exec()
     char *errpr = malloc(8);
     clock_t clock_begin, clock_end;
 
-    if((&execmode)->tracemode) {
+    if((&execmode)->trace) {
         fprintf(stdout, "\nExecuting machine codes\n");
     }
     /* フラグレジスタの初期値設定 */
@@ -309,15 +311,15 @@ void exec()
         if(cerrno > 0) {
             goto execerr;
         }
-        if((&execmode)->tracemode){
+        if((&execmode)->trace){
             fprintf(stdout, "#%04X: Register::::\n", PR);
             dspregister();
         }
-        if((&execmode)->dumpmode){
+        if((&execmode)->dump){
             fprintf(stdout, "#%04X: Memory::::\n", PR);
             dumpmemory();
         }
-        if((&execmode)->dumpmode || (&execmode)->tracemode) {
+        if((&execmode)->dump || (&execmode)->trace) {
             fprintf(stdout, "\n");
         }
         PR++;