X-Git-Url: https://git.gir.st/Chiptunes.git/blobdiff_plain/8d8c00e4909d9744682e557833a0a7abb071fb90..362b33c918938aadd44c6516c15661c30952a584:/foo.c

diff --git a/foo.c b/foo.c
index f227598..fcb07cd 100644
--- a/foo.c
+++ b/foo.c
@@ -41,11 +41,16 @@ void mod3(void) {
 	LSR	(tmp)
 	ANDI	(Ml, 0x03)
 	ADD	(Ml, tmp)
-	if (Ml > 2) Ml = Ml - 3; //TODO
+	CPI	(Ml, 3)
+	BRPL	(skip)
+	SUBI	(Ml, 3)
+	skip:;
+	RET
 	#undef tmp
 }
 void g(void) {
-	// g(i, x, t, o) -> t
+	// g(i, t) -> t
+	// tempvars: `x` and `_`
 	#define tmp _
 	ANDI	(t, 0x07)
 	MOV	(tmp, i2)
@@ -62,10 +67,7 @@ void g(void) {
 	  ADC X_hi, zero
 	  LD  t, X         */
 	t = (((i1&0x1f)<<8|i0)*t)>>8; //TODO
-	t >>= o; //NOTE: o == {1, 2, 4}
-	AND	(t, x)
-	ANDI	(t, 3)
-	RET
+	RET //TODO: CALL/RET is expensive; store PC in register and RJMP, then JRMP back
 };
 
 int main(void) {
@@ -96,14 +98,15 @@ int main(void) {
 		#undef tmp
 
 		//voice 1:
-		LDI	(x, 1)
 		MOV	(t, n)
 		LDI	(o, 4)
 		RCALL	g();
+	t >>= o; //NOTE: o == {1, 2, 4}
+	ANDI	(t, 3)
+		ANDI	(t, 1)
 		MOV	(acc, t)
 
 		//voice 2:
-		MOV	(x, s)
 		#define tmp o
 		MOV	(tmp, i2)
 		LSL	(tmp)
@@ -118,9 +121,40 @@ int main(void) {
 		EOR	(t, n)
 		LDI	(o, 2)
 		RCALL	g();
+	t >>= o; //NOTE: o == {1, 2, 4}
+	ANDI	(t, 3)
+		AND	(t, s)
 		ADD	(acc, t)
 
 		//voice 3:
+		MOV	(Ml, i2)
+		SWAP	(Ml)
+		ANDI	(Ml, 0xf0)
+		LSL	(Ml)
+		#define tmp Mh
+		MOV	(tmp, i1)
+		LSR	(tmp)
+		LSR	(tmp)
+		LSR	(tmp)
+		OR	(Ml, tmp)
+		#undef tmp
+		MOV	(Mh, i3)
+		SWAP	(Mh)
+		ANDI	(Mh, 0xf0)
+		LSL	(Mh)
+		#define tmp _
+		MOV	(tmp, i2)
+		LSR	(tmp)
+		LSR	(tmp)
+		LSR	(tmp)
+		OR	(Mh, tmp)
+		#undef tmp
+		RCALL	mod3();
+		ADD	(t, n)
+		LDI	(o, 2)
+		RCALL	g();
+	t >>= o; //NOTE: o == {1, 2, 4}
+	ANDI	(t, 3)
 		MOV	(x, s)
 		INC	(x)
 		#define tmp o
@@ -138,15 +172,40 @@ int main(void) {
 		LSR	(tmp)
                 MOV	(x, tmp)
 		#undef tmp
-		Ml = i2<<5 | i1>>3;
-		Mh = i3<<5 | i2>>3;
-		RCALL	mod3();
-		ADD	(t, n)
-		LDI	(o, 2)
-		RCALL	g();
+		AND	(t, x)
 		ADD	(acc, t)
 
 		//voice 4:
+		MOV	(Ml, i2)
+		SWAP	(Ml)
+		ANDI	(Ml, 0xf0)
+		LSL	(Ml)
+		LSL	(Ml)
+		#define tmp Mh
+		MOV	(tmp, i1)
+		LSR	(tmp)
+		LSR	(tmp)
+		OR	(Ml, tmp)
+		#undef tmp
+		MOV	(Mh, i3)
+		SWAP	(Mh)
+		ANDI	(Mh, 0xf0)
+		LSL	(Mh)
+		LSL	(Mh)
+		#define tmp _
+		MOV	(tmp, i2)
+		LSR	(tmp)
+		LSR	(tmp)
+		OR	(Mh, tmp)
+		#undef tmp
+		RCALL	mod3();
+		SUB	(t, n)
+		NEG	(t)
+		SUBI	(t, -8)
+		LDI	(o, 1)
+		RCALL	g();
+	t >>= o; //NOTE: o == {1, 2, 4}
+	ANDI	(t, 3)
 		MOV	(x, s)
 		INC	(x)
 		#define tmp o
@@ -164,14 +223,7 @@ int main(void) {
 		LSR	(tmp)
                 MOV	(x, tmp)
 		#undef tmp
-		Ml = i2<<6 | i1>>2;
-		Mh = i3<<6 | i2>>2;
-		RCALL	mod3();
-		SUB	(t, n)
-		NEG	(t)
-		SUBI	(t, -8)
-		LDI	(o, 1)
-		RCALL	g();
+		AND	(t, x)
 		ADD	(acc, t)
 
 		putchar(acc<<4); //TODO