Update test to reflect new ATTR routine

Author: boriel

tests/functional/arrbase1.asm

@@ -136,7 +136,7 @@ __MUL16NOADD:
 
 #line 20 "array.asm"
 
-#line 24 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 24 "/src/zxb/trunk/library-asm/array.asm"
 
 __ARRAY:
 		PROC
@@ -159,10 +159,10 @@ __ARRAY:
 		ld hl, 0	; BC = Offset "accumulator"
 
 LOOP:
-#line 49 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 49 "/src/zxb/trunk/library-asm/array.asm"
 		pop bc		; Get next index (Ai) from the stack
 
-#line 59 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 59 "/src/zxb/trunk/library-asm/array.asm"
 
 		add hl, bc	; Adds current index
 
@@ -192,7 +192,7 @@ ARRAY_END:
 		push de
 		exx
 
-#line 92 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 92 "/src/zxb/trunk/library-asm/array.asm"
 	    LOCAL ARRAY_SIZE_LOOP
 
 	    ex de, hl
@@ -223,7 +223,7 @@ ARRAY_SIZE_LOOP:
 
 	    ;add hl, de
     ;__ARRAY_FIN:
-#line 123 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 123 "/src/zxb/trunk/library-asm/array.asm"
 
 		pop de
 		add hl, de  ; Adds element start
@@ -562,9 +562,9 @@ __MEM_START:
 __MEM_LOOP:  ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
 	        ld a, h ;  HL = NULL (No memory available?)
 	        or l
-#line 111 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/alloc.asm"
+#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
 	        ret z ; NULL
-#line 113 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/alloc.asm"
+#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
 	        ; HL = Pointer to Free block
 	        ld e, (hl)
 	        inc hl

tests/functional/arrcheck.asm

@@ -173,7 +173,7 @@ __STOP:
 	    ld (ERR_NR), a
 	    ret
 #line 23 "array.asm"
-#line 24 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 24 "/src/zxb/trunk/library-asm/array.asm"
 
 __ARRAY:
 		PROC
@@ -198,7 +198,7 @@ __ARRAY:
 LOOP:
 
 	    pop de
-#line 49 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 49 "/src/zxb/trunk/library-asm/array.asm"
 		pop bc		; Get next index (Ai) from the stack
 
 
@@ -208,7 +208,7 @@ LOOP:
 	    ld a, ERROR_SubscriptWrong
 	    jp c, __ERROR
 	    ex de, hl
-#line 59 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 59 "/src/zxb/trunk/library-asm/array.asm"
 
 		add hl, bc	; Adds current index
 
@@ -238,7 +238,7 @@ ARRAY_END:
 		push de
 		exx
 
-#line 92 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 92 "/src/zxb/trunk/library-asm/array.asm"
 	    LOCAL ARRAY_SIZE_LOOP
 
 	    ex de, hl
@@ -269,7 +269,7 @@ ARRAY_SIZE_LOOP:
 
 	    ;add hl, de
     ;__ARRAY_FIN:
-#line 123 "/Users/boriel/Documents/src/zxbasic/zxbasic/library-asm/array.asm"
+#line 123 "/src/zxb/trunk/library-asm/array.asm"
 
 		pop de
 		add hl, de  ; Adds element start

tests/functional/astore16.asm

@@ -561,23 +561,41 @@ PAPER_TMP:
 
 FLASH:
 		ld de, ATTR_P
+
+	    PROC
+	    LOCAL IS_TR
+	    LOCAL IS_ZERO
+
 __SET_FLASH:
 		; Another entry. This will set the flash flag at location pointer by DE
-		and 1	; # Convert to 0/1
+		cp 8
+		jr z, IS_TR
 
-		rrca
+		; # Convert to 0/1
+		or a
+		jr z, IS_ZERO
+		ld a, 0x80
+
+IS_ZERO:
 		ld b, a	; Saves the color
 		ld a, (de)
 		and 07Fh ; Clears previous value
 		or b
 		ld (de), a
 		ret
 
+IS_TR:  ; transparent
+		inc de ; Points DE to MASK_T or MASK_P
+		ld a, (de)
+		or 0x80; Set bit 7 to enable transparency
+		ld (de), a
+		ret
 
 	; Sets the FLASH flag passed in A register in the ATTR_T variable
 FLASH_TMP:
 		ld de, ATTR_T
 		jr __SET_FLASH
+	    ENDP
 
 #line 12 "print.asm"
 #line 1 "bright.asm"
@@ -590,25 +608,41 @@ FLASH_TMP:
 BRIGHT:
 		ld de, ATTR_P
 
+	    PROC
+	    LOCAL IS_TR
+	    LOCAL IS_ZERO
+
 __SET_BRIGHT:
 		; Another entry. This will set the bright flag at location pointer by DE
-		and 1	; # Convert to 0/1
+		cp 8
+		jr z, IS_TR
 
-		rrca
-		rrca
+		; # Convert to 0/1
+		or a
+		jr z, IS_ZERO
+		ld a, 0x40
+
+IS_ZERO:
 		ld b, a	; Saves the color
 		ld a, (de)
 		and 0BFh ; Clears previous value
 		or b
 		ld (de), a
 		ret
 
+IS_TR:  ; transparent
+		inc de ; Points DE to MASK_T or MASK_P
+		ld a, (de)
+		or 0x40; Set bit 6 to enable transparency
+		ld (de), a
+		ret
+
 
 	; Sets the BRIGHT flag passed in A register in the ATTR_T variable
 BRIGHT_TMP:
 		ld de, ATTR_T
 		jr __SET_BRIGHT
-
+	    ENDP
 #line 13 "print.asm"
 #line 1 "over.asm"
 
@@ -885,6 +919,8 @@ __SET_ATTR:
 	    PROC
 
 	    call __ATTR_ADDR
+
+__SET_ATTR2:  ; Sets attr from ATTR_T to (HL) which points to the scr address
 	    ld de, (ATTR_T)    ; E = ATTR_T, D = MASK_T
 
 	    ld a, d
@@ -902,6 +938,20 @@ __SET_ATTR:
 	    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
+	    or 18h
+	    ld h, a
+	    ld de, (SCREEN_ADDR)
+	    add hl, de  ;; Final screen addr
+	    jp __SET_ATTR2
 #line 19 "print.asm"
 
 	; Putting a comment starting with @INIT <address>

tests/functional/attr.asm

@@ -139,23 +139,41 @@ BOLD_TMP:
 
 FLASH:
 		ld de, ATTR_P
+
+	    PROC
+	    LOCAL IS_TR
+	    LOCAL IS_ZERO
+
 __SET_FLASH:
 		; Another entry. This will set the flash flag at location pointer by DE
-		and 1	; # Convert to 0/1
+		cp 8
+		jr z, IS_TR
+
+		; # Convert to 0/1
+		or a
+		jr z, IS_ZERO
+		ld a, 0x80
 
-		rrca
+IS_ZERO:
 		ld b, a	; Saves the color
 		ld a, (de)
 		and 07Fh ; Clears previous value
 		or b
 		ld (de), a
 		ret
 
+IS_TR:  ; transparent
+		inc de ; Points DE to MASK_T or MASK_P
+		ld a, (de)
+		or 0x80; Set bit 7 to enable transparency
+		ld (de), a
+		ret
 
 	; Sets the FLASH flag passed in A register in the ATTR_T variable
 FLASH_TMP:
 		ld de, ATTR_T
 		jr __SET_FLASH
+	    ENDP
 
 #line 35 "attr.bas"
 #line 1 "ink.asm"

tests/functional/circle.asm

@@ -256,6 +256,100 @@ __CLS_SCR:
 		ENDP
 
 #line 10 "plot.asm"
+#line 1 "attr.asm"
+
+	; Attribute routines
+; vim:ts=4:et:sw:
+
+
+
+
+#line 1 "const.asm"
+
+	; Global constants
+
+	P_FLAG	EQU 23697
+	FLAGS2	EQU 23681
+	ATTR_P	EQU 23693	; permanet ATTRIBUTES
+	ATTR_T	EQU 23695	; temporary ATTRIBUTES
+	CHARS	EQU 23606 ; Pointer to ROM/RAM Charset
+	UDG	EQU 23675 ; Pointer to UDG Charset
+	MEM0	EQU 5C92h ; Temporary memory buffer used by ROM chars
+
+#line 8 "attr.asm"
+
+
+__ATTR_ADDR:
+	    ; calc start address in DE (as (32 * d) + e)
+    ; Contributed by Santiago Romero at http://www.speccy.org
+	    ld h, 0                     ;  7 T-States
+	    ld a, d                     ;  4 T-States
+	    add a, a     ; a * 2        ;  4 T-States
+	    add a, a     ; a * 4        ;  4 T-States
+	    ld l, a      ; HL = A * 4   ;  4 T-States
+
+	    add hl, hl   ; HL = A * 8   ; 15 T-States
+	    add hl, hl   ; HL = A * 16  ; 15 T-States
+	    add hl, hl   ; HL = A * 32  ; 15 T-States
+
+    ld d, 18h ; DE = 6144 + E. Note: 6144 is the screen size (before attr zone)
+	    add hl, de
+
+	    ld de, (SCREEN_ADDR)    ; Adds the screen address
+	    add hl, de
+
+	    ; Return current screen address in HL
+	    ret
+
+
+	; Sets the attribute at a given screen coordinate (D, E).
+	; The attribute is taken from the ATTR_T memory variable
+	; Used by PRINT routines
+SET_ATTR:
+
+	    ; Checks for valid coords
+	    call __IN_SCREEN
+	    ret nc
+
+__SET_ATTR:
+	    ; Internal __FASTCALL__ Entry used by printing routines
+	    PROC
+
+	    call __ATTR_ADDR
+
+__SET_ATTR2:  ; Sets attr from ATTR_T to (HL) which points to the scr address
+	    ld de, (ATTR_T)    ; E = ATTR_T, D = MASK_T
+
+	    ld a, d
+	    and (hl)
+	    ld c, a    ; C = current screen color, masked
+
+	    ld a, d
+	    cpl        ; Negate mask
+	    and e    ; Mask current attributes
+	    or c    ; Mix them
+	    ld (hl), a ; Store result in screen
+
+	    ret
+
+	    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
+	    or 18h
+	    ld h, a
+	    ld de, (SCREEN_ADDR)
+	    add hl, de  ;; Final screen addr
+	    jp __SET_ATTR2
+#line 11 "plot.asm"
 
 PLOT:
 		PROC
@@ -313,21 +407,7 @@ __PLOT_OVER1:
 	LOCAL __PLOT_END
 __PLOT_END:
 	    ld (hl), a
-
-	;; gets ATTR position with offset given in SCREEN_ADDR
-	    ld a, h
-	    rrca
-	    rrca
-	    rrca
-	    and 3
-	    or 18h
-	    ld h, a
-	    ld de, (SCREEN_ADDR)
-	    add hl, de  ;; Final screen addr
-
-	LOCAL PO_ATTR_2
-	PO_ATTR_2 EQU 0BE4h  ; Another entry to PO_ATTR
-	    jp PO_ATTR_2   ; This will update attr accordingly. Beware, uses IY
+	    jp SET_PIXEL_ADDR_ATTR
 
 __PLOT_ERR:
 	    jp __OUT_OF_SCREEN_ERR ; Spent 3 bytes, but saves 3 T-States at (#1)