Kernel 0.94

BIN/CSH.D.txt

@@ -25,6 +25,6 @@ CSH.StackPtr	.BS 1
 CSH.VarDef		.BS 6
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.D
+SAVE usr/src/bin/csh.d
-LOAD USR/SRC/BIN/CSH.S
+LOAD usr/src/bin/csh.s
 ASM

BIN/CSH.E.txt

@@ -18,6 +18,6 @@ CSH.E.OOM		.EQ $D2
 CSH.E.DUP		.EQ $D3
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.E
+SAVE usr/src/bin/csh.e
-LOAD USR/SRC/BIN/CSH.S
+LOAD usr/src/bin/csh.s
 ASM

BIN/CSH.I.txt

@@ -77,6 +77,7 @@ CSH.BOPS		>PSTR "+"
 * Reserved Directives:
 *--------------------------------------
 CSH.DIRS		>PSTR "define"
+				>PSTR "include"
 				.HS 00
 *--------------------------------------
 * Reserved Keywords:
@@ -192,6 +193,6 @@ CSH.FN
 				.DA #0
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.I
+SAVE usr/src/bin/csh.i
-LOAD USR/SRC/BIN/CSH.S
+LOAD usr/src/bin/csh.s
 ASM

BIN/CSH.R.txt

@@ -50,6 +50,7 @@ L.CSH.DIRS		.DA CSH.DIRS
 L.CSH.KW		.DA CSH.KW
 L.CSH.STYPES	.DA CSH.STYPES
 J.CSH.DIRS		.DA CSH.DIR.DEFINE
+				.DA CSH.DIR.INCLUDE
 J.CSH.KW		.DA CSH.IF
 				.DA CSH.WHILE
 				.DA CSH.ELSE
@@ -96,6 +97,6 @@ J.CSH.EXEC		.DA EXEC.log
 				.DA EXEC.malloc
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.R
+SAVE usr/src/bin/csh.r
-LOAD USR/SRC/BIN/CSH.S
+LOAD usr/src/bin/csh.s
 ASM

BIN/CSH.S.CORE.txt

@@ -199,7 +199,7 @@ CSH.DIR			jsr CSH.GetNextCharNB
 				cmp #'!'				#!/bin/csh
 				bne .1
 
-				bra CSH.SkipLine
+				jmp CSH.SkipLine
 
 .1				>LDYA L.CSH.DIRS
 				jsr CSH.LookupID
@@ -254,6 +254,32 @@ CSH.DIR.DEFINE	jsr CSH.CheckSpace
 				>SYSCALL SListAddData
 				bcs .99
 
+				bra CSH.SkipLine
+
+.90				lda #CSH.E.SYNTAX
+				sec
+.99				rts
+*--------------------------------------
+CSH.DIR.INCLUDE	jsr CSH.CheckSpace
+				bcs .99
+
+				cmp #'"'
+				beq .1
+
+				cmp #'<'
+				bne .80
+
+
+
+
+				lda #'>'
+.1				sta ArgIndex
+
+
+
+
+
+
 				bra CSH.SkipLine
 
 .90				lda #CSH.E.SYNTAX
@@ -609,8 +635,7 @@ CSH.fCall		ldx ZPPtr1
 .99				rts
 
 *--------------------------------------
-CSH.fCall.Exec
+CSH.fCall.Exec	jmp (J.CSH.EXEC,x)
-				jmp (J.CSH.EXEC,x)
 *--------------------------------------
 * Input:
 *   ZPFileBufPtr, A = Expected type
@@ -1429,6 +1454,6 @@ DEBUG.VAR		>SYSCALL PutChar
 				rts
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.S.CORE
+SAVE usr/src/bin/csh.s.core
-LOAD USR/SRC/BIN/CSH.S
+LOAD usr/src/bin/csh.s
 ASM

BIN/CSH.S.EXEC.txt

@@ -275,6 +275,6 @@ EXEC.malloc		>PULLYA
 				rts
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.S.EXEC
+SAVE usr/src/bin/csh.s.exec
-LOAD USR/SRC/BIN/CSH.S
+LOAD usr/src/bin/csh.s
 ASM

BIN/CSH.S.txt

@@ -5,12 +5,12 @@ NEW
 				.OR	$2000
 				.TF bin/csh
 *--------------------------------------
-				.INB INC/MACROS.I
+				.INB inc/macros.i
-				.INB INC/A2OSX.I
+				.INB inc/a2osx.i
-				.INB INC/MLI.I
+				.INB inc/mli.i
-				.INB INC/MLI.E.I
+				.INB inc/mli.e.i
 *--------------------------------------
-				.INB USR/SRC/BIN/CSH.E
+				.INB usr/src/bin/csh.e
 *--------------------------------------
 * Zero Page Segment, up to 32 bytes
 *--------------------------------------
@@ -21,25 +21,22 @@ ZPFileBuf		.BS 2
 ZPFileBufPtr	.BS 2
 ZPFileBufPtrBak	.BS 2
 
+
 ZPCSHConst		.BS 2
 ZPCSHData		.BS 2
 ZPCSHStack		.BS 2
 
-ZPVarID			.BS 2
 
+ZPVarID			.BS 2
 ZPVarDef		.EQ *
 ZPVarType		.BS 2
 ZPVarSizeOf		.BS 2
 ZPVarDataPtr	.BS 2
 
 ZPhMacro		.BS 1
-
+ArgIndex		.BS 1
 ZPPtr1			.BS 2
 ZPPtr2			.BS 2
-
-
-ArgIndex		.BS 1
-
 ZPPtr3			.BS 2
 
 ZS.END			.ED
@@ -70,7 +67,7 @@ L.MSG.ECHOCRLF	.DA MSG.ECHOCRLF
 L.MSG.DEBUG		.DA MSG.DEBUG
 L.MSG.ERR		.DA MSG.ERR
 L.MSG.DBGVAR	.DA MSG.DBGVAR
-				.INB USR/SRC/BIN/CSH.R
+				.INB usr/src/bin/csh.r
 				.DA 0
 *--------------------------------------
 * Called once at process creation
@@ -295,8 +292,8 @@ PrintTraceMsg.3	>PUSHBI '>'
 
 				rts
 *--------------------------------------
-				.INB USR/SRC/BIN/CSH.S.CORE
+				.INB usr/src/bin/csh.s.core
-				.INB USR/SRC/BIN/CSH.S.EXEC
+				.INB usr/src/bin/csh.s.exec
 *--------------------------------------
 CS.END
 *--------------------------------------
@@ -314,16 +311,16 @@ MSG.DBGVAR		.AZ "K=%H, T=%H, S=%H, P=%H, V=%L\r\n"
 OptionList		.AS "DdTt"
 OptionVars		.DA #bDebug,#bDebug,#bTrace,#bTrace
 *--------------------------------------
-				.INB USR/SRC/BIN/CSH.I
+				.INB usr/src/bin/csh.i
 *--------------------------------------
 				.DUMMY
 				.OR 0
-DS.START		.INB USR/SRC/BIN/CSH.D
+DS.START		.INB usr/src/bin/csh.d
 bDebug			.BS 1
 bTrace			.BS 1
 DS.END
 				.ED
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/CSH.S
+SAVE usr/src/bin/csh.s
 ASM

DRV/UTHER2.AI.DRV.S.txt

@@ -353,7 +353,7 @@ OPEN.I			jsr CLOSE
 				rts
 *--------------------------------------
 OPEN.SnY		>AR.Sn.SELECT S0.MR
-				lda #W5100.AR.Sn.MR.IPRAW+W5100.AR.Sn.MR.MF
+				lda #W5100.AR.Sn.MR.IPRAW
 				sta W5100.DR,x
 
 				>AR.Sn.SELECT S0.PROTO

INCLUDE/a2osx.h.txt

@@ -12,4 +12,4 @@ NEW
 short int fopen ( const char *, short int, short int, int );
   
 MAN
-SAVE include/A2osX.h
+TEXT include/A2osX.h