Added c16/plus4 fast(), isfast() and slow() functions, and updated the documentation accordingly.
+++ /dev/null
-;
-; Target-specific black & white values for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
- .export tgi_color_black:zp = $00
- .export tgi_color_white:zp = $01
+++ /dev/null
-;
-; Target-specific black & white values for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
- .export tgi_color_black:zp = $00
- .export tgi_color_white:zp = $01
+++ /dev/null
-;
-; Target-specific black & white values for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
- .export tgi_color_black:zp = $00
- .export tgi_color_white:zp = $01
; Based on Stephen L. Judd's GRLIB code.
;
; 2017-01-13, Greg King
+; 2018-03-13, Sven Klose
;
.include "zeropage.inc"
Y2 := ptr4
TEXT := ptr3
-ROW := tmp2 ; Bitmap row...
-COL := tmp3 ; ...and column, both set by PLOT
TEMP := tmp4
TEMP2 := sreg
POINT := regsave
-INRANGE := regsave+2 ; PLOT variable, $00 = coordinates in range
CHUNK := X2 ; Used in the line routine
OLDCHUNK := X2+1 ; Dito
; LINE: Draw a line from X1/Y1 to X2/Y2, where X1/Y1 = ptr1/ptr2 and
; X2/Y2 = ptr3/ptr4 using the current drawing color.
;
-; To deal with off-screen coordinates, the current row
-; and column (40x25) is kept track of. These are set
-; negative when the point is off the screen, and made
-; positive when the point is within the visible screen.
-;
; X1,X2 etc. are set up above (x2=LINNUM in particular)
; Format is LINE x2,y2,x1,y1
;
stx YINCDEC
stx XINCDEC
- jsr CALC ; Set up .X,.Y,POINT, and INRANGE
+ jsr CALC ; Set up .X, .Y, and POINT
lda BITCHUNK,X
sta OLDCHUNK
sta CHUNK
;
YLOOP: sta TEMP
- lda INRANGE ;Range check
- bne @SKIP
-
- lda (POINT),y ;Otherwise plot
+ lda (POINT),y
eor BITMASK
and CHUNK
eor (POINT),y
sta (POINT),y
-@SKIP:
YINCDEC:
iny ;Advance Y coordinate
cpy #8
and CHUNK
eor (POINT),y
sta (POINT),y
-YDONE: lda #$36
+ lda #$36
sta $01
cli
rts
bne YCONT ;If we pass a column boundary...
ror CHUNK ;then reset CHUNK to $80
sta TEMP2
- lda COL
- bmi @C1 ;Skip if column is negative
- cmp #39 ;End if move past end of screen
- bcs YDONE
-@C1: lda POINT ;And add 8 to POINT
+ lda POINT ;And add 8 to POINT
adc #8
sta POINT
bcc @CONT
inc POINT+1
-@CONT: inc COL ;Increment column
- bne @C2
- lda ROW ;Range check
- cmp #25
- bcs @C2
- lda #00 ;Passed into col 0
- sta INRANGE
-@C2: lda TEMP2
+@CONT: lda TEMP2
dex
bne YLOOP
beq YCONT2
dec COUNTHI ;High bits set?
bpl XLOOP
-XDONE: lsr CHUNK ;Advance to last point
+ lsr CHUNK ;Advance to last point
jsr LINEPLOT ;Plot the last chunk
EXIT: lda #$36
sta $01
lda #$FF
sta CHUNK
sta OLDCHUNK
- lda COL
- bmi @C1 ;Skip if column is negative
- cmp #39 ;End if move past end of screen
- bcs EXIT
-@C1: lda POINT
+ lda POINT
+ clc
adc #8
sta POINT
- bcc @CONT
+ lda TEMP
+ bcc XCONT1
inc POINT+1
-@CONT: inc COL
- bne @C2
- lda ROW
- cmp #25
- bcs @C2
- lda #00
- sta INRANGE
-@C2: lda TEMP
- sec
- bcs XCONT1
+ jmp XCONT1
;
; Check to make sure there isn't a high bit, plot chunk,
; and update Y-coordinate.
; room, gray hair, etc.)
;
LINEPLOT: ; Plot the line chunk
- lda INRANGE
- bne @SKIP
-
- lda (POINT),Y ; Otherwise plot
+ lda (POINT),Y
eor BITMASK
ora CHUNK
and OLDCHUNK
eor CHUNK
eor (POINT),Y
sta (POINT),Y
-@SKIP: rts
+ rts
;
; Subroutine to fix up pointer when Y decreases through
;
FIXY: cpy #255 ;Y=255 or Y=8
beq @DECPTR
+
@INCPTR: ;Add 320 to pointer
ldy #0 ;Y increased through 7
- lda ROW
- bmi @C1 ;If negative, then don't update
- cmp #24
- bcs @TOAST ;If at bottom of screen then quit
-@C1: lda POINT
+ lda POINT
adc #<320
sta POINT
lda POINT+1
adc #>320
sta POINT+1
-@CONT1: inc ROW
- bne @DONE
- lda COL
- bpl @CLEAR
-@DONE: rts
+ rts
@DECPTR: ;Okay, subtract 320 then
ldy #7 ;Y decreased through 0
lda POINT+1
sbc #>320
sta POINT+1
-@CONT2: dec ROW
- bmi @TOAST
- lda ROW
- cmp #24
- bne @DONE
- lda COL
- bmi @DONE
-@CLEAR: lda #00
- sta INRANGE
rts
-@TOAST: pla ;Remove old return address
- pla
- jmp EXIT ;Restore interrupts, etc.
-
; ------------------------------------------------------------------------
; BAR: Draw a filled rectangle with the corners X1/Y1, X2/Y2, where
; X1/Y1 = ptr1/ptr2 and X2/Y2 = ptr3/ptr4 using the current drawing color.
rts
; ------------------------------------------------------------------------
-; Calculate all variables to plot the pixel at X1/Y1. If the point is out
-; of range, a carry is returned and INRANGE is set to a value !0 zero. If
-; the coordinates are valid, INRANGE is zero and the carry clear.
+; Calculate all variables to plot the pixel at X1/Y1.
CALC: lda Y1
- sta ROW
+ sta TEMP2
and #7
tay
lda Y1+1
lsr ; Neg is possible
- ror ROW
+ ror TEMP2
lsr
- ror ROW
+ ror TEMP2
lsr
- ror ROW
+ ror TEMP2
lda #00
sta POINT
- lda ROW
+ lda TEMP2
cmp #$80
ror
ror POINT
cmp #$80
ror
ror POINT ; row*64
- adc ROW ; +row*256
+ adc TEMP2 ; +row*256
clc
adc #>VBASE ; +bitmap base
sta POINT+1
lda X1
tax
- sta COL
- lda X1+1
- lsr
- ror COL
- lsr
- ror COL
- lsr
- ror COL
-
- txa
and #$F8
clc
adc POINT ; +(X AND #$F8)
txa
and #7
tax
-
- lda ROW
- cmp #25
- bcs @L9
- lda COL
- cmp #40
- bcs @L9
- lda #00
-@L9: sta INRANGE
rts
+++ /dev/null
-;
-; Target-specific black & white values for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
- .export tgi_color_black:zp = $00
- .export tgi_color_white:zp = $01
--- /dev/null
+;
+; Target-specific black & white values for use by the target-shared TGI kernel
+;
+
+ .include "tgi-kernel.inc"
+
+ .export tgi_color_black:zp = $00
+ .export tgi_color_white:zp = $01
+++ /dev/null
-;
-; Target-specific black & white values, for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
-tgi_color_black = $00
-tgi_color_white = $01
+++ /dev/null
-;
-; Target-specific black & white values for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
- .export tgi_color_black:zp = $00
- .export tgi_color_white:zp = $01
+++ /dev/null
-;
-; Target-specific black & white values for use by the target-shared TGI kernel
-;
-
- .include "tgi-kernel.inc"
-
- .export tgi_color_black:zp = $00
- .export tgi_color_white:zp = $01
# For this one see https://applecommander.github.io/
AC ?= ac.jar
-CL = cl65
-CLFLAGS = -t apple2 -C apple2-hgr.cfg -Oirs
+CL ?= cl65
-hgrtest.dsk: hgrtest
+all: hgr.dsk dhgr.dsk
+
+hgr.dsk: hgrshow hgrtest
cp prodos.dsk $@
- java -jar $(AC) -cc65 $@ hgrtest bin <hgrtest
+ java -jar $(AC) -as $@ hgrshow <hgrshow
+ java -jar $(AC) -as $@ hgrtest <hgrtest
+ java -jar $(AC) -p $@ astronaut.hgr bin 0x2000 <astronaut.hgr
+ java -jar $(AC) -p $@ chips.hgr bin 0x2000 <chips.hgr
+ java -jar $(AC) -p $@ macrometer.hgr bin 0x2000 <macrometer.hgr
+ java -jar $(AC) -p $@ mariner.hgr bin 0x2000 <mariner.hgr
+ java -jar $(AC) -p $@ rose.hgr bin 0x2000 <rose.hgr
+ java -jar $(AC) -p $@ werner.hgr bin 0x2000 <werner.hgr
+ java -jar $(AC) -p $@ winston.hgr bin 0x2000 <winston.hgr
+
+hgrshow: hgrshow.c
+ $(CL) -Oirs -t apple2 --start-addr 0x4000 -m hgrshow.map $^
hgrtest: hgrtest.c werner.s
- $(CL) $(CLFLAGS) -m hgrtest.map $^
+ $(CL) -Oirs -t apple2 -C apple2-hgr.cfg -m hgrtest.map $^
+
+dhgr.dsk: dhgrshow
+ cp prodos.dsk $@
+ java -jar $(AC) -as $@ dhgrshow <dhgrshow
+ java -jar $(AC) -p $@ catface.dhgr bin 0x2000 <catface.dhgr
+ java -jar $(AC) -p $@ gatsby.dhgr bin 0x2000 <gatsby.dhgr
+ java -jar $(AC) -p $@ girl.dhgr bin 0x2000 <girl.dhgr
+ java -jar $(AC) -p $@ monarch.dhgr bin 0x2000 <monarch.dhgr
+ java -jar $(AC) -p $@ superman.dhgr bin 0x2000 <superman.dhgr
+ java -jar $(AC) -p $@ venice.dhgr bin 0x2000 <venice.dhgr
+
+dhgrshow: dhgrshow.c
+ $(CL) -Oirs -t apple2enh --start-addr 0x4000 -m dhgrshow.map $^
--- /dev/null
+// cl65 -t apple2enh --start-addr 0x4000 dhgrshow.c
+
+#include <tgi.h>
+#include <conio.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <peekpoke.h>
+
+void main (void)
+{
+ unsigned old;
+ DIR *dir;
+ struct dirent *ent;
+
+ old = videomode (VIDEOMODE_80x24);
+ tgi_install (a2e_hi_tgi);
+ tgi_init ();
+ POKE (0xC05E, 0);
+
+ dir = opendir (".");
+ while (ent = readdir (dir)) {
+ char *ext;
+ int hgr;
+
+ ext = strrchr (ent->d_name, '.');
+ if (!ext || strcasecmp (ext, ".dhgr"))
+ continue;
+
+ hgr = open (ent->d_name, O_RDONLY);
+ POKE (0xC055, 0);
+ read (hgr, (void*)0x2000, 0x2000);
+ POKE (0xC054, 0);
+ read (hgr, (void*)0x2000, 0x2000);
+ close (hgr);
+
+ if (cgetc () == '\r')
+ break;
+ }
+ closedir (dir);
+
+ tgi_uninstall ();
+ videomode (old);
+}
--- /dev/null
+// cl65 -t apple2 --start-addr 0x4000 hgrshow.c
+
+#include <tgi.h>
+#include <conio.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+
+void main (void)
+{
+ DIR *dir;
+ struct dirent *ent;
+
+ tgi_install (a2_hi_tgi);
+ tgi_init ();
+
+ dir = opendir (".");
+ while (ent = readdir (dir)) {
+ char *ext;
+ int hgr;
+
+ ext = strrchr (ent->d_name, '.');
+ if (!ext || strcasecmp (ext, ".hgr"))
+ continue;
+
+ hgr = open (ent->d_name, O_RDONLY);
+ read (hgr, (void*)0x2000, 0x2000);
+ close (hgr);
+
+ if (cgetc () == '\r')
+ break;
+ }
+ closedir (dir);
+
+ tgi_uninstall ();
+}
.segment "HGR"
-.incbin "werner.pic"
+.incbin "werner.hgr"
projects / cc65 / commitdiff