From caf2b81431602fe5d480e0036e3eb6df8f60f1a0 Mon Sep 17 00:00:00 2001
From: lux <michael.krause@uni-leipzig.de>
Date: Thu, 10 Aug 2017 23:08:50 +0200
Subject: [PATCH] Finish rough ACCU implementation!

---
 src/.main.c.swp | Bin 12288 -> 0 bytes
 src/.toy.h.swp  | Bin 12288 -> 0 bytes
 src/main.c      |  18 +++++++++++-------
 src/toy.c       |  37 +++++++++++++++++++++----------------
 src/toy.h       |   2 +-
 5 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 src/.main.c.swp
 delete mode 100644 src/.toy.h.swp

diff --git a/src/.main.c.swp b/src/.main.c.swp
deleted file mode 100644
index c26b609196f0e9211774750b6b07aeb7b823ee1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O-~a+7{><=Vo=oJ!Ry!tvW3zYB}gbWK_S8cH5g0;$!5Ddr4!oiI^9(aQ4c0w
zOgyP4xq9{+s2{<%@8C&q#-sm--O}O<CfrD#Nq#%b%rj4)`AshkTPfUJSd<rX;{xrJ
z5OezJt!I5t#QT0BHjERs6fNxELLIop@rnI|u=+4gm=BxxZS9B31V-VRZy7h=aI~Lu
z|C@pX*Z><ih=C}qj!h1T^XG~M+MZ6Gm8S=n50Z)ZumLu}2G{@_U;}J`4X^<=a7Yb=
zL63NZ+Iy4wt)%bytxtyBu>m%~2G{@_U;}J`4X^<=zy{a=8(;&6(17C!F?C#sAAtV<
z-~Rpo{iG0|!6)zzyajK-Hh2kMfajnE?tmpQ4btEk_;x~wkKhB?2Cu*-2*3)M1ZO}m
z_%a~GYw#F^U>*#CLC_D5f<ABr{7h>7O7(JM18jf|umLu}2G{@_U;}J`4gAHx10m7y
zzHwxHS=c)&Azq4no+9EE`b*VYN(S!eXi3np-2%7lIiX`ao@XrMG*$z5Ez=3nRZDFu
zHwu;23~aaQsqAieb_DU6jA*AyE8o-A-62gkoDDUvHfN(oV1*`9S=!ObP9cH8yVF%G
zHRBo8YN;tX<lXjDolp5k__gcuGO9s%MBzzsUBPKx^;A{P&Rtr*BItvt?bcqdYTvVI
zXlc{6E6F3va$SXXGoTaijnD>*iKtRyc`NDf)pT81Ci3O*FkDYtOEZi1jfIuDu_8PP
zssKW@uS4zBbxYaEL(;R3S$FAiH&ZSnwtcZhTqSL)G@EtmsZsW_B$=^C*oznN>>RHU
zFGg4`PS`sUfs1`z^ONzkOpg5L25rh+;q5eZ^!BmVN@7b;0ra{%&K1g?gGjgL7&$`c
zSzW`qMb|eYjZ4wKitj}V+>%e%bTz&wjD5Erd1~6hcfo|Y+C}V6=42|D_f#cXkDs|(
Ls%r@^;nTz~lOqkt

diff --git a/src/.toy.h.swp b/src/.toy.h.swp
deleted file mode 100644
index 16bf9ea8504aadae7bf1307680756964e7c271ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI&&rTCT90%~hizojCUtn}Kfu@vJn~K4Z7&Vat!GLJsGER4<bVA+T%+4B(iQc^E
z1-$4J_!6Fc0xmoOK7mKQ_#IjxLd1j{$#;`)H#5JP-%dZbP1|igonMf*8*PE>vJf}y
zht-eg-;3W;hz+l+(#FEcS8zqzYIjavgzDR2!|9N}RxS(H7vAD?y7XzBYxMuyfeR==
zfl~=op*J;iLEO68YR3J^wX5>V_{ynTaT5h7KmiI+fC3bt00k&;HU&a4Cf?!b=SIgL
zAKk}}+($#+C_n)UP=Epypa2CZKmiI+fC3aag96$JF?CUhO(g#QzyJRK^O6uhkX>XO
z`G$N&J|SDk8>EY9<T-L3`Gp=k$QR@@5_^6}cu{}?6rcbFC_n)UP=Epypa2Dq3M7fm
zjO*d$GS3InzOrc*>_mmXi_fSa^FpP$v2}^DG&*Rdjq&wZZgo(vdHrH?R>W%0Wk$s%
zdz<&FE-Qnt(%|w8i}ri2+o19yw*A-2*v@4xI6ZKsRd~kX%J{_LakO7g>oV<YFKaan
zUdqW?iLaL!i?djH|M7}?wz%{_Ezhq#l&#J|Vd>t&aIW3F)4`6!W$B<YR^Bax8Mtnv
hKlk@sq&YT;Lmr>Y<J7@}o-D4aM`+c{a3nb#{Q(QPrBVO@

diff --git a/src/main.c b/src/main.c
index 7b11a7d..0c925a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,24 +15,28 @@ int main(int argc, char *argv[])
     uint8_t     op_code;
     uint16_t    pc = 0;
     int         data_addr=0;
+    char        quit;
     bool        run = true;
 
     if(initialise_ram(ram,argc,argv)==-1) return 1;
 
-//    while(run && pc<(RAM_SIZE-1))
-//    {
+    while(run && pc<(RAM_SIZE-1))
+    {
         ir = ram[pc];
         op_code = get_opcode(ir);
         data_addr=find_data(ir);
         #ifdef DEBUG
-            printf("OP Code: %u\n",op_code);
+            printf("OP Code: %"PRIu8"\n",op_code);
             printf("Adresse: %d\n",data_addr);
-            makeHexDump(true,ram);
         #endif
-        if(execute(op_code,data_addr,*ram))
-            pc=data_addr(ram[pc]);
+        if(execute(op_code,data_addr,ram))
+            pc=find_data(ram[pc]);              //jump if ACCU is ZERO
         else pc++;
-//    }
+        printf("(n)ext step or (q)uit or (c)oredump ?\n");
+        scanf("%c",&quit);
+        if(quit == 'c') makeHexDump(true,ram);
+        else if(quit == 'q') run = false;
+    }
  
 
 
diff --git a/src/toy.c b/src/toy.c
index e85843f..e640f8f 100644
--- a/src/toy.c
+++ b/src/toy.c
@@ -71,23 +71,28 @@ bool execute(uint8_t op_code, int data_addr, uint16_t *ram) // jump when 1
     //vorsicht uint16 und Zweierkomplement noch nicht stringent !!!
     //Vorsicht bool ops bei sigend int typs sind undefiniert !
    static uint16_t accu;
+   bool jump=false;
+
     switch(op_code)
     {
-        case 0: ram[data_addr]=accu; break;
-        case 1: accu=ram[data_addr]; break;
-//        case 2: if(!accu) break;
-        case 3: accu=accu + ram[data_addr]; break;
-        case 4: accu=accu - ram[data_addr]; break;
-        case 5: accu=accu | ram[data_addr]; break;
-        case 6: accu=accu & ram[data_addr]; break;
-        case 7: accu=accu & ram[data_addr]; break;
-        case 8: break;
-        case 9: break;
-        case 10: break;
-        case 11: break;
-        case 12: break;
-        case 13: break;
-        case 14: break;
-        case 15: break;
+        case 0: ram[data_addr] = accu;              break; //STORE
+        case 1: accu = ram[data_addr];              break; //LOAD
+        case 2: jump = ((accu==0) ? true : false);  break; //JMPZ
+        case 3: accu = accu + ram[data_addr];       break; //ADD
+        case 4: accu = accu - ram[data_addr];       break; //SUB
+        case 5: accu = accu | ram[data_addr];       break; //OR
+        case 6: accu = accu & ram[data_addr];       break; //AND
+        case 7: accu = accu ^ ram[data_addr];       break; //XOR
+        case 8: accu = ~accu;                       break; //NOT
+        case 9: accu++;                             break; //INC
+        case 10: accu--;                            break; //DEC
+        case 11: accu = 0;                          break; //ZERO
+        case 12: ;                                  break; //NOP
+        case 13: ;                                  break; //NOP
+        case 14: ;                                  break; //NOP
+        case 15: ;                                  break; //NOP
+    }
+        printf("ACCU: %"PRIu16 "\n",accu);
+        return jump;
 }
 
diff --git a/src/toy.h b/src/toy.h
index ac0f288..469e337 100644
--- a/src/toy.h
+++ b/src/toy.h
@@ -2,7 +2,7 @@
 #define TOY_H
 
 #include <stdio.h>
-#include <stdint.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>