Fixed bug where (L|R)SHIFT returned wrong result with non-constant ar…

…gument 0
neilsf · Jan 2, 2021 · 4b96909 · 4b96909
1 parent 3ab2e7c
commit 4b96909
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.3.06
+v2.3.07
diff --git a/lib/nucleus.asm b/lib/nucleus.asm
@@ -2171,9 +2171,12 @@ NUCL_SQRW	SUBROUTINE
 	tay
 	pla
 .loop
+	cpy #$00
+	beq .endloop
 	asl
 	dey
-	bne .loop
+	bpl .loop ; = branch always
+.endloop
 	IF !FPUSH
 	pha
 	ENDIF
@@ -2186,9 +2189,12 @@ NUCL_SQRW	SUBROUTINE
 	tay
 	pla
 .loop
+	cpy #$00
+	beq .endloop
 	lsr
 	dey
-	bne .loop
+	bpl .loop ; = branch always
+.endloop
 	IF !FPUSH
 	pha
 	ENDIF
@@ -2208,10 +2214,13 @@ NUCL_SQRW	SUBROUTINE
 	tay
 	tsx
 .loop
+	cpy #$00
+	beq .endloop
 	asl.wx stack+2
 	rol.wx stack+1
 	dey
-	bne .loop
+	bpl .loop ; = branch always
+.endloop
 	ENDM
 	
 	MAC rshiftw
@@ -2221,10 +2230,13 @@ NUCL_SQRW	SUBROUTINE
 	tay
 	tsx
 .loop
+	cpy #$00
+	beq .endloop
 	lsr.wx stack+1
 	ror.wx stack+2
 	dey
-	bne .loop
+	bpl .loop ; = branch always
+.endloop
 	ENDM
 	
 	; LSHIFT!() function

diff --git a/modules/xcb-module-grammar b/modules/xcb-module-grammar
diff --git a/source/app.d b/source/app.d
@@ -27,7 +27,7 @@ string listfile="";
  * Version
  */
 
-string compiler_version = "v2.3.06";
+string compiler_version = "v2.3.07";
 
 /**
  * Application entry point