Another Bunch of fixes:

-Loader is now working (todo:rename to A2osX.system,tSYS) -most of BINs working -CR->CR/LF
2015-03-14 22:47:37 +01:00 · 2015-03-14 22:47:37 +01:00 · f34e2b5f7c
parent 36e174bbf2
commit f34e2b5f7c
22 changed files with 3330 additions and 3293 deletions
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@ -1,15 +1,15 @@
 PR#3
-PREFIX /DATA/A2OS
+PREFIX /DATA/A2OSX
 NEW
 INC 1
 AUTO 6
 					.LIST OFF
 					.OP	65C02
 					.OR $2000
-					.TF	/DATA/A2OS/BIN/ASM
+					.TF	BIN/ASM
 *---------------------------------------
 					.INB INC/MACROS.I
-					.INB INC/A2OS.I
+					.INB INC/A2OSX.I
 					.INB INC/LIBSTR.I
 *---------------------------------------
 SYM.BLOCK.SIZE		.EQ 4096
@ -24,7 +24,7 @@ CS.START			cld
 					jmp (.1,x)
 .1					.DA CS.INIT
 					.DA CS.RUN
-					.DA CS.EVENT		
+					.DA CS.DOEVENT		
 					.DA	CS.QUIT
 L.LIBSTR			.DA LIBSTR
 L.MSG.HELP1			.DA MSG.HELP1
@ -44,7 +44,7 @@ CS.INIT				>LIBLOADP L.LIBSTR
 					bne .1
 					
 					ldy #S.PS.hARGS
-					lda (TSKMGR.TSKPTR),y
+					lda (pPsContext),y
 					bne CS.INIT.ARGS
 					
 					>PUSHW L.MSG.HELP1
@ -68,21 +68,21 @@ CS.INIT.ARGS		>SYSCALL SYS.GetMemPtrA
 					cmp #'/'
 					bne .2
 					ldy #S.PS.hARGS
-					lda (TSKMGR.TSKPTR),y
+					lda (pPsContext),y
 					>SYSCALL SYS.PStrCpyA
 					bra CS.INIT.ARGS.OK
 					
 .2					ldy #S.PS.hARGS
-					lda (TSKMGR.TSKPTR),y
+					lda (pPsContext),y
 					>PUSHA
 					ldy #S.PS.hPREFIX
-					lda (TSKMGR.TSKPTR),y
+					lda (pPsContext),y
 					>PUSHA
 					>SYSCALL SYS.PStrCat
 					
 CS.INIT.ARGS.OK		sta SRC.hFILENAMES
 					
-					>SYSCALL SYS.OpenFileA
+					>SYSCALL SYS.MLIOpenA
 					bcc CS.INIT.OPEN
 					sec
 					rts
@ -91,7 +91,7 @@ CS.INIT.OPEN		sta SRC.hREFNUMS
 					stx SRC.hBUFFERS
 					inc SRC.COUNT
 					lda SRC.hFILENAMES
-					>SYSCALL SYS.GetFileInfoA
+					>SYSCALL SYS.MLIGetFileInfoA
 					bcs .99
 					
 					>STYA ZPQuickPtr1
@ -103,7 +103,7 @@ CS.INIT.OPEN		sta SRC.hREFNUMS
 					>PUSHBI $0D
 					>PUSHBI $FF
 					>PUSHB SRC.hREFNUMS
-					>SYSCALL SYS.NewLine
+					>SYSCALL SYS.MLINewLine
 					bcs .99

 .1					cmp #$FA			BAS?
@ -111,9 +111,9 @@ CS.INIT.OPEN		sta SRC.hREFNUMS

 					stz bSTOP
 					stz bCANCEL
-					lda (TSKMGR.TSKPTR)
+					lda (pPsContext)
 					ora #S.PS.F.EVENT		Now accept events
-					sta (TSKMGR.TSKPTR)
+					sta (pPsContext)

 					clc
 					rts
@ -229,22 +229,22 @@ CS.RUN.READLINE.YA	>PUSHYA
 					ldx SRC.COUNT
 					lda SRC.hREFNUMS-1,x
 					>PUSHA
-					>SYSCALL SYS.ReadFile
+					>SYSCALL SYS.MLIRead
 					rts
 *--------------------------------------
-CS.EVENT			ldy #S.EVT.hDEV		is Event from active IN device?
-					lda (EVTMGR.EVTPTR),y
+CS.DOEVENT			ldy #S.EVT.hDEV		is Event from active IN device?
+					lda (pEvent),y
 					ldy #S.PS.hINDEV
-					cmp (TSKMGR.TSKPTR),y
+					cmp (pPsContext),y
 					bne .9
-					lda (EVTMGR.EVTPTR)
+					lda (pEvent)
 					and #S.EVT.F.KEY		is it a KEY event?
 					beq .9
 					ldy #S.EVT.DATAHI		is it an O or SAPPLE key ?
-					lda (EVTMGR.EVTPTR),y
+					lda (pEvent),y
 					bne	.9
 					ldy #S.EVT.DATALO	
-					lda (EVTMGR.EVTPTR),y
+					lda (pEvent),y
 					cmp #$03				Ctrl-C
 					bne .1
 					lda #$FF
@ -265,7 +265,7 @@ CS.QUIT				ldx SRC.COUNT
 					beq .1
 					
 					lda SRC.hREFNUMS-1,x
-					>SYSCALL SYS.CloseFileA
+					>SYSCALL SYS.MLICloseA
 					
 					ldx SRC.COUNT
 					lda SRC.hFILENAMES-1,x
@ -378,5 +378,5 @@ SYM.BLOCKS			.BS SYM.BLOCK.MAX
 DS.END
 *---------------------------------------
 MAN
-SAVE /DATA/A2OS/BIN/ASM.S
+SAVE BIN/ASM.S
 ASM
--- a/BIN/CP.S.txt
+++ b/BIN/CP.S.txt
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
--- a/BIN/HWINFO.S.txt
+++ b/BIN/HWINFO.S.txt
--- a/BIN/MD.S.txt
+++ b/BIN/MD.S.txt
--- a/BIN/MV.S.txt
+++ b/BIN/MV.S.txt
--- a/BIN/RM.S.txt
+++ b/BIN/RM.S.txt
--- a/BIN/TEST.S.txt
+++ b/BIN/TEST.S.txt
@ -33,6 +33,7 @@ L.MSG1			.DA MSG1
 L.MSG2			.DA MSG2
 L.MSG3			.DA MSG3
 L.SSCANF.IP		.DA SSCANF.IP
+L.PRINTF.IP		.DA PRINTF.IP
 L.DST.IP		.DA DST.IP
 L.TEST1			.DA TEST1
 L.TEST2			.DA TEST2
@ -44,19 +45,15 @@ L.TEST3			.DA TEST3
 CS.INIT			>LIBLOADP L.LIBSTR
 				sta hLIBSTR

-				ldy #S.PS.hOUTDEV
-				lda (TSKMGR.TSKPTR),y
-				>SYSCALL SYS.DevSelectA
-				
 				ldy #S.PS.hPREFIX
-				lda (TSKMGR.TSKPTR),y
+				lda (pPsContext),y
 				>SYSCALL SYS.GetMemPtrA
 				>PUSHYA
 				>PUSHW L.MSG0
 				>LIBCALL hLIBSTR,LIBSTR.PRINTF
 				
 				ldy #S.PS.hCS
-				lda (TSKMGR.TSKPTR),y
+				lda (pPsContext),y
 				>SYSCALL SYS.GetMemByIDA
 				>STYA ZPQuickPtr1
 				ldy #S.MEM.BIN
@ -67,18 +64,18 @@ CS.INIT			>LIBLOADP L.LIBSTR
 				>LIBCALL hLIBSTR,LIBSTR.PRINTF

 				ldy #S.PS.hARGS
-				lda (TSKMGR.TSKPTR),y
+				lda (pPsContext),y
 				>SYSCALL SYS.GetMemPtrA
 				>PUSHYA
 				ldy #S.PS.hCMD
-				lda (TSKMGR.TSKPTR),y
+				lda (pPsContext),y
 				>SYSCALL SYS.GetMemPtrA
 				>PUSHYA
 				>PUSHW L.MSG2
 				>LIBCALL hLIBSTR,LIBSTR.PRINTF

 				ldy #S.PS.hENV
-				lda (TSKMGR.TSKPTR),y
+				lda (pPsContext),y
 				>SYSCALL SYS.GetMemPtrA
 				>STYA ZPBIN

@ -100,27 +97,36 @@ CS.INIT			>LIBLOADP L.LIBSTR
 				>PUSHW L.TEST1	
 				>LIBCALL hLIBSTR,LIBSTR.SSCANF

-				lda DST.IP+3
-				jsr PRBYTE
-				jsr CROUT
+				>PUSHB DST.IP+3
+				>PUSHB DST.IP+2
+				>PUSHB DST.IP+1
+				>PUSHB DST.IP
+				>PUSHW L.PRINTF.IP
+				>LIBCALL hLIBSTR,LIBSTR.PRINTF

 				>PUSHW L.DST.IP
 				>PUSHW L.SSCANF.IP
 				>PUSHW L.TEST2
 				>LIBCALL hLIBSTR,LIBSTR.SSCANF

-				lda DST.IP+3
-				jsr PRBYTE
-				jsr CROUT
+				>PUSHB DST.IP+3
+				>PUSHB DST.IP+2
+				>PUSHB DST.IP+1
+				>PUSHB DST.IP
+				>PUSHW L.PRINTF.IP
+				>LIBCALL hLIBSTR,LIBSTR.PRINTF

 				>PUSHW L.DST.IP
 				>PUSHW L.SSCANF.IP
 				>PUSHW L.TEST3	
 				>LIBCALL hLIBSTR,LIBSTR.SSCANF

-				lda DST.IP+3
-				jsr PRBYTE
-				jsr CROUT
+				>PUSHB DST.IP+3
+				>PUSHB DST.IP+2
+				>PUSHB DST.IP+1
+				>PUSHB DST.IP
+				>PUSHW L.PRINTF.IP
+				>LIBCALL hLIBSTR,LIBSTR.PRINTF

 				lda #0					tell TSKMGR that all done ok, but 
 				sec						we do not want to stay in memory
@ -135,6 +141,36 @@ CS.QUIT			lda hLIBSTR
 				clc
 				rts
 *--------------------------------------
+PRBYTE			pha
+				lsr
+				lsr
+				lsr
+				lsr
+				ora #$B0
+				cmp #$BA
+				bcc .1
+				adc #6
+.1				jsr COUT
+				pla
+PRHEX			and #$0F
+				ora #$B0
+				cmp #$BA
+				bcc COUT
+				adc #6
+				bra COUT
+*--------------------------------------
+CROUT			lda #13	
+*--------------------------------------
+COUT			phx
+				phy
+				>PUSHA
+				ldy #S.PS.hOUTDEV
+				lda	(pPsContext),y
+				>SYSCALL SYS.DevOutA
+				ply
+				plx
+				rts
+*--------------------------------------
 CS.END			
 hLIBSTR			.BS	1
 LIBSTR			>PSTRING "libstr.o"
@ -146,6 +182,7 @@ TEST1			>PSTRING "198.168.1.1"
 TEST2			>PSTRING "198.168.1.23"
 TEST3			>PSTRING "198.168.1.4"
 SSCANF.IP		>PSTRING "%d.%d.%d.%d"
+PRINTF.IP		>CSTRING "IP=%d.%d.%d.%d\n"
 DST.IP			.BS 4
 *--------------------------------------
 MAN
--- a/BIN/UMOUNT.S.txt
+++ b/BIN/UMOUNT.S.txt