Merge pull request #1058 from boriel-basic/t-tang-main

Allows PRINT42 to use UDG

Author: boriel

src/lib/arch/zx48k/stdlib/print42.bas

@@ -39,9 +39,15 @@ asm
 LOCAL examineChar
 examineChar:
     LD A,(HL)       ; Grab the character at our pointer position
-    CP 128          ; Too high to print?
+    CP 165          ; Too high to print?
     JR NC, nextChar ; Then we go to the next
 
+    CP 144
+    JR NC, prn      ; char is a UDG
+
+    CP 128
+    JR NC, nextChar      ; char is a block graphic
+
     CP 22           ; Is this an AT?
     JR NZ, isNewline ; If not jump over the AT routine to isNewline
 
@@ -130,6 +136,9 @@ printachar:
       PUSH HL ; Store H'L' where we can get it.
       EXX               
 
+      CP 144
+      jr nc,printudg
+
       ld c, a   ; Put a copy of the character in C
       ld h, 0   
       ld l, a   ; Put the Character in HL
@@ -148,6 +157,19 @@ printachar:
       ld c, l          ; Copy our character data address into BC
       jr printdata     ; We have our data source, so we print it.
 
+LOCAL printudg
+printudg
+      sub 144          ; get the udg offset
+      ld hl,$5C7B      ; examine system variables for udg address
+      ld e,(hl)        ; lsb for udg address
+      inc hl
+      ld d,(hl)        ; mbs for udg address
+      ld l,a           ; character offset for udg
+      call mult8       ; multiplies L by 8 and adds in DE [so HL points at our table entry]
+      ld b, h         
+      ld c, l          ; Copy our character data address into BC
+      jr printdata     ; We have our data source, so we print it.
+
 LOCAL calcChar
 calcChar: ; this is the calculate from the ROM data option
       ; a holds the column kill data

tests/functional/arch/zx48k/print42.asm

@@ -73,6 +73,10 @@ _print42:
 		LOCAL examineChar
 examineChar:
 		LD A,(HL)
+		CP 165
+		JR NC, nextChar
+		CP 144
+		JR NC, prn
 		CP 128
 		JR NC, nextChar
 		CP 22
@@ -144,6 +148,8 @@ printachar:
 		EXX
 		PUSH HL
 		EXX
+		CP 144
+		jr nc,printudg
 		ld c, a
 		ld h, 0
 		ld l, a
@@ -158,6 +164,18 @@ printachar:
 		ld b, h
 		ld c, l
 		jr printdata
+		LOCAL printudg
+		printudg
+		sub 144
+		ld hl,$5C7B
+		ld e,(hl)
+		inc hl
+		ld d,(hl)
+		ld l,a
+		call mult8
+		ld b, h
+		ld c, l
+		jr printdata
 		LOCAL calcChar
 calcChar:
 		ld de, 15360
@@ -315,9 +333,9 @@ ycoord:
 		ret c
 		ld d, 0
 		ret
-#line 329 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
+#line 351 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
 .LABEL._printAt42Coords:
-#line 330 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
+#line 352 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
 		LOCAL xycoords
 xycoords:
 		defb 0
@@ -491,7 +509,7 @@ characters:
 		LOCAL print42end
 print42end:
 		ENDP
-#line 522 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
+#line 544 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
 _print42__leave:
 	ex af, af'
 	exx
@@ -508,7 +526,7 @@ _print42__leave:
 	exx
 	ret
 	;; --- end of user code ---
-#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/free.asm"
 ; vim: ts=4:et:sw=4:
 	; Copyleft (K) by Jose M. Rodriguez de la Rosa
 	;  (a.k.a. Boriel)
@@ -568,7 +586,7 @@ _print42__leave:
 	; HL = BLOCK Start & DE = Length.
 	; An init directive is useful for initialization routines.
 	; They will be added automatically if needed.
-#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm"
+#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/heapinit.asm"
 ; vim: ts=4:et:sw=4:
 	; Copyleft (K) by Jose M. Rodriguez de la Rosa
 	;  (a.k.a. Boriel)
@@ -675,7 +693,7 @@ __MEM_INIT2:
 	    ret
 	    ENDP
 	    pop namespace
-#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm"
+#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/mem/free.asm"
 	; ---------------------------------------------------------------------
 	; MEM_FREE
 	;  Frees a block of memory
@@ -774,5 +792,5 @@ __MEM_BLOCK_JOIN:  ; Joins current block (pointed by HL) with next one (pointed
 	    ret
 	    ENDP
 	    pop namespace
-#line 540 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
+#line 562 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas"
 	END