Merge pull request #975 from boriel-basic/patch-1

Patch 1

Author: boriel

src/arch/z80/backend/main.py

@@ -661,9 +661,7 @@ def emit_prologue() -> list[str]:
         output.append("exx")
         output.append("push hl")
         output.append("exx")
-        output.append("ld hl, 0")
-        output.append("add hl, sp")
-        output.append(f"ld ({common.CALL_BACK}), hl")
+        output.append(f"ld ({common.CALL_BACK}), sp")
         output.append("ei")
 
         output.extend(f"call {x}" for x in sorted(common.INITS))

src/arch/zxnext/backend/main.py

@@ -75,9 +75,7 @@ def emit_prologue() -> list[str]:
         output.append("di")
         output.append("push iy")
         output.append("ld iy, 0x5C3A  ; ZX Spectrum ROM variables address")
-        output.append("ld hl, 0")
-        output.append("add hl, sp")
-        output.append(f"ld ({common.CALL_BACK}), hl")
+        output.append(f"ld ({common.CALL_BACK}), sp")
         output.append("ei")
 
         output.extend(f"call {x}" for x in sorted(common.INITS))

src/lib/arch/zx48k/runtime/arith/divf.asm

@@ -27,9 +27,7 @@ ERR_SP      EQU 23613
     ld (TMP), hl
     ld hl, __DIVBYZERO
     push hl
-    ld hl, 0
-    add hl, sp
-    ld (ERR_SP), hl
+    ld (ERR_SP), sp
 
     ; ------------- ROM DIV
     rst 28h

src/lib/arch/zx48k/runtime/val.asm

@@ -59,9 +59,7 @@ SET_MIN     EQU 16B0h
     ;; Now put our error handler on ERR_SP
     ld hl, __VAL_ERROR
     push hl
-    ld hl, 0
-    add hl, sp
-    ld (ERR_SP), hl
+    ld (ERR_SP), sp
 
     call STK_STO_S ; Enter it on the stack
 

src/lib/arch/zxnext/runtime/arith/divf.asm

@@ -27,9 +27,7 @@ ERR_SP      EQU 23613
     ld (TMP), hl
     ld hl, __DIVBYZERO
     push hl
-    ld hl, 0
-    add hl, sp
-    ld (ERR_SP), hl
+    ld (ERR_SP), sp
 
     ; ------------- ROM DIV
     rst 28h

src/lib/arch/zxnext/runtime/val.asm

@@ -59,9 +59,7 @@ SET_MIN     EQU 16B0h
     ;; Now put our error handler on ERR_SP
     ld hl, __VAL_ERROR
     push hl
-    ld hl, 0
-    add hl, sp
-    ld (ERR_SP), hl
+    ld (ERR_SP), sp
 
     call STK_STO_S ; Enter it on the stack
 

tests/functional/arch/zx48k/00.asm

@@ -6,9 +6,7 @@
 	exx
 	push hl
 	exx
-	ld hl, 0
-	add hl, sp
-	ld (.core.__CALL_BACK__), hl
+	ld (.core.__CALL_BACK__), sp
 	ei
 	jp .core.__MAIN_PROGRAM__
 .core.__CALL_BACK__:

tests/functional/arch/zx48k/02.asm

@@ -6,9 +6,7 @@
 	exx
 	push hl
 	exx
-	ld hl, 0
-	add hl, sp
-	ld (.core.__CALL_BACK__), hl
+	ld (.core.__CALL_BACK__), sp
 	ei
 	jp .core.__MAIN_PROGRAM__
 .core.__CALL_BACK__:

tests/functional/arch/zx48k/03.asm

@@ -6,9 +6,7 @@
 	exx
 	push hl
 	exx
-	ld hl, 0
-	add hl, sp
-	ld (.core.__CALL_BACK__), hl
+	ld (.core.__CALL_BACK__), sp
 	ei
 	jp .core.__MAIN_PROGRAM__
 .core.__CALL_BACK__:

tests/functional/arch/zx48k/04.asm

@@ -6,9 +6,7 @@
 	exx
 	push hl
 	exx
-	ld hl, 0
-	add hl, sp
-	ld (.core.__CALL_BACK__), hl
+	ld (.core.__CALL_BACK__), sp
 	ei
 	jp .core.__MAIN_PROGRAM__
 .core.__CALL_BACK__: