Kernel 0.9.1 : 32 bytes ZP for BIN

2018-01-15 06:50:44 +00:00 · 2018-01-15 06:50:44 +00:00 · 0932474116
parent f67d827ad3
commit 0932474116
44 changed files with 5527 additions and 4116 deletions
--- a/.Docs/KERNEL.md
+++ b/.Docs/KERNEL.md
@ -46,6 +46,14 @@ And return, if found, the full path to it.
 + X = DEVID
 + Y,A = DEVSLOT

+# K.GetDevStatus.A
+
+## IN: 
+ A = DevID
+
+## OUT:
+ Y,A = S.DSTAT
+
 # OpenDir.YA

 ## In:
@ -412,7 +420,7 @@ return a hFILE to a new FIFO
 + A = hFILE

 # FPutC.AY
-Print A (char) to File
+Print A (char) to Node

 ## In:
 + A : char to print
@ -441,7 +449,7 @@ Get char from StdIn
 + A = char

 # GetC.A
-Get char from File
+Get char from Node

 ## In:
 + A = hFILE
@ -470,7 +478,7 @@ Write String to StdOut
 + CC = success

 # FGetS
-Read String From FILE
+Read String From Node

 ## In:
 + PUSHW : CPtr 
--- a/.Floppies/A2OSX.BOOT.po
+++ b/.Floppies/A2OSX.BOOT.po
--- a/.Floppies/A2OSX.BUILD.po
+++ b/.Floppies/A2OSX.BUILD.po
--- a/.Floppies/A2OSX.SRC.po
+++ b/.Floppies/A2OSX.SRC.po
--- a/.Tools/ASM.T.xlsm
+++ b/.Tools/ASM.T.xlsm
--- a/BIN/ASM.S.DIR.txt
+++ b/BIN/ASM.S.DIR.txt
@ -25,7 +25,9 @@ DIR.AT				clc
 DIR.AZ				clc
 					rts
 *---------------------------------------
-DIR.BS				jsr EXP.Eval
+DIR.BS				jsr	SRC.GetNextCharNB
+					beq .98
+					jsr EXP.Eval
 					bcs .9
 					
 					lda SRC.ACC+3
@ -214,8 +216,8 @@ DIR.FI				ldy #ASM.DO.Count
 DIR.HS				clc
 					rts
 *---------------------------------------
-DIR.IN				jsr SRC.CheckBlank
-					bcs .9
+DIR.IN				jsr	SRC.GetNextCharNB
+					beq .9
 					
 					>LDYA ZPLinePtr
 					>SYSCALL RealPath.YA
--- a/BIN/ASM.S.FIO.txt
+++ b/BIN/ASM.S.FIO.txt
@ -65,6 +65,39 @@ FIO.LOAD.ASM.T		>STYA ZPPtr2
 					ldy #ASM.T.hMem
 					sta (pData),y
 					
+					>SYSCALL GetMemPtr.A
+					>STYA ZPPtr1
+
+					ldy #ASM.T.AM
+					lda (ZPPtr1),y
+					clc
+					adc ZPPtr1
+					sta ZPAMPtr
+					iny
+					lda (ZPPtr1),y
+					adc ZPPtr1+1
+					sta ZPAMPtr+1
+					
+					iny
+					lda (ZPPtr1),y
+					clc
+					adc ZPPtr1
+					sta ZPRPtr
+					iny
+					lda (ZPPtr1),y
+					adc ZPPtr1+1
+					sta ZPRPtr+1
+					
+					iny
+					lda (ZPPtr1),y
+					clc
+					adc ZPPtr1
+					sta ZPOPtr
+					iny
+					lda (ZPPtr1),y
+					adc ZPPtr1+1
+					sta ZPOPtr+1
+					
 .9					rts										
 *---------------------------------------
 FIO.OpenFile		>STYA ZPPtr1
--- a/BIN/ASM.S.SRC.txt
+++ b/BIN/ASM.S.SRC.txt
@ -110,13 +110,18 @@ SRC.ParseLine		lda (ZPLineBuf)

 SRC.ParseLine.Ok	lda SRC.GLabel.New
 					bpl .8
-					clc
-					rts

 					ldy #ASM.PASS		
 					lda (pData),y		pass#2?
 					bne .8				yes, nothing to do
 * --- Pass #1					
+
+
+					clc
+					rts
+
+
+
 					>LDYA L.SRC.GLabel.Flags
 					jsr SYM.SearchGlobal
 					bcs .1				if CS, not found, add
@ -253,52 +258,27 @@ SRC.ParseLine.Add.Macro
 					rts
 *---------------------------------------
 SRC.ParseLine.OpCode
-					
-					ldy #ASM.T.hMem
-					lda (pData),y
-					>SYSCALL GetMemPtr.A
+					>LDYA ZPOPtr
 					>STYA ZPPtr1
-
-					ldy #ASM.T.O		setup Ptr2 to Opcodes
-					lda (ZPPtr1),y
-					clc
-					adc ZPPtr1
-					sta ZPPtr2
-					iny
-					lda (ZPPtr1),y
-					adc ZPPtr1+1
-					sta ZPPtr2+1
 					
-					ldy #ASM.T.R		setup Ptr3 to Registers
-					lda (ZPPtr1),y
-					clc
-					adc ZPPtr1
-					sta ZPPtr3
-					iny
-					lda (ZPPtr1),y
-					adc ZPPtr1+1
-					sta ZPPtr3+1
-					
-.10					lda (ZPPtr2)		End Of OpCode List
+.10					lda (ZPPtr1)		End Of OpCode List
 					ldy #1
-					ora (ZPPtr2),y
+					ora (ZPPtr1),y
 					beq .9
 					
-					lda ZPPtr2
+					lda ZPPtr1
 					clc
 					adc #2
-					sta ZPPtr1
-					lda ZPPtr2+1
+					sta ZPPtr2
+					lda ZPPtr1+1
 					adc #0
-					sta ZPPtr1+1
+					sta ZPPtr2+1
 					
-					lda (ZPPtr1)
+					lda (ZPPtr2)
 					tax
 					
 					ldy #0
 					
-					>DEBUG
-					
 .1					lda (ZPLinePtr),y
 					cmp #'a'
 					bcc .11
@ -308,25 +288,16 @@ SRC.ParseLine.OpCode
 					eor #$20
 					
 .11					iny
-					cmp (ZPPtr1),y
+					cmp (ZPPtr2),y
 					bne .7
 					
 					dex
 					bne .1
 					
-					jsr SRC.ParseLine.AM
-					
-					
-					
-					
-					
-
-					
-					
-					
-					
-					
+*					jsr SRC.ParseLine.AM
 					
+					clc
+					rts
 					
 					bcs .99
 					bcc .20
@ -357,15 +328,15 @@ SRC.ParseLine.OpCode
 .2					clc
 					rts
 					
-.7					lda ZPPtr2
+.7					lda ZPPtr1
 					clc
-					adc (ZPPtr2)
+					adc (ZPPtr1)
 					tax
-					lda ZPPtr2+1
+					lda ZPPtr1+1
 					ldy #1
-					adc (ZPPtr2),y
-					stx ZPPtr2
-					sta ZPPtr2+1
+					adc (ZPPtr1),y
+					stx ZPPtr1
+					sta ZPPtr1+1
 					bra .10
 					
 .9					lda #ERR.INV.OPCODE
@ -767,6 +738,7 @@ SRC.GetKeyword		>STYA ZPPtr1		KeyWord table

 .3					lda (ZPLinePtr),y
 					beq .5
+					
 					jsr SRC.IsLetter
 					bcs .5
 					
@ -883,22 +855,6 @@ SRC.IsDigit8		cmp #'0'
 					cmp #'7'+1
 					rts					cc if ok, cs if not
 					
-.9					sec
-					rts
-*---------------------------------------
-SRC.CheckBlank		lda (ZPLinePtr)
-					beq .9
-					cmp #' '
-					bne .9
-					
-.1					jsr SRC.GetNextChar
-					beq .9
-					
-					cmp #' '
-					beq .1
-					clc
-					rts
-					
 .9					sec
 					rts
 *---------------------------------------
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@ -17,6 +17,9 @@ ZPLinePtr			.EQ ZPBIN+8
 ZPBlockPtr			.EQ ZPBIN+10
 ZPSymbolPtr			.EQ ZPBIN+12
 ZPTmpBuf			.EQ ZPBIN+14
+ZPAMPtr				.EQ ZPBIN+16
+ZPRPtr				.EQ ZPBIN+18
+ZPOPtr				.EQ ZPBIN+20
 *---------------------------------------
 ASM.T.AM			.EQ 0
 ASM.T.R				.EQ 2
@ -63,7 +66,7 @@ CS.START			cld
 					.DA CS.END-CS.START		CS
 					.DA DS.END-DS.START		DS
 					.DA #0					SS
-					.DA #16					ZP
+					.DA #24					ZP
 					.DA 0
 *--------------------------------------
 * Relocation Table
--- a/BIN/ASM.T.6502.A.txt
+++ b/BIN/ASM.T.6502.A.txt
@ -2,23 +2,23 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "(a),Y"
-				>ST "(a,X)"
-				>ST "a"
-				>ST "a,X"
-				>ST "aa"
-				>ST "aa,X"
-				>ST "aa,Y"
-				>ST "i"
-				>ST "r"
-				>ST "(aa)"
-				>ST "a,Y"
+T.ADDR.MODES	.EQ *
+				>PSTR "(a),Y"
+				>PSTR "(a,X)"
+				>PSTR "a"
+				>PSTR "a,X"
+				>PSTR "aa"
+				>PSTR "aa,X"
+				>PSTR "aa,Y"
+				>PSTR "i"
+				>PSTR "r"
+				>PSTR "(aa)"
+				>PSTR "a,Y"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "Y"
-				>ST "X"
+				>PSTR "Y"
+				>PSTR "X"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.6502.O.txt
+++ b/BIN/ASM.T.6502.O.txt
@ -3,380 +3,475 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.OPCODES	.EQ *
-ADC		.DA ADC.E+1
+ADC		.DA ADC.E+1-*
+			>PSTR "ADC"
+			.HS 00
+			>PSTR "71a"
+			.HS 01
+			>PSTR "61a"
+			.HS 02
+			>PSTR "65a"
 			.HS 03
-			.AS "ADC"
-			.HS 00.03373161
-			.HS 01.03363161
-			.HS 02.03363561
-			.HS 03.03373561
-			.HS 04.0436446161
-			.HS 05.0437446161
-			.HS 06.0437396161
-			.HS 07.03363969
+			>PSTR "75a"
+			.HS 04
+			>PSTR "6Daa"
+			.HS 05
+			>PSTR "7Daa"
+			.HS 06
+			>PSTR "79aa"
+			.HS 07
+			>PSTR "69i"
 ADC.E	.HS 00
-AND		.DA AND.E+1
+AND		.DA AND.E+1-*
+			>PSTR "AND"
+			.HS 00
+			>PSTR "31a"
+			.HS 01
+			>PSTR "21a"
+			.HS 02
+			>PSTR "25a"
 			.HS 03
-			.AS "AND"
-			.HS 00.03333161
-			.HS 01.03323161
-			.HS 02.03323561
-			.HS 03.03333561
-			.HS 04.0432446161
-			.HS 05.0433446161
-			.HS 06.0433396161
-			.HS 07.03323969
+			>PSTR "35a"
+			.HS 04
+			>PSTR "2Daa"
+			.HS 05
+			>PSTR "3Daa"
+			.HS 06
+			>PSTR "39aa"
+			.HS 07
+			>PSTR "29i"
 AND.E	.HS 00
-ASL		.DA ASL.E+1
+ASL		.DA ASL.E+1-*
+			>PSTR "ASL"
+			.HS 02
+			>PSTR "06a"
 			.HS 03
-			.AS "ASL"
-			.HS 02.03303661
-			.HS 03.03313661
-			.HS 04.0430456161
-			.HS 05.0431456161
-			.HS FF.023041
+			>PSTR "16a"
+			.HS 04
+			>PSTR "0Eaa"
+			.HS 05
+			>PSTR "1Eaa"
+			.HS FF
+			>PSTR "0A"
 ASL.E	.HS 00
-BCC		.DA BCC.E+1
-			.HS 03
-			.AS "BCC"
-			.HS 08.03393072
+BCC		.DA BCC.E+1-*
+			>PSTR "BCC"
+			.HS 08
+			>PSTR "90r"
 BCC.E	.HS 00
-BCS		.DA BCS.E+1
-			.HS 03
-			.AS "BCS"
-			.HS 08.03423072
+BCS		.DA BCS.E+1-*
+			>PSTR "BCS"
+			.HS 08
+			>PSTR "B0r"
 BCS.E	.HS 00
-BEQ		.DA BEQ.E+1
-			.HS 03
-			.AS "BEQ"
-			.HS 08.03463072
+BEQ		.DA BEQ.E+1-*
+			>PSTR "BEQ"
+			.HS 08
+			>PSTR "F0r"
 BEQ.E	.HS 00
-BIT		.DA BIT.E+1
-			.HS 03
-			.AS "BIT"
-			.HS 02.03323461
-			.HS 04.0432436161
+BIT		.DA BIT.E+1-*
+			>PSTR "BIT"
+			.HS 02
+			>PSTR "24a"
+			.HS 04
+			>PSTR "2Caa"
 BIT.E	.HS 00
-BMI		.DA BMI.E+1
-			.HS 03
-			.AS "BMI"
-			.HS 08.03333072
+BMI		.DA BMI.E+1-*
+			>PSTR "BMI"
+			.HS 08
+			>PSTR "30r"
 BMI.E	.HS 00
-BNE		.DA BNE.E+1
-			.HS 03
-			.AS "BNE"
-			.HS 08.03443072
+BNE		.DA BNE.E+1-*
+			>PSTR "BNE"
+			.HS 08
+			>PSTR "D0r"
 BNE.E	.HS 00
-BPL		.DA BPL.E+1
-			.HS 03
-			.AS "BPL"
-			.HS 08.03313072
+BPL		.DA BPL.E+1-*
+			>PSTR "BPL"
+			.HS 08
+			>PSTR "10r"
 BPL.E	.HS 00
-BRK		.DA BRK.E+1
-			.HS 03
-			.AS "BRK"
-			.HS FF.023030
+BRK		.DA BRK.E+1-*
+			>PSTR "BRK"
+			.HS FF
+			>PSTR "00"
 BRK.E	.HS 00
-BVC		.DA BVC.E+1
-			.HS 03
-			.AS "BVC"
-			.HS 08.03353072
+BVC		.DA BVC.E+1-*
+			>PSTR "BVC"
+			.HS 08
+			>PSTR "50r"
 BVC.E	.HS 00
-BVS		.DA BVS.E+1
-			.HS 03
-			.AS "BVS"
-			.HS 08.03373072
+BVS		.DA BVS.E+1-*
+			>PSTR "BVS"
+			.HS 08
+			>PSTR "70r"
 BVS.E	.HS 00
-CLC		.DA CLC.E+1
-			.HS 03
-			.AS "CLC"
-			.HS FF.023138
+CLC		.DA CLC.E+1-*
+			>PSTR "CLC"
+			.HS FF
+			>PSTR "18"
 CLC.E	.HS 00
-CLD		.DA CLD.E+1
-			.HS 03
-			.AS "CLD"
-			.HS FF.024438
+CLD		.DA CLD.E+1-*
+			>PSTR "CLD"
+			.HS FF
+			>PSTR "D8"
 CLD.E	.HS 00
-CLI		.DA CLI.E+1
-			.HS 03
-			.AS "CLI"
-			.HS FF.023538
+CLI		.DA CLI.E+1-*
+			>PSTR "CLI"
+			.HS FF
+			>PSTR "58"
 CLI.E	.HS 00
-CLV		.DA CLV.E+1
-			.HS 03
-			.AS "CLV"
-			.HS FF.024238
+CLV		.DA CLV.E+1-*
+			>PSTR "CLV"
+			.HS FF
+			>PSTR "B8"
 CLV.E	.HS 00
-CMP		.DA CMP.E+1
+CMP		.DA CMP.E+1-*
+			>PSTR "CMP"
+			.HS 00
+			>PSTR "D1a"
+			.HS 01
+			>PSTR "C1a"
+			.HS 02
+			>PSTR "C5a"
 			.HS 03
-			.AS "CMP"
-			.HS 00.03443161
-			.HS 01.03433161
-			.HS 02.03433561
-			.HS 03.03443561
-			.HS 04.0443446161
-			.HS 05.0444446161
-			.HS 06.0444396161
-			.HS 07.03433969
+			>PSTR "D5a"
+			.HS 04
+			>PSTR "CDaa"
+			.HS 05
+			>PSTR "DDaa"
+			.HS 06
+			>PSTR "D9aa"
+			.HS 07
+			>PSTR "C9i"
 CMP.E	.HS 00
-CPX		.DA CPX.E+1
-			.HS 03
-			.AS "CPX"
-			.HS 02.03453461
-			.HS 04.0445636161
-			.HS 07.03453069
+CPX		.DA CPX.E+1-*
+			>PSTR "CPX"
+			.HS 02
+			>PSTR "E4a"
+			.HS 04
+			>PSTR "Ecaa"
+			.HS 07
+			>PSTR "E0i"
 CPX.E	.HS 00
-CPY		.DA CPY.E+1
-			.HS 03
-			.AS "CPY"
-			.HS 02.03433461
-			.HS 04.0443636161
-			.HS 07.03433069
+CPY		.DA CPY.E+1-*
+			>PSTR "CPY"
+			.HS 02
+			>PSTR "C4a"
+			.HS 04
+			>PSTR "Ccaa"
+			.HS 07
+			>PSTR "C0i"
 CPY.E	.HS 00
-DEC		.DA DEC.E+1
+DEC		.DA DEC.E+1-*
+			>PSTR "DEC"
+			.HS 02
+			>PSTR "C6a"
 			.HS 03
-			.AS "DEC"
-			.HS 02.03433661
-			.HS 03.03443661
-			.HS 04.0443656161
-			.HS 05.0444656161
+			>PSTR "D6a"
+			.HS 04
+			>PSTR "Ceaa"
+			.HS 05
+			>PSTR "Deaa"
 DEC.E	.HS 00
-DEX		.DA DEX.E+1
-			.HS 03
-			.AS "DEX"
-			.HS FF.024341
+DEX		.DA DEX.E+1-*
+			>PSTR "DEX"
+			.HS FF
+			>PSTR "CA"
 DEX.E	.HS 00
-DEY		.DA DEY.E+1
-			.HS 03
-			.AS "DEY"
-			.HS FF.023838
+DEY		.DA DEY.E+1-*
+			>PSTR "DEY"
+			.HS FF
+			>PSTR "88"
 DEY.E	.HS 00
-EOR		.DA EOR.E+1
+EOR		.DA EOR.E+1-*
+			>PSTR "EOR"
+			.HS 00
+			>PSTR "51a"
+			.HS 01
+			>PSTR "41a"
+			.HS 02
+			>PSTR "45a"
 			.HS 03
-			.AS "EOR"
-			.HS 00.03353161
-			.HS 01.03343161
-			.HS 02.03343561
-			.HS 03.03353561
-			.HS 04.0434446161
-			.HS 05.0435446161
-			.HS 06.0435396161
-			.HS 07.03343969
+			>PSTR "55a"
+			.HS 04
+			>PSTR "4Daa"
+			.HS 05
+			>PSTR "5Daa"
+			.HS 06
+			>PSTR "59aa"
+			.HS 07
+			>PSTR "49i"
 EOR.E	.HS 00
-INC		.DA INC.E+1
+INC		.DA INC.E+1-*
+			>PSTR "INC"
+			.HS 02
+			>PSTR "E6a"
 			.HS 03
-			.AS "INC"
-			.HS 02.03453661
-			.HS 03.03463661
-			.HS 04.0445656161
-			.HS 05.0446656161
+			>PSTR "F6a"
+			.HS 04
+			>PSTR "Eeaa"
+			.HS 05
+			>PSTR "Feaa"
 INC.E	.HS 00
-INX		.DA INX.E+1
-			.HS 03
-			.AS "INX"
-			.HS FF.024538
+INX		.DA INX.E+1-*
+			>PSTR "INX"
+			.HS FF
+			>PSTR "E8"
 INX.E	.HS 00
-INY		.DA INY.E+1
-			.HS 03
-			.AS "INY"
-			.HS FF.024338
+INY		.DA INY.E+1-*
+			>PSTR "INY"
+			.HS FF
+			>PSTR "C8"
 INY.E	.HS 00
-JMP		.DA JMP.E+1
-			.HS 03
-			.AS "JMP"
-			.HS 09.0436436161
-			.HS 04.0434436161
+JMP		.DA JMP.E+1-*
+			>PSTR "JMP"
+			.HS 09
+			>PSTR "6Caa"
+			.HS 04
+			>PSTR "4Caa"
 JMP.E	.HS 00
-JSR		.DA JSR.E+1
-			.HS 03
-			.AS "JSR"
-			.HS 04.0432306161
+JSR		.DA JSR.E+1-*
+			>PSTR "JSR"
+			.HS 04
+			>PSTR "20aa"
 JSR.E	.HS 00
-LDA		.DA LDA.E+1
+LDA		.DA LDA.E+1-*
+			>PSTR "LDA"
+			.HS 00
+			>PSTR "B1a"
+			.HS 01
+			>PSTR "A1a"
+			.HS 02
+			>PSTR "A5a"
 			.HS 03
-			.AS "LDA"
-			.HS 00.03423161
-			.HS 01.03413161
-			.HS 02.03413561
-			.HS 03.03423561
-			.HS 04.0441646161
-			.HS 05.0442646161
-			.HS 06.0442396161
-			.HS 07.03413969
+			>PSTR "B5a"
+			.HS 04
+			>PSTR "Adaa"
+			.HS 05
+			>PSTR "Bdaa"
+			.HS 06
+			>PSTR "B9aa"
+			.HS 07
+			>PSTR "A9i"
 LDA.E	.HS 00
-LDX		.DA LDX.E+1
-			.HS 03
-			.AS "LDX"
-			.HS 02.03413661
-			.HS 0A.03423661
-			.HS 04.0441656161
-			.HS 06.0442656161
-			.HS 07.03413269
+LDX		.DA LDX.E+1-*
+			>PSTR "LDX"
+			.HS 02
+			>PSTR "A6a"
+			.HS 0A
+			>PSTR "B6a"
+			.HS 04
+			>PSTR "Aeaa"
+			.HS 06
+			>PSTR "Beaa"
+			.HS 07
+			>PSTR "A2i"
 LDX.E	.HS 00
-LDY		.DA LDY.E+1
+LDY		.DA LDY.E+1-*
+			>PSTR "LDY"
+			.HS 02
+			>PSTR "A4a"
 			.HS 03
-			.AS "LDY"
-			.HS 02.03413461
-			.HS 03.03423461
-			.HS 04.0441636161
-			.HS 05.0442636161
-			.HS 07.03413069
+			>PSTR "B4a"
+			.HS 04
+			>PSTR "Acaa"
+			.HS 05
+			>PSTR "Bcaa"
+			.HS 07
+			>PSTR "A0i"
 LDY.E	.HS 00
-LSR		.DA LSR.E+1
+LSR		.DA LSR.E+1-*
+			>PSTR "LSR"
+			.HS 02
+			>PSTR "46a"
 			.HS 03
-			.AS "LSR"
-			.HS 02.03343661
-			.HS 03.03353661
-			.HS 04.0434456161
-			.HS 05.0435456161
-			.HS FF.023441
+			>PSTR "56a"
+			.HS 04
+			>PSTR "4Eaa"
+			.HS 05
+			>PSTR "5Eaa"
+			.HS FF
+			>PSTR "4A"
 LSR.E	.HS 00
-NOP		.DA NOP.E+1
-			.HS 03
-			.AS "NOP"
-			.HS FF.024541
+NOP		.DA NOP.E+1-*
+			>PSTR "NOP"
+			.HS FF
+			>PSTR "EA"
 NOP.E	.HS 00
-ORA		.DA ORA.E+1
+ORA		.DA ORA.E+1-*
+			>PSTR "ORA"
+			.HS 00
+			>PSTR "11a"
+			.HS 01
+			>PSTR "01a"
+			.HS 02
+			>PSTR "05a"
 			.HS 03
-			.AS "ORA"
-			.HS 00.03313161
-			.HS 01.03303161
-			.HS 02.03303561
-			.HS 03.03313561
-			.HS 04.0430446161
-			.HS 05.0431446161
-			.HS 06.0431396161
-			.HS 07.03303969
+			>PSTR "15a"
+			.HS 04
+			>PSTR "0Daa"
+			.HS 05
+			>PSTR "1Daa"
+			.HS 06
+			>PSTR "19aa"
+			.HS 07
+			>PSTR "09i"
 ORA.E	.HS 00
-PHA		.DA PHA.E+1
-			.HS 03
-			.AS "PHA"
-			.HS FF.023438
+PHA		.DA PHA.E+1-*
+			>PSTR "PHA"
+			.HS FF
+			>PSTR "48"
 PHA.E	.HS 00
-PHP		.DA PHP.E+1
-			.HS 03
-			.AS "PHP"
-			.HS FF.023038
+PHP		.DA PHP.E+1-*
+			>PSTR "PHP"
+			.HS FF
+			>PSTR "08"
 PHP.E	.HS 00
-PLA		.DA PLA.E+1
-			.HS 03
-			.AS "PLA"
-			.HS FF.023638
+PLA		.DA PLA.E+1-*
+			>PSTR "PLA"
+			.HS FF
+			>PSTR "68"
 PLA.E	.HS 00
-PLP		.DA PLP.E+1
-			.HS 03
-			.AS "PLP"
-			.HS FF.023238
+PLP		.DA PLP.E+1-*
+			>PSTR "PLP"
+			.HS FF
+			>PSTR "28"
 PLP.E	.HS 00
-ROL		.DA ROL.E+1
+ROL		.DA ROL.E+1-*
+			>PSTR "ROL"
+			.HS 02
+			>PSTR "26a"
 			.HS 03
-			.AS "ROL"
-			.HS 02.03323661
-			.HS 03.03333661
-			.HS 04.0432456161
-			.HS 05.0433456161
-			.HS FF.023241
+			>PSTR "36a"
+			.HS 04
+			>PSTR "2Eaa"
+			.HS 05
+			>PSTR "3Eaa"
+			.HS FF
+			>PSTR "2A"
 ROL.E	.HS 00
-ROR		.DA ROR.E+1
+ROR		.DA ROR.E+1-*
+			>PSTR "ROR"
+			.HS 02
+			>PSTR "66a"
 			.HS 03
-			.AS "ROR"
-			.HS 02.03363661
-			.HS 03.03373661
-			.HS 04.0436456161
-			.HS 05.0437456161
-			.HS FF.023641
+			>PSTR "76a"
+			.HS 04
+			>PSTR "6Eaa"
+			.HS 05
+			>PSTR "7Eaa"
+			.HS FF
+			>PSTR "6A"
 ROR.E	.HS 00
-RTI		.DA RTI.E+1
-			.HS 03
-			.AS "RTI"
-			.HS FF.023430
+RTI		.DA RTI.E+1-*
+			>PSTR "RTI"
+			.HS FF
+			>PSTR "40"
 RTI.E	.HS 00
-RTS		.DA RTS.E+1
-			.HS 03
-			.AS "RTS"
-			.HS FF.023630
+RTS		.DA RTS.E+1-*
+			>PSTR "RTS"
+			.HS FF
+			>PSTR "60"
 RTS.E	.HS 00
-SBC		.DA SBC.E+1
+SBC		.DA SBC.E+1-*
+			>PSTR "SBC"
+			.HS 00
+			>PSTR "F1a"
+			.HS 01
+			>PSTR "E1a"
+			.HS 02
+			>PSTR "E5a"
 			.HS 03
-			.AS "SBC"
-			.HS 00.03463161
-			.HS 01.03453161
-			.HS 02.03453561
-			.HS 03.03463561
-			.HS 04.0445646161
-			.HS 05.0446646161
-			.HS 06.0446396161
-			.HS 07.03453969
+			>PSTR "F5a"
+			.HS 04
+			>PSTR "Edaa"
+			.HS 05
+			>PSTR "Fdaa"
+			.HS 06
+			>PSTR "F9aa"
+			.HS 07
+			>PSTR "E9i"
 SBC.E	.HS 00
-SEC		.DA SEC.E+1
-			.HS 03
-			.AS "SEC"
-			.HS FF.023338
+SEC		.DA SEC.E+1-*
+			>PSTR "SEC"
+			.HS FF
+			>PSTR "38"
 SEC.E	.HS 00
-SED		.DA SED.E+1
-			.HS 03
-			.AS "SED"
-			.HS FF.024638
+SED		.DA SED.E+1-*
+			>PSTR "SED"
+			.HS FF
+			>PSTR "F8"
 SED.E	.HS 00
-SEI		.DA SEI.E+1
-			.HS 03
-			.AS "SEI"
-			.HS FF.023738
+SEI		.DA SEI.E+1-*
+			>PSTR "SEI"
+			.HS FF
+			>PSTR "78"
 SEI.E	.HS 00
-STA		.DA STA.E+1
+STA		.DA STA.E+1-*
+			>PSTR "STA"
+			.HS 00
+			>PSTR "91a"
+			.HS 01
+			>PSTR "81a"
+			.HS 02
+			>PSTR "85a"
 			.HS 03
-			.AS "STA"
-			.HS 00.03393161
-			.HS 01.03383161
-			.HS 02.03383561
-			.HS 03.03393561
-			.HS 04.0438446161
-			.HS 05.0439446161
-			.HS 06.0439396161
+			>PSTR "95a"
+			.HS 04
+			>PSTR "8Daa"
+			.HS 05
+			>PSTR "9Daa"
+			.HS 06
+			>PSTR "99aa"
 STA.E	.HS 00
-STX		.DA STX.E+1
-			.HS 03
-			.AS "STX"
-			.HS 02.03383661
-			.HS 0A.03393661
-			.HS 04.0438456161
+STX		.DA STX.E+1-*
+			>PSTR "STX"
+			.HS 02
+			>PSTR "86a"
+			.HS 0A
+			>PSTR "96a"
+			.HS 04
+			>PSTR "8Eaa"
 STX.E	.HS 00
-STY		.DA STY.E+1
+STY		.DA STY.E+1-*
+			>PSTR "STY"
+			.HS 02
+			>PSTR "84a"
 			.HS 03
-			.AS "STY"
-			.HS 02.03383461
-			.HS 03.03393461
-			.HS 04.0438436161
+			>PSTR "94a"
+			.HS 04
+			>PSTR "8Caa"
 STY.E	.HS 00
-TAX		.DA TAX.E+1
-			.HS 03
-			.AS "TAX"
-			.HS FF.024141
+TAX		.DA TAX.E+1-*
+			>PSTR "TAX"
+			.HS FF
+			>PSTR "AA"
 TAX.E	.HS 00
-TAY		.DA TAY.E+1
-			.HS 03
-			.AS "TAY"
-			.HS FF.024138
+TAY		.DA TAY.E+1-*
+			>PSTR "TAY"
+			.HS FF
+			>PSTR "A8"
 TAY.E	.HS 00
-TSX		.DA TSX.E+1
-			.HS 03
-			.AS "TSX"
-			.HS FF.024241
+TSX		.DA TSX.E+1-*
+			>PSTR "TSX"
+			.HS FF
+			>PSTR "BA"
 TSX.E	.HS 00
-TXA		.DA TXA.E+1
-			.HS 03
-			.AS "TXA"
-			.HS FF.023841
+TXA		.DA TXA.E+1-*
+			>PSTR "TXA"
+			.HS FF
+			>PSTR "8A"
 TXA.E	.HS 00
-TXS		.DA TXS.E+1
-			.HS 03
-			.AS "TXS"
-			.HS FF.023941
+TXS		.DA TXS.E+1-*
+			>PSTR "TXS"
+			.HS FF
+			>PSTR "9A"
 TXS.E	.HS 00
-TYA		.DA TYA.E+1
-			.HS 03
-			.AS "TYA"
-			.HS FF.023938
+TYA		.DA TYA.E+1-*
+			>PSTR "TYA"
+			.HS FF
+			>PSTR "98"
 TYA.E		.HS 00
 			.HS 0000
 *---------------------------------------
--- a/BIN/ASM.T.6502.S.txt
+++ b/BIN/ASM.T.6502.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.6502
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/ASM.T.65816.A.txt
+++ b/BIN/ASM.T.65816.A.txt
@ -2,35 +2,35 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "(a)"
-				>ST "(a),Y"
-				>ST "(a,S),Y"
-				>ST "(a,X)"
-				>ST "[a]"
-				>ST "[a],Y"
-				>ST "a"
-				>ST "a,X"
-				>ST "aa"
-				>ST "aa,X"
-				>ST "aa,Y"
-				>ST "aaa"
-				>ST "aaa,X"
-				>ST "i"
-				>ST "a,S"
-				>ST "r"
-				>ST "rr"
-				>ST "(aa)"
-				>ST "(aa,X)"
-				>ST "[aa]"
-				>ST "a,Y"
-				>ST "a,a"
+T.ADDR.MODES	.EQ *
+				>PSTR "(a)"
+				>PSTR "(a),Y"
+				>PSTR "(a,S),Y"
+				>PSTR "(a,X)"
+				>PSTR "[a]"
+				>PSTR "[a],Y"
+				>PSTR "a"
+				>PSTR "a,X"
+				>PSTR "aa"
+				>PSTR "aa,X"
+				>PSTR "aa,Y"
+				>PSTR "aaa"
+				>PSTR "aaa,X"
+				>PSTR "i"
+				>PSTR "a,S"
+				>PSTR "r"
+				>PSTR "rr"
+				>PSTR "(aa)"
+				>PSTR "(aa,X)"
+				>PSTR "[aa]"
+				>PSTR "a,Y"
+				>PSTR "a,a"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "Y"
-				>ST "S"
-				>ST "X"
+				>PSTR "Y"
+				>PSTR "S"
+				>PSTR "X"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.65816.O.txt
+++ b/BIN/ASM.T.65816.O.txt
--- a/BIN/ASM.T.65816.S.txt
+++ b/BIN/ASM.T.65816.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.65816
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/ASM.T.65C02.A.txt
+++ b/BIN/ASM.T.65C02.A.txt
@ -2,25 +2,25 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "(a)"
-				>ST "(a),Y"
-				>ST "(a,X)"
-				>ST "a"
-				>ST "a,X"
-				>ST "aa"
-				>ST "aa,X"
-				>ST "aa,Y"
-				>ST "i"
-				>ST "r"
-				>ST "(aa)"
-				>ST "(aa,x)"
-				>ST "a,Y"
+T.ADDR.MODES	.EQ *
+				>PSTR "(a)"
+				>PSTR "(a),Y"
+				>PSTR "(a,X)"
+				>PSTR "a"
+				>PSTR "a,X"
+				>PSTR "aa"
+				>PSTR "aa,X"
+				>PSTR "aa,Y"
+				>PSTR "i"
+				>PSTR "r"
+				>PSTR "(aa)"
+				>PSTR "(aa,X)"
+				>PSTR "a,Y"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "Y"
-				>ST "X"
+				>PSTR "Y"
+				>PSTR "X"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.65C02.O.txt
+++ b/BIN/ASM.T.65C02.O.txt
@ -3,439 +3,553 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.OPCODES	.EQ *
-ADC		.DA ADC.E+1
+ADC		.DA ADC.E+1-*
+			>PSTR "ADC"
+			.HS 00
+			>PSTR "72a"
+			.HS 01
+			>PSTR "71a"
+			.HS 02
+			>PSTR "61a"
 			.HS 03
-			.AS "ADC"
-			.HS 00.03373261
-			.HS 01.03373161
-			.HS 02.03363161
-			.HS 03.03363561
-			.HS 04.03373561
-			.HS 05.0436446161
-			.HS 06.0437446161
-			.HS 07.0437396161
-			.HS 08.03363969
+			>PSTR "65a"
+			.HS 04
+			>PSTR "75a"
+			.HS 05
+			>PSTR "6Daa"
+			.HS 06
+			>PSTR "7Daa"
+			.HS 07
+			>PSTR "79aa"
+			.HS 08
+			>PSTR "69i"
 ADC.E	.HS 00
-AND		.DA AND.E+1
+AND		.DA AND.E+1-*
+			>PSTR "AND"
+			.HS 00
+			>PSTR "32a"
+			.HS 01
+			>PSTR "31a"
+			.HS 02
+			>PSTR "21a"
 			.HS 03
-			.AS "AND"
-			.HS 00.03333261
-			.HS 01.03333161
-			.HS 02.03323161
-			.HS 03.03323561
-			.HS 04.03333561
-			.HS 05.0432446161
-			.HS 06.0433446161
-			.HS 07.0433396161
-			.HS 08.03323969
+			>PSTR "25a"
+			.HS 04
+			>PSTR "35a"
+			.HS 05
+			>PSTR "2Daa"
+			.HS 06
+			>PSTR "3Daa"
+			.HS 07
+			>PSTR "39aa"
+			.HS 08
+			>PSTR "29i"
 AND.E	.HS 00
-ASL		.DA ASL.E+1
+ASL		.DA ASL.E+1-*
+			>PSTR "ASL"
 			.HS 03
-			.AS "ASL"
-			.HS 03.03303661
-			.HS 04.03313661
-			.HS 05.0430456161
-			.HS 06.0431456161
-			.HS FF.023041
+			>PSTR "06a"
+			.HS 04
+			>PSTR "16a"
+			.HS 05
+			>PSTR "0Eaa"
+			.HS 06
+			>PSTR "1Eaa"
+			.HS FF
+			>PSTR "0A"
 ASL.E	.HS 00
-BCC		.DA BCC.E+1
-			.HS 03
-			.AS "BCC"
-			.HS 09.03393072
+BCC		.DA BCC.E+1-*
+			>PSTR "BCC"
+			.HS 09
+			>PSTR "90r"
 BCC.E	.HS 00
-BCS		.DA BCS.E+1
-			.HS 03
-			.AS "BCS"
-			.HS 09.03423072
+BCS		.DA BCS.E+1-*
+			>PSTR "BCS"
+			.HS 09
+			>PSTR "B0r"
 BCS.E	.HS 00
-BEQ		.DA BEQ.E+1
-			.HS 03
-			.AS "BEQ"
-			.HS 09.03463072
+BEQ		.DA BEQ.E+1-*
+			>PSTR "BEQ"
+			.HS 09
+			>PSTR "F0r"
 BEQ.E	.HS 00
-BIT		.DA BIT.E+1
+BIT		.DA BIT.E+1-*
+			>PSTR "BIT"
 			.HS 03
-			.AS "BIT"
-			.HS 03.03323461
-			.HS 04.03333461
-			.HS 05.0432436161
-			.HS 06.0433436161
-			.HS 08.03383969
+			>PSTR "24a"
+			.HS 04
+			>PSTR "34a"
+			.HS 05
+			>PSTR "2Caa"
+			.HS 06
+			>PSTR "3Caa"
+			.HS 08
+			>PSTR "89i"
 BIT.E	.HS 00
-BMI		.DA BMI.E+1
-			.HS 03
-			.AS "BMI"
-			.HS 09.03333072
+BMI		.DA BMI.E+1-*
+			>PSTR "BMI"
+			.HS 09
+			>PSTR "30r"
 BMI.E	.HS 00
-BNE		.DA BNE.E+1
-			.HS 03
-			.AS "BNE"
-			.HS 09.03443072
+BNE		.DA BNE.E+1-*
+			>PSTR "BNE"
+			.HS 09
+			>PSTR "D0r"
 BNE.E	.HS 00
-BPL		.DA BPL.E+1
-			.HS 03
-			.AS "BPL"
-			.HS 09.03313072
+BPL		.DA BPL.E+1-*
+			>PSTR "BPL"
+			.HS 09
+			>PSTR "10r"
 BPL.E	.HS 00
-BRA		.DA BRA.E+1
-			.HS 03
-			.AS "BRA"
-			.HS 09.03383072
+BRA		.DA BRA.E+1-*
+			>PSTR "BRA"
+			.HS 09
+			>PSTR "80r"
 BRA.E	.HS 00
-BRK		.DA BRK.E+1
-			.HS 03
-			.AS "BRK"
-			.HS FF.023030
+BRK		.DA BRK.E+1-*
+			>PSTR "BRK"
+			.HS FF
+			>PSTR "00"
 BRK.E	.HS 00
-BVC		.DA BVC.E+1
-			.HS 03
-			.AS "BVC"
-			.HS 09.03353072
+BVC		.DA BVC.E+1-*
+			>PSTR "BVC"
+			.HS 09
+			>PSTR "50r"
 BVC.E	.HS 00
-BVS		.DA BVS.E+1
-			.HS 03
-			.AS "BVS"
-			.HS 09.03373072
+BVS		.DA BVS.E+1-*
+			>PSTR "BVS"
+			.HS 09
+			>PSTR "70r"
 BVS.E	.HS 00
-CLC		.DA CLC.E+1
-			.HS 03
-			.AS "CLC"
-			.HS FF.023138
+CLC		.DA CLC.E+1-*
+			>PSTR "CLC"
+			.HS FF
+			>PSTR "18"
 CLC.E	.HS 00
-CLD		.DA CLD.E+1
-			.HS 03
-			.AS "CLD"
-			.HS FF.024438
+CLD		.DA CLD.E+1-*
+			>PSTR "CLD"
+			.HS FF
+			>PSTR "D8"
 CLD.E	.HS 00
-CLI		.DA CLI.E+1
-			.HS 03
-			.AS "CLI"
-			.HS FF.023538
+CLI		.DA CLI.E+1-*
+			>PSTR "CLI"
+			.HS FF
+			>PSTR "58"
 CLI.E	.HS 00
-CLV		.DA CLV.E+1
-			.HS 03
-			.AS "CLV"
-			.HS FF.024238
+CLV		.DA CLV.E+1-*
+			>PSTR "CLV"
+			.HS FF
+			>PSTR "B8"
 CLV.E	.HS 00
-CMP		.DA CMP.E+1
+CMP		.DA CMP.E+1-*
+			>PSTR "CMP"
+			.HS 00
+			>PSTR "D2a"
+			.HS 01
+			>PSTR "D1a"
+			.HS 02
+			>PSTR "C1a"
 			.HS 03
-			.AS "CMP"
-			.HS 00.03443261
-			.HS 01.03443161
-			.HS 02.03433161
-			.HS 03.03433561
-			.HS 04.03443561
-			.HS 05.0443446161
-			.HS 06.0444446161
-			.HS 07.0444396161
-			.HS 08.03433969
+			>PSTR "C5a"
+			.HS 04
+			>PSTR "D5a"
+			.HS 05
+			>PSTR "CDaa"
+			.HS 06
+			>PSTR "DDaa"
+			.HS 07
+			>PSTR "D9aa"
+			.HS 08
+			>PSTR "C9i"
 CMP.E	.HS 00
-CPX		.DA CPX.E+1
+CPX		.DA CPX.E+1-*
+			>PSTR "CPX"
 			.HS 03
-			.AS "CPX"
-			.HS 03.03453461
-			.HS 05.0445636161
-			.HS 08.03453069
+			>PSTR "E4a"
+			.HS 05
+			>PSTR "Ecaa"
+			.HS 08
+			>PSTR "E0i"
 CPX.E	.HS 00
-CPY		.DA CPY.E+1
+CPY		.DA CPY.E+1-*
+			>PSTR "CPY"
 			.HS 03
-			.AS "CPY"
-			.HS 03.03433461
-			.HS 05.0443636161
-			.HS 08.03433069
+			>PSTR "C4a"
+			.HS 05
+			>PSTR "Ccaa"
+			.HS 08
+			>PSTR "C0i"
 CPY.E	.HS 00
-DEC		.DA DEC.E+1
+DEC		.DA DEC.E+1-*
+			>PSTR "DEC"
+			.HS FF
+			>PSTR "3A"
 			.HS 03
-			.AS "DEC"
-			.HS FF.023341
-			.HS 03.03433661
-			.HS 04.03443661
-			.HS 05.0443656161
-			.HS 06.0444656161
+			>PSTR "C6a"
+			.HS 04
+			>PSTR "D6a"
+			.HS 05
+			>PSTR "Ceaa"
+			.HS 06
+			>PSTR "Deaa"
 DEC.E	.HS 00
-DEX		.DA DEX.E+1
-			.HS 03
-			.AS "DEX"
-			.HS FF.024341
+DEX		.DA DEX.E+1-*
+			>PSTR "DEX"
+			.HS FF
+			>PSTR "CA"
 DEX.E	.HS 00
-DEY		.DA DEY.E+1
-			.HS 03
-			.AS "DEY"
-			.HS FF.023838
+DEY		.DA DEY.E+1-*
+			>PSTR "DEY"
+			.HS FF
+			>PSTR "88"
 DEY.E	.HS 00
-EOR		.DA EOR.E+1
+EOR		.DA EOR.E+1-*
+			>PSTR "EOR"
+			.HS 00
+			>PSTR "52a"
+			.HS 01
+			>PSTR "51a"
+			.HS 02
+			>PSTR "41a"
 			.HS 03
-			.AS "EOR"
-			.HS 00.03353261
-			.HS 01.03353161
-			.HS 02.03343161
-			.HS 03.03343561
-			.HS 04.03353561
-			.HS 05.0434446161
-			.HS 06.0435446161
-			.HS 07.0435396161
-			.HS 08.03343969
+			>PSTR "45a"
+			.HS 04
+			>PSTR "55a"
+			.HS 05
+			>PSTR "4Daa"
+			.HS 06
+			>PSTR "5Daa"
+			.HS 07
+			>PSTR "59aa"
+			.HS 08
+			>PSTR "49i"
 EOR.E	.HS 00
-INC		.DA INC.E+1
+INC		.DA INC.E+1-*
+			>PSTR "INC"
+			.HS FF
+			>PSTR "1A"
 			.HS 03
-			.AS "INC"
-			.HS FF.023141
-			.HS 03.03453661
-			.HS 04.03463661
-			.HS 05.0445656161
-			.HS 06.0446656161
+			>PSTR "E6a"
+			.HS 04
+			>PSTR "F6a"
+			.HS 05
+			>PSTR "Eeaa"
+			.HS 06
+			>PSTR "Feaa"
 INC.E	.HS 00
-INX		.DA INX.E+1
-			.HS 03
-			.AS "INX"
-			.HS FF.024538
+INX		.DA INX.E+1-*
+			>PSTR "INX"
+			.HS FF
+			>PSTR "E8"
 INX.E	.HS 00
-INY		.DA INY.E+1
-			.HS 03
-			.AS "INY"
-			.HS FF.024338
+INY		.DA INY.E+1-*
+			>PSTR "INY"
+			.HS FF
+			>PSTR "C8"
 INY.E	.HS 00
-JMP		.DA JMP.E+1
-			.HS 03
-			.AS "JMP"
-			.HS 0A.0436436161
-			.HS 0B.0437436161
-			.HS 05.0434436161
+JMP		.DA JMP.E+1-*
+			>PSTR "JMP"
+			.HS 0A
+			>PSTR "6Caa"
+			.HS 0B
+			>PSTR "7Caa"
+			.HS 05
+			>PSTR "4Caa"
 JMP.E	.HS 00
-JSR		.DA JSR.E+1
-			.HS 03
-			.AS "JSR"
-			.HS 05.0432306161
+JSR		.DA JSR.E+1-*
+			>PSTR "JSR"
+			.HS 05
+			>PSTR "20aa"
 JSR.E	.HS 00
-LDA		.DA LDA.E+1
+LDA		.DA LDA.E+1-*
+			>PSTR "LDA"
+			.HS 00
+			>PSTR "B2a"
+			.HS 01
+			>PSTR "B1a"
+			.HS 02
+			>PSTR "A1a"
 			.HS 03
-			.AS "LDA"
-			.HS 00.03423261
-			.HS 01.03423161
-			.HS 02.03413161
-			.HS 03.03413561
-			.HS 04.03423561
-			.HS 05.0441646161
-			.HS 06.0442646161
-			.HS 07.0442396161
-			.HS 08.03413969
+			>PSTR "A5a"
+			.HS 04
+			>PSTR "B5a"
+			.HS 05
+			>PSTR "Adaa"
+			.HS 06
+			>PSTR "Bdaa"
+			.HS 07
+			>PSTR "B9aa"
+			.HS 08
+			>PSTR "A9i"
 LDA.E	.HS 00
-LDX		.DA LDX.E+1
+LDX		.DA LDX.E+1-*
+			>PSTR "LDX"
 			.HS 03
-			.AS "LDX"
-			.HS 03.03413661
-			.HS 0C.03423661
-			.HS 05.0441656161
-			.HS 07.0442656161
-			.HS 08.03413269
+			>PSTR "A6a"
+			.HS 0C
+			>PSTR "B6a"
+			.HS 05
+			>PSTR "Aeaa"
+			.HS 07
+			>PSTR "Beaa"
+			.HS 08
+			>PSTR "A2i"
 LDX.E	.HS 00
-LDY		.DA LDY.E+1
+LDY		.DA LDY.E+1-*
+			>PSTR "LDY"
 			.HS 03
-			.AS "LDY"
-			.HS 03.03413461
-			.HS 04.03423461
-			.HS 05.0441636161
-			.HS 06.0442636161
-			.HS 08.03413069
+			>PSTR "A4a"
+			.HS 04
+			>PSTR "B4a"
+			.HS 05
+			>PSTR "Acaa"
+			.HS 06
+			>PSTR "Bcaa"
+			.HS 08
+			>PSTR "A0i"
 LDY.E	.HS 00
-LSR		.DA LSR.E+1
+LSR		.DA LSR.E+1-*
+			>PSTR "LSR"
 			.HS 03
-			.AS "LSR"
-			.HS 03.03343661
-			.HS 04.03353661
-			.HS 05.0434456161
-			.HS 06.0435456161
-			.HS FF.023441
+			>PSTR "46a"
+			.HS 04
+			>PSTR "56a"
+			.HS 05
+			>PSTR "4Eaa"
+			.HS 06
+			>PSTR "5Eaa"
+			.HS FF
+			>PSTR "4A"
 LSR.E	.HS 00
-NOP		.DA NOP.E+1
-			.HS 03
-			.AS "NOP"
-			.HS FF.024541
+NOP		.DA NOP.E+1-*
+			>PSTR "NOP"
+			.HS FF
+			>PSTR "EA"
 NOP.E	.HS 00
-ORA		.DA ORA.E+1
+ORA		.DA ORA.E+1-*
+			>PSTR "ORA"
+			.HS 00
+			>PSTR "12a"
+			.HS 01
+			>PSTR "11a"
+			.HS 02
+			>PSTR "01a"
 			.HS 03
-			.AS "ORA"
-			.HS 00.03313261
-			.HS 01.03313161
-			.HS 02.03303161
-			.HS 03.03303561
-			.HS 04.03313561
-			.HS 05.0430446161
-			.HS 06.0431446161
-			.HS 07.0431396161
-			.HS 08.03303969
+			>PSTR "05a"
+			.HS 04
+			>PSTR "15a"
+			.HS 05
+			>PSTR "0Daa"
+			.HS 06
+			>PSTR "1Daa"
+			.HS 07
+			>PSTR "19aa"
+			.HS 08
+			>PSTR "09i"
 ORA.E	.HS 00
-PHA		.DA PHA.E+1
-			.HS 03
-			.AS "PHA"
-			.HS FF.023438
+PHA		.DA PHA.E+1-*
+			>PSTR "PHA"
+			.HS FF
+			>PSTR "48"
 PHA.E	.HS 00
-PHP		.DA PHP.E+1
-			.HS 03
-			.AS "PHP"
-			.HS FF.023038
+PHP		.DA PHP.E+1-*
+			>PSTR "PHP"
+			.HS FF
+			>PSTR "08"
 PHP.E	.HS 00
-PHX		.DA PHX.E+1
-			.HS 03
-			.AS "PHX"
-			.HS FF.024441
+PHX		.DA PHX.E+1-*
+			>PSTR "PHX"
+			.HS FF
+			>PSTR "DA"
 PHX.E	.HS 00
-PHY		.DA PHY.E+1
-			.HS 03
-			.AS "PHY"
-			.HS FF.023541
+PHY		.DA PHY.E+1-*
+			>PSTR "PHY"
+			.HS FF
+			>PSTR "5A"
 PHY.E	.HS 00
-PLA		.DA PLA.E+1
-			.HS 03
-			.AS "PLA"
-			.HS FF.023638
+PLA		.DA PLA.E+1-*
+			>PSTR "PLA"
+			.HS FF
+			>PSTR "68"
 PLA.E	.HS 00
-PLP		.DA PLP.E+1
-			.HS 03
-			.AS "PLP"
-			.HS FF.023238
+PLP		.DA PLP.E+1-*
+			>PSTR "PLP"
+			.HS FF
+			>PSTR "28"
 PLP.E	.HS 00
-PLX		.DA PLX.E+1
-			.HS 03
-			.AS "PLX"
-			.HS FF.024641
+PLX		.DA PLX.E+1-*
+			>PSTR "PLX"
+			.HS FF
+			>PSTR "FA"
 PLX.E	.HS 00
-PLY		.DA PLY.E+1
-			.HS 03
-			.AS "PLY"
-			.HS FF.023741
+PLY		.DA PLY.E+1-*
+			>PSTR "PLY"
+			.HS FF
+			>PSTR "7A"
 PLY.E	.HS 00
-ROL		.DA ROL.E+1
+ROL		.DA ROL.E+1-*
+			>PSTR "ROL"
 			.HS 03
-			.AS "ROL"
-			.HS 03.03323661
-			.HS 04.03333661
-			.HS 05.0432456161
-			.HS 06.0433456161
-			.HS FF.023241
+			>PSTR "26a"
+			.HS 04
+			>PSTR "36a"
+			.HS 05
+			>PSTR "2Eaa"
+			.HS 06
+			>PSTR "3Eaa"
+			.HS FF
+			>PSTR "2A"
 ROL.E	.HS 00
-ROR		.DA ROR.E+1
+ROR		.DA ROR.E+1-*
+			>PSTR "ROR"
 			.HS 03
-			.AS "ROR"
-			.HS 03.03363661
-			.HS 04.03373661
-			.HS 05.0436456161
-			.HS 06.0437456161
-			.HS FF.023641
+			>PSTR "66a"
+			.HS 04
+			>PSTR "76a"
+			.HS 05
+			>PSTR "6Eaa"
+			.HS 06
+			>PSTR "7Eaa"
+			.HS FF
+			>PSTR "6A"
 ROR.E	.HS 00
-RTI		.DA RTI.E+1
-			.HS 03
-			.AS "RTI"
-			.HS FF.023430
+RTI		.DA RTI.E+1-*
+			>PSTR "RTI"
+			.HS FF
+			>PSTR "40"
 RTI.E	.HS 00
-RTS		.DA RTS.E+1
-			.HS 03
-			.AS "RTS"
-			.HS FF.023630
+RTS		.DA RTS.E+1-*
+			>PSTR "RTS"
+			.HS FF
+			>PSTR "60"
 RTS.E	.HS 00
-SBC		.DA SBC.E+1
+SBC		.DA SBC.E+1-*
+			>PSTR "SBC"
+			.HS 00
+			>PSTR "F2a"
+			.HS 01
+			>PSTR "F1a"
+			.HS 02
+			>PSTR "E1a"
 			.HS 03
-			.AS "SBC"
-			.HS 00.03463261
-			.HS 01.03463161
-			.HS 02.03453161
-			.HS 03.03453561
-			.HS 04.03463561
-			.HS 05.0445646161
-			.HS 06.0446646161
-			.HS 07.0446396161
-			.HS 08.03453969
+			>PSTR "E5a"
+			.HS 04
+			>PSTR "F5a"
+			.HS 05
+			>PSTR "Edaa"
+			.HS 06
+			>PSTR "Fdaa"
+			.HS 07
+			>PSTR "F9aa"
+			.HS 08
+			>PSTR "E9i"
 SBC.E	.HS 00
-SEC		.DA SEC.E+1
-			.HS 03
-			.AS "SEC"
-			.HS FF.023338
+SEC		.DA SEC.E+1-*
+			>PSTR "SEC"
+			.HS FF
+			>PSTR "38"
 SEC.E	.HS 00
-SED		.DA SED.E+1
-			.HS 03
-			.AS "SED"
-			.HS FF.024638
+SED		.DA SED.E+1-*
+			>PSTR "SED"
+			.HS FF
+			>PSTR "F8"
 SED.E	.HS 00
-SEI		.DA SEI.E+1
-			.HS 03
-			.AS "SEI"
-			.HS FF.023738
+SEI		.DA SEI.E+1-*
+			>PSTR "SEI"
+			.HS FF
+			>PSTR "78"
 SEI.E	.HS 00
-STA		.DA STA.E+1
+STA		.DA STA.E+1-*
+			>PSTR "STA"
+			.HS 00
+			>PSTR "92a"
+			.HS 01
+			>PSTR "91a"
+			.HS 02
+			>PSTR "81a"
 			.HS 03
-			.AS "STA"
-			.HS 00.03393261
-			.HS 01.03393161
-			.HS 02.03383161
-			.HS 03.03383561
-			.HS 04.03393561
-			.HS 05.0438446161
-			.HS 06.0439446161
-			.HS 07.0439396161
+			>PSTR "85a"
+			.HS 04
+			>PSTR "95a"
+			.HS 05
+			>PSTR "8Daa"
+			.HS 06
+			>PSTR "9Daa"
+			.HS 07
+			>PSTR "99aa"
 STA.E	.HS 00
-STX		.DA STX.E+1
+STX		.DA STX.E+1-*
+			>PSTR "STX"
 			.HS 03
-			.AS "STX"
-			.HS 03.03383661
-			.HS 0C.03393661
-			.HS 05.0438456161
+			>PSTR "86a"
+			.HS 0C
+			>PSTR "96a"
+			.HS 05
+			>PSTR "8Eaa"
 STX.E	.HS 00
-STY		.DA STY.E+1
+STY		.DA STY.E+1-*
+			>PSTR "STY"
 			.HS 03
-			.AS "STY"
-			.HS 03.03383461
-			.HS 04.03393461
-			.HS 05.0438436161
+			>PSTR "84a"
+			.HS 04
+			>PSTR "94a"
+			.HS 05
+			>PSTR "8Caa"
 STY.E	.HS 00
-STZ		.DA STZ.E+1
+STZ		.DA STZ.E+1-*
+			>PSTR "STZ"
 			.HS 03
-			.AS "STZ"
-			.HS 03.03363461
-			.HS 04.03373461
-			.HS 05.0439436161
-			.HS 06.0439456161
+			>PSTR "64a"
+			.HS 04
+			>PSTR "74a"
+			.HS 05
+			>PSTR "9Caa"
+			.HS 06
+			>PSTR "9Eaa"
 STZ.E	.HS 00
-TAX		.DA TAX.E+1
-			.HS 03
-			.AS "TAX"
-			.HS FF.024141
+TAX		.DA TAX.E+1-*
+			>PSTR "TAX"
+			.HS FF
+			>PSTR "AA"
 TAX.E	.HS 00
-TAY		.DA TAY.E+1
-			.HS 03
-			.AS "TAY"
-			.HS FF.024138
+TAY		.DA TAY.E+1-*
+			>PSTR "TAY"
+			.HS FF
+			>PSTR "A8"
 TAY.E	.HS 00
-TRB		.DA TRB.E+1
+TRB		.DA TRB.E+1-*
+			>PSTR "TRB"
 			.HS 03
-			.AS "TRB"
-			.HS 03.03313461
-			.HS 05.0431436161
+			>PSTR "14a"
+			.HS 05
+			>PSTR "1Caa"
 TRB.E	.HS 00
-TSB		.DA TSB.E+1
+TSB		.DA TSB.E+1-*
+			>PSTR "TSB"
 			.HS 03
-			.AS "TSB"
-			.HS 03.03303461
-			.HS 05.0430436161
+			>PSTR "04a"
+			.HS 05
+			>PSTR "0Caa"
 TSB.E	.HS 00
-TSX		.DA TSX.E+1
-			.HS 03
-			.AS "TSX"
-			.HS FF.024241
+TSX		.DA TSX.E+1-*
+			>PSTR "TSX"
+			.HS FF
+			>PSTR "BA"
 TSX.E	.HS 00
-TXA		.DA TXA.E+1
-			.HS 03
-			.AS "TXA"
-			.HS FF.023841
+TXA		.DA TXA.E+1-*
+			>PSTR "TXA"
+			.HS FF
+			>PSTR "8A"
 TXA.E	.HS 00
-TXS		.DA TXS.E+1
-			.HS 03
-			.AS "TXS"
-			.HS FF.023941
+TXS		.DA TXS.E+1-*
+			>PSTR "TXS"
+			.HS FF
+			>PSTR "9A"
 TXS.E	.HS 00
-TYA		.DA TYA.E+1
-			.HS 03
-			.AS "TYA"
-			.HS FF.023938
+TYA		.DA TYA.E+1-*
+			>PSTR "TYA"
+			.HS FF
+			>PSTR "98"
 TYA.E		.HS 00
 			.HS 0000
 *---------------------------------------
--- a/BIN/ASM.T.65C02.S.txt
+++ b/BIN/ASM.T.65C02.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.65C02
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/ASM.T.65R02.A.txt
+++ b/BIN/ASM.T.65R02.A.txt
@ -2,26 +2,26 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "(a)"
-				>ST "(a),Y"
-				>ST "(a,X)"
-				>ST "a"
-				>ST "a,X"
-				>ST "aa"
-				>ST "aa,X"
-				>ST "aa,Y"
-				>ST "i"
-				>ST "a,r"
-				>ST "r"
-				>ST "(aa)"
-				>ST "(aa,x)"
-				>ST "a,Y"
+T.ADDR.MODES	.EQ *
+				>PSTR "(a)"
+				>PSTR "(a),Y"
+				>PSTR "(a,X)"
+				>PSTR "a"
+				>PSTR "a,X"
+				>PSTR "aa"
+				>PSTR "aa,X"
+				>PSTR "aa,Y"
+				>PSTR "i"
+				>PSTR "a,r"
+				>PSTR "r"
+				>PSTR "(aa)"
+				>PSTR "(aa,x)"
+				>PSTR "a,Y"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "Y"
-				>ST "X"
+				>PSTR "Y"
+				>PSTR "X"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.65R02.O.txt
+++ b/BIN/ASM.T.65R02.O.txt
--- a/BIN/ASM.T.65R02.S.txt
+++ b/BIN/ASM.T.65R02.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.65R02
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/ASM.T.65W02.A.txt
+++ b/BIN/ASM.T.65W02.A.txt
@ -2,26 +2,26 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "(a)"
-				>ST "(a),Y"
-				>ST "(a,X)"
-				>ST "a"
-				>ST "a,X"
-				>ST "aa"
-				>ST "aa,X"
-				>ST "aa,Y"
-				>ST "i"
-				>ST "a,r"
-				>ST "r"
-				>ST "(aa)"
-				>ST "(aa,x)"
-				>ST "a,Y"
+T.ADDR.MODES	.EQ *
+				>PSTR "(a)"
+				>PSTR "(a),Y"
+				>PSTR "(a,X)"
+				>PSTR "a"
+				>PSTR "a,X"
+				>PSTR "aa"
+				>PSTR "aa,X"
+				>PSTR "aa,Y"
+				>PSTR "i"
+				>PSTR "a,r"
+				>PSTR "r"
+				>PSTR "(aa)"
+				>PSTR "(aa,x)"
+				>PSTR "a,Y"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "Y"
-				>ST "X"
+				>PSTR "Y"
+				>PSTR "X"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.65W02.O.txt
+++ b/BIN/ASM.T.65W02.O.txt
--- a/BIN/ASM.T.65W02.S.txt
+++ b/BIN/ASM.T.65W02.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.65W02
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/ASM.T.SW16.A.txt
+++ b/BIN/ASM.T.SW16.A.txt
@ -2,59 +2,59 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "R0"
-				>ST "R1"
-				>ST "R2"
-				>ST "R3"
-				>ST "R4"
-				>ST "R5"
-				>ST "R6"
-				>ST "R7"
-				>ST "R8"
-				>ST "R9"
-				>ST "R10"
-				>ST "R11"
-				>ST "R12"
-				>ST "R13"
-				>ST "R14"
-				>ST "R15"
-				>ST "r"
-				>ST "@R0"
-				>ST "@R1"
-				>ST "@R2"
-				>ST "@R3"
-				>ST "@R4"
-				>ST "@R5"
-				>ST "@R6"
-				>ST "@R7"
-				>ST "@R8"
-				>ST "@R9"
-				>ST "@R10"
-				>ST "@R11"
-				>ST "@R12"
-				>ST "@R13"
-				>ST "@R14"
-				>ST "@R15"
+T.ADDR.MODES	.EQ *
+				>PSTR "R0"
+				>PSTR "R1"
+				>PSTR "R2"
+				>PSTR "R3"
+				>PSTR "R4"
+				>PSTR "R5"
+				>PSTR "R6"
+				>PSTR "R7"
+				>PSTR "R8"
+				>PSTR "R9"
+				>PSTR "R10"
+				>PSTR "R11"
+				>PSTR "R12"
+				>PSTR "R13"
+				>PSTR "R14"
+				>PSTR "R15"
+				>PSTR "r"
+				>PSTR "@R0"
+				>PSTR "@R1"
+				>PSTR "@R2"
+				>PSTR "@R3"
+				>PSTR "@R4"
+				>PSTR "@R5"
+				>PSTR "@R6"
+				>PSTR "@R7"
+				>PSTR "@R8"
+				>PSTR "@R9"
+				>PSTR "@R10"
+				>PSTR "@R11"
+				>PSTR "@R12"
+				>PSTR "@R13"
+				>PSTR "@R14"
+				>PSTR "@R15"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "R0"
-				>ST "R1"
-				>ST "R2"
-				>ST "R3"
-				>ST "R4"
-				>ST "R5"
-				>ST "R6"
-				>ST "R7"
-				>ST "R8"
-				>ST "R9"
-				>ST "R10"
-				>ST "R11"
-				>ST "R12"
-				>ST "R13"
-				>ST "R14"
-				>ST "R15"
+				>PSTR "R0"
+				>PSTR "R1"
+				>PSTR "R2"
+				>PSTR "R3"
+				>PSTR "R4"
+				>PSTR "R5"
+				>PSTR "R6"
+				>PSTR "R7"
+				>PSTR "R8"
+				>PSTR "R9"
+				>PSTR "R10"
+				>PSTR "R11"
+				>PSTR "R12"
+				>PSTR "R13"
+				>PSTR "R14"
+				>PSTR "R15"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.SW16.O.txt
+++ b/BIN/ASM.T.SW16.O.txt
@ -3,362 +3,589 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.OPCODES	.EQ *
-ADD		.DA ADD.E+1
+ADD		.DA ADD.E+1-*
+			>PSTR "ADD"
+			.HS 00
+			>PSTR "A0"
+			.HS 01
+			>PSTR "A1"
+			.HS 02
+			>PSTR "A2"
 			.HS 03
-			.AS "ADD"
-			.HS 00.024130
-			.HS 01.024131
-			.HS 02.024132
-			.HS 03.024133
-			.HS 04.024134
-			.HS 05.024135
-			.HS 06.024136
-			.HS 07.024137
-			.HS 08.024138
-			.HS 09.024139
-			.HS 0A.024141
-			.HS 0B.024142
-			.HS 0C.024143
-			.HS 0D.024144
-			.HS 0E.024145
-			.HS 0F.024146
+			>PSTR "A3"
+			.HS 04
+			>PSTR "A4"
+			.HS 05
+			>PSTR "A5"
+			.HS 06
+			>PSTR "A6"
+			.HS 07
+			>PSTR "A7"
+			.HS 08
+			>PSTR "A8"
+			.HS 09
+			>PSTR "A9"
+			.HS 0A
+			>PSTR "AA"
+			.HS 0B
+			>PSTR "AB"
+			.HS 0C
+			>PSTR "AC"
+			.HS 0D
+			>PSTR "AD"
+			.HS 0E
+			>PSTR "AE"
+			.HS 0F
+			>PSTR "AF"
 ADD.E	.HS 00
-BC		.DA BC.E+1
-			.HS 02
-			.AS "BC"
-			.HS 10.03303372
+BC		.DA BC.E+1-*
+			>PSTR "BC"
+			.HS 10
+			>PSTR "03r"
 BC.E	.HS 00
-BK		.DA BK.E+1
-			.HS 02
-			.AS "BK"
-			.HS FF.023041
+BK		.DA BK.E+1-*
+			>PSTR "BK"
+			.HS FF
+			>PSTR "0A"
 BK.E	.HS 00
-BM		.DA BM.E+1
-			.HS 02
-			.AS "BM"
-			.HS 10.03303572
+BM		.DA BM.E+1-*
+			>PSTR "BM"
+			.HS 10
+			>PSTR "05r"
 BM.E	.HS 00
-BM1		.DA BM1.E+1
-			.HS 03
-			.AS "BM1"
-			.HS 10.03303872
+BM1		.DA BM1.E+1-*
+			>PSTR "BM1"
+			.HS 10
+			>PSTR "08r"
 BM1.E	.HS 00
-BNC		.DA BNC.E+1
-			.HS 03
-			.AS "BNC"
-			.HS 10.03303272
+BNC		.DA BNC.E+1-*
+			>PSTR "BNC"
+			.HS 10
+			>PSTR "02r"
 BNC.E	.HS 00
-BNM1		.DA BNM1.E+1
-			.HS 04
-			.AS "BNM1"
-			.HS 10.03303972
+BNM1		.DA BNM1.E+1-*
+			>PSTR "BNM1"
+			.HS 10
+			>PSTR "09r"
 BNM1.E	.HS 00
-BNZ		.DA BNZ.E+1
-			.HS 03
-			.AS "BNZ"
-			.HS 10.03303772
+BNZ		.DA BNZ.E+1-*
+			>PSTR "BNZ"
+			.HS 10
+			>PSTR "07r"
 BNZ.E	.HS 00
-BP		.DA BP.E+1
-			.HS 02
-			.AS "BP"
-			.HS 10.03303472
+BP		.DA BP.E+1-*
+			>PSTR "BP"
+			.HS 10
+			>PSTR "04r"
 BP.E	.HS 00
-BR		.DA BR.E+1
-			.HS 02
-			.AS "BR"
-			.HS 10.03303172
+BR		.DA BR.E+1-*
+			>PSTR "BR"
+			.HS 10
+			>PSTR "01r"
 BR.E	.HS 00
-BS		.DA BS.E+1
-			.HS 02
-			.AS "BS"
-			.HS 10.03304472
+BS		.DA BS.E+1-*
+			>PSTR "BS"
+			.HS 10
+			>PSTR "0Dr"
 BS.E	.HS 00
-BZ		.DA BZ.E+1
-			.HS 02
-			.AS "BZ"
-			.HS 10.03303672
+BZ		.DA BZ.E+1-*
+			>PSTR "BZ"
+			.HS 10
+			>PSTR "06r"
 BZ.E	.HS 00
-CPR		.DA CPR.E+1
-			.HS 03
-			.AS "CPR"
-			.HS 00.024430
-			.HS 01.024431
-			.HS 02.024432
-			.HS 03.024433
-			.HS 04.024434
-			.HS 05.024435
-			.HS 06.024436
-			.HS 07.024437
-			.HS 08.024438
-			.HS 09.024439
-			.HS 0A.024441
-			.HS 0B.024442
-			.HS 0C.024443
-			.HS 0D.024444
-			.HS 0E.024445
-			.HS 0F.024446
-CPR.E	.HS 00
-DCR		.DA DCR.E+1
-			.HS 03
-			.AS "DCR"
-			.HS 00.024630
-			.HS 01.024631
-			.HS 02.024632
-			.HS 03.024633
-			.HS 04.024634
-			.HS 05.024635
-			.HS 06.024636
-			.HS 07.024637
-			.HS 08.024638
-			.HS 09.024639
-			.HS 0A.024641
-			.HS 0B.024642
-			.HS 0C.024643
-			.HS 0D.024644
-			.HS 0E.024645
-			.HS 0F.024646
-DCR.E	.HS 00
-INR		.DA INR.E+1
-			.HS 03
-			.AS "INR"
-			.HS 00.024530
-			.HS 01.024531
-			.HS 02.024532
-			.HS 03.024533
-			.HS 04.024534
-			.HS 05.024535
-			.HS 06.024536
-			.HS 07.024537
-			.HS 08.024538
-			.HS 09.024539
-			.HS 0A.024541
-			.HS 0B.024542
-			.HS 0C.024543
-			.HS 0D.024544
-			.HS 0E.024545
-			.HS 0F.024546
-INR.E	.HS 00
-LD		.DA LD.E+1
+CPR		.DA CPR.E+1-*
+			>PSTR "CPR"
+			.HS 00
+			>PSTR "D0"
+			.HS 01
+			>PSTR "D1"
 			.HS 02
-			.AS "LD"
-			.HS 00.023230
-			.HS 01.023231
-			.HS 02.023232
-			.HS 03.023233
-			.HS 04.023234
-			.HS 05.023235
-			.HS 06.023236
-			.HS 07.023237
-			.HS 08.023238
-			.HS 09.023239
-			.HS 0A.023241
-			.HS 0B.023242
-			.HS 0C.023243
-			.HS 0D.023244
-			.HS 0E.023245
-			.HS 0F.023246
-			.HS 11.023430
-			.HS 12.023431
-			.HS 13.023432
-			.HS 14.023433
-			.HS 15.023434
-			.HS 16.023435
-			.HS 17.023436
-			.HS 18.023437
-			.HS 19.023438
-			.HS 1A.023439
-			.HS 1B.023441
-			.HS 1C.023442
-			.HS 1D.023443
-			.HS 1E.023444
-			.HS 1F.023445
-			.HS 20.023446
-LD.E	.HS 00
-LDD		.DA LDD.E+1
+			>PSTR "D2"
 			.HS 03
-			.AS "LDD"
-			.HS 11.023630
-			.HS 12.023631
-			.HS 13.023632
-			.HS 14.023633
-			.HS 15.023634
-			.HS 16.023635
-			.HS 17.023636
-			.HS 18.023637
-			.HS 19.023638
-			.HS 1A.023639
-			.HS 1B.023641
-			.HS 1C.023642
-			.HS 1D.023643
-			.HS 1E.023644
-			.HS 1F.023645
-			.HS 20.023646
-LDD.E	.HS 00
-POP		.DA POP.E+1
-			.HS 03
-			.AS "POP"
-			.HS 11.023830
-			.HS 12.023831
-			.HS 13.023832
-			.HS 14.023833
-			.HS 15.023834
-			.HS 16.023835
-			.HS 17.023836
-			.HS 18.023837
-			.HS 19.023838
-			.HS 1A.023839
-			.HS 1B.023841
-			.HS 1C.023842
-			.HS 1D.023843
-			.HS 1E.023844
-			.HS 1F.023845
-			.HS 20.023846
-POP.E	.HS 00
-POPD		.DA POPD.E+1
+			>PSTR "D3"
 			.HS 04
-			.AS "POPD"
-			.HS 11.024330
-			.HS 12.024331
-			.HS 13.024332
-			.HS 14.024333
-			.HS 15.024334
-			.HS 16.024335
-			.HS 17.024336
-			.HS 18.024337
-			.HS 19.024338
-			.HS 1A.024339
-			.HS 1B.024341
-			.HS 1C.024342
-			.HS 1D.024343
-			.HS 1E.024344
-			.HS 1F.024345
-			.HS 20.024346
+			>PSTR "D4"
+			.HS 05
+			>PSTR "D5"
+			.HS 06
+			>PSTR "D6"
+			.HS 07
+			>PSTR "D7"
+			.HS 08
+			>PSTR "D8"
+			.HS 09
+			>PSTR "D9"
+			.HS 0A
+			>PSTR "DA"
+			.HS 0B
+			>PSTR "DB"
+			.HS 0C
+			>PSTR "DC"
+			.HS 0D
+			>PSTR "DD"
+			.HS 0E
+			>PSTR "DE"
+			.HS 0F
+			>PSTR "DF"
+CPR.E	.HS 00
+DCR		.DA DCR.E+1-*
+			>PSTR "DCR"
+			.HS 00
+			>PSTR "F0"
+			.HS 01
+			>PSTR "F1"
+			.HS 02
+			>PSTR "F2"
+			.HS 03
+			>PSTR "F3"
+			.HS 04
+			>PSTR "F4"
+			.HS 05
+			>PSTR "F5"
+			.HS 06
+			>PSTR "F6"
+			.HS 07
+			>PSTR "F7"
+			.HS 08
+			>PSTR "F8"
+			.HS 09
+			>PSTR "F9"
+			.HS 0A
+			>PSTR "FA"
+			.HS 0B
+			>PSTR "FB"
+			.HS 0C
+			>PSTR "FC"
+			.HS 0D
+			>PSTR "FD"
+			.HS 0E
+			>PSTR "FE"
+			.HS 0F
+			>PSTR "FF"
+DCR.E	.HS 00
+INR		.DA INR.E+1-*
+			>PSTR "INR"
+			.HS 00
+			>PSTR "E0"
+			.HS 01
+			>PSTR "E1"
+			.HS 02
+			>PSTR "E2"
+			.HS 03
+			>PSTR "E3"
+			.HS 04
+			>PSTR "E4"
+			.HS 05
+			>PSTR "E5"
+			.HS 06
+			>PSTR "E6"
+			.HS 07
+			>PSTR "E7"
+			.HS 08
+			>PSTR "E8"
+			.HS 09
+			>PSTR "E9"
+			.HS 0A
+			>PSTR "EA"
+			.HS 0B
+			>PSTR "EB"
+			.HS 0C
+			>PSTR "EC"
+			.HS 0D
+			>PSTR "ED"
+			.HS 0E
+			>PSTR "EE"
+			.HS 0F
+			>PSTR "EF"
+INR.E	.HS 00
+LD		.DA LD.E+1-*
+			>PSTR "LD"
+			.HS 00
+			>PSTR "20"
+			.HS 01
+			>PSTR "21"
+			.HS 02
+			>PSTR "22"
+			.HS 03
+			>PSTR "23"
+			.HS 04
+			>PSTR "24"
+			.HS 05
+			>PSTR "25"
+			.HS 06
+			>PSTR "26"
+			.HS 07
+			>PSTR "27"
+			.HS 08
+			>PSTR "28"
+			.HS 09
+			>PSTR "29"
+			.HS 0A
+			>PSTR "2A"
+			.HS 0B
+			>PSTR "2B"
+			.HS 0C
+			>PSTR "2C"
+			.HS 0D
+			>PSTR "2D"
+			.HS 0E
+			>PSTR "2E"
+			.HS 0F
+			>PSTR "2F"
+			.HS 11
+			>PSTR "40"
+			.HS 12
+			>PSTR "41"
+			.HS 13
+			>PSTR "42"
+			.HS 14
+			>PSTR "43"
+			.HS 15
+			>PSTR "44"
+			.HS 16
+			>PSTR "45"
+			.HS 17
+			>PSTR "46"
+			.HS 18
+			>PSTR "47"
+			.HS 19
+			>PSTR "48"
+			.HS 1A
+			>PSTR "49"
+			.HS 1B
+			>PSTR "4A"
+			.HS 1C
+			>PSTR "4B"
+			.HS 1D
+			>PSTR "4C"
+			.HS 1E
+			>PSTR "4D"
+			.HS 1F
+			>PSTR "4E"
+			.HS 20
+			>PSTR "4F"
+LD.E	.HS 00
+LDD		.DA LDD.E+1-*
+			>PSTR "LDD"
+			.HS 11
+			>PSTR "60"
+			.HS 12
+			>PSTR "61"
+			.HS 13
+			>PSTR "62"
+			.HS 14
+			>PSTR "63"
+			.HS 15
+			>PSTR "64"
+			.HS 16
+			>PSTR "65"
+			.HS 17
+			>PSTR "66"
+			.HS 18
+			>PSTR "67"
+			.HS 19
+			>PSTR "68"
+			.HS 1A
+			>PSTR "69"
+			.HS 1B
+			>PSTR "6A"
+			.HS 1C
+			>PSTR "6B"
+			.HS 1D
+			>PSTR "6C"
+			.HS 1E
+			>PSTR "6D"
+			.HS 1F
+			>PSTR "6E"
+			.HS 20
+			>PSTR "6F"
+LDD.E	.HS 00
+POP		.DA POP.E+1-*
+			>PSTR "POP"
+			.HS 11
+			>PSTR "80"
+			.HS 12
+			>PSTR "81"
+			.HS 13
+			>PSTR "82"
+			.HS 14
+			>PSTR "83"
+			.HS 15
+			>PSTR "84"
+			.HS 16
+			>PSTR "85"
+			.HS 17
+			>PSTR "86"
+			.HS 18
+			>PSTR "87"
+			.HS 19
+			>PSTR "88"
+			.HS 1A
+			>PSTR "89"
+			.HS 1B
+			>PSTR "8A"
+			.HS 1C
+			>PSTR "8B"
+			.HS 1D
+			>PSTR "8C"
+			.HS 1E
+			>PSTR "8D"
+			.HS 1F
+			>PSTR "8E"
+			.HS 20
+			>PSTR "8F"
+POP.E	.HS 00
+POPD		.DA POPD.E+1-*
+			>PSTR "POPD"
+			.HS 11
+			>PSTR "C0"
+			.HS 12
+			>PSTR "C1"
+			.HS 13
+			>PSTR "C2"
+			.HS 14
+			>PSTR "C3"
+			.HS 15
+			>PSTR "C4"
+			.HS 16
+			>PSTR "C5"
+			.HS 17
+			>PSTR "C6"
+			.HS 18
+			>PSTR "C7"
+			.HS 19
+			>PSTR "C8"
+			.HS 1A
+			>PSTR "C9"
+			.HS 1B
+			>PSTR "CA"
+			.HS 1C
+			>PSTR "CB"
+			.HS 1D
+			>PSTR "CC"
+			.HS 1E
+			>PSTR "CD"
+			.HS 1F
+			>PSTR "CE"
+			.HS 20
+			>PSTR "CF"
 POPD.E	.HS 00
-RS		.DA RS.E+1
-			.HS 02
-			.AS "RS"
-			.HS FF.023042
+RS		.DA RS.E+1-*
+			>PSTR "RS"
+			.HS FF
+			>PSTR "0B"
 RS.E	.HS 00
-RTN		.DA RTN.E+1
-			.HS 03
-			.AS "RTN"
-			.HS FF.03303072
+RTN		.DA RTN.E+1-*
+			>PSTR "RTN"
+			.HS FF
+			>PSTR "00r"
 RTN.E	.HS 00
-SET		.DA SET.E+1
-			.HS 03
-			.AS "SET"
-			.HS 00.023130
-			.HS 01.023131
-			.HS 02.023132
-			.HS 03.023133
-			.HS 04.023134
-			.HS 05.023135
-			.HS 06.023136
-			.HS 07.023137
-			.HS 08.023138
-			.HS 09.023139
-			.HS 0A.023141
-			.HS 0B.023142
-			.HS 0C.023143
-			.HS 0D.023144
-			.HS 0E.023145
-			.HS 0F.023144
-SET.E	.HS 00
-ST		.DA ST.E+1
+SET		.DA SET.E+1-*
+			>PSTR "SET"
+			.HS 00
+			>PSTR "10"
+			.HS 01
+			>PSTR "11"
 			.HS 02
-			.AS "ST"
-			.HS 00.023330
-			.HS 01.023331
-			.HS 02.023332
-			.HS 03.023333
-			.HS 04.023334
-			.HS 05.023335
-			.HS 06.023336
-			.HS 07.023337
-			.HS 08.023338
-			.HS 09.023339
-			.HS 0A.023341
-			.HS 0B.023342
-			.HS 0C.023343
-			.HS 0D.023344
-			.HS 0E.023345
-			.HS 0F.023346
-			.HS 11.023530
-			.HS 12.023531
-			.HS 13.023532
-			.HS 14.023533
-			.HS 15.023534
-			.HS 16.023535
-			.HS 17.023536
-			.HS 18.023537
-			.HS 19.023538
-			.HS 1A.023539
-			.HS 1B.023541
-			.HS 1C.023542
-			.HS 1D.023543
-			.HS 1E.023544
-			.HS 1F.023545
-			.HS 20.023546
+			>PSTR "12"
+			.HS 03
+			>PSTR "13"
+			.HS 04
+			>PSTR "14"
+			.HS 05
+			>PSTR "15"
+			.HS 06
+			>PSTR "16"
+			.HS 07
+			>PSTR "17"
+			.HS 08
+			>PSTR "18"
+			.HS 09
+			>PSTR "19"
+			.HS 0A
+			>PSTR "1A"
+			.HS 0B
+			>PSTR "1B"
+			.HS 0C
+			>PSTR "1C"
+			.HS 0D
+			>PSTR "1D"
+			.HS 0E
+			>PSTR "1E"
+			.HS 0F
+			>PSTR "1D"
+SET.E	.HS 00
+ST		.DA ST.E+1-*
+			>PSTR "ST"
+			.HS 00
+			>PSTR "30"
+			.HS 01
+			>PSTR "31"
+			.HS 02
+			>PSTR "32"
+			.HS 03
+			>PSTR "33"
+			.HS 04
+			>PSTR "34"
+			.HS 05
+			>PSTR "35"
+			.HS 06
+			>PSTR "36"
+			.HS 07
+			>PSTR "37"
+			.HS 08
+			>PSTR "38"
+			.HS 09
+			>PSTR "39"
+			.HS 0A
+			>PSTR "3A"
+			.HS 0B
+			>PSTR "3B"
+			.HS 0C
+			>PSTR "3C"
+			.HS 0D
+			>PSTR "3D"
+			.HS 0E
+			>PSTR "3E"
+			.HS 0F
+			>PSTR "3F"
+			.HS 11
+			>PSTR "50"
+			.HS 12
+			>PSTR "51"
+			.HS 13
+			>PSTR "52"
+			.HS 14
+			>PSTR "53"
+			.HS 15
+			>PSTR "54"
+			.HS 16
+			>PSTR "55"
+			.HS 17
+			>PSTR "56"
+			.HS 18
+			>PSTR "57"
+			.HS 19
+			>PSTR "58"
+			.HS 1A
+			>PSTR "59"
+			.HS 1B
+			>PSTR "5A"
+			.HS 1C
+			>PSTR "5B"
+			.HS 1D
+			>PSTR "5C"
+			.HS 1E
+			>PSTR "5D"
+			.HS 1F
+			>PSTR "5E"
+			.HS 20
+			>PSTR "5F"
 ST.E	.HS 00
-STD		.DA STD.E+1
-			.HS 03
-			.AS "STD"
-			.HS 11.023730
-			.HS 12.023731
-			.HS 13.023732
-			.HS 14.023733
-			.HS 15.023734
-			.HS 16.023735
-			.HS 17.023736
-			.HS 18.023737
-			.HS 19.023738
-			.HS 1A.023739
-			.HS 1B.023741
-			.HS 1C.023742
-			.HS 1D.023743
-			.HS 1E.023744
-			.HS 1F.023745
-			.HS 20.023746
+STD		.DA STD.E+1-*
+			>PSTR "STD"
+			.HS 11
+			>PSTR "70"
+			.HS 12
+			>PSTR "71"
+			.HS 13
+			>PSTR "72"
+			.HS 14
+			>PSTR "73"
+			.HS 15
+			>PSTR "74"
+			.HS 16
+			>PSTR "75"
+			.HS 17
+			>PSTR "76"
+			.HS 18
+			>PSTR "77"
+			.HS 19
+			>PSTR "78"
+			.HS 1A
+			>PSTR "79"
+			.HS 1B
+			>PSTR "7A"
+			.HS 1C
+			>PSTR "7B"
+			.HS 1D
+			>PSTR "7C"
+			.HS 1E
+			>PSTR "7D"
+			.HS 1F
+			>PSTR "7E"
+			.HS 20
+			>PSTR "7F"
 STD.E	.HS 00
-STP		.DA STP.E+1
-			.HS 03
-			.AS "STP"
-			.HS 11.023930
-			.HS 12.023931
-			.HS 13.023932
-			.HS 14.023933
-			.HS 15.023934
-			.HS 16.023935
-			.HS 17.023936
-			.HS 18.023937
-			.HS 19.023938
-			.HS 1A.023939
-			.HS 1B.023941
-			.HS 1C.023942
-			.HS 1D.023943
-			.HS 1E.023944
-			.HS 1F.023945
-			.HS 20.023946
+STP		.DA STP.E+1-*
+			>PSTR "STP"
+			.HS 11
+			>PSTR "90"
+			.HS 12
+			>PSTR "91"
+			.HS 13
+			>PSTR "92"
+			.HS 14
+			>PSTR "93"
+			.HS 15
+			>PSTR "94"
+			.HS 16
+			>PSTR "95"
+			.HS 17
+			>PSTR "96"
+			.HS 18
+			>PSTR "97"
+			.HS 19
+			>PSTR "98"
+			.HS 1A
+			>PSTR "99"
+			.HS 1B
+			>PSTR "9A"
+			.HS 1C
+			>PSTR "9B"
+			.HS 1D
+			>PSTR "9C"
+			.HS 1E
+			>PSTR "9D"
+			.HS 1F
+			>PSTR "9E"
+			.HS 20
+			>PSTR "9F"
 STP.E	.HS 00
-SUB		.DA SUB.E+1
+SUB		.DA SUB.E+1-*
+			>PSTR "SUB"
+			.HS 00
+			>PSTR "B0"
+			.HS 01
+			>PSTR "B1"
+			.HS 02
+			>PSTR "B2"
 			.HS 03
-			.AS "SUB"
-			.HS 00.024230
-			.HS 01.024231
-			.HS 02.024232
-			.HS 03.024233
-			.HS 04.024234
-			.HS 05.024235
-			.HS 06.024236
-			.HS 07.024237
-			.HS 08.024238
-			.HS 09.024239
-			.HS 0A.024241
-			.HS 0B.024242
-			.HS 0C.024243
-			.HS 0D.024244
-			.HS 0E.024245
-			.HS 0F.024246
+			>PSTR "B3"
+			.HS 04
+			>PSTR "B4"
+			.HS 05
+			>PSTR "B5"
+			.HS 06
+			>PSTR "B6"
+			.HS 07
+			>PSTR "B7"
+			.HS 08
+			>PSTR "B8"
+			.HS 09
+			>PSTR "B9"
+			.HS 0A
+			>PSTR "BA"
+			.HS 0B
+			>PSTR "BB"
+			.HS 0C
+			>PSTR "BC"
+			.HS 0D
+			>PSTR "BD"
+			.HS 0E
+			>PSTR "BE"
+			.HS 0F
+			>PSTR "BF"
 SUB.E		.HS 00
 			.HS 0000
 *---------------------------------------
--- a/BIN/ASM.T.SW16.S.txt
+++ b/BIN/ASM.T.SW16.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.SW16
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/ASM.T.Z80.A.txt
+++ b/BIN/ASM.T.Z80.A.txt
@ -2,212 +2,212 @@ NEW
 PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
-T.ADDR.MODES		.EQ *
-				>ST "A,(HL)"
-				>ST "A,(IX+a)"
-				>ST "A,(IY+a)"
-				>ST "A,A"
-				>ST "A,a"
-				>ST "A,B"
-				>ST "A,C"
-				>ST "A,D"
-				>ST "A,E"
-				>ST "A,H"
-				>ST "A,L"
-				>ST "HL,BC"
-				>ST "HL,DE"
-				>ST "HL,HL"
-				>ST "HL,SP"
-				>ST "IX,BC"
-				>ST "IX,DE"
-				>ST "IX,IX"
-				>ST "IX,SP"
-				>ST "IY,BC"
-				>ST "IY,DE"
-				>ST "IY,IY"
-				>ST "IY,SP"
-				>ST "(HL)"
-				>ST "(IX+a)"
-				>ST "(IY+a)"
-				>ST "A"
-				>ST "a"
-				>ST "B"
-				>ST "C"
-				>ST "D"
-				>ST "E"
-				>ST "H"
-				>ST "L"
-				>ST "aa"
-				>ST "BC"
-				>ST "DE"
-				>ST "HL"
-				>ST "IX"
-				>ST "IY"
-				>ST "SP"
-				>ST "r"
-				>ST "(SP),HL"
-				>ST "(SP),IX"
-				>ST "(SP),IY"
-				>ST "DE,HL"
-				>ST "A,(a)"
-				>ST "A,(C)"
-				>ST "B,(C)"
-				>ST "C,(C)"
-				>ST "D,(C)"
-				>ST "E,(C)"
-				>ST "H,(C)"
-				>ST "L,(C)"
-				>ST "(IX)"
-				>ST "(IY)"
-				>ST "(aa),A"
-				>ST "(aa),BC"
-				>ST "(aa),DE"
-				>ST "(aa),HL"
-				>ST "(aa),IX"
-				>ST "(aa),IY"
-				>ST "(aa),SP"
-				>ST "(BC),A"
-				>ST "(DE),A"
-				>ST "(HL),A"
-				>ST "(HL),a"
-				>ST "(HL),B"
-				>ST "(HL),C"
-				>ST "(HL),D"
-				>ST "(HL),E"
-				>ST "(HL),H"
-				>ST "(HL),L"
-				>ST "(IX+a),A"
-				>ST "(IX+a),a"
-				>ST "(IX+a),B"
-				>ST "(IX+a),C"
-				>ST "(IX+a),D"
-				>ST "(IX+a),E"
-				>ST "(IX+a),H"
-				>ST "(IX+a),L"
-				>ST "(IY+a),A"
-				>ST "(IY+a),a"
-				>ST "(IY+a),B"
-				>ST "(IY+a),C"
-				>ST "(IY+a),D"
-				>ST "(IY+a),E"
-				>ST "(IY+a),H"
-				>ST "(IY+a),L"
-				>ST "A,(aa)"
-				>ST "A,(BC)"
-				>ST "A,(DE)"
-				>ST "A,I"
-				>ST "A,R"
-				>ST "B,(HL)"
-				>ST "B,(IX+a)"
-				>ST "B,(IY+a)"
-				>ST "B,A"
-				>ST "B,a"
-				>ST "B,B"
-				>ST "B,C"
-				>ST "B,D"
-				>ST "B,E"
-				>ST "B,H"
-				>ST "B,L"
-				>ST "BC,(aa)"
-				>ST "BC,aa"
-				>ST "C,(HL)"
-				>ST "C,(IX+a)"
-				>ST "C,(IY+a)"
-				>ST "C,A"
-				>ST "C,a"
-				>ST "C,B"
-				>ST "C,C"
-				>ST "C,D"
-				>ST "C,E"
-				>ST "C,H"
-				>ST "C,L"
-				>ST "D,(HL)"
-				>ST "D,(IX+a)"
-				>ST "D,(IY+a)"
-				>ST "D,A"
-				>ST "D,a"
-				>ST "D,B"
-				>ST "D,C"
-				>ST "D,D"
-				>ST "D,E"
-				>ST "D,H"
-				>ST "D,L"
-				>ST "DE,(aa)"
-				>ST "DE,aa"
-				>ST "E,(HL)"
-				>ST "E,(IX+a)"
-				>ST "E,(IY+a)"
-				>ST "E,A"
-				>ST "E,a"
-				>ST "E,B"
-				>ST "E,C"
-				>ST "E,D"
-				>ST "E,E"
-				>ST "E,H"
-				>ST "E,L"
-				>ST "H,(HL)"
-				>ST "H,(IX+a)"
-				>ST "H,(IY+a)"
-				>ST "H,A"
-				>ST "H,a"
-				>ST "H,B"
-				>ST "H,C"
-				>ST "H,D"
-				>ST "H,E"
-				>ST "H,H"
-				>ST "H,L"
-				>ST "HL,(aa)"
-				>ST "HL,aa"
-				>ST "I,A"
-				>ST "IX,(aa)"
-				>ST "IX,aa"
-				>ST "IY,(aa)"
-				>ST "IY,aa"
-				>ST "L,(HL)"
-				>ST "L,(IX+a)"
-				>ST "L,(IY+a)"
-				>ST "L,A"
-				>ST "L,a"
-				>ST "L,B"
-				>ST "L,C"
-				>ST "L,D"
-				>ST "L,E"
-				>ST "L,H"
-				>ST "L,L"
-				>ST "R,A"
-				>ST "SP,(aa)"
-				>ST "SP,aa"
-				>ST "SP,HL"
-				>ST "SP,IX"
-				>ST "SP,IY"
-				>ST "(a),A"
-				>ST "(C),A"
-				>ST "(C),B"
-				>ST "(C),C"
-				>ST "(C),D"
-				>ST "(C),E"
-				>ST "(C),H"
-				>ST "(C),L"
-				>ST "AF"
+T.ADDR.MODES	.EQ *
+				>PSTR "A,(HL)"
+				>PSTR "A,(IX+a)"
+				>PSTR "A,(IY+a)"
+				>PSTR "A,A"
+				>PSTR "A,a"
+				>PSTR "A,B"
+				>PSTR "A,C"
+				>PSTR "A,D"
+				>PSTR "A,E"
+				>PSTR "A,H"
+				>PSTR "A,L"
+				>PSTR "HL,BC"
+				>PSTR "HL,DE"
+				>PSTR "HL,HL"
+				>PSTR "HL,SP"
+				>PSTR "IX,BC"
+				>PSTR "IX,DE"
+				>PSTR "IX,IX"
+				>PSTR "IX,SP"
+				>PSTR "IY,BC"
+				>PSTR "IY,DE"
+				>PSTR "IY,IY"
+				>PSTR "IY,SP"
+				>PSTR "(HL)"
+				>PSTR "(IX+a)"
+				>PSTR "(IY+a)"
+				>PSTR "A"
+				>PSTR "a"
+				>PSTR "B"
+				>PSTR "C"
+				>PSTR "D"
+				>PSTR "E"
+				>PSTR "H"
+				>PSTR "L"
+				>PSTR "aa"
+				>PSTR "BC"
+				>PSTR "DE"
+				>PSTR "HL"
+				>PSTR "IX"
+				>PSTR "IY"
+				>PSTR "SP"
+				>PSTR "r"
+				>PSTR "(SP),HL"
+				>PSTR "(SP),IX"
+				>PSTR "(SP),IY"
+				>PSTR "DE,HL"
+				>PSTR "A,(a)"
+				>PSTR "A,(C)"
+				>PSTR "B,(C)"
+				>PSTR "C,(C)"
+				>PSTR "D,(C)"
+				>PSTR "E,(C)"
+				>PSTR "H,(C)"
+				>PSTR "L,(C)"
+				>PSTR "(IX)"
+				>PSTR "(IY)"
+				>PSTR "(aa),A"
+				>PSTR "(aa),BC"
+				>PSTR "(aa),DE"
+				>PSTR "(aa),HL"
+				>PSTR "(aa),IX"
+				>PSTR "(aa),IY"
+				>PSTR "(aa),SP"
+				>PSTR "(BC),A"
+				>PSTR "(DE),A"
+				>PSTR "(HL),A"
+				>PSTR "(HL),a"
+				>PSTR "(HL),B"
+				>PSTR "(HL),C"
+				>PSTR "(HL),D"
+				>PSTR "(HL),E"
+				>PSTR "(HL),H"
+				>PSTR "(HL),L"
+				>PSTR "(IX+a),A"
+				>PSTR "(IX+a),a"
+				>PSTR "(IX+a),B"
+				>PSTR "(IX+a),C"
+				>PSTR "(IX+a),D"
+				>PSTR "(IX+a),E"
+				>PSTR "(IX+a),H"
+				>PSTR "(IX+a),L"
+				>PSTR "(IY+a),A"
+				>PSTR "(IY+a),a"
+				>PSTR "(IY+a),B"
+				>PSTR "(IY+a),C"
+				>PSTR "(IY+a),D"
+				>PSTR "(IY+a),E"
+				>PSTR "(IY+a),H"
+				>PSTR "(IY+a),L"
+				>PSTR "A,(aa)"
+				>PSTR "A,(BC)"
+				>PSTR "A,(DE)"
+				>PSTR "A,I"
+				>PSTR "A,R"
+				>PSTR "B,(HL)"
+				>PSTR "B,(IX+a)"
+				>PSTR "B,(IY+a)"
+				>PSTR "B,A"
+				>PSTR "B,a"
+				>PSTR "B,B"
+				>PSTR "B,C"
+				>PSTR "B,D"
+				>PSTR "B,E"
+				>PSTR "B,H"
+				>PSTR "B,L"
+				>PSTR "BC,(aa)"
+				>PSTR "BC,aa"
+				>PSTR "C,(HL)"
+				>PSTR "C,(IX+a)"
+				>PSTR "C,(IY+a)"
+				>PSTR "C,A"
+				>PSTR "C,a"
+				>PSTR "C,B"
+				>PSTR "C,C"
+				>PSTR "C,D"
+				>PSTR "C,E"
+				>PSTR "C,H"
+				>PSTR "C,L"
+				>PSTR "D,(HL)"
+				>PSTR "D,(IX+a)"
+				>PSTR "D,(IY+a)"
+				>PSTR "D,A"
+				>PSTR "D,a"
+				>PSTR "D,B"
+				>PSTR "D,C"
+				>PSTR "D,D"
+				>PSTR "D,E"
+				>PSTR "D,H"
+				>PSTR "D,L"
+				>PSTR "DE,(aa)"
+				>PSTR "DE,aa"
+				>PSTR "E,(HL)"
+				>PSTR "E,(IX+a)"
+				>PSTR "E,(IY+a)"
+				>PSTR "E,A"
+				>PSTR "E,a"
+				>PSTR "E,B"
+				>PSTR "E,C"
+				>PSTR "E,D"
+				>PSTR "E,E"
+				>PSTR "E,H"
+				>PSTR "E,L"
+				>PSTR "H,(HL)"
+				>PSTR "H,(IX+a)"
+				>PSTR "H,(IY+a)"
+				>PSTR "H,A"
+				>PSTR "H,a"
+				>PSTR "H,B"
+				>PSTR "H,C"
+				>PSTR "H,D"
+				>PSTR "H,E"
+				>PSTR "H,H"
+				>PSTR "H,L"
+				>PSTR "HL,(aa)"
+				>PSTR "HL,aa"
+				>PSTR "I,A"
+				>PSTR "IX,(aa)"
+				>PSTR "IX,aa"
+				>PSTR "IY,(aa)"
+				>PSTR "IY,aa"
+				>PSTR "L,(HL)"
+				>PSTR "L,(IX+a)"
+				>PSTR "L,(IY+a)"
+				>PSTR "L,A"
+				>PSTR "L,a"
+				>PSTR "L,B"
+				>PSTR "L,C"
+				>PSTR "L,D"
+				>PSTR "L,E"
+				>PSTR "L,H"
+				>PSTR "L,L"
+				>PSTR "R,A"
+				>PSTR "SP,(aa)"
+				>PSTR "SP,aa"
+				>PSTR "SP,HL"
+				>PSTR "SP,IX"
+				>PSTR "SP,IY"
+				>PSTR "(a),A"
+				>PSTR "(C),A"
+				>PSTR "(C),B"
+				>PSTR "(C),C"
+				>PSTR "(C),D"
+				>PSTR "(C),E"
+				>PSTR "(C),H"
+				>PSTR "(C),L"
+				>PSTR "AF"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
-				>ST "A"
-				>ST "HL"
-				>ST "IX"
-				>ST "IY"
-				>ST "B"
-				>ST "C"
-				>ST "D"
-				>ST "E"
-				>ST "H"
-				>ST "L"
-				>ST "BC"
-				>ST "DE"
-				>ST "SP"
-				>ST "I"
-				>ST "R"
-				>ST "AF"
+				>PSTR "A"
+				>PSTR "HL"
+				>PSTR "IX"
+				>PSTR "IY"
+				>PSTR "B"
+				>PSTR "C"
+				>PSTR "D"
+				>PSTR "E"
+				>PSTR "H"
+				>PSTR "L"
+				>PSTR "BC"
+				>PSTR "DE"
+				>PSTR "SP"
+				>PSTR "I"
+				>PSTR "R"
+				>PSTR "AF"
 				.HS 00
 *---------------------------------------
 MAN
--- a/BIN/ASM.T.Z80.O.txt
+++ b/BIN/ASM.T.Z80.O.txt
--- a/BIN/ASM.T.Z80.S.txt
+++ b/BIN/ASM.T.Z80.S.txt
@ -5,7 +5,7 @@ AUTO 4,1
 				.OR $0
 				.TF /A2OSX.BUILD/BIN/DEV/ASM.T.Z80
 *---------------------------------------
-				.MA ST
+				.MA PSTR
 				.DA #:1-*-1
 				.AS "]1"
 :1				.EQ *
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@ -179,11 +179,7 @@ CS.RUN			jsr CS.RUN.BuildCat
 				rts
 *--------------------------------------
 CS.RUN.BuildCat	>LDA.G hDev
-				>SYSCALL GetDevByID.A
-				bcs .99
-				>STYA pDev
-				ldx #DEVMGR.STATUS
-				jsr pDevJmp
+				>SYSCALL GetDevStatus.A
 				bcs .99
 				
 				>STYA ZPPtr1
@ -239,15 +235,11 @@ CS.RUN.BuildCat	>LDA.G hDev
 				>LIBCALL hLIBBLKDEV,LIBBLKDEV.BuildProDOSCat
 .9				rts
 *--------------------------------------
-CS.RUN.WriteCat	>LDA.G hDev
-				>SYSCALL GetDevByID.A
-				bcs .9
-				>STYA pDev
+CS.RUN.WriteCat	>PUSHB.G hDev
+				>PUSHBI DEVMGR.WRITEBLOCK		
+				>PUSHEA.G BlkParams.Ptr
 				
-				>LEA.G BlkParams.Ptr
-				ldx #DEVMGR.WRITEBLOCK		
-				
-				jsr pDevJmp
+				>SYSCALL DevIOCTL
 				bcs .9
 				
 				lda #'.'
--- a/BIN/LSDEV.S.txt
+++ b/BIN/LSDEV.S.txt
@ -57,12 +57,9 @@ CS.RUN			>LDYA L.MSG0
 				bcs .9
 				
 				>LDA.G DEV.ID
-				>SYSCALL GetDevByID.A
-				>STYA pDev
-
-				ldx #DEVMGR.STATUS
-				jsr pDevJmp
+				>SYSCALL GetDevStatus.A
 				bcs .6
+				
 				>STYA ZPPTR2

 				jsr DumpStatus
@ -81,8 +78,8 @@ CS.RUN			>LDYA L.MSG0
 				bne .1
 				
 .8				lda #0					tell TSKMGR that all done ok, but 
-.9				sec						we do not want to stay in memory
-				rts
+				sec						we do not want to stay in memory
+.9				rts
 *--------------------------------------
 DumpHeader		ldy #S.DEV.DRV.JMP+1
 				>PUSHB (ZPPTR1),y
--- a/DRV/DHGR.DRV.S.BLT.txt
+++ b/DRV/DHGR.DRV.S.BLT.txt
@ -16,14 +16,16 @@ AUTO 4,1
 *  S.CB.SrcPtr+1 = 0, hMem in S.CB.SrcPtr 
 *  S.CB.DstPtr : pointer to Save Buffer
 *--------------------------------------
-BITBLT			>LDYA CB.CACHE+S.CB.SrcPtr
+BITBLT			ldy CB.CACHE+S.CB.SrcPtr
+				lda CB.CACHE+S.CB.SrcPtr+1
 				bne BITBLT.1
 				
-				tya
-				>SYSCALL GetStkObj.A
-				
 				sta SETREADAUX
 				sta SETWRITEAUX
+
+				tya
+				ldx #SYS.GetMemPtr.A
+				jsr Kernel.JMP
 				
 				jsr BITBLT.1
 				
@ -397,6 +399,8 @@ BLT.Get7BMBits1	lda (ZPBMDataPtr)
 				inc ZPBMDataPtr+1			
 .8				rts
 *--------------------------------------
+Kernel.JMP		jmp (SYS.Kernel.JMP,x)
+*--------------------------------------
 MAN
 SAVE /A2OSX.SRC/DRV/DHGR.DRV.S.RECT
 LOAD /A2OSX.SRC/DRV/DHGR.DRV.S
--- a/INC/A2osX.I.txt
+++ b/INC/A2osX.I.txt
@ -3,23 +3,21 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 				.LIST OFF
 *--------------------------------------
-pDrv			.EQ $10
-pDev			.EQ $12
-pEvent			.EQ $14
-pPs				.EQ $16
-*--------------------------------------
-* PS Context : 24 bytes
-*--------------------------------------
-pCode			.EQ $18
-pData			.EQ $1A
-pStack			.EQ $1C
-pLocal			.EQ $1E
-
-ZPBIN			.EQ $20
-*--------------------------------------
 ZPDRV			.EQ	$30
 ZPLIB			.EQ	$40					32 bytes for TCPIP
 *--------------------------------------
+* PS Context : 48 bytes MAX
+*--------------------------------------
+pEvent			.EQ $D4
+pPs				.EQ $D6
+
+pCode			.EQ $D8
+pData			.EQ $DA
+pStack			.EQ $DC
+pLocal			.EQ $DE
+
+ZPBIN			.EQ $E0					32 bytes
+*--------------------------------------
 * A2osX GLOBAL PAGE
 *  $BD00->$BD0F : Public Vetors
 *--------------------------------------
@ -29,8 +27,7 @@ A2osX.ATKCALL	.EQ	$BD06
 A2osX.ROMCALL	.EQ	$BD09
 A2osX.BADCALL	.EQ $BD0C
 *--------------------------------------
-pDevJmp			.EQ $BD10
-A2osx.SLEEP		.EQ $BD13
+A2osx.SLEEP		.EQ $BD10
 *--------------------------------------
 *  $BEE0->$BEEF : Public Variables
 *--------------------------------------
@ -92,8 +89,8 @@ SYS.GetC.A			.EQ $24
 SYS.GetChar			.EQ $26
 SYS.FPutS			.EQ $28
 SYS.PutS.YA			.EQ $2A
-*SYS.FGetS			.EQ $2C
-*SYS.GetS.YA		.EQ $2E
+*					.EQ $2C
+*					.EQ $2E

 SYS.FOpen			.EQ $30
 SYS.FOpen.R				.EQ $01			Open For Read
@ -119,8 +116,8 @@ SYS.Rename			.EQ $42

 SYS.GetDevByID.A	.EQ $48
 SYS.GetDevByName.YA	.EQ $4A
-*					.EQ $4C
-*					.EQ $4E
+SYS.GetDevStatus.A	.EQ $4C
+SYS.DevIOCTL		.EQ $4E

 *					.EQ $50
 SYS.SScanF			.EQ $52
@ -178,8 +175,8 @@ SYS.CreatePS.YA		.EQ $A6
 SYS.GetPSStatus.A	.EQ $AC
 SYS.GetPSList.YA	.EQ $AE

-*SYS.GetArgC			.EQ $B0
-SYS.GetArg.A			.EQ $B2
+*					.EQ $B0
+SYS.GetArg.A		.EQ $B2
 SYS.ExpandStr.YA	.EQ $B4
 *					.EQ $B6

@ -223,9 +220,9 @@ SYS.GetMemStat.YA	.EQ $EE
 *					.EQ $F4
 *					.EQ $F6

-SYS.NewStkObj.YA	.EQ $F8
+*					.EQ $F8
 SYS.LoadStkObj		.EQ $FA
-SYS.GetStkObj.A		.EQ $FC
+SYS.NewStkObj.YA	.EQ $FC
 SYS.FreeStkObj.A	.EQ $FE
 *--------------------------------------
 SYS.Kernel.JMP	.EQ $E000
--- a/INC/KERNEL.I.txt
+++ b/INC/KERNEL.I.txt
@ -33,7 +33,7 @@ H.BIN.DRV.CODE.LEN	.EQ 14
 H.BIN.DRV.REL.TABLE	.EQ 0
 *--------------------------------------
 ZPKERNEL		.EQ $0
-ZPMEMMGR		.EQ $8
+ZPMEMMGR		.EQ $10
 *--------------------------------------
 * MoveAux / XFer
 *--------------------------------------
--- a/INC/MACROS.I.txt
+++ b/INC/MACROS.I.txt
@ -133,6 +133,12 @@ AUTO 4,1
 				>LEA.G ]1
 				>PUSHYA
 				.EM
+*--------------------------------------
+				.MA	PUSHB.G
+				ldy #]1
+				lda (pData),y
+				>PUSHA
+				.EM
 *--------------------------------------
 				.MA	PUSHW.G
 				ldy #]1+1
--- a/SYS/KERNEL.S.CORE.txt
+++ b/SYS/KERNEL.S.CORE.txt
@ -377,10 +377,10 @@ CORE.ScrSel		and #$0F
 				
 				stx A2osX.ASCREEN
 				
-				>STYA pDev
+				>STYA .1+1

 				ldx #DEVMGR.CONTROL
-				jmp pDevJmp
+.1				jmp $ffff				SELF MODIFED
 				
 .8				rts
 *--------------------------------------
--- a/SYS/KERNEL.S.DEV.txt
+++ b/SYS/KERNEL.S.DEV.txt
@ -17,14 +17,10 @@ K.GetDevByID.A	cmp DevMgr.Count
 				asl
 				asl
 				asl
-				php
-				clc
-				adc	#Dev.Table
 				tay
 				
-				plp
-				lda #0
-				adc /Dev.Table
+				lda /Dev.Table
+				adc #0
 				rts						CC		
 */--------------------------------------
 * # GetDevByName.YA
@ -53,11 +49,9 @@ K.GetDevByName.YA
 				bne .2					no....loop
 				
 				lda ZPPtr2
-				sec
-				sbc #S.DEV.NAME
+				and #$F0
 				tay
 				lda ZPPtr2+1
-				sbc /S.DEV.NAME
 				clc
 				rts
 				
@ -75,6 +69,49 @@ K.GetDevByName.YA

 K.GetDevDNF		lda #MLI.E.NODEV		CS from cpx/beq
 				rts
+*/--------------------------------------
+* # K.GetDevStatus.A
+* ## IN: 
+*  A = DevID
+* ## OUT:
+*  Y,A = S.DSTAT
+*\--------------------------------------
+K.GetDevStatus.A	
+				jsr K.GetDevByID.A
+				bcs .9
+				
+				>STYA pDev
+				
+				ldx #DEVMGR.STATUS
+				jmp (pDev)
+.9				rts
+*/--------------------------------------
+* # K.DevIOCTL
+* ## IN: 
+*  PUSHB = DevID
+*  PUSHB = Operation
+*  PUSHW = Param Block
+* ## OUT:
+*  Y,A = ...
+*\--------------------------------------
+K.DevIOCTL		>PULLB .1+1
+				>PULLB .2+1
+				
+				>PULLA
+				tax
+				
+				>PULLA
+				jsr K.GetDevByID.A
+				bcs .9
+				
+				>STYA pDev
+				
+.1				ldy #$ff				SELF MODIFIED
+.2				lda #$ff				SELF MODIFIED
+
+				jmp (pDev)
+				
+.9				rts
 *--------------------------------------
 MAN
 SAVE /A2OSX.SRC/SYS/KERNEL.S.DEV
--- a/SYS/KERNEL.S.GP.txt
+++ b/SYS/KERNEL.S.GP.txt
@ -39,8 +39,6 @@ AUTO 4,1
 				lda #MLI.E.BADCALL
 				sec
 				rts
-*--------------------------------------
-				jmp (pDev)				pDevJmp
 *--------------------------------------
 * SLEEP
 *--------------------------------------
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@ -6,6 +6,9 @@ ZPPtr1			.EQ ZPKERNEL
 ZPPtr2			.EQ ZPKERNEL+2
 ZPPtr3			.EQ ZPKERNEL+4
 ZPPtr4			.EQ ZPKERNEL+6
+pDrv			.EQ ZPKERNEL+8
+pDev			.EQ ZPKERNEL+10
+
 *--------------------------------------
 SYS.BASL0		.EQ $400
 *--------------------------------------
--- a/SYS/KERNEL.S.JMP.txt
+++ b/SYS/KERNEL.S.JMP.txt
@ -30,8 +30,8 @@ K.SYSCALL.JMP	.DA 0					$00
 				.DA K.GetChar
 				.DA K.FPutS
 				.DA K.PutS.YA
-				.DA K.FGetS
-				.DA K.GetS.YA
+				.DA 0
+				.DA 0
 				
 				.DA K.FOpen				$30
 				.DA K.FClose.A
@ -48,8 +48,8 @@ K.SYSCALL.JMP	.DA 0					$00
 				.DA 0
 				.DA K.GetDevByID.A
 				.DA K.GetDevByName.YA
-				.DA 0
-				.DA 0
+				.DA K.GetDevStatus.A
+				.DA K.DevIOCTL
 				
 				.DA 0					$50
 				.DA K.SScanF
@ -149,9 +149,9 @@ K.SYSCALL.JMP	.DA 0					$00
 				.DA 0
 				.DA 0
 				.DA 0
-				.DA K.NewStkObj.YA
+				.DA 0
 				.DA K.LoadStkObj
-				.DA K.GetStkObj.A
+				.DA K.NewStkObj.YA
 				.DA K.FreeStkObj.A
 *--------------------------------------
 * LO Byte :
--- a/SYS/KERNEL.S.MEM.txt
+++ b/SYS/KERNEL.S.MEM.txt
@ -479,6 +479,46 @@ K.NewStr.YA		>STYA .1+1
 				ply
 				clc
 .9				rts				
+*/--------------------------------------
+* # GetMemStat.YA
+* ## In:
+*  Y,A = Ptr to 24 bytes buffer
+* ## Out:
+*  Buffer filled with memory stats
+*\--------------------------------------
+K.GetMemStat.YA	>STYA ZPMemMgrTmp1
+				
+				ldy #6
+				
+.1				lda Mem.Table,y
+				sta (ZPMemMgrTmp1),y
+				dey
+				bpl .1
+				
+				
+				ldx #6
+				ldy #14
+				
+				sta SETREADAUX
+				
+.2				lda Mem.Table,x
+				sta (ZPMemMgrTmp1),y
+				dey
+				dex
+				bpl .2
+				
+				sta CLRREADAUX
+				
+				ldx #6
+				ldy #22
+
+.3				lda DevMgr.Stat,x
+				sta (ZPMemMgrTmp1),y
+				dey
+				dex
+				bpl .3
+				
+				rts
 *--------------------------------------
 * SList : 
 *  Block : 
@ -530,25 +570,6 @@ K.SListFree
 *--------------------------------------
 MEM.SList.Next
 */--------------------------------------
-* # NewStkObj.YA
-* ## In: 
-*  Y,A = Size Requested
-* ## Out:
-*  CC : success
-*   YA = PTR to Mem (Uninitialised)
-*	X = hMem
-*  CS :
-*   A = EC
-*\--------------------------------------
-K.NewStkObj.YA	sta SETREADAUX
-				sta SETWRITEAUX
-				
-				jsr	K.GetMem.YA
-				
-				sta CLRREADAUX
-				sta CLRWRITEAUX
-				rts
-*/--------------------------------------
 * # LoadStkObj
 * Load a file in AUX memory (Stock Objects)
 * ## In:
@ -600,18 +621,23 @@ K.LoadStkObj	>SYSCALL LoadFile
 				sec
 .99				rts				
 */--------------------------------------
-* # GetStkObj.A
-* ## In:
-*  A = hMem
+* # NewStkObj.YA
+* ## In: 
+*  Y,A = Size Requested
 * ## Out:
-*  Y,A = PTR to MemBlock (AUX Mem)
-*  (X unmodified)
+*  CC : success
+*   YA = PTR to Mem (Uninitialised)
+*	X = hMem
+*  CS :
+*   A = EC
 *\--------------------------------------
-K.GetStkObj.A	sta SETREADAUX
+K.NewStkObj.YA	sta SETREADAUX
+				sta SETWRITEAUX
 				
-				jsr K.GetMemPtr.A
+				jsr	K.GetMem.YA
 				
 				sta CLRREADAUX
+				sta CLRWRITEAUX
 				rts
 */--------------------------------------
 * # FreeStkObj.A
@ -628,46 +654,6 @@ K.FreeStkObj.A	sta SETREADAUX
 				
 				sta CLRREADAUX
 				sta CLRWRITEAUX
-				rts
-*/--------------------------------------
-* # GetMemStat.YA
-* ## In:
-*  Y,A = Ptr to 24 bytes buffer
-* ## Out:
-*  Buffer filled with memory stats
-*\--------------------------------------
-K.GetMemStat.YA	>STYA ZPMemMgrTmp1
-				
-				ldy #6
-				
-.1				lda Mem.Table,y
-				sta (ZPMemMgrTmp1),y
-				dey
-				bpl .1
-				
-				
-				ldx #6
-				ldy #14
-				
-				sta SETREADAUX
-				
-.2				lda Mem.Table,x
-				sta (ZPMemMgrTmp1),y
-				dey
-				dex
-				bpl .2
-				
-				sta CLRREADAUX
-				
-				ldx #6
-				ldy #22
-
-.3				lda DevMgr.Stat,x
-				sta (ZPMemMgrTmp1),y
-				dey
-				dex
-				bpl .3
-				
 				rts
 *--------------------------------------
 MAN
--- a/SYS/KERNEL.S.STAT.txt
+++ b/SYS/KERNEL.S.STAT.txt
@ -122,8 +122,8 @@ K.MKDir.YA		jsr PFT.CheckPathYA
 *\--------------------------------------
 K.MkNod.YA		jsr K.GetDevByName.YA	Ptr1=NAME
 				bcs .9
-				>STYA pDev
-				stx .1+1
+				>STYA .1+1
+				stx .2+1
 				
 				ldy #S.DEV.S
 				lda (pDev),y
@ -132,7 +132,7 @@ K.MkNod.YA		jsr K.GetDevByName.YA	Ptr1=NAME

 				txa						Pass DEV.ID to OPEN
 				ldx #DEVMGR.OPEN
-				jsr pDevJmp
+.1				jsr $FFFF				SELF MODIFIED
 				bcs .9
 				
 				>LDYAI S.NODE.DEV
@ -147,15 +147,15 @@ K.MkNod.YA		jsr K.GetDevByName.YA	Ptr1=NAME
 				
 				ldy	#S.NODE.DEV.ID
 				
-.1				lda #$ff				Self Modified
+.2				lda #$ff				Self Modified
 				sta (ZPPtr3),y

 				ldy	#S.NODE.DEV.JMP
-				lda pDev
+				lda .1+1
 				sta (ZPPtr3),y

 				iny
-				lda pDev+1
+				lda .1+2
 				sta (ZPPtr3),y
 				txa
 				clc
--- a/SYS/KERNEL.S.STDIO.txt
+++ b/SYS/KERNEL.S.STDIO.txt
@ -50,11 +50,11 @@ K.PutChar.A.1	sta K.PutC.Node
 *--------------------------------------
 K.PutChar.A.Jmp	jmp (.1,x)
 .1				.DA K.PutChar.A.REG
-				.DA STDIO.IOERR		DIR
+				.DA STDIO.IOERR			DIR
 				.DA K.PutChar.A.CDEV
-				.DA STDIO.IOERR		BDEV
-				.DA STDIO.IOERR		LNK
-				.DA STDIO.IOERR		DSOCK
+				.DA STDIO.IOERR			BDEV
+				.DA STDIO.IOERR			LNK
+				.DA STDIO.IOERR			DSOCK
 				.DA K.PutChar.A.SSOCK
 				.DA K.PutChar.A.FIFO
 *--------------------------------------
@ -62,7 +62,8 @@ K.PutChar.A.REG	lda K.PutC.Node
 				ldy K.PutC.Char
 				jmp K.FWrite.AY
 *--------------------------------------
-K.PutChar.A.CDEV	ldy #S.NODE.DEV.JMP
+K.PutChar.A.CDEV
+				ldy #S.NODE.DEV.JMP
 				lda (pDev),y
 				sta .1+1
 				iny
@ -203,26 +204,8 @@ K.FPutS
 * ## Out: 
 *  CC = success
 *\--------------------------------------
-K.PutS.YA	
-*/--------------------------------------
-* # FGetS
-* Read String From Node
-* ## In:
-*  PUSHW : CPtr 
-*  PUSHB : hFILE
-* ## Out: 
-*  CC = success
-*\--------------------------------------
-K.FGetS
-*/--------------------------------------
-* # GetS.YA
-* Read String From StdIn
-* ## In:
-*  Y,A : CPtr 
-* ## Out: 
-*  CC = success
-*\--------------------------------------
-K.GetS.YA
+K.PutS.YA
+
 				bra *
 */--------------------------------------
 * # FOpen