feat: make XOR bool normalized

Author: boriel

src/arch/z80/peephole/opts/020_o1_bool_norm_empty.opt

@@ -26,5 +26,5 @@ IF {{
   "call .core.__GEF", "call .core.__LEI16", "call .core.__LEI8", "call .core.__LTI8",
   "call .core.__ANDF", "call .core.__EQF", "call .core.__GTF", "call .core.__LTI16",
   "call .core.__LEF", "call .core.__LEI32", "call .core.__LTF", "call .core.__LTI32",
-  "call .core.__NEF", "call .core.__NOTF", "call .core.__ORF")
+  "call .core.__NEF", "call .core.__NOTF", "call .core.__ORF", "call .core.__XORF")
 }}

src/arch/z80/peephole/opts/021_o1_bool_norm_neg.opt

@@ -22,6 +22,5 @@ WITH {{
 }}
 
 IF {{
-    $1 == "sbc a, a" ||
-    $1 == "call .core.__NOT32"
+    $1 IN ("sbc a, a", "call .core.__NOT32", "call .core.__XOR8", "call .core.__XOR16", "call .core.__XOR32")
 }}

tests/functional/arch/zx48k/xor16.asm

@@ -27,26 +27,35 @@ _b:
 	ld hl, (_a)
 	ld a, h
 	or l
+	sub 1
+	sbc a, a
+	inc a
 	ld (_b), a
 	ld hl, (_a)
 	ld a, h
 	or l
 	sub 1
 	sbc a, a
+	neg
 	ld (_b), a
 	ld hl, (_a)
 	ld a, h
 	or l
+	sub 1
+	sbc a, a
+	inc a
 	ld (_b), a
 	ld hl, (_a)
 	ld a, h
 	or l
 	sub 1
 	sbc a, a
+	neg
 	ld (_b), a
 	ld de, (_a)
 	ld hl, (_a)
 	call .core.__XOR16
+	neg
 	ld (_b), a
 	ld hl, 0
 	ld b, h
@@ -63,9 +72,9 @@ _b:
 	ei
 	ret
 	;; --- end of user code ---
-#line 1 "/zxbasic/src/arch/zx48k/library-asm/xor16.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor16.asm"
 	; XOR16 implemented in XOR8.ASM file
-#line 1 "/zxbasic/src/arch/zx48k/library-asm/xor8.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor8.asm"
 ; vim:ts=4:et:
 	; FASTCALL boolean xor 8 version.
 	; result in Accumulator (0 False, not 0 True)
@@ -88,6 +97,6 @@ __XOR8:
 	    xor l
 	    ret
 	    pop namespace
-#line 4 "/zxbasic/src/arch/zx48k/library-asm/xor16.asm"
-#line 41 "xor16.bas"
+#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor16.asm"
+#line 50 "arch/zx48k/xor16.bas"
 	END

tests/functional/arch/zx48k/xor32.asm

@@ -31,6 +31,7 @@ _b:
 	ld de, 0
 	ld hl, 0
 	call .core.__XOR32
+	neg
 	ld (_b), a
 	ld hl, (_a + 2)
 	push hl
@@ -39,6 +40,7 @@ _b:
 	ld de, 0
 	ld hl, 1
 	call .core.__XOR32
+	neg
 	ld (_b), a
 	ld hl, (_a)
 	ld de, (_a + 2)
@@ -47,6 +49,7 @@ _b:
 	ld bc, 0
 	push bc
 	call .core.__XOR32
+	neg
 	ld (_b), a
 	ld hl, (_a)
 	ld de, (_a + 2)
@@ -55,6 +58,7 @@ _b:
 	ld bc, 1
 	push bc
 	call .core.__XOR32
+	neg
 	ld (_b), a
 	ld hl, (_a + 2)
 	push hl
@@ -63,6 +67,7 @@ _b:
 	ld hl, (_a)
 	ld de, (_a + 2)
 	call .core.__XOR32
+	neg
 	ld (_b), a
 	ld hl, 0
 	ld b, h
@@ -79,12 +84,12 @@ _b:
 	ei
 	ret
 	;; --- end of user code ---
-#line 1 "/zxbasic/src/arch/zx48k/library-asm/xor32.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor32.asm"
 	; FASTCALL boolean xor 8 version.
 	; result in Accumulator (0 False, not 0 True)
 ; __FASTCALL__ version (operands: A, H)
 	; Performs 32bit xor 32bit and returns the boolean
-#line 1 "/zxbasic/src/arch/zx48k/library-asm/xor8.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor8.asm"
 ; vim:ts=4:et:
 	; FASTCALL boolean xor 8 version.
 	; result in Accumulator (0 False, not 0 True)
@@ -107,7 +112,7 @@ __XOR8:
 	    xor l
 	    ret
 	    pop namespace
-#line 7 "/zxbasic/src/arch/zx48k/library-asm/xor32.asm"
+#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor32.asm"
 	    push namespace core
 __XOR32:
 	    ld a, h
@@ -125,5 +130,5 @@ __XOR32:
 	    ld h, c
 	    jp __XOR8
 	    pop namespace
-#line 57 "xor32.bas"
+#line 62 "arch/zx48k/xor32.bas"
 	END

tests/functional/arch/zx48k/xor8.asm

@@ -25,20 +25,29 @@ _b:
 .core.ZXBASIC_USER_DATA_END:
 .core.__MAIN_PROGRAM__:
 	ld a, (_a)
+	sub 1
+	sbc a, a
+	inc a
 	ld (_b), a
 	ld a, (_a)
 	sub 1
 	sbc a, a
+	neg
 	ld (_b), a
 	ld a, (_a)
+	sub 1
+	sbc a, a
+	inc a
 	ld (_b), a
 	ld a, (_a)
 	sub 1
 	sbc a, a
+	neg
 	ld (_b), a
 	ld hl, (_a - 1)
 	ld a, (_a)
 	call .core.__XOR8
+	neg
 	ld (_b), a
 	ld hl, 0
 	ld b, h
@@ -55,7 +64,7 @@ _b:
 	ei
 	ret
 	;; --- end of user code ---
-#line 1 "/zxbasic/src/arch/zx48k/library-asm/xor8.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bool/xor8.asm"
 ; vim:ts=4:et:
 	; FASTCALL boolean xor 8 version.
 	; result in Accumulator (0 False, not 0 True)
@@ -78,5 +87,5 @@ __XOR8:
 	    xor l
 	    ret
 	    pop namespace
-#line 33 "xor8.bas"
+#line 42 "arch/zx48k/xor8.bas"
 	END