Merge pull request #396 from boriel/feature/improved_optimizations

Feature/improved optimizations

Author: boriel

arch/zx48k/peephole/opts/014_o1_or_sbc_a_a.opt

@@ -0,0 +1,22 @@
+;; Replaces sequence:
+;;  or|xor|and a
+;;  sbc a, a
+;; with
+;;  xor a
+
+OLEVEL: 1
+OFLAG: 14
+
+REPLACE {{
+  $1 a
+  sbc a, a
+}}
+
+IF {{
+  ($1 IN (or, and, xor))
+}}
+
+WITH {{
+  xor a
+}}
+

arch/zx48k/peephole/opts/015_o3_ld_r_n_not_required.opt

@@ -0,0 +1,18 @@
+;; Removes sequence
+;;  ld a, XXXX
+;; if a is not used later
+
+OLEVEL: 3
+OFLAG: 15
+
+REPLACE {{
+  ld a, $1
+}}
+
+IF {{
+   !IS_REQUIRED(a)
+}}
+
+WITH {{
+}}
+

arch/zx48k/peephole/opts/016_o1_xor_a_jp_z.opt

@@ -0,0 +1,22 @@
+;; Replaces sequence:
+;;  or|xor|and a
+;;  sbc a, a
+;; with
+;;  xor a
+
+OLEVEL: 1
+OFLAG: 17
+
+REPLACE {{
+  xor a
+  $1 z, $2
+}}
+
+IF {{
+  ($1 IN (jp, jr))
+}}
+
+WITH {{
+  $1 $2
+}}
+

arch/zx48k/peephole/opts/027_ld_h_a_oper_A.opt

@@ -14,7 +14,7 @@ REPLACE {{
 }}
 
 IF {{
-  (($2 == or) || ($2 == xor) || ($2 == and) || ($2 == cp) || ($2 == sub) || ($2 == "add a,") || ($2 == "sbc a,"))
+  ($2 IN (or, xor, and, cp, sub, "add a,", "sbc a,"))
 }}
 
 WITH {{

arch/zx48k/peephole/opts/030_ora_jp_nc_jp.opt

@@ -14,7 +14,7 @@ REPLACE {{
 }}
 
 IF {{
-  (($1 == or) || ($1 == and)) && (($2 == jp) || ($2 == jr))
+  ($1 IN (or, xor, and, cp, sub)) && (($2 == jp) || ($2 == jr))
 }}
 
 WITH {{

arch/zx48k/peephole/opts/103_o3_or_and_a.opt

@@ -0,0 +1,17 @@
+;; Removes useless XOR a
+
+OLEVEL: 3
+OFLAG: 103
+
+REPLACE {{
+  $1 $2
+}}
+
+IF {{
+  ($1 IN (and, or)) &&
+  (($2 == a) || (!IS_REQUIRED(a))) &&
+  !IS_REQUIRED(f)
+}}
+
+WITH {{
+}}

tests/functional/ubyteopt.asm

@@ -0,0 +1,93 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	ld a, 2
+	push af
+	ld a, 1
+	push af
+	call _CanDraw
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+_CanDraw:
+	push ix
+	ld ix, 0
+	add ix, sp
+	ld a, (ix+7)
+	push af
+	ld h, 0
+	pop af
+	cp h
+	sbc a, a
+	push af
+	ld a, (ix+5)
+	push af
+	ld h, 0
+	pop af
+	cp h
+	sbc a, a
+	pop de
+	or d
+	push af
+	ld a, (ix+7)
+	push af
+	ld a, 20
+	pop hl
+	cp h
+	sbc a, a
+	pop de
+	or d
+	push af
+	ld a, (ix+5)
+	push af
+	ld a, 31
+	pop hl
+	cp h
+	sbc a, a
+	pop de
+	or d
+	jp z, __LABEL1
+	xor a
+	jp _CanDraw__leave
+__LABEL1:
+	ld a, 1
+_CanDraw__leave:
+	ld sp, ix
+	pop ix
+	exx
+	pop hl
+	pop bc
+	ex (sp), hl
+	exx
+	ret
+	END

tests/functional/ubyteopt.bas

@@ -0,0 +1,6 @@
+function CanDraw(x as ubyte, y as ubyte) as ubyte
+  if y<0 or x<0 or y>20 or x>31 then return 0
+  return 1
+end function
+
+CanDraw(1, 2)