refact: update drawing primitives dependencies (zxnext)

Author: boriel

src/arch/zxnext/library-asm/attr.asm

@@ -61,20 +61,4 @@ __SET_ATTR2:  ; Sets attr from ATTR_T to (HL) which points to the scr address
 
     ENDP
 
-
-; Sets the attribute at a given screen pixel address in hl
-; HL contains the address in RAM for a given pixel (not a coordinate)
-SET_PIXEL_ADDR_ATTR:
-    ;; gets ATTR position with offset given in SCREEN_ADDR
-    ld a, h
-    rrca
-    rrca
-    rrca
-    and 3
-
-    ld h, a
-    ld de, (SCREEN_ATTR_ADDR)
-    add hl, de  ;; Final screen addr
-    jp __SET_ATTR2
-
     pop namespace

src/arch/zxnext/library-asm/draw.asm

@@ -8,8 +8,8 @@
 #include once <error.asm>
 #include once <in_screen.asm>
 
-#include once <cls.asm>
-#include once <attr.asm>
+#include once <sysvars.asm>
+#include once <set_pixel_addr_attr.asm>
 
 #include once <SP/PixelDown.asm>
 #include once <SP/PixelUp.asm>
@@ -330,4 +330,3 @@ __FASTPLOTEND:
     ENDP
 
     pop namespace
-

src/arch/zxnext/library-asm/in_screen.asm

@@ -18,8 +18,6 @@ __IN_SCREEN:
     ld a, d
     inc hl
     cp (hl)
-    ;; jr nc, __IN_SCREEN_ERR	; Do nothing and return if out of range
-    ;; ret
     ret c                       ; Return if carry (OK)
 
 __IN_SCREEN_ERR:

src/arch/zxnext/library-asm/plot.asm

@@ -6,8 +6,8 @@
 
 #include once <error.asm>
 #include once <in_screen.asm>
-#include once <cls.asm>
-#include once <attr.asm>
+#include once <sysvars.asm>
+#include once <set_pixel_addr_attr.asm>
 
     push namespace core
 

src/arch/zxnext/library-asm/print.asm

@@ -32,12 +32,17 @@ __PRINT_INIT: ; To be called before program starts (initializes library)
     ld hl, 1821h
     ld (MAXX), hl  ; Sets current maxX and maxY
 
+    call __LOAD_S_POSN
+    call __ATTR_ADDR
+
     xor a
     ld (FLAGS2), a
 
     ret
 
 
+
+
 __PRINTCHAR: ; Print character store in accumulator (A register)
     ; Modifies H'L', B'C', A'F', D'E', A
 
@@ -74,7 +79,7 @@ __SCROLL:  ; Scroll?
 
 __PRINT_START:
     cp ' '
-    jp c, __PRINT_SPECIAL    ; Characters below ' ' are special ones
+    jr c, __PRINT_SPECIAL    ; Characters below ' ' are special ones
 
     exx               ; Switch to alternative registers
     ex af, af'        ; Saves a value (char to print) for later
@@ -107,10 +112,10 @@ __PRINT_START:
     ex af, af'
 
     cp 80h    ; Is it an UDG or a ?
-    jp c, __SRCADDR
+    jr c, __SRCADDR
 
     cp 90h
-    jp nc, __PRINT_UDG
+    jr nc, __PRINT_UDG
 
     ; Print a 8 bit pattern (80h to 8Fh)
 
@@ -529,5 +534,3 @@ __PRINT_TABLE:    ; Jump table for 0 .. 22 codes
     ENDP
 
     pop namespace
-
-

src/arch/zxnext/library-asm/set_pixel_addr_attr.asm

@@ -0,0 +1,20 @@
+#include once <attr.asm>
+
+push namespace core
+
+; Sets the attribute at a given screen pixel address in hl
+; HL contains the address in RAM for a given pixel (not a coordinate)
+SET_PIXEL_ADDR_ATTR:
+    ;; gets ATTR position with offset given in SCREEN_ADDR
+    ld a, h
+    rrca
+    rrca
+    rrca
+    and 3
+
+    ld h, a
+    ld de, (SCREEN_ATTR_ADDR)
+    add hl, de  ;; Final screen addr
+    jp __SET_ATTR2
+
+pop namespace

src/arch/zxnext/library-asm/sposn.asm

@@ -1,8 +1,9 @@
+#include once <sysvars.asm>
+
 ; Printing positioning library.
     push namespace core
 
     PROC
-    LOCAL ECHO_E
 
 __LOAD_S_POSN:		; Loads into DE current ROW, COL print position from S_POSN mem var.
     ld de, (S_POSN)
@@ -20,16 +21,6 @@ __SAVE_S_POSN:		; Saves ROW, COL from DE into S_POSN mem var.
     ld (S_POSN), hl ; saves it again
     ret
 
-
-ECHO_E	EQU 23682
-MAXX	EQU ECHO_E   ; Max X position + 1
-MAXY	EQU MAXX + 1 ; Max Y position + 1
-
-S_POSN	EQU 23688
-POSX	EQU S_POSN		; Current POS X
-POSY	EQU S_POSN + 1	; Current POS Y
-
     ENDP
 
     pop namespace
-

src/arch/zxnext/library-asm/sysvars.asm

@@ -0,0 +1,35 @@
+;; -----------------------------------------------------------------------
+;; ZX Basic System Vars
+;; Some of them will be mapped over Sinclair ROM ones for compatibility
+;; -----------------------------------------------------------------------
+
+push namespace core
+
+SCREEN_ADDR:        DW 16384  ; Screen address (can be pointed to other place to use a screen buffer)
+SCREEN_ATTR_ADDR:   DW 22528  ; Screen attribute address (ditto.)
+
+; These are mapped onto ZX Spectrum ROM VARS
+
+CHARS	            EQU 23606  ; Pointer to ROM/RAM Charset
+TVFLAGS             EQU 23612  ; TV Flags
+UDG	                EQU 23675  ; Pointer to UDG Charset
+COORDS              EQU 23677  ; Last PLOT coordinates
+FLAGS2	            EQU 23681  ;
+ECHO_E              EQU 23682  ;
+DFCC                EQU 23684  ; Next screen addr for PRINT
+DFCCL              EQU 23686  ; Next screen attr for PRINT
+S_POSN              EQU 23688
+ATTR_P              EQU 23693  ; Current Permanent ATTRS set with INK, PAPER, etc commands
+ATTR_T	            EQU 23695  ; temporary ATTRIBUTES
+P_FLAG	            EQU 23697  ;
+MEM0                EQU 23698  ; Temporary memory buffer used by ROM chars
+
+;; Screen MAX col (MAXX) and MAX row (MAXY)
+MAXX                EQU ECHO_E   ; Max X position + 1
+MAXY                EQU MAXX + 1 ; Max Y position + 1
+
+;; Screen current ROW, COL (POSX, POSY) position
+POSX                EQU S_POSN     ; Current POS X
+POSY                EQU S_POSN + 1 ; Current POS Y
+
+pop namespace