new version

diff --git a/fakeasm.h b/fakeasm.h
index 31536400cc0e8408880ff4115f6ba28e609ac47c..cfb459868eccfa90c0f7c7a2cf42e17e49904be8 100644 (file)
--- a/fakeasm.h
+++ b/fakeasm.h
@@ -21,9 +21,9 @@
 #define CLR(x)    x = 0;
 #define RET       return;
 #define RCALL    //pseudo
-int zero = 0; //status register zero bit
-#define TST(x)    if(x==0)zero=1;else zero=0; //WARN: not a complete TST mockup
-#define BREQ(l)   if(zero) goto l;
+int sr_zero = 0; //status register zero bit
+#define TST(x)    if(x==0)sr_zero=1;else sr_zero=0; //WARN: not a complete TST mockup
+#define BREQ(l)   if(sr_zero) goto l;
 int carry = 0; //status register carry bit //WARN: not respected by all mocked instructions
 int asmtmp = 0;
 #define ROL(x) asmtmp = x>>7; x <<= 1; x |= carry; carry = asmtmp;

diff --git a/foo.c b/foo.c
index bc469c9b2327761579987537e5e50b7af537279e..85d4d40c9505d377a5ca4bd0bdcdff9e59692606 100644 (file)
--- a/foo.c
+++ b/foo.c
@@ -33,7 +33,8 @@ void g(void) {
          CLR zero
          ADC X_hi, zero
          LD  t, X         */
-       t = (((i1&0x1f)<<8|i0)*t)>>8 >> o; //TODO; NOTE: o == {1, 2, 4}
+       t = (((i1&0x1f)<<8|i0)*t)>>8; //TODO
+       t >>= o; //NOTE: o == {1, 2, 4}
        AND     (t, x)
        ANDI    (t, 3)
        RET