Kernel 0.93

BIN/ASM.S.SRC.txt

@@ -27,10 +27,10 @@ SRC.ParseLine	jsr OUT.Reset
 				jsr SRC.ParseLine.LABEL
 				bcs .9
 				
-				>LDA.G SYM.bNewGlobal
+*				>LDA.G SYM.bNewGlobal
-				bpl .8
+*				bpl .8
 
-				jmp SYM.StoreGlobal
+*				jmp SYM.StoreGlobal
 				
 .8				clc
 .9				rts

BIN/ASM.S.SYM.txt

@@ -82,7 +82,7 @@ SYM.Dump		>LDA.G ASM.LI.ON
 
 .1				>LDYA ZPPtr2
 				>STYA ZPPtr1
-				
+
 				>PUSHW ZPNameBuf	
 				>PUSHW ZPPtr1
 				>LDA.G SYM.hGlobalList
@@ -91,19 +91,13 @@ SYM.Dump		>LDA.G ASM.LI.ON
 				
 				>STYA ZPPtr2			Save Next ID
 				
-				>PUSHW ZPNameBuf		Label (PString)
-				>PUSHBI 2
-				>LDYA L.MSG.PSTR
-				>SYSCALL printf
-.9				bcs SYM.Quit.RTS
-				
 				>PUSHWI 0				Start
 				>PUSHWI $ffff			End
 				>PUSHW ZPGlobalBuf
 				>PUSHW ZPPtr1			KeyID
 				>LDA.G SYM.hGlobalList
 				>SYSCALL SListGetData
-				bcs .9
+				bcs SYM.Quit.RTS
 				
 				ldy #SYMG.SIZE			Get Symbol Size
 				lda (ZPGlobalBuf),y
@@ -129,6 +123,11 @@ SYM.Dump		>LDA.G ASM.LI.ON
 				lda L.MSG.EQU0+1,x
 				>SYSCALL printf
 
+				>PUSHW ZPNameBuf		Label
+				>PUSHBI 2
+				>LDYA L.MSG.LABEL
+				>SYSCALL printf
+
 				lda (ZPGlobalBuf)
 				bit #SYMG.F.LOCALS
 				beq .7
@@ -162,7 +161,7 @@ SYM.Dump		>LDA.G ASM.LI.ON
 .7				>PUSHBI 0
 				>LDYA L.MSG.CRLF
 				>SYSCALL printf
-				jmp .1
+				jmp .1			
 *---------------------------------------
 SYM.NewOrGetGlobal
 				>LDA.G ASM.PASS
@@ -260,7 +259,7 @@ SYM.LookupGlobal
 SYM.StoreGlobal	>LDA.G ASM.PASS
 				bne .8
 
-				>LDA.G SYM.StoreGlobal
+				>LDA.G SYM.bNewGlobal
 				bpl .8
 	
 				>LDA.G SYM.GlobalPtr
@@ -337,7 +336,7 @@ SYM.Lookup2Acc	ldy #SYMG.F+4
 *---------------------------------------
 SYM.NewOrGetLocalA
 				tax						Save ID
-				
+				>DEBUG				
 				>LDA.G SYM.bNewGlobal	not in a global label
 				bpl .91
 				

BIN/ASM.S.txt

@@ -124,8 +124,7 @@ L.MSG.LSYMBOL	.DA MSG.LSYMBOL
 L.MSG.SRCLINE	.DA MSG.SRCLINE
 L.MSG.ERROR		.DA MSG.ERROR
 L.MSG.SYMBOLS	.DA MSG.SYMBOLS
-L.MSG.PSTRCRLF	.DA MSG.PSTRCRLF
+L.MSG.LABEL		.DA MSG.LABEL
-L.MSG.PSTR		.DA MSG.PSTR
 L.MSG.CRLF		.DA MSG.CRLF
 L.MSG.SUMMARY	.DA MSG.SUMMARY
 L.MSG.PASS		.DA MSG.PASS
@@ -345,6 +344,7 @@ CS.RUN			ldy #S.PS.hStdIn
 
 .9				pha
 				jsr OUT.PrintLineErr
+
 				jsr SYM.Dump
 				pla
 				sec
@@ -463,8 +463,7 @@ MSG.LSYMBOL		.AZ ", .%d=%h%h%h%h"
 MSG.SRCLINE		.AZ " %05D %s\r\n"
 MSG.ERROR		.AZ "*** Fatal Error $%h "
 MSG.SYMBOLS		.AZ "Symbol Table:"
-MSG.PSTRCRLF	.AZ " %S\r\n"
+MSG.LABEL		.AZ " %s "
-MSG.PSTR		.AZ " %S"
 MSG.CRLF		.AZ " \r\n"
 MSG.SUMMARY		.AZ "\r\nSymbol Table Size : %5D Bytes.\r\nEnd Of Assembly.\r\n"
 SRC.MOD.RESERVED	>PSTR "#/^<>"

SYS/KERNEL.S.SLIST.txt

@@ -196,7 +196,9 @@ SLIST.GetByID	jsr SLIST.Select
 				
 				ldy #0
 				
-.1				jsr SLIST.GetNextByte
+.1				phy
+				jsr SLIST.GetNextByte
+				ply
 				jsr MEM.SetKeyCharY
 				iny
 				dex