From 754d3ec7f33c9e26db574d34751c7747078a6abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Thu, 13 Oct 2016 08:21:16 +0200 Subject: [PATCH] Kernel version 0.8 : Migration from LIBSTR/PStrOut to new Kernel Frintf --- A2OSX.BOOT.po | Bin 143360 -> 143360 bytes A2OSX.SRC.po | Bin 819200 -> 819200 bytes BIN/LS.S.txt | 49 ++++++++++++++++++----------------------- SYS/KERNEL.S.CIO.txt | 2 +- SYS/KERNEL.S.INIT3.txt | 43 ++++++++++++++++++------------------ SYS/KERNEL.S.MEM.txt | 4 ++-- SYS/KERNEL.S.RUN.txt | 8 +++---- 7 files changed, 50 insertions(+), 56 deletions(-) diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index 7e76411021ebabcb1daed4491584808925bc10e1..b0665ab8665fa1da779ab8ec65dcc1ae424843ec 100644 GIT binary patch delta 2920 zcmaJ?eNa%)*+1ITVH@cf&mnUI)YC{MR&!$FMdqj&g`A{ z&b{Y%&OP_sd(SG(2~e=U{BrY~9Tl_$9S-fnAO061$q> zUVzjRH24TDmz|rh!Xpq%?;I&Nfzkhr`sJ8Ht5CHJ`q>byHpGj`Bs@ z^Ve2a)NQNA;QE@B-(g@O*ic?oQ@aOjD6K~FTAfaZgb03XS9x{aPtbQt>kOc{qO$Hs znkA*5{{D5vcWTQ&s@R>MwuxV-qeiR6ic2dh%gaDM*s4x5Y)A0xKCP;$+F4m%SI(~u z^*hzL>1@@`?FunuoxpMgGGyX>$TG3cEXxs=9I_Sr^4&!l@p>0zWwI(nERZ#z-U4Av zV~wPq9aVePmIk=5F>@);I2u?o4k0fEJY-}YBugfF)n);&ZH^jMQ&Aql@p`sNG3Bts zn~eoqc>T4{lv$#@S!gbAWx?xKcws``X;(eF_8G6j;A4nd8`%GEzS<5O_AOIFmb-r$ z?Q4QS8{y=xBP@9LTE}GwukM>W3n3yTH1+Fxko62v9;=iZFdfyfo{}{cNXU9cqzbQ>S7yvaHxC%NvL6=?nW= zUlu2ufGm}D2%WNgP|8W#kOPUxFRh(b$n?&I$UldjHGp@G*Tx2A%w@t6IhNRm?kH=w_s)&JNz_tw|A4Th?E7M+!$s)4mMpw7rzjHn}73(2|{y{4NshMdcYe?Gw$ zJJG;036cpT%S26(?Ct$5(?l3hBOoqN&NSmDjKV;!pAjet-!>)@YI`id?YThqSU!NM2a^g64^d`e8lAbB)8 z+QeQ8_h6R(UPrKZik8In_qu|;Rl#0Mu(y-B8+aaKpnymDxYK)uv+P2;De0{2tM_r^ znt*$Xzav^wiD9%_O9L$})Y6#sb^sIx-I><$faOl$&_nM>FqUe z`0Kecslu*N5|qN3KvQBUYt6>*!sV^XIkyAcJiCw*c{HHw1{n3bH#SqE!$L}ofOhyv zYtC$>A)KMHYn&Hn2<<|ben?5U?gZM9w;|ZxT8!+7PW}?nl9TiCHSqJ3Z>DDiY0Qgp zVz4+k#yo6R5*B3;WCUHxAg72(6ob!rDI7YPD&rj{%p#M};XNf;pYaVYj_gnkj9{*+ zMD>m8w92jehsv+QFjop_Qv!MhDghQD%$`h{A(}_VJ8`-eA+!Jys|aqJOu8&QbF6?=hIq>logrgf|gZii9)j30H-E@l_{J@Cm_Gj$zy$2 zRNU;2ix~4z&&SK@3zI6#J(VFNJ~Fzmf}cG|k3+>EEqn1MkhTe^)ATU#Al(Q+R(8&! z+{H_l<}E8M!sHa@5QUCi6LKp$Ji;@g5R>dvb1@T`{0t`l5|fiR4~aq!afl50KIbNV z^_&ch2i>AW2Q++Ana*%~5SY z6zUlB2oZ2u9AYNHWXLV%j5RTj z!R`SkX2+C-vn!7y|3R z?oUAJb@xMXJZ#efQ-7JxtK*WhW>C={UF3olk0`P8I=~rl=X#4ySs^j&TuG3e(td~@ z?J?_MyLq8WOUpq@JJ}41N2qlXWpY~e>uN)3bs1ma-`Z7|U%VpiL+$GFU29jbK*e6W zy0D~h{l-^A{o2TIb2jSq+RZt9$5(yD<0K;0a*L2Tr(el|riyqrT1WqJ}uM`h4K37t7n8TICL=ybVV@+;Sn25YRK1-N0 zO&Zslp?u5JFjwu>93;8-4gxNolB2wEH(-0)tH}u4HQ*?eK1r2UhdVr)a+Re9WZ zwzA(n-J;>w)1dV-yPk#_`}5TE!YHzdKyHIqqsTuqx@Q?wSt6Z=aME{*lF*h@*&%`rqhY)?M8l=ni({J)z#Vz+VI2z;}VW z0SwdjVc2B9I9M3Ou;|eHp{t?M(3$`d_zJH5_qmvt7D`dV{Et9!E>@1;$77Tn0Kpqx zMOF&c8i(hcJnX>*tws3yqcK)ot2Xr;@_rDUGW>wO$_CU?=M5A;^t0vIMf8!=N4Ht= wB{+7@ZpEwd7{HBy%_DoCpd@&7=rcU&T#^mH6?HD=2>t+v3PDWkpYT8b7o5f)-~a#s delta 2941 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 RWXMr|dS!;3=cgYf@L%5%#9jaZ diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index 9caf3af8..d1151362 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -97,9 +97,10 @@ CS.RUN ldy #bCANCEL .2 ldy #hDIR lda (pData),y >SYSCALL SYS.READDIRA - bcs .9 + bcc .20 + rts - phx Save hDIRENT +.20 phx Save hDIRENT >STYA ZPPtr1 .3 lda (ZPPtr1) @@ -118,33 +119,27 @@ CS.RUN ldy #bCANCEL lda (ZPPtr2),y cmp #$0F Directory ? bne .31 + + >PUSHW ZPPtr1 + >LDYA L.MSG.DIR + >SYSCALL SYS.PrintFYA + bra .7 - lda #'/' - >SYSCALL SYS.COutA - -.31 >LDYA ZPPtr1 - >SYSCALL SYS.PStrOutYA - - ldy #S.STAT.PRODOS.TYPE +.31 ldy #S.STAT.PRODOS.AUXTYPE+1 lda (ZPPtr2),y - cmp #$0F Directory ? - beq .32 + >PUSHA + dey + lda (ZPPtr2),y + >PUSHA - pha - lda #'.' - >SYSCALL SYS.COutA - - pla + dey + lda (ZPPtr2),y jsr FileType2PSTR - >SYSCALL SYS.PStrOutYA - + >PUSHYA - - -.32 - - lda #13 - >SYSCALL SYS.COutA + >PUSHW ZPPtr1 + >LDYA L.MSG.FILE + >SYSCALL SYS.PrintFYA .7 lda ZPPtr2 clc @@ -158,7 +153,7 @@ CS.RUN ldy #bCANCEL .8 pla >SYSCALL SYS.FreeMemA clc -.9 rts + rts *-------------------------------------- CS.DOEVENT ldy #S.EVT.hDEV is Event from active IN device? lda (pEvent),y @@ -250,8 +245,8 @@ FileType2PSTR ldy #0 CS.END LIBSTR >PSTRING "libstr.o" MSG.VOL >CSTRING "/%S\n" -MSG.DIR >CSTRING "/%15S %a %T %t %T %t\n" -MSG.FILE >CSTRING "%15S %S $%H %a %8L %T %t %T %t\n" +MSG.DIR >CSTRING "/%15S \n" +MSG.FILE >CSTRING "%15S %S $%H\n" *-------------------------------------- PRODOS.FT.HEX .HS 0406FAFCFDE2FF PRODOS.FT.TXT >PSTRING "TXT" diff --git a/SYS/KERNEL.S.CIO.txt b/SYS/KERNEL.S.CIO.txt index 3884de29..30b9e6d2 100644 --- a/SYS/KERNEL.S.CIO.txt +++ b/SYS/KERNEL.S.CIO.txt @@ -502,7 +502,7 @@ DEC2HEX stz HEXBUF pla .99 rts *-------------------------------------- -ACCESS .AS "drwxrwxrwx" +*ACCESS .AS "drwxrwxrwx" HEXBUF .BS 4 32 bits max BCDBUF .BS 5 5, enough to handle 10 digits (32bits) ASCBUF .BS 12 LEN + sign + 10 digits ($FFFFFFFF=4.294.967.295) diff --git a/SYS/KERNEL.S.INIT3.txt b/SYS/KERNEL.S.INIT3.txt index 2594125c..e496df42 100644 --- a/SYS/KERNEL.S.INIT3.txt +++ b/SYS/KERNEL.S.INIT3.txt @@ -21,30 +21,30 @@ Kernel.Init3 jsr K.DevMgrInit sta A2osX.ASCREEN >LDYAI MSG.Init3 - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA >LDYAI MSG.IRQ - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA jsr K.IrqMgrInit bcs * >LDYAI MSG.MEM - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA jsr K.MemMgrInit bcs * >LDYAI MSG.EVT - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA jsr K.EvtMgrInit bcs * >LDYAI MSG.FLT - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA jsr K.FltMgrInit bcs * >LDYAI MSG.TSK - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA jsr K.TskMgrInit bcs * @@ -54,18 +54,18 @@ Kernel.Init3 jsr K.DevMgrInit >PUSHYA >LDYAI MSG.Prefix - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA >PUSHWI STARTUP.CMDLINE >LDYAI MSG.Startup - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA >LDYAI STARTUP.CMDLINE >SYSCALL SYS.CreateProcessYA bcs .9 >LDYAI MSG.Init3.OK - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA >LDYAI TskMgr.Table >STYA pPs @@ -77,7 +77,7 @@ Kernel.Init3 jsr K.DevMgrInit .9 >PUSHA >LDYAI MSG.StartupErr - >SYSCALL SYS.PStrOutYA + >SYSCALL SYS.PrintFYA bra * *-------------------------------------- * K.DevMgrInit @@ -274,20 +274,19 @@ I.ENV.A2osX >PSTRING "A2OSX" I.ENV.PATH >PSTRING "PATH=${A2OSX}SBIN/;${A2OSX}BIN/" I.ENV.LIB >PSTRING "LIB=${A2OSX}LIB/" I.ENV.DRV >PSTRING "DRV=${A2OSX}DRV/" -*-------------------------------------- -MSG.Init3 >PSTRING "A2osX[Stage3]:Init\n" -MSG.IRQ >PSTRING " - Interrupt Manager...\n" -MSG.MEM >PSTRING " - Memory Manager...\n" -MSG.EVT >PSTRING " - Event Manager...\n" -MSG.FLT >PSTRING " - Path Filter...\n" -MSG.TSK >PSTRING " - Task Manager...\n" -MSG.Prefix >PSTRING "Prefix:%S\n" -MSG.Startup >PSTRING "Executing Kernel Startup Script...\nCmd:%S\n" -MSG.StartupErr >PSTRING "Failed : [$%h]\n" -MSG.Init3.OK >PSTRING "A2osX[Stage3]:Complete.\n" -*-------------------------------------- STARTUP.CMDLINE >PSTRING "${A2OSX}SBIN/SHELL ${A2OSX}A2osX.STARTUP" *-------------------------------------- +MSG.Init3 >CSTRING "A2osX[Stage3]:Init\n" +MSG.IRQ >CSTRING " - Interrupt Manager...\n" +MSG.MEM >CSTRING " - Memory Manager...\n" +MSG.EVT >CSTRING " - Event Manager...\n" +MSG.FLT >CSTRING " - Path Filter...\n" +MSG.TSK >CSTRING " - Task Manager...\n" +MSG.Prefix >CSTRING "Prefix:%S\n" +MSG.Startup >CSTRING "Executing Kernel Startup Script...\nCmd:%S\n" +MSG.StartupErr >CSTRING "Failed : [$%h]\n" +MSG.Init3.OK >CSTRING "A2osX[Stage3]:Complete.\n" +*-------------------------------------- MAN SAVE SYS/KERNEL.S.INIT3 LOAD SYS/KERNEL.S diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt index 6961fd0e..6ec08f38 100644 --- a/SYS/KERNEL.S.MEM.txt +++ b/SYS/KERNEL.S.MEM.txt @@ -320,14 +320,14 @@ K.FreeMemA phy >PUSHYA >LDYAI K.FreeMemA.ERR - jsr K.PStrOutYA + jsr K.PrintFYA .91 ldx #$ff bit $C000,x bit $C000,x bra * *-------------------------------------- -K.FreeMemA.ERR >PSTRING "***MemMgr:Attempt to Free an already freed hMem at $%H" +K.FreeMemA.ERR >CSTRING "***MemMgr:Attempt to Free an already freed hMem at $%H" *-------------------------------------- * K.GetMemPtrA * In: diff --git a/SYS/KERNEL.S.RUN.txt b/SYS/KERNEL.S.RUN.txt index 0971a0e4..98ddb50c 100644 --- a/SYS/KERNEL.S.RUN.txt +++ b/SYS/KERNEL.S.RUN.txt @@ -31,7 +31,7 @@ K.KernelRun jsr TSK.TskMgrRun bpl .10 >LDYAI MSG.DumpEvent - jsr K.PStrOutYA + jsr K.PrintFYA .2 jsr EVT.DestroyEvent @@ -78,11 +78,11 @@ K.KernelRun jsr TSK.TskMgrRun *-------------------------------------- .9 jsr DevMgr.SYS.Select >LDYAI MSG.KRNLPANIC - jsr K.PStrOutYA + jsr K.PrintFYA bra * *-------------------------------------- -MSG.DumpEvent >PSTRING "!Unhandled Event:Flags=%h,DevID=%h,DATALO=%h,DATAHI=%h,W1=%H,W2=%H\n" -MSG.KRNLPANIC >PSTRING "\n!!!Kernel Panic!!!\n" +MSG.DumpEvent >CSTRING "!Unhandled Evt:F=%b,DevID=$%h,DATALO=$%h,DATAHI=$%h,W1=$%H,W2=$%H\n" +MSG.KRNLPANIC >CSTRING "\n!!!Kernel Panic!!!\n" *-------------------------------------- MAN SAVE SYS/KERNEL.S.RUN