Kernel 0.94

BIN/CSH.D.txt

@@ -5,6 +5,7 @@ NEW
 PathBuf			.BS 65
 
 hFileBuf		.BS 1
+hIncludeBuf		.BS 1
 
 CSH.BufPtrSave	.BS 2
 CSH.CmdSave		.BS 1

BIN/CSH.S.CORE.txt

@@ -52,11 +52,6 @@ CSH.Init		>SYSCALL SListNew
 				lda #0
 				>STA.G CSH.ConstPtr
 				>STA.G CSH.StackPtr
-*				sta (ZPCSHConst)
-*				sta (ZPCSHStack)
-
-*				>DEC.G bTrace
-*				>DEC.G bDebug
 *				clc
 .9				rts
 *--------------------------------------
@@ -78,7 +73,12 @@ CSH.Quit		>LDA.G CSH.hSymbols
 				>PUSHA
 				>SYSCALL SListFree
 
-.3				lda ZPhMacro
+.3				>LDA.G hIncludeBuf
+				beq .4
+				
+				>SYSCALL FClose
+
+.4				lda ZPhMacro
 				jsr .7
 
 				>LDA.G hFileBuf
@@ -250,8 +250,6 @@ CSH.DIR.DEFINE	jsr CSH.CheckSpace
 
 .2				iny
 
-				lda #0
-				pha
 				phy
 
 				>PUSHB.G CSH.hDefines
@@ -259,13 +257,13 @@ CSH.DIR.DEFINE	jsr CSH.CheckSpace
 				>PUSHW ZPFileBufPtr
 
 				ply
-				pla
+				lda #0
 				>PUSHYA					DataLen
 
 				>SYSCALL SListAddData
 				bcs .99
 
-				bra CSH.SkipLine
+				jmp CSH.SkipLine
 
 .90				lda #CSH.E.SYNTAX
 				sec
@@ -315,8 +313,19 @@ CSH.DIR.INCLUDE	>STZ.G PathBuf
 
 .8				jsr CSH.GetNextChar		skip " or >
 
-				>LDYA pData
-				>SYSCALL PutS
+				>LDA.G hIncludeBuf
+				bne .90
+				
+				>PUSHW pData
+				>PUSHBI	O.RDONLY
+				>PUSHBI S.FI.T.TXT
+				>PUSHWZ					Aux type
+				>SYSCALL LoadTxtFile
+				bcs .99
+				
+				txa 
+				>STA.G hIncludeBuf
+				
 				rts
 *--------------------------------------
 CSH.SkipLine	jsr CSH.GetNextChar

INCLUDE/stdio.h.txt

@@ -12,7 +12,7 @@ NEW
 fastcall int putchar(short int);
 // int fputc ( hFILE stream , short int character );
 fastcall int puts(const char*);
-// int fputs (hFILE stream, const char * str );
+int fputs (short int, const char*);
 // char *fgets(hFILE stream, char * s, int n);
 short int getchar();
 fastcall short int getc(short int);