Combine overlapping and/or/xor implementations to save executable space

Author: calc84maniac

src/crt/iand.src renamed to src/crt/and.src

@@ -1,6 +1,30 @@
 	assume	adl=1
 
 	section	.text
+	public	__land
+
+if PREFER_OS_CRT
+
+__land := 0001A4h
+
+else
+
+__land:
+; CC: 28*r(PC)+11*r(SPL)+10*w(SPL)+1
+	push	af
+	and	a, e
+	ld	e, a
+;	jr	__iand.hijack_land
+	virtual
+		ld	a, 0
+		load .ld_a: byte from $$
+	end virtual
+	db	.ld_a	; push af -> ld a,*
+	require	__iand
+
+end if
+
+	section .text
 	public	__iand
 
 if PREFER_OS_CRT
@@ -12,7 +36,7 @@ else
 __iand:
 ; CC: 24*r(PC)+11*r(SPL)+10*w(SPL)+1
 	push	af
-	public	__iand.hijack_land
+	private	__iand.hijack_land
 .hijack_land:
 	push	hl
 	scf

src/crt/land_fast.src renamed to src/crt/and_fast.src

@@ -6,6 +6,12 @@ __land_fast:
 ; CC: 24*r(PC)+8*r(SPL)+7*w(SPL)+1
 	and	a, e
 	ld	e, a
+	require	__iand_fast
+
+	section	.text
+	public	__iand_fast
+__iand_fast:
+; CC: 22*r(PC)+8*r(SPL)+7*w(SPL)+1
 	push	hl
 	scf
 	sbc	hl, hl
@@ -19,6 +25,12 @@ __land_fast:
 	and	a, (hl)
 	ld	(hl), a
 	pop	hl
+	require	__sand_fast
+
+	section	.text
+	public	__sand_fast
+__sand_fast:
+; CC: 8*r(PC)+3*r(SPL)+1
 	ld	a, h
 	and	a, b
 	ld	h, a

src/crt/iand_fast.src

@@ -1,5 +1,29 @@
 	assume	adl=1
 
+	section	.text
+	public	__lor
+
+if PREFER_OS_CRT
+
+__lor := 0001D8h
+
+else
+
+__lor:
+; CC: 28*r(PC)+11*r(SPL)+10*w(SPL)+1
+	push	af
+	or	a, e
+	ld	e, a
+;	jr	__ior.hijack_lor
+	virtual
+		ld	a, 0
+		load .ld_a: byte from $$
+	end virtual
+	db	.ld_a	; push af -> ld a,*
+	require	__ior
+
+end if
+
 	section	.text
 	public	__ior
 
@@ -12,7 +36,7 @@ else
 __ior:
 ; CC: 24*r(PC)+11*r(SPL)+10*w(SPL)+1
 	push	af
-	public	__ior.hijack_lor
+	private	__ior.hijack_lor
 .hijack_lor:
 	push	hl
 	scf

src/crt/ior_fast.src

@@ -6,6 +6,12 @@ __lor_fast:
 ; CC: 24*r(PC)+8*r(SPL)+7*w(SPL)+1
 	or	a, e
 	ld	e, a
+	require	__ior_fast
+
+	section	.text
+	public	__ior_fast
+__ior_fast:
+; CC: 22*r(PC)+8*r(SPL)+7*w(SPL)+1
 	push	hl
 	scf
 	sbc	hl, hl
@@ -19,6 +25,12 @@ __lor_fast:
 	or	a, (hl)
 	ld	(hl), a
 	pop	hl
+	require	__sor_fast
+
+	section	.text
+	public	__sor_fast
+__sor_fast:
+; CC: 8*r(PC)+3*r(SPL)+1
 	ld	a, h
 	or	a, b
 	ld	h, a

src/crt/ixor_fast.src

@@ -1,5 +1,29 @@
 	assume	adl=1
 
+	section	.text
+	public	__lxor
+
+if PREFER_OS_CRT
+
+__lxor := 0001FCh
+
+else
+
+__lxor:
+; CC: 28*r(PC)+11*r(SPL)+10*w(SPL)+1
+	push	af
+	xor	a, e
+	ld	e, a
+;	jr	__ixor.hijack_lxor
+	virtual
+		ld	a, 0
+		load .ld_a: byte from $$
+	end virtual
+	db	.ld_a	; push af -> ld a,*
+	require	__ixor
+
+end if
+
 	section	.text
 	public	__ixor
 
@@ -12,7 +36,7 @@ else
 __ixor:
 ; CC: 24*r(PC)+11*r(SPL)+10*w(SPL)+1
 	push	af
-	public	__ixor.hijack_lxor
+	private	__ixor.hijack_lxor
 .hijack_lxor:
 	push	hl
 	scf

src/crt/land.src

@@ -6,6 +6,12 @@ __lxor_fast:
 ; CC: 24*r(PC)+8*r(SPL)+7*w(SPL)+1
 	xor	a, e
 	ld	e, a
+	require	__ixor_fast
+
+	section	.text
+	public	__ixor_fast
+__ixor_fast:
+; CC: 22*r(PC)+8*r(SPL)+7*w(SPL)+1
 	push	hl
 	scf
 	sbc	hl, hl
@@ -19,6 +25,12 @@ __lxor_fast:
 	xor	a, (hl)
 	ld	(hl), a
 	pop	hl
+	require	__sxor_fast
+
+	section	.text
+	public	__sxor_fast
+__sxor_fast:
+; CC: 8*r(PC)+3*r(SPL)+1
 	ld	a, h
 	xor	a, b
 	ld	h, a