diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 79568d34..d4b8b9bc 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/DRV/DHGR.DRV.S.LINE.txt b/DRV/DHGR.DRV.S.LINE.txt index 0196a4e9..89f31181 100644 --- a/DRV/DHGR.DRV.S.LINE.txt +++ b/DRV/DHGR.DRV.S.LINE.txt @@ -79,15 +79,18 @@ VLINE lda CB.Cache+S.CB.M VLINE.MONO >LDYA CB.Cache+S.CB.X1 - jsr DIVMOD7YA + jsr DIVMOD7YA X = MOD 7 tay lda COL.OFS,y - sta ZPTmpByte Save COL (DIV) + sta ZPTmpByte Save COL (DIV) lda COL.BANK,y tay sta $C000,y Select proper BANK + ldy CB.Cache+S.CB.Y1 + clc + lda CB.Cache+S.CB.OP * cmp #S.CB.OP.XOR beq VLINE.MONO.XOR @@ -96,9 +99,7 @@ VLINE.MONO >LDYA CB.Cache+S.CB.X1 bne VLINE.MONO.WHITE VLINE.MONO.BLACK - ldy CB.Cache+S.CB.Y1 - clc - + .1 lda BASEL,y adc ZPTmpByte sta ZPBasePtr @@ -115,23 +116,12 @@ VLINE.MONO.BLACK rts VLINE.MONO.WHITE - -.1 lda BASEL,y - adc ZPTmpByte - sta ZPBasePtr - lda BASEH,y - sta ZPBasePtr+1 - - lda (ZPBasePtr) - ora Mono.Masks,x - sta (ZPBasePtr) - cpy CB.Cache+S.CB.Y2 - iny - bcc .1 - - rts + lda #$1D ORA abs,x + .HS 2C BIT ABS VLINE.MONO.XOR - + lda #$5D EOR abs,x + sta .2 + .1 lda BASEL,y adc ZPTmpByte sta ZPBasePtr @@ -139,7 +129,7 @@ VLINE.MONO.XOR sta ZPBasePtr+1 lda (ZPBasePtr) - eor Mono.Masks,x +.2 eor Mono.Masks,x SELF MODIFIED sta (ZPBasePtr) cpy CB.Cache+S.CB.Y2 iny @@ -153,91 +143,22 @@ VLINE.C16 lda CB.Cache+S.CB.X1 lsr CB.Cache+S.CB.X1+1 ror tay Y=X/4 (range 0->139) - lda DIV7.0,y A=X/4/7 (range 0->19) - - asl times 2 (range 0->38) - + ldx CB.Cache+S.CB.Y1 - adc BASEL,x setup line Base Ptr (cc by asl) - sta ZPBasePtr ZPBasePtr now point to first of... - lda BASEH,x - sta ZPBasePtr+1 ...the 4 columns - lda MOD7.0,y get MOD +.1 phy + phx - asl times 4 to compute index in MASK tables - asl - tax set in X for Masks,NMasks + jsr SETPIXEL.C16.YX - lda CB.Cache+S.CB.COLOR - - asl times 4 to compute index in PIXELS table - asl - tay + plx + ply - lda Color.Masks,x bits in 1st byte to light? - beq .10 - - and Color.Pixels,y apply color - sta ZPTmpByte - - sta SETPAGE2 - - lda (ZPBasePtr) - and Color.NMasks,x reset existing pixel, - ora ZPTmpByte - sta (ZPBasePtr) - -.10 inx + cpy CB.Cache+S.CB.Y2 iny + bcc .1 - lda Color.Masks,x - beq .11 - - and Color.Pixels,y apply color - sta ZPTmpByte - - sta CLRPAGE2 - - lda (ZPBasePtr) - and Color.NMasks,x reset existing pixel, - ora ZPTmpByte - sta (ZPBasePtr) - -.11 inc ZPBasePtr - inx - iny - - lda Color.Masks,x - beq .12 - - and Color.Pixels,y apply color - sta ZPTmpByte - - sta SETPAGE2 - - lda (ZPBasePtr) - and Color.NMasks,x reset existing pixel, - ora ZPTmpByte - sta (ZPBasePtr) - -.12 inx - iny - - lda Color.Masks,x - beq .13 - - and Color.Pixels,y apply color - sta ZPTmpByte - - sta CLRPAGE2 - - lda (ZPBasePtr) - and Color.NMasks,x reset existing pixel, - ora ZPTmpByte - sta (ZPBasePtr) - -.13 rts + rts *-------------------------------------- MAN SAVE USR/SRC/DRV/DHGR.DRV.S.LINE diff --git a/DRV/DHGR.DRV.S.PIX.txt b/DRV/DHGR.DRV.S.PIX.txt index f644759f..7cd3ddc3 100644 --- a/DRV/DHGR.DRV.S.PIX.txt +++ b/DRV/DHGR.DRV.S.PIX.txt @@ -68,18 +68,22 @@ SETPIXEL.C16 lda CB.Cache+S.CB.X1 lsr CB.Cache+S.CB.X1+1 ror tay Y=X/4 (range 0->139) - lda DIV7.0,y A=X/4/7 (range 0->19) + + ldx CB.Cache+S.CB.Y1 + +* Y = PixelX (0,139), X = PixelY (0,191) + +SETPIXEL.C16.YX lda DIV7.0,y PixelX MOD 7 (range 0->19) asl times 2 (range 0->38) - ldx CB.Cache+S.CB.Y1 * clc adc BASEL,x setup line Base Ptr (cc by asl) sta ZPBasePtr ZPBasePtr now point to first of... lda BASEH,x sta ZPBasePtr+1 ...the 4 columns - lda MOD7.0,y get MOD + lda MOD7.0,y get pixelX MOD7 asl times 4 to compute index in MASK tables asl @@ -93,6 +97,7 @@ SETPIXEL.C16 lda CB.Cache+S.CB.X1 lda Color.Masks,x bits in 1st byte to light? beq .10 + and Color.Pixels,y apply color sta ZPTmpByte diff --git a/LIB/LIBGUI.G.BM.txt b/LIB/LIBGUI.G.BM.txt index e9760f9e..4ab30fa5 100644 --- a/LIB/LIBGUI.G.BM.txt +++ b/LIB/LIBGUI.G.BM.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- BM.Apple .DA #S.BM.F.BBP4 .DA #2 RowBytes diff --git a/LIB/LIBGUI.G.CUR.txt b/LIB/LIBGUI.G.CUR.txt index a53ab0c8..69875d15 100644 --- a/LIB/LIBGUI.G.CUR.txt +++ b/LIB/LIBGUI.G.CUR.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- CUR.T .BS 1 CUR.bVisible .BS 1 diff --git a/LIB/LIBGUI.G.FON.txt b/LIB/LIBGUI.G.FON.txt index 40472ab4..1e15a909 100644 --- a/LIB/LIBGUI.G.FON.txt +++ b/LIB/LIBGUI.G.FON.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- hSYSFON .BS 1 hSYSFONB .BS 1 diff --git a/LIB/LIBGUI.G.WND.txt b/LIB/LIBGUI.G.WND.txt index 37e23c77..792def0b 100644 --- a/LIB/LIBGUI.G.WND.txt +++ b/LIB/LIBGUI.G.WND.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- WND.TB.H .BS 1 WND.Stack.Top .BS 1 diff --git a/LIB/LIBGUI.S.BM.txt b/LIB/LIBGUI.S.BM.txt index 21fbc59f..2198e5fe 100644 --- a/LIB/LIBGUI.S.BM.txt +++ b/LIB/LIBGUI.S.BM.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- BM.Get *-------------------------------------- diff --git a/LIB/LIBGUI.S.BUT.txt b/LIB/LIBGUI.S.BUT.txt index 1b1de266..596a5184 100644 --- a/LIB/LIBGUI.S.BUT.txt +++ b/LIB/LIBGUI.S.BUT.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- BUT.New >STYA ZPPtr1 diff --git a/LIB/LIBGUI.S.CLIP.txt b/LIB/LIBGUI.S.CLIP.txt index ab6e24a5..27dfceef 100644 --- a/LIB/LIBGUI.S.CLIP.txt +++ b/LIB/LIBGUI.S.CLIP.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- * CLIPPING Functions: * In: diff --git a/LIB/LIBGUI.S.CUR.txt b/LIB/LIBGUI.S.CUR.txt index 87885f33..4675cc0d 100644 --- a/LIB/LIBGUI.S.CUR.txt +++ b/LIB/LIBGUI.S.CUR.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- UpdateCursor lda CUR.T cmp #CUR.T.WAIT diff --git a/LIB/LIBGUI.S.DRAW.txt b/LIB/LIBGUI.S.DRAW.txt index 5a42347e..a8c6c41a 100644 --- a/LIB/LIBGUI.S.DRAW.txt +++ b/LIB/LIBGUI.S.DRAW.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- Draw >PULLW ZPCBPtr Get CB diff --git a/LIB/LIBGUI.S.EVT.txt b/LIB/LIBGUI.S.EVT.txt index 62b4b2b3..38375551 100644 --- a/LIB/LIBGUI.S.EVT.txt +++ b/LIB/LIBGUI.S.EVT.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- EVT.Get diff --git a/LIB/LIBGUI.S.FON.txt b/LIB/LIBGUI.S.FON.txt index 1aab0a06..1ca91052 100644 --- a/LIB/LIBGUI.S.FON.txt +++ b/LIB/LIBGUI.S.FON.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- FON.Init >PUSHWZ Aux type >PUSHBI $CC Type diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt index 13326dfd..afdefdde 100644 --- a/LIB/LIBGUI.S.MENU.txt +++ b/LIB/LIBGUI.S.MENU.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- * Y,A = ptr to menu definition *-------------------------------------- diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt index c9340b71..95b833b0 100644 --- a/LIB/LIBGUI.S.MOU.txt +++ b/LIB/LIBGUI.S.MOU.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- MOU.Init .1 >PUSHBI 0 diff --git a/LIB/LIBGUI.S.PAT.txt b/LIB/LIBGUI.S.PAT.txt index 1567244e..75d5a1f5 100644 --- a/LIB/LIBGUI.S.PAT.txt +++ b/LIB/LIBGUI.S.PAT.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- GetMPattern clc diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt index 22232e1b..b29c6c4e 100644 --- a/LIB/LIBGUI.S.WND.txt +++ b/LIB/LIBGUI.S.WND.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 *-------------------------------------- WND.Init >PUSHBI 0 >LDYA L.DEVNAME.GFX diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 14c7341b..ac55e760 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF .OP 65C02 .OR $2000 diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index 08bb462e..c2485f7e 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -818,7 +818,7 @@ K.GetMemStat >STYA ZPPtr1 dey dex bpl .3 - + clc rts *-------------------------------------- MAN