Fixed SYS/KM folder

BIN/CC.S.DECL.txt

@@ -2,7 +2,62 @@ NEW
   AUTO 3,1
 				.LIST OFF
 *--------------------------------------
-CC.DECL.
+CC.DECL			jsr CC.IsLetter
+				bcc .10
+
+* TODO: PREOPS ++ --.....
+
+				bcs .90
+				
+.10				>LDYA L.CC.SCSPEC
+				jsr CC.LookupID
+				bcs .20
+
+* TODO: typedef ....
+
+				bcs .90
+*--------------------------------------
+.20				>LDYA L.CC.TYPEQUAL
+				jsr CC.LookupID
+				bcs .80
+
+				jsr CC.TYPE.Decl
+				bcs .99
+
+				ldx #SYM.SC.STATIC		Y,A = Type/Qual
+				bit ScopenCnt
+				bpl .21
+
+				bit #SYM.Q.FUNC			someone wants to add a local f() ?
+				bne .90
+
+				ldx #SYM.SC.AUTO
+
+.21				jsr CC.SYM.New			Y,A=T/Q, add with undef value...
+				bcs .99
+
+
+
+
+
+.80				bit #$60
+				clc
+				rts
+
+.90				lda #E.CSYN
+				sec
+.99				rts
+*--------------------------------------
+CC.SCSPEC.AUTO
+CC.SCSPEC.REGISTER
+CC.SCSPEC.STATIC
+CC.SCSPEC.EXTERN
+CC.SCSPEC.TYPEDEF
+
+
+.99				lda #E.CSYN
+				sec
+.9				rts
 *--------------------------------------
 MAN
 SAVE usr/src/bin/cc.s.decl

BIN/CC.S.DIR.txt

@@ -32,6 +32,8 @@ CC.DIR.DEFINE	jsr CC.CheckSpace
 
 				>STYA ZPSymID
 
+				jsr CC.SkipX
+
 				jsr CC.CheckSpace
 				bcs .99
 

BIN/CC.S.KW.txt

@@ -278,8 +278,7 @@ CC.KW.RETURN	ldy CStackPtr
 				rts
 *--------------------------------------
 CC.KW.SIZEOF
-*--------------------------------------
+				lda #E.CSYN
-CC.KW.TYPEDEF	lda #E.CSYN
 				sec
 				rts
 *--------------------------------------
@@ -297,6 +296,8 @@ CC.KW.STRUCT	>ENTER 4
 				ldy #1
 				sta (pStack),y
 				
+				jsr CC.SkipX
+
 				jsr CC.GetNextCharNB
 				bcs .99
 

BIN/CC.S.SYM.txt

@@ -14,7 +14,8 @@ CC.SYM.New		>STYA ZPPtr2			T/Q
 				jsr CC.SYM.NewKey
 				bcs .9
 
-				>STYA ZPSymID			Y,A = KeyID, X = KeyLen
+				>STYA ZPSymID			Y,A = KeyID
+				stx ZPPtr3+1			X = KeyLen
 
 				>LDYAI 256
 				>SYSCALL GetMem
@@ -34,6 +35,11 @@ CC.SYM.New		>STYA ZPPtr2			T/Q
 				sta ZPSymSize
 				stz ZPSymSize+1
 
+				ldx ZPPtr3+1			Key Len
+				jsr CC.SYM.Link
+				
+				jsr CC.SkipX
+
 				jsr CC.GetCharNB
 				bcs CC.SYM.SetAddr
 
@@ -174,25 +180,9 @@ CC.SYM.SetAddrL	jsr CC.SYM.GetSymSizeOfInAXC
 CC.SYM.NewKey	>PUSHA
 				>PUSHW ZPLineBufPtr
 				>SYSCALL SListNewKey
-				bcs .9
+*				bcs .9
 
-				phy
+*				clc						Y,A = KeyID, X = KeyLen
-				pha
-
-				lda #0
-				ldy #SYM.Addr
-				sta (ZPSymBufPtr),y
-				iny
-				sta (ZPSymBufPtr),y
-
-				jsr CC.SYM.Link
-
-				jsr CC.SkipX
-
-				clc
-
-				pla						Y,A = KeyID, X = KeyLen
-				ply
 
 .9				rts
 *--------------------------------------
@@ -203,6 +193,12 @@ CC.SYM.Link		>LDYA L.CC.LIBC
 
 				phx
 
+				lda #0
+				ldy #SYM.Addr
+				sta (ZPSymBufPtr),y
+				iny
+				sta (ZPSymBufPtr),y
+
 				ldx #0
 
 .1				lda (ZPLookupPtr)

BIN/CC.S.txt

@@ -155,6 +155,7 @@ J.CC.cBOPS		.DA CC.BOPS.cMUL
 				.DA CC.BOPS.LOR
 L.CC.DIRS		.DA CC.DIRS
 L.CC.KW			.DA CC.KW
+L.CC.SCSPEC		.DA CC.SCSPEC
 L.CC.TYPEQUAL	.DA CC.TYPEQUAL
 L.CC.TYPESPEC	.DA CC.TYPESPEC
 L.CC.TYPES		.DA CC.TYPES
@@ -174,7 +175,6 @@ J.CC.KW			.DA CC.KW.IF
 				.DA CC.KW.RETURN
 *--------------------------------------
 				.DA CC.KW.SIZEOF
-				.DA CC.KW.TYPEDEF
 				.DA CC.KW.STRUCT
 *--------------------------------------
 J.CC.KW.END		.DA CC.KW.IF.END
@@ -183,6 +183,11 @@ J.CC.KW.END		.DA CC.KW.IF.END
 				.DA CC.KW.DO.END
 				.DA CC.KW.FOR.END
 *--------------------------------------
+J.CC.SCSPEC		.DA CC.SCSPEC.AUTO
+				.DA CC.SCSPEC.REGISTER
+				.DA CC.SCSPEC.STATIC
+				.DA CC.SCSPEC.EXTERN
+				.DA CC.SCSPEC.TYPEDEF
 J.CC.TYPEQUAL	.DA CC.TYPE.CONST
 				.DA CC.TYPE.VOLATILE
 J.CC.TYPESPEC	.DA CC.TYPE.SIGNED
@@ -839,11 +844,15 @@ CC.KW			>PSTR "if"
 				>PSTR "continue"
 				>PSTR "return"
 				>PSTR "sizeof"
-				>PSTR "typedef"
 				>PSTR "struct"
 				.HS 00
 *--------------------------------------
-* Type Declaration
+CC.SCSPEC		>PSTR "auto"
+				>PSTR "register"
+				>PSTR "static"
+				>PSTR "extern"
+				>PSTR "typedef"
+				.HS 00
 *--------------------------------------
 CC.TYPEQUAL		>PSTR "const"			ALL
 				>PSTR "volatile"

BIN/UNAME.S.txt

@@ -60,6 +60,9 @@ L.TYPES			.DA TYPE.UNKNOWN
 				.DA TYPE.IIe
 				.DA TYPE.IIc
 				.DA TYPE.IIgs
+L.SUBT.ROM		.DA SUBT.ROM
+L.SUBT.IIE		.DA SUBT.ENH
+				.DA SUBT.LCCARD
 L.CPUS			.DA CPU.65C02
 				.DA CPU.65R02
 				.DA CPU.65816
@@ -122,12 +125,7 @@ CS.RUN.PRINT	bit bHostName
 .1				bit bMachineType
 				bpl .2
 
-				lda A2osX.HWType
+				jsr CS.RUN.TYPESUBT
-				asl
-				tax
-				
-				>LDYA L.TYPES,x
-				jsr CS.RUN.PRINTYA
 
 .2				bit bCPUType
 				bpl .3
@@ -263,6 +261,37 @@ CS.RUN.GetFile	stz hFILE
 				plp
 				rts
 *--------------------------------------
+CS.RUN.TYPESUBT	lda A2osX.HWType
+				asl
+				tax
+
+				>LDYA L.TYPES,x
+				jsr CS.RUN.PRINTYA
+
+				lda A2osX.HWType
+				beq .8					Unknown
+
+				cmp #A2osX.HWType.IIc
+				bcc .1
+
+				>PUSHW L.SUBT.ROM		//c & IIgs
+				>PUSHB A2osX.HWSubT
+				>PUSHBI 1
+				>SYSCALL PrintF
+				rts
+
+.1				lda A2osX.HWSubT		//e
+				beq .8
+
+				asl
+				tax
+
+				>PUSHW L.SUBT.IIE-2,x
+				>PUSHBI 0
+				>SYSCALL PrintF
+
+.8				rts
+*--------------------------------------
 CS.RUN.PRINTYA	>PUSHYA
 				>PUSHBI 0
 
@@ -335,6 +364,9 @@ TYPE.UNKNOWN	.AZ "Unknown_HW"
 TYPE.IIe		.AZ "Apple//e"
 TYPE.IIc		.AZ "Apple//c"
 TYPE.IIgs		.AZ "AppleIIgs"
+SUBT.ROM		.AZ "_ROM%h"
+SUBT.ENH		.AZ "_Enh"
+SUBT.LCCARD		.AZ "_LCCard"
 CPU.65C02		.AZ "65c02"
 CPU.65R02		.AZ "65r02"
 CPU.65816		.AZ "65816"

SYS/KM.APPLETALK.S.txt

@@ -3,7 +3,7 @@ NEW
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
-				.TF sys/km.appletalk
+				.TF sys/km/km.appletalk
 *--------------------------------------
 				.INB inc/macros.i
 				.INB inc/io.i

SYS/KM.NSC.S.txt

@@ -3,7 +3,7 @@ NEW
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
-				.TF sys/km.nsc
+				.TF sys/km/km.nsc
 *--------------------------------------
 				.INB inc/macros.i
 				.INB inc/io.i

SYS/KM.RAMWORKS.S.txt

@@ -3,7 +3,7 @@ NEW
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
-				.TF sys/km.ramworks
+				.TF sys/km/km.ramworks
 *--------------------------------------
 				.INB inc/macros.i
 				.INB inc/io.i

SYS/KM.VSDRIVE.S.txt

@@ -3,7 +3,7 @@ NEW
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
-				.TF sys/km.vsdrive
+				.TF sys/km/km.vsdrive
 *--------------------------------------
 				.INB inc/macros.i
 				.INB inc/io.i