fix: implement ZX Next MUL dependencies

ZX Next MUL instruction dependencies were not implemented
in the optimizer.

Author: boriel

setup.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import pathlib
+
 from setuptools import setup
 
 packages = ["src"]

src/arch/z80/optimizer/cpustate.py

@@ -884,6 +884,17 @@ def execute(self, asm_code):
             self.set(o[0], None)
             return
 
+        if i == "mul":
+            val_d = self.getv(o[0])
+            val_e = self.getv(o[1])
+            if val_d is not None and val_e is not None:
+                val = val_d * val_e
+                self.set("de", val)
+                self.Z = int(val == 0)
+                self.C = int(val < 0)
+                self.S = int(val < 0)
+                return
+
         # Unknown. Resets ALL
         self.reset()
 

src/arch/z80/optimizer/memcell.py

@@ -170,6 +170,8 @@ def destroys(self) -> Set[str]:
             res.add("f")
         elif i in ("set", "res"):
             res.update(helpers.single_registers(o[1]))
+        elif i == "mul":
+            res.update("d", "e")
 
         return res
 
@@ -310,6 +312,9 @@ def requires(self) -> Set[str]:
         elif i == "im":
             result.add("i")
 
+        elif i == "mul":
+            result.update("d", "e")
+
         return result
 
     def affects(self, reglist: Union[List[str], str]) -> bool:

tests/functional/zxnext/opt4_mul8.asm

@@ -0,0 +1,95 @@
+	org 32768
+.core.__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (.core.__CALL_BACK__), hl
+	ei
+	jp .core.__MAIN_PROGRAM__
+.core.__CALL_BACK__:
+	DEFW 0
+.core.ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+.core.ZXBASIC_USER_DATA_LEN EQU .core.ZXBASIC_USER_DATA_END - .core.ZXBASIC_USER_DATA
+	.core.__LABEL__.ZXBASIC_USER_DATA_LEN EQU .core.ZXBASIC_USER_DATA_LEN
+	.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
+_x:
+	DEFB 00, 00
+_y:
+	DEFB 00
+.core.ZXBASIC_USER_DATA_END:
+.core.__MAIN_PROGRAM__:
+	ld a, 1
+	ld (_y), a
+	ld d, 16
+	ld e, a
+	mul d, e
+	ld a, e
+	push af
+	ld hl, (_x)
+	call .core.__MUL16_FAST
+	push hl
+	call _printTest
+	ld bc, 0
+.core.__END_PROGRAM:
+	di
+	ld hl, (.core.__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	pop iy
+	pop ix
+	exx
+	ei
+	ret
+_printTest:
+	push ix
+	ld ix, 0
+	add ix, sp
+	ld a, (ix+7)
+	ld (0), a
+_printTest__leave:
+	ld sp, ix
+	pop ix
+	exx
+	pop hl
+	pop bc
+	ex (sp), hl
+	exx
+	ret
+	;; --- end of user code ---
+#line 1 "/zxbasic/src/arch/zxnext/library-asm/mul16.asm"
+	    push namespace core
+__MUL16:	; Mutiplies HL with the last value stored into de stack
+	    ; Works for both signed and unsigned
+	    PROC
+	    ex de, hl
+	    pop hl		; Return address
+	    ex (sp), hl ; CALLEE caller convention
+__MUL16_FAST:
+	    ld a,d                      ; a = xh
+	    ld d,h                      ; d = yh
+	    ld h,a                      ; h = xh
+	    ld c,e                      ; c = xl
+	    ld b,l                      ; b = yl
+	    mul d,e                     ; yh * yl
+	    ex de,hl
+	    mul d,e                     ; xh * yl
+	    add hl,de                   ; add cross products
+	    ld e,c
+	    ld d,b
+	    mul d,e                     ; yl * xl
+	    ld a,l                      ; cross products lsb
+	    add a,d                     ; add to msb final
+	    ld h,a
+	    ld l,e                      ; hl = final
+	    ret	; Result in hl (16 lower bits)
+	    ENDP
+	    pop namespace
+#line 41 "zxnext/opt4_mul8.bas"
+	END

tests/functional/zxnext/opt4_mul8.bas

@@ -0,0 +1,10 @@
+dim x as uinteger
+dim y as ubyte
+
+y = 1
+
+printTest(x*16,y*16)
+
+sub printTest(xpos as uinteger, ypos as ubyte)
+  poke 0, ypos
+end sub

tools/normalize_bas.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
-import sys
 import re
-
+import sys
 
 INDENT = 4 * " "
 RE_END_ASM = re.compile("^END[ \t]+ASM$")

zxb.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 # vim: ts=4:sw=4:et:
 
-import sys
 import os
+import sys
 
 sys.path.append(os.path.dirname(__file__))
 

zxbasm.py

@@ -11,8 +11,8 @@
 # This is the Parser for the ZXBASM (ZXBasic Assembler)
 # ----------------------------------------------------------------------
 
-import sys
 import os
+import sys
 
 sys.path.append(os.path.dirname(__file__))
 

zxbc.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 # vim: ts=4:sw=4:et:
 
-import sys
 import os
+import sys
 
 sys.path.append(os.path.dirname(__file__))
 

zxbpp.py

@@ -11,8 +11,8 @@
 # This is the Parser for the ZXBpp (ZXBasic Preprocessor)
 # ----------------------------------------------------------------------
 
-import sys
 import os
+import sys
 
 sys.path.append(os.path.dirname(__file__))