new version

[Chiptunes.git] / fakeasm.h

diff --git a/fakeasm.h b/fakeasm.h
index a5b0e8d79a404ec8917268e907d4e6f42f2e911a..e5485170173923c6bce356ee3c9c7e7e57d72afc 100644 (file)
--- a/fakeasm.h
+++ b/fakeasm.h
@@ -2,29 +2,37 @@
 #define c2(x) (0xff & (x>>16))
 #define c1(x) (0xff & (x>> 8))
 #define c0(x) (0xff & (x    ))
-#define LSL(x)    x <<= 1;
-#define LSR(x)    x >>= 1;
+#define LSL(x)    carry = x>>7; x <<= 1;
+#define LSR(x)    carry = x&1; x >>= 1;
 #define SWAP(x)   x = ((x & 0x0F) << 4 | (x & 0xF0) >> 4);
 #define AND(x,y)  x &= y;
 #define ANDI(x,n) x &= n;
 #define OR(x,y)   x |= y;
 #define ORI(x,n)  x |= n;
 #define EOR(x,y)  x ^= y;
-#define ADD(x,y)  x += y;
-#define ADC(x,y,c)x += y; x+=c;
-#define SUB(x,y)  x -= y;
-#define SUBI(x,n) x -= (u8)n;
-#define INC(x)    x++;
+#define ADD(x,y)  carry = (x+y)>>8; x += y;
+#define ADC(x,y,c)x += y; x+=c; //TODO: carry
+#define SUB(x,y)  x -= y; //TODO: carry
+#define SUBI(x,n) x -= (u8)n; //TODO: carry
+#define INC(x)    x++; //WARN: does not set carry
+#define DEC(x)    x--; sr_zero=!x;
 #define MOV(x,y)  x = y;
 #define LDI(x,n)  x = n;
-#define SBRC(x,b) if (x & b) //skip if cleared => do if set
+#define SBRC(x,b) if (x & 1<<b) //skip if cleared => do if set
+#define SBRS(x,b) if (!(x & 1<<b)) //skip if set => do if not
 #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 carry = 0; //status register carry bit
+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;
+#define BRNE(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;
 #define ROR(x) asmtmp = x&0x1; x >>= 1; x |= carry<<7; carry = asmtmp;
+#define NEG(x) x *= -1;
+int sr_neg = 0;
+#define CPI(x,n)  sr_neg = (x-n < 0);sr_zero = (x-n == 0); //WARN: not a complete CPI mockup
+#define BRPL(l)   if (sr_neg) goto l;
+#define RJMP(l)   goto l;