bugfix: 32bit operations bug

boriel · boriel · commit 0503a2ae7b05 · 2018-09-30T13:04:26.000+02:00
Many 32 bit operations might fail (i.e. division) because
the SWAP32 routine was buggy upon last optimization.
Fixed.
diff --git a/library-asm/swap32.asm b/library-asm/swap32.asm
@@ -4,13 +4,13 @@
 __SWAP32:
 	pop bc ; Return address
     ex (sp), hl
-    dec sp
-    dec sp
+    inc sp
+    inc sp
     ex de, hl
     ex (sp), hl
     ex de, hl
-    inc sp
-    inc sp
+    dec sp
+    dec sp
     push bc
 	ret
 
diff --git a/tests/functional/divf16c.asm b/tests/functional/divf16c.asm
@@ -345,13 +345,13 @@ __ENDF16DIV: 	   ; Put the sign on the result
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/divi32c.asm b/tests/functional/divi32c.asm
@@ -263,13 +263,13 @@ __MODI32:	; 32bits signed division modulus
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/divu32c.asm b/tests/functional/divu32c.asm
@@ -263,13 +263,13 @@ __MODI32:	; 32bits signed division modulus
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/gef16.asm b/tests/functional/gef16.asm
@@ -156,13 +156,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/gei32.asm b/tests/functional/gei32.asm
@@ -171,13 +171,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/geu32.asm b/tests/functional/geu32.asm
@@ -144,13 +144,13 @@ __SUB32:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/gtf16.asm b/tests/functional/gtf16.asm
@@ -165,13 +165,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/gti32.asm b/tests/functional/gti32.asm
@@ -180,13 +180,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/gtu32.asm b/tests/functional/gtu32.asm
@@ -134,13 +134,13 @@ __CALL_BACK__:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/lef16.asm b/tests/functional/lef16.asm
@@ -157,13 +157,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/lei32.asm b/tests/functional/lei32.asm
@@ -170,13 +170,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/leu32.asm b/tests/functional/leu32.asm
@@ -139,13 +139,13 @@ __CALL_BACK__:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/ltf16.asm b/tests/functional/ltf16.asm
@@ -148,13 +148,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/lti32c.asm b/tests/functional/lti32c.asm
@@ -161,13 +161,13 @@ checkParity:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/ltu32c.asm b/tests/functional/ltu32c.asm
@@ -139,13 +139,13 @@ __SUB32:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/modf16c.asm b/tests/functional/modf16c.asm
@@ -496,13 +496,13 @@ __MODF16:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/modi32c.asm b/tests/functional/modi32c.asm
@@ -263,13 +263,13 @@ __MODI32:	; 32bits signed division modulus
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/modu32c.asm b/tests/functional/modu32c.asm
@@ -263,13 +263,13 @@ __MODI32:	; 32bits signed division modulus
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/subf16c.asm b/tests/functional/subf16c.asm
@@ -96,13 +96,13 @@ __SUB32:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/subi32c.asm b/tests/functional/subi32c.asm
@@ -105,13 +105,13 @@ __SUB32:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/subu32c.asm b/tests/functional/subu32c.asm
@@ -105,13 +105,13 @@ __SUB32:
 __SWAP32:
 		pop bc ; Return address
 	    ex (sp), hl
-	    dec sp
-	    dec sp
+	    inc sp
+	    inc sp
 	    ex de, hl
 	    ex (sp), hl
 	    ex de, hl
-	    inc sp
-	    inc sp
+	    dec sp
+	    dec sp
 	    push bc
 		ret
 
diff --git a/tests/functional/swap32.asm b/tests/functional/swap32.asm
diff --git a/tests/functional/swap32.bas b/tests/functional/swap32.bas
