Merge pull request boriel-basic#288 from boriel/feature/refact_or32

Refactorize OR32

library-asm/or32.asm

@@ -1,22 +1,25 @@
 __OR32:  ; Performs logical operation A AND B
-		 ; between DEHL and TOP of the stack.
-		 ; Returns A = 0 (False) or A = FF (True)
+         ; between DEHL and TOP of the stack.
+         ; Returns A = 0 (False) or A = FF (True)
 
-	ld a, h
-	or l
-	or d
-	or e
+    ld a, h
+    or l
+    or d
+    or e
 
-	pop hl ; Return address
+    pop hl ; Return address
+    pop de
+    ex (sp), hl
 
-	pop de	
-	or d
-	or e
-
-	pop de	
-	or d
-	or e   ; A = 0 only if DEHL and TOP of the stack = 0
-
-	jp (hl) ; Faster "Ret"
+    or d
+    or e
+    or h
+    or l
 
+#ifdef NORMALIZE_BOOLEAN
+    ; Ensure it returns 0 or 1
+    ret z
+    ld a, 1
+#endif
+    ret
 

tests/functional/or32.asm

@@ -68,20 +68,21 @@ __CALL_BACK__:
 	DEFW 0
 #line 1 "or32.asm"
 __OR32:  ; Performs logical operation A AND B
-			 ; between DEHL and TOP of the stack.
-			 ; Returns A = 0 (False) or A = FF (True)
-		ld a, h
-		or l
-		or d
-		or e
-		pop hl ; Return address
-		pop de
-		or d
-		or e
-		pop de
-		or d
-		or e   ; A = 0 only if DEHL and TOP of the stack = 0
-		jp (hl) ; Faster "Ret"
+	         ; between DEHL and TOP of the stack.
+	         ; Returns A = 0 (False) or A = FF (True)
+	    ld a, h
+	    or l
+	    or d
+	    or e
+	    pop hl ; Return address
+	    pop de
+	    ex (sp), hl
+	    or d
+	    or e
+	    or h
+	    or l
+#line 24 "/zxbasic/library-asm/or32.asm"
+	    ret
 #line 58 "or32.bas"
 ZXBASIC_USER_DATA:
 _a: