Kernel 0.9.1 : GUI, debugging....

This commit is contained in:
Rémy GIBERT 2017-11-20 07:59:59 +01:00
parent ef62a7d69f
commit 50c85844df
8 changed files with 47 additions and 52 deletions

Binary file not shown.

Binary file not shown.

View File

@ -59,8 +59,8 @@ BITBLT >LDYA CB.CACHE+S.CB.SrcPtr
lda CB.Cache+S.CB.X1
pha
and #7 we have to shift right!!!
tax
and #7
sta BLT.BMBitOfs
pla
lsr CB.Cache+S.CB.X1+1
@ -85,11 +85,33 @@ BITBLT >LDYA CB.CACHE+S.CB.SrcPtr
inc ZPBMMaskPtr+1
.4
.4 lda S.CB.X2
sec
sbc S.CB.X1
sta BLT.DX
lda S.CB.X2+1
sbc S.CB.X1+1
sta BLT.DX+1
>LDYA S.CB.DestX
jsr LBUF.SetBounds1YA
stx BLT.SCRBitOfs
lda S.CB.DestX
clc
adc BLT.DX
tay
lda S.CB.DestX+1
adc BLT.DX+1
jsr LBUF.SetBounds2YA
clc
rts
*--------------------------------------
BLT.Get7BMBits
*--------------------------------------
MAN
SAVE /A2OSX.SRC/DRV/DHGR.DRV.S.RECT
LOAD /A2OSX.SRC/DRV/DHGR.DRV.S

View File

@ -8,8 +8,7 @@ AUTO 6
LBUF.SetBounds1YA
jsr DIVMOD7YA A=DIV, X=MOD
sta LBUF.C1
tay
lda C1.MASK,x
sta LBUF.C1.MASK
lda C1.DATA,x
@ -19,8 +18,7 @@ LBUF.SetBounds1YA
LBUF.SetBounds2YA
jsr DIVMOD7YA A=DIV, X=MOD
sta LBUF.C2
tay
cmp LBUF.C1 C1=C2, go combine in C1
beq .1

View File

@ -82,12 +82,6 @@ J.LBUF.DrawAtY .DA LBUF.DrawAtY.XOR
.DA LBUF.DrawAtY.ORA
.DA LBUF.DrawAtY.AND
L.DSTAT .DA DSTAT
L.DIV7.0 .DA DIV7.0
.DA DIV7.256
.DA DIV7.512
L.MOD7.0 .DA MOD7.0
.DA MOD7.256
.DA MOD7.512
L.Color.Pixels .DA Color.Pixels
.DA 0 end or relocation
*--------------------------------------
@ -96,26 +90,6 @@ STATUS >LDYA L.DSTAT
rts
*--------------------------------------
OPEN sta A2osX.SCRNDEVS+2 DEV.ID in A
ldy #0
ldx #0
.1 lda L.DIV7.0,y
sta DIV7.lo,x
lda L.MOD7.0,y
sta MOD7.lo,x
iny
lda L.DIV7.0,y
sta DIV7.hi,x
lda L.MOD7.0,y
sta MOD7.hi,x
iny
inx
cpx #3
bne .1
*--------------------------------------
CONTROL sta CLRTEXT
sta CLRMIXED
@ -245,11 +219,6 @@ CB.CmdLen .DA S.CB.Y1+1 SETPIXEL
CB.Cache .BS S.CB
BM.Cache .BS S.BM
*--------------------------------------
DIV7.lo .BS 3
DIV7.hi .BS 3
MOD7.lo .BS 3
MOD7.hi .BS 3
*--------------------------------------
LBUF.C1 .BS 1
LBUF.C1.MASK .BS 1 Bits to CLR in VMEM : 11100000 00000000 00111111
LBUF.C1.DATA .BS 1 Bits to SET/ORA/XOR : 000ccccc cccccccc cc000000
@ -259,6 +228,10 @@ LBUF.C2.DATA .BS 1
LBUF.MASK .BS 80
LBUF.DATA .BS 80
*--------------------------------------
BLT.BMBitOfs .BS 1
BLT.SCRBitOfs .BS 1
BLT.DX .BS 2
*--------------------------------------
GBYTE .BS 1
GWORD .BS 2
*--------------------------------------
@ -268,7 +241,8 @@ DSTAT .DA #0
.BS 3
.DA #S.DSTAT.T.GFX
.DA #0
.DA $0900
.DA #0
.DA #91
*--------------------------------------
DEVSTAT.MODES .DA #S.CB.MODE.MONO+S.CB.MODE.C16
DEVSTAT.W .DA 560 X.SIZE

View File

@ -108,8 +108,6 @@ COL.OFS .DA #00,#00,#01,#01,#02,#02,#03,#03,#04,#04,#05,#05,#06,#06,#07,#07,#0
.DA #20,#20,#21,#21,#22,#22,#23,#23,#24,#24,#25,#25,#26,#26,#27,#27,#28,#28,#29,#29
.DA #30,#30,#31,#31,#32,#32,#33,#33,#34,#34,#35,#35,#36,#36,#37,#37,#38,#38,#39,#39
*--------------------------------------
DIV7.BASE .HS 002449 Indexed with X.HI
*--------------------------------------
DIV7.0 .HS 00
DIV7.512 .HS 000000
DIV7.256 .HS 000000

View File

@ -92,6 +92,7 @@ Draw >PULLW ZPCmdPtr
sta CB.Cache,y
dey
bpl .2
jsr Draw.Jmp
bra .7
@ -424,6 +425,7 @@ CB.CmdLen .DA S.CB.Y1+1 SETPIXEL
.DA S.CB.Y2+1 VLINE
.DA S.CB.Y2+1 FILLRECT
.DA S.CB.DstPtr+1 BITBLT
.DA S.CB.DstPtr+1 GETRECTBUFSIZE
.DA S.CB.Y2+1 DRAWLINE
*--------------------------------------
CB.Cache .BS S.CB

View File

@ -180,9 +180,6 @@ CS.QUIT clc
Destop.Paint >PUSHW L.Rect.CB
>LIBCALL hLIBGUI,LIBGUI.Draw
>PUSHW L.DrawLines.CB
>LIBCALL hLIBGUI,LIBGUI.Draw
lda #S.CB.MODE.C16
sta SetPixel.Mode
@ -225,7 +222,11 @@ Destop.Paint >PUSHW L.Rect.CB
cmp #16
bne .1
.4 rts
.4
>PUSHW L.DrawLines.CB
>LIBCALL hLIBGUI,LIBGUI.Draw
rts
*--------------------------------------
*--------------------------------------
*--------------------------------------
@ -244,7 +245,7 @@ MouseClamp .BS 8
MouseData .BS 5
*--------------------------------------
Rect.CB .DA #S.CB.CMD.FILLRECT
.DA #S.CB.OP.ORA
.DA #S.CB.OP.SET
.DA #S.CB.MODE.C16
.DA #11
.DA 0
@ -253,7 +254,7 @@ Rect.CB .DA #S.CB.CMD.FILLRECT
.DA 191
.DA #S.CB.CMD.FILLRECT
.DA #S.CB.OP.ORA
.DA #S.CB.OP.SET
.DA #S.CB.MODE.MONO
.DA #1
.DA 10
@ -271,7 +272,7 @@ Rect.CB .DA #S.CB.CMD.FILLRECT
.DA 170
.DA #S.CB.CMD.FILLRECT
.DA #S.CB.OP.ORA
.DA #S.CB.OP.SET
.DA #S.CB.MODE.C16
.DA #9
.DA 30
@ -280,7 +281,7 @@ Rect.CB .DA #S.CB.CMD.FILLRECT
.DA 160
.DA #S.CB.CMD.FILLRECT
.DA #S.CB.OP.ORA
.DA #S.CB.OP.XOR
.DA #S.CB.MODE.C16
.DA #8
.DA 40
@ -291,7 +292,7 @@ Rect.CB .DA #S.CB.CMD.FILLRECT
.DA #0
*--------------------------------------
DrawLines.CB .DA #S.CB.CMD.DRAWLINE
.DA #S.CB.OP.ORA
.DA #S.CB.OP.SET
.DA #S.CB.MODE.C16
.DA #1
.DA 80
@ -309,7 +310,7 @@ DrawLines.CB .DA #S.CB.CMD.DRAWLINE
.DA 191
.DA #S.CB.CMD.DRAWLINE
.DA #S.CB.OP.ORA
.DA #S.CB.OP.SET
.DA #S.CB.MODE.MONO
.DA #1
.DA 100
@ -318,7 +319,7 @@ DrawLines.CB .DA #S.CB.CMD.DRAWLINE
.DA 191
.DA #S.CB.CMD.DRAWLINE
.DA #S.CB.OP.ORA
.DA #S.CB.OP.SET
.DA #S.CB.MODE.C16
.DA #15
.DA 110