From 2f42486dbd7a2452a54a80f192fd18bd37628a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Fri, 27 Oct 2017 08:36:46 +0200
Subject: [PATCH] Kernel 0.9.1 : SHELL, CSH style scripting.....(wip), Math API
 (wip), API reorg

---
 .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes
 .Floppies/A2OSX.SRC.po   | Bin 819200 -> 819200 bytes
 BIN/FORMAT.S.txt         |   4 +-
 BIN/IPCONFIG.S.txt       |  26 ++++----
 BIN/LSDEV.S.txt          |  12 ++--
 BIN/MEM.S.txt            |  44 ++++++-------
 BIN/MEMDUMP.S.txt        |  18 +++---
 DRV/CONSOLE.DRV.S.txt    |   4 +-
 DRV/DHGR.DRV.S.txt       |   2 +-
 DRV/LANCEGS.DRV.S.txt    |   8 +--
 DRV/MOUSE.DRV.S.txt      |   2 +-
 DRV/PIC.DRV.S.txt        |   4 +-
 DRV/SSC.DRV.S.txt        |   4 +-
 DRV/SSC.I.DRV.S.txt      |   4 +-
 DRV/UTHER2.AI.DRV.S.txt  |   6 +-
 DRV/UTHERNET.DRV.S.txt   |  12 ++--
 DRV/UTHERNET2.DRV.S.txt  |   4 +-
 INC/A2osX.I.txt          | 114 +++++++++++++++++-----------------
 INC/KERNEL.I.txt         |  60 ++++++++++--------
 INC/NET.I.txt            |  22 +++----
 LIB/LIBTCPIP.S.CFG.txt   |   4 +-
 LIB/LIBTCPIP.S.FRM.txt   |   6 +-
 SBIN/DESKTOP.S.txt       |   2 +-
 SBIN/TCPIPD.S.txt        |   2 +-
 SYS/KERNEL.S.BIN.txt     |   2 +-
 SYS/KERNEL.S.CORE.txt    |  10 +--
 SYS/KERNEL.S.D01.txt     |  20 +++---
 SYS/KERNEL.S.DEV.txt     |   6 +-
 SYS/KERNEL.S.GP.txt      |   8 ++-
 SYS/KERNEL.S.INIT.txt    |  34 +++++-----
 SYS/KERNEL.S.IRQ.txt     |   4 +-
 SYS/KERNEL.S.MATH.txt    |  36 +++++------
 SYS/KERNEL.S.MEM.txt     | 130 +++++++++++++++++++--------------------
 SYS/KERNEL.S.PFT.txt     |   2 +-
 34 files changed, 315 insertions(+), 301 deletions(-)

diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 1a34af5cef7e7617d010055ab3efeccb4eb53ed4..76cd5bba8a28dc2cfcdeab4e3368895674ce6577 100644
GIT binary patch
delta 3980
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

delta 3864
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

diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index a645b3d29f241b58900ad1aead3e51275a0d62a0..b7e43e12b3ab965c749fcdc17c3f517086185393 100644
GIT binary patch
delta 5772
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
BG;sg`

delta 5507
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
A7XSbN

diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index 2dff5f21..71b2bfcf 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -185,10 +185,10 @@ CS.RUN.BuildCat	>LDA.G hDev
 				
 				bcs .99
 				>STYA ZPPtr1
-				ldy #S.DEVSTAT.SIZE
+				ldy #S.DSTAT.SIZE
 				lda (ZPPtr1),y
 				>STA.G SizeInBlocks
-				ldy #S.DEVSTAT.SIZE+1
+				ldy #S.DSTAT.SIZE+1
 				lda (ZPPtr1),y
 				>STA.G SizeInBlocks+1
 				
diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt
index 9cb583cf..e21ffc84 100644
--- a/BIN/IPCONFIG.S.txt
+++ b/BIN/IPCONFIG.S.txt
@@ -93,11 +93,11 @@ CS.RUN.DUMPDEV	sta DevID
 				>LDYA L.MSG0.L
 				>SYSCALL PrintF.YA
 
-				ldy #S.DEVSTAT.NET.MAC+5
+				ldy #S.DSTAT.NET.MAC+5
 				
 .1				>PUSHB (ZPDevStatPtr),y
 				dey
-				cpy #S.DEVSTAT.NET.MAC-1
+				cpy #S.DSTAT.NET.MAC-1
 				bne .1
 
 				lda #S.DEV.NAME
@@ -111,10 +111,10 @@ CS.RUN.DUMPDEV	sta DevID
 				
 				lda ZPDevStatPtr
 				clc
-				adc #S.DEVSTAT.IDS
+				adc #S.DSTAT.IDS
 				tay
 				lda ZPDevStatPtr+1
-				adc /S.DEVSTAT.IDS
+				adc /S.DSTAT.IDS
 				>PUSHYA
 				
 				>PUSHB DevID
@@ -122,27 +122,27 @@ CS.RUN.DUMPDEV	sta DevID
 				>LDYA L.MSG1.DEV
 				>SYSCALL PrintF.YA
 				
-				ldy #S.DEVSTAT.NET.FLAGS
+				ldy #S.DSTAT.NET.FLAGS
 				lda (ZPDevStatPtr),y
-				and #S.DEVSTAT.NET.FLAGS.ARPOFFLOAD
+				and #S.DSTAT.NET.FLAGS.ARPOFFLOAD
 				beq .2
 				lda #1
 .2				>PUSHA		
 				>LDYA L.MSG1.DEV.ARP
 				>SYSCALL PrintF.YA
 				
-				ldy #S.DEVSTAT.NET.FLAGS
+				ldy #S.DSTAT.NET.FLAGS
 				lda (ZPDevStatPtr),y
-				and #S.DEVSTAT.NET.FLAGS.IPOFFLOAD
+				and #S.DSTAT.NET.FLAGS.IPOFFLOAD
 				beq .3
 				lda #1
 .3				>PUSHA		
 				>LDYA L.MSG1.DEV.IP
 				>SYSCALL PrintF.YA
 				
-				ldy #S.DEVSTAT.NET.STATUS
+				ldy #S.DSTAT.NET.STATUS
 				lda (ZPDevStatPtr),y
-				and #S.DEVSTAT.NET.STATUS.OK
+				and #S.DSTAT.NET.STATUS.OK
 				bne CS.RUN.LINK
 				>PUSHW L.MSG1.LINK.KO
 				>LDYA L.MSG1.LINK
@@ -156,7 +156,7 @@ CS.RUN.LINK		>PUSHW L.MSG1.LINK.OK
 				>LDYA L.MSG1.LINKSPEED
 				>SYSCALL PrintF.YA
 				
-				ldy #S.DEVSTAT.NET.STATUS
+				ldy #S.DSTAT.NET.STATUS
 				lda (ZPDevStatPtr),y
 				and #$0F
 				tax
@@ -168,9 +168,9 @@ CS.RUN.LINK		>PUSHW L.MSG1.LINK.OK
 				dex
 				bne .4
 				
-				ldy #S.DEVSTAT.NET.STATUS
+				ldy #S.DSTAT.NET.STATUS
 				lda (ZPDevStatPtr),y
-				and #S.DEVSTAT.NET.STATUS.FD
+				and #S.DSTAT.NET.STATUS.FD
 				bne .5
 				>LDYA L.MSG1.DPLX.HD
 				bra .6
diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt
index aa5f929e..e4fb4bcd 100644
--- a/BIN/LSDEV.S.txt
+++ b/BIN/LSDEV.S.txt
@@ -136,35 +136,35 @@ DumpHeader		ldy #S.DEV.DRV.JMP+1
 DumpStatus		>LDA.G DEV.S
 				bpl .1
 				
-				ldy #S.DEVSTAT.SIZE
+				ldy #S.DSTAT.SIZE
 				lda (ZPPTR2),y
 				>STA.G DEV.SIZE
 				
-				ldy #S.DEVSTAT.SIZE+1
+				ldy #S.DSTAT.SIZE+1
 				lda (ZPPTR2),y
 				>STA.G DEV.SIZE+1
 				
-				ldy #S.DEVSTAT.SIZE+2
+				ldy #S.DSTAT.SIZE+2
 				lda (ZPPTR2),y
 				>STA.G DEV.SIZE+2
 				
 				>PUSHEA.G DEV.SIZE
 				
-.1				ldy #S.DEVSTAT.VERSION+1
+.1				ldy #S.DSTAT.VERSION+1
 				>PUSHB (ZPPTR2),y
 				dey
 				>PUSHB (ZPPTR2),y
 				
 				lda ZPPTR2
 				clc
-				adc #S.DEVSTAT.IDS
+				adc #S.DSTAT.IDS
 				tay
 				lda ZPPTR2+1
 				adc #0
 				
 				>PUSHYA
 				
-				ldy #S.DEVSTAT.ST
+				ldy #S.DSTAT.ST
 				>PUSHB (ZPPTR2),y
 				dey
 				>PUSHB (ZPPTR2),y
diff --git a/BIN/MEM.S.txt b/BIN/MEM.S.txt
index ddca8572..2bc27ebf 100644
--- a/BIN/MEM.S.txt
+++ b/BIN/MEM.S.txt
@@ -53,17 +53,17 @@ CS.RUN			>LDYA L.MemStat
 				>LDYA L.MSG.Main
 				>SYSCALL PrintF.YA
 
-				lda MemStat+S.MEMSTAT.MF
+				lda MemStat+S.MSTAT.MF
 				sec
-				sbc MemStat+S.MEMSTAT.ML
+				sbc MemStat+S.MSTAT.ML
 				tay
-				lda MemStat+S.MEMSTAT.MF+1
-				sbc MemStat+S.MEMSTAT.ML+1
+				lda MemStat+S.MSTAT.MF+1
+				sbc MemStat+S.MSTAT.ML+1
 				>PUSHYA
 				
-				>PUSHW MemStat+S.MEMSTAT.MH
-				>PUSHW MemStat+S.MEMSTAT.MF
-				>PUSHW MemStat+S.MEMSTAT.ML
+				>PUSHW MemStat+S.MSTAT.MH
+				>PUSHW MemStat+S.MSTAT.MF
+				>PUSHW MemStat+S.MSTAT.ML
 				
 				>LDYA L.MSG.Stat
 				>SYSCALL PrintF.YA
@@ -71,17 +71,17 @@ CS.RUN			>LDYA L.MemStat
 				>LDYA L.MSG.Aux
 				>SYSCALL PrintF.YA
 
-				lda MemStat+S.MEMSTAT.XF
+				lda MemStat+S.MSTAT.XF
 				sec
-				sbc MemStat+S.MEMSTAT.XL
+				sbc MemStat+S.MSTAT.XL
 				tay
-				lda MemStat+S.MEMSTAT.XF+1
-				sbc MemStat+S.MEMSTAT.XL+1
+				lda MemStat+S.MSTAT.XF+1
+				sbc MemStat+S.MSTAT.XL+1
 				>PUSHYA
 				
-				>PUSHW MemStat+S.MEMSTAT.XH
-				>PUSHW MemStat+S.MEMSTAT.XF
-				>PUSHW MemStat+S.MEMSTAT.XL
+				>PUSHW MemStat+S.MSTAT.XH
+				>PUSHW MemStat+S.MSTAT.XF
+				>PUSHW MemStat+S.MSTAT.XL
 				
 				>LDYA L.MSG.Stat
 				>SYSCALL PrintF.YA
@@ -89,17 +89,17 @@ CS.RUN			>LDYA L.MemStat
 				>LDYA L.MSG.Kernel
 				>SYSCALL PrintF.YA
 
-				lda MemStat+S.MEMSTAT.DH
+				lda MemStat+S.MSTAT.DH
 				sec
-				sbc MemStat+S.MEMSTAT.DF
+				sbc MemStat+S.MSTAT.DF
 				tay
-				lda MemStat+S.MEMSTAT.DH+1
-				sbc MemStat+S.MEMSTAT.DF+1
+				lda MemStat+S.MSTAT.DH+1
+				sbc MemStat+S.MSTAT.DF+1
 				>PUSHYA
 				
-				>PUSHW MemStat+S.MEMSTAT.DH
-				>PUSHW MemStat+S.MEMSTAT.DF
-				>PUSHW MemStat+S.MEMSTAT.DL
+				>PUSHW MemStat+S.MSTAT.DH
+				>PUSHW MemStat+S.MSTAT.DF
+				>PUSHW MemStat+S.MSTAT.DL
 				
 				>LDYA L.MSG.Stat
 				>SYSCALL PrintF.YA
@@ -122,7 +122,7 @@ MSG.Aux			>CSTR "--- Aux Memory ----------------\r\n"
 MSG.Kernel		>CSTR "--- Kernel (Drivers) Memory ---\r\n"
 MSG.Stat		>CSTR " Low              : $%H\r\n Free Ptr         : $%H\r\n High             : $%H\r\n Available Memory : %05D Bytes\r\n"
 MSG.End			>CSTR "-------------------------------\r\n"
-MemStat			.BS S.MEMSTAT
+MemStat			.BS S.MSTAT
 *--------------------------------------
 				.DUMMY
 				.OR 0
diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt
index 82d3a636..80c7794f 100644
--- a/BIN/MEMDUMP.S.txt
+++ b/BIN/MEMDUMP.S.txt
@@ -84,7 +84,7 @@ CS.RUN			>SYSCALL GetChar
 				bne .8
 				
 				>LDA.G MEM.COUNT
-				>CMP.G MemStat+S.MEMSTAT.MLastSlot
+				>CMP.G MemStat+S.MSTAT.MLast
 				beq .10
 
 				ldy #LINE.COUNT
@@ -137,27 +137,27 @@ CS.RUN			>SYSCALL GetChar
 				>LDYA L.MSG2
 				>SYSCALL PrintF.YA
 
-				>LDYA.G MemStat+S.MEMSTAT.MH
+				>LDYA.G MemStat+S.MSTAT.MH
 				>PUSHYA
 				>LDYA L.MSG3
 				>SYSCALL PrintF.YA
 
-				>LDYA.G MemStat+S.MEMSTAT.MF
+				>LDYA.G MemStat+S.MSTAT.MF
 				>PUSHYA
 				>LDYA L.MSG4
 				>SYSCALL PrintF.YA
 
-				>LDYA.G MemStat+S.MEMSTAT.ML
+				>LDYA.G MemStat+S.MSTAT.ML
 				>PUSHYA
 				>LDYA L.MSG5
 				>SYSCALL PrintF.YA
 				
 				sec
-				>LDA.G MemStat+S.MEMSTAT.MF
-				>SBC.G MemStat+S.MEMSTAT.ML
+				>LDA.G MemStat+S.MSTAT.MF
+				>SBC.G MemStat+S.MSTAT.ML
 				pha
-				>LDA.G MemStat+S.MEMSTAT.MF+1
-				>SBC.G MemStat+S.MEMSTAT.ML+1
+				>LDA.G MemStat+S.MSTAT.MF+1
+				>SBC.G MemStat+S.MSTAT.ML+1
 				ply
 				
 				>PUSHYA
@@ -309,7 +309,7 @@ LINE.COUNT		.BS 1
 MEM.COUNT		.BS 1
 USED.COUNT		.BS 1
 bSTOP			.BS 1
-MemStat			.BS S.MEMSTAT
+MemStat			.BS S.MSTAT
 MEM.FLAGS		.BS 9
 DS.END
 				.ED
diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt
index 3ad8395e..d3f080f5 100644
--- a/DRV/CONSOLE.DRV.S.txt
+++ b/DRV/CONSOLE.DRV.S.txt
@@ -889,10 +889,10 @@ EscSeqParamTmp	.BS 2
 EscSeqParamCnt	.BS 1
 EscSeqParam		.BS 4
 *--------------------------------------
-DEVSTAT			.DA #S.DEVSTAT.S.WRITE+S.DEVSTAT.S.READ
+DEVSTAT			.DA #S.DSTAT.S.WRITE+S.DSTAT.S.READ
 				.DA #0,#0,#0
 				>PSTR "ANSI 80c Console"
-				.DA #S.DEVSTAT.T.CHAR
+				.DA #S.DSTAT.T.CHAR
 				.DA #0
 				.DA $0900
 ENQ.String		>CSTR "A2osXTERM"
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 99a882a4..ec1f51b7 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -330,7 +330,7 @@ STAT			.DA #0
 				.DA #0,#0,#0
 				>PSTR "Apple II DHGR"
 				.BS 3
-				.DA #S.DEVSTAT.T.GFX
+				.DA #S.DSTAT.T.GFX
 				.DA #0
 				.DA $0900
 *--------------------------------------
diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt
index e1d8bbc5..607458fe 100644
--- a/DRV/LANCEGS.DRV.S.txt
+++ b/DRV/LANCEGS.DRV.S.txt
@@ -124,7 +124,7 @@ DRV.CS.START	.DA STATUS
 L.DEVSTAT		.DA DEVSTAT
 				.DA 0					end or relocation
 *--------------------------------------
-STATUS			lda #S.DEVSTAT.NET.STATUS.10
+STATUS			lda #S.DSTAT.NET.STATUS.10
 				sta LINK.STATUS
 
 				ldx DEVSLOTx0
@@ -135,7 +135,7 @@ STATUS			lda #S.DEVSTAT.NET.STATUS.10
 				and /L91C96.0.EPHSR.LINK
 				beq .1
 				lda LINK.STATUS
-				ora #S.DEVSTAT.NET.STATUS.OK
+				ora #S.DSTAT.NET.STATUS.OK
 				sta LINK.STATUS
 	
 .1				lda L91C96.0.TCR,x
@@ -143,7 +143,7 @@ STATUS			lda #S.DEVSTAT.NET.STATUS.10
 				and /L91C96.0.TCR.FDSE
 				bne .2
 				lda LINK.STATUS
-				ora #S.DEVSTAT.NET.STATUS.FD
+				ora #S.DSTAT.NET.STATUS.FD
 				sta LINK.STATUS
 				
 .2				>LDYA L.DEVSTAT
@@ -438,7 +438,7 @@ DEVSTAT			.DA #0
 				.BS 3					size
 				>PSTR "LanCEGS/L91C96"
 				.BS 1
-				.DA #S.DEVSTAT.T.NET
+				.DA #S.DSTAT.T.NET
 				.BS 1					Subtype
 				.BS 2					Version
 *--------------------------------------	
diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt
index 5a84d482..6759e6b0 100644
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@@ -313,7 +313,7 @@ DEVSTAT			.DA #0
 				.DA #0,#0,#0			size
 				>PSTR "Apple II Mouse"
 				.BS 2
-				.DA #S.DEVSTAT.T.XY
+				.DA #S.DSTAT.T.XY
 				.DA #0
 				.DA $0900
 *--------------------------------------
diff --git a/DRV/PIC.DRV.S.txt b/DRV/PIC.DRV.S.txt
index 1e41681d..9ea8d2a1 100644
--- a/DRV/PIC.DRV.S.txt
+++ b/DRV/PIC.DRV.S.txt
@@ -147,11 +147,11 @@ DEVSLOT0n		.BS 1
 DEVSLOTCn		.BS 1
 DEVSLOTn0		.BS 1
 *--------------------------------------
-STAT			.DA #S.DEVSTAT.S.WRITE
+STAT			.DA #S.DSTAT.S.WRITE
 				.DA #0,#0,#0
 				>PSTR "Parallel Card"
 				.DA #0,#0,#0
-				.DA #S.DEVSTAT.T.CHAR
+				.DA #S.DSTAT.T.CHAR
 				.DA #0
 				.DA $0900
 *--------------------------------------
diff --git a/DRV/SSC.DRV.S.txt b/DRV/SSC.DRV.S.txt
index 3def6ec0..71e8cbf4 100644
--- a/DRV/SSC.DRV.S.txt
+++ b/DRV/SSC.DRV.S.txt
@@ -198,10 +198,10 @@ WRITE			pha
 DRV.CS.END
 DEVSLOTn0		.BS 1
 *--------------------------------------
-STAT			.DA #S.DEVSTAT.S.WRITE+S.DEVSTAT.S.READ
+STAT			.DA #S.DSTAT.S.WRITE+S.DSTAT.S.READ
 				.DA #0,#0,#0
 				>PSTR "Serial Card/Port"
-				.DA #S.DEVSTAT.T.CHAR
+				.DA #S.DSTAT.T.CHAR
 				.DA #0
 				.DA $0900
 *--------------------------------------
diff --git a/DRV/SSC.I.DRV.S.txt b/DRV/SSC.I.DRV.S.txt
index eba87877..23aa7919 100644
--- a/DRV/SSC.I.DRV.S.txt
+++ b/DRV/SSC.I.DRV.S.txt
@@ -318,10 +318,10 @@ OUTBUF.HEAD		.BS 1
 INBUF			.BS BUF.SIZE
 OUTBUF			.BS BUF.SIZE
 *--------------------------------------
-STAT			.DA #S.DEVSTAT.S.WRITE+S.DEVSTAT.S.READ+S.DEV.S.IRQ
+STAT			.DA #S.DSTAT.S.WRITE+S.DSTAT.S.READ+S.DEV.S.IRQ
 				.DA #0,#0,#0
 				>PSTR "Serial Card/Port"
-				.DA #S.DEVSTAT.T.CHAR
+				.DA #S.DSTAT.T.CHAR
 				.DA #0
 				.DA $0900
 *--------------------------------------
diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt
index c8194e17..78def4a2 100644
--- a/DRV/UTHER2.AI.DRV.S.txt
+++ b/DRV/UTHER2.AI.DRV.S.txt
@@ -503,12 +503,12 @@ DEVSLOTx0		.BS 1
 DEVSTAT			.DA #0
 				.BS 3					size
 				>PSTR "UtherNetII/W5100"
-				.DA #S.DEVSTAT.T.NET
+				.DA #S.DSTAT.T.NET
 				.BS 1					Subtype
 				.BS 2					Version
 *--------------------------------------
-FLAGS			.DA #S.DEVSTAT.NET.FLAGS.ARPOFFLOAD+S.DEVSTAT.NET.FLAGS.IPOFFLOAD
-LINK.STATUS		.DA #S.DEVSTAT.NET.STATUS.OK+S.DEVSTAT.NET.STATUS.FD+S.DEVSTAT.NET.STATUS.100
+FLAGS			.DA #S.DSTAT.NET.FLAGS.ARPOFFLOAD+S.DSTAT.NET.FLAGS.IPOFFLOAD
+LINK.STATUS		.DA #S.DSTAT.NET.STATUS.OK+S.DSTAT.NET.STATUS.FD+S.DSTAT.NET.STATUS.100
 MAC				.BS 6
 MAN
 SAVE /A2OSX.SRC/DRV/UTHER2.AI.DRV.S
diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt
index d27876e7..247d34d7 100644
--- a/DRV/UTHERNET.DRV.S.txt
+++ b/DRV/UTHERNET.DRV.S.txt
@@ -87,9 +87,9 @@ Dev.Detect		>STYA ARGS
 				sta PacketPagePTR,x
 				
 				lda PacketPageDATA+1,x
-				sta DEVSTAT+S.DEVSTAT.VERSION+1	set Hardware version
+				sta DEVSTAT+S.DSTAT.VERSION+1	set Hardware version
 				lda PacketPageDATA,x
-				sta DEVSTAT+S.DEVSTAT.VERSION
+				sta DEVSTAT+S.DSTAT.VERSION
 				
 				>LDYA ARGS
 				>STYA ZPTmpPTR
@@ -154,7 +154,7 @@ DRV.CS.START	.DA STATUS
 L.DEVSTAT		.DA DEVSTAT
 				.DA 0					end or relocation
 *--------------------------------------
-STATUS			lda #S.DEVSTAT.NET.STATUS.10
+STATUS			lda #S.DSTAT.NET.STATUS.10
 				sta LINK.STATUS
 
 				ldx DEVSLOTx0
@@ -170,7 +170,7 @@ STATUS			lda #S.DEVSTAT.NET.STATUS.10
 				beq .1
 				
 				lda LINK.STATUS
-				ora #S.DEVSTAT.NET.STATUS.OK
+				ora #S.DSTAT.NET.STATUS.OK
 				sta LINK.STATUS
 	
 .1				lda /PP.TestCTL
@@ -184,7 +184,7 @@ STATUS			lda #S.DEVSTAT.NET.STATUS.10
 				beq .2
 				
 				lda LINK.STATUS
-				ora #S.DEVSTAT.NET.STATUS.FD
+				ora #S.DSTAT.NET.STATUS.FD
 				sta LINK.STATUS
 				
 .2				>LDYA L.DEVSTAT
@@ -442,7 +442,7 @@ DEVSLOTx0		.BS 1
 DEVSTAT			.DA #0
 				.BS 3					size
 				>PSTR "Uthernet/CS8900A"
-				.DA #S.DEVSTAT.T.NET
+				.DA #S.DSTAT.T.NET
 				.BS 1					Subtype
 				.BS 2					Version
 *--------------------------------------
diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt
index 520637b2..4cab8999 100644
--- a/DRV/UTHERNET2.DRV.S.txt
+++ b/DRV/UTHERNET2.DRV.S.txt
@@ -389,12 +389,12 @@ DEVSLOTx0		.BS 1
 DEVSTAT			.DA #0
 				.BS 3					size
 				>PSTR "UtherNetII/W5100"
-				.DA #S.DEVSTAT.T.NET
+				.DA #S.DSTAT.T.NET
 				.BS 1					Subtype
 				.BS 2					Version
 *--------------------------------------
 FLAGS			.DA #0
-LINK.STATUS		.DA #S.DEVSTAT.NET.STATUS.OK+S.DEVSTAT.NET.STATUS.FD+S.DEVSTAT.NET.STATUS.100
+LINK.STATUS		.DA #S.DSTAT.NET.STATUS.OK+S.DSTAT.NET.STATUS.FD+S.DSTAT.NET.STATUS.100
 MAC				.BS 6
 MAN
 SAVE /A2OSX.SRC/DRV/UTHERNET2.DRV.S
diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt
index 0dea9b2b..3c9b3d24 100644
--- a/INC/A2osX.I.txt
+++ b/INC/A2osX.I.txt
@@ -235,22 +235,22 @@ S.MEM.LEN		.EQ 6
 *
 S.MEM			.EQ 8
 *--------------------------------------
-S.MEMSTAT.ML		.EQ 0
-S.MEMSTAT.MF		.EQ 2
-S.MEMSTAT.MH		.EQ 4
-S.MEMSTAT.MLastSlot	.EQ 6
+S.MSTAT.ML		.EQ 0
+S.MSTAT.MF		.EQ 2
+S.MSTAT.MH		.EQ 4
+S.MSTAT.MLast	.EQ 6
 *
-S.MEMSTAT.XL		.EQ 8
-S.MEMSTAT.XF		.EQ 10
-S.MEMSTAT.XH		.EQ 12
-S.MEMSTAT.XLastSlot	.EQ 14
+S.MSTAT.XL		.EQ 8
+S.MSTAT.XF		.EQ 10
+S.MSTAT.XH		.EQ 12
+S.MSTAT.XLast	.EQ 14
 *
-S.MEMSTAT.DL		.EQ 16
-S.MEMSTAT.DF		.EQ 18
-S.MEMSTAT.DH		.EQ 20
-S.MEMSTAT.DCount	.EQ 22
+S.MSTAT.DL		.EQ 16
+S.MSTAT.DF		.EQ 18
+S.MSTAT.DH		.EQ 20
+S.MSTAT.DCount	.EQ 22
 *
-S.MEMSTAT			.EQ 24
+S.MSTAT			.EQ 24
 *--------------------------------------
 * DEVMGR (new API) = Smartport
 *--------------------------------------
@@ -302,46 +302,47 @@ DEVMGR.GFX.VLINE	.EQ 28
 DEVMGR.GFX.FILLRECT	.EQ 30
 DEVMGR.GFX.BITBLT	.EQ 32
 *--------------------------------------
-S.DEVSTAT.S			.EQ 0
-S.DEVSTAT.S.BLOCK		.EQ %10000000
-S.DEVSTAT.S.WRITE		.EQ %01000000
-S.DEVSTAT.S.READ		.EQ %00100000
-S.DEVSTAT.S.ONLINE		.EQ %00010000
-S.DEVSTAT.S.NOFMT		.EQ %00001000
-S.DEVSTAT.S.WENABL		.EQ %00000100
-S.DEVSTAT.S.IRQ			.EQ %00000010
-S.DEVSTAT.S.OPENED		.EQ %00000001
-S.DEVSTAT.SIZE		.EQ 1				3 bytes
-S.DEVSTAT.IDS		.EQ 4				1 (LEN) + 16 MAX
-S.DEVSTAT.T			.EQ 21
-S.DEVSTAT.T.RAM			.EQ $00			Memory Expansion Card (RAM disk)
-S.DEVSTAT.T.3.5			.EQ	$01			3.5" disk
-S.DEVSTAT.T.PROFILE		.EQ	$02 		ProFile-type hard disk
-S.DEVSTAT.T.GENSCSI		.EQ	$03			Generic SCSI
-S.DEVSTAT.T.ROM			.EQ	$04			ROM disk
-S.DEVSTAT.T.CDROM		.EQ	$05			SCSI CD-ROM
-S.DEVSTAT.T.TAPE		.EQ	$06			SCSI tape or other SCSI sequential device
-S.DEVSTAT.T.HD			.EQ	$07			SCSI hard disk
+S.DSTAT.S			.EQ 0
+S.DSTAT.S.BLOCK			.EQ %10000000
+S.DSTAT.S.WRITE			.EQ %01000000
+S.DSTAT.S.READ			.EQ %00100000
+S.DSTAT.S.ONLINE		.EQ %00010000
+S.DSTAT.S.NOFMT			.EQ %00001000
+S.DSTAT.S.WENABL		.EQ %00000100
+S.DSTAT.S.IRQ			.EQ %00000010
+S.DSTAT.S.OPENED		.EQ %00000001
+S.DSTAT.SIZE		.EQ 1				3 bytes
+S.DSTAT.IDS			.EQ 4				1 (LEN) + 16 MAX
+S.DSTAT.T			.EQ 21
+S.DSTAT.T.RAM			.EQ $00			Memory Expansion Card (RAM disk)
+S.DSTAT.T.3.5			.EQ	$01			3.5" disk
+S.DSTAT.T.PROFILE		.EQ	$02 		ProFile-type hard disk
+S.DSTAT.T.GENSCSI		.EQ	$03			Generic SCSI
+S.DSTAT.T.ROM			.EQ	$04			ROM disk
+S.DSTAT.T.CDROM			.EQ	$05			SCSI CD-ROM
+S.DSTAT.T.TAPE			.EQ	$06			SCSI tape or other SCSI sequential device
+S.DSTAT.T.HD			.EQ	$07			SCSI hard disk
 *						.EQ	$08			Reserved
-S.DEVSTAT.T.SPRINTER	.EQ	$09			SCSI printer
-S.DEVSTAT.T.5.25		.EQ	$0A			5-1/4" disk
+S.DSTAT.T.SPRINTER		.EQ	$09			SCSI printer
+S.DSTAT.T.5.25			.EQ	$0A			5-1/4" disk
 *						.EQ	$0B			Reserved
 *						.EQ	$0C			Reserved
-S.DEVSTAT.T.PRINTER		.EQ	$0D			Printer
-S.DEVSTAT.T.CLOCK		.EQ	$0E			Clock
-S.DEVSTAT.T.MODEM		.EQ	$0F			Modem
-S.DEVSTAT.T.DISKII		.EQ	$10
-S.DEVSTAT.T.PRODOS		.EQ	$11
-S.DEVSTAT.T.NET			.EQ	$12			Network board
-S.DEVSTAT.T.XY			.EQ	$13			X,Y Pointing Device
-S.DEVSTAT.T.CHAR		.EQ	$14
-S.DEVSTAT.T.GFX			.EQ	$15
-S.DEVSTAT.ST		.EQ 22
-S.DEVSTAT.ST.EXT		.EQ $80
-S.DEVSTAT.ST.DSKSW		.EQ $40
-S.DEVSTAT.ST.NOREM		.EQ $20
-S.DEVSTAT.VERSION	.EQ 23
-S.DEVSTAT			.EQ 25
+S.DSTAT.T.PRINTER		.EQ	$0D			Printer
+S.DSTAT.T.CLOCK			.EQ	$0E			Clock
+S.DSTAT.T.MODEM			.EQ	$0F			Modem
+S.DSTAT.T.DISKII		.EQ	$10
+S.DSTAT.T.PRODOS		.EQ	$11
+S.DSTAT.T.NET			.EQ	$12			Network board
+S.DSTAT.T.XY			.EQ	$13			X,Y Pointing Device
+S.DSTAT.T.CHAR			.EQ	$14
+S.DSTAT.T.GFX			.EQ	$15
+S.DSTAT.ST			.EQ 22
+S.DSTAT.ST.EXT			.EQ $80
+S.DSTAT.ST.DSKSW		.EQ $40
+S.DSTAT.ST.NOREM		.EQ $20
+S.DSTAT.VERSION		.EQ 23
+*
+S.DSTAT				.EQ 25
 *--------------------------------------
 * PS STRUCT
 *--------------------------------------
@@ -390,15 +391,14 @@ TSKMGR.QUIT		.EQ 6
 S.EVT.F			.EQ 0
 S.EVT.F.T10TH	.EQ %10000000
 S.EVT.F.T1SEC	.EQ %01000000
-S.EVT.F.hMEM2	.EQ %00100000			Indicates That S.EVT.DATAHI is a hMem
-S.EVT.F.hMEM1	.EQ %00010000			Indicates That S.EVT.DATALO is a hMem
+S.EVT.F.hMEM2	.EQ %00100000			Indicates That S.EVT.B2 is a hMem
+S.EVT.F.hMEM1	.EQ %00010000			Indicates That S.EVT.B1 is a hMem
 
 S.EVT.hDEV		.EQ 1
-S.EVT.DATA		.EQ 2
-S.EVT.DATALO	.EQ 2
-S.EVT.DATAHI	.EQ 3
-S.EVT.DATAW1	.EQ 4
-S.EVT.DATAW2	.EQ 6
+S.EVT.B1		.EQ 2
+S.EVT.B2		.EQ 3
+S.EVT.W1		.EQ 4
+S.EVT.W2		.EQ 6
 *
 S.EVT			.EQ 8
 *--------------------------------------
diff --git a/INC/KERNEL.I.txt b/INC/KERNEL.I.txt
index cd473fbf..1a1bf9f9 100644
--- a/INC/KERNEL.I.txt
+++ b/INC/KERNEL.I.txt
@@ -43,23 +43,35 @@ ZPMEMMGR		.EQ $8
 *--------------------------------------
 INDEX			.EQ $5E					->$5F
 FORPNT			.EQ $85					->$86
-FAC				.EQ $9D					->$A1
-FAC.SIGN		.EQ $A2
-FAC.EXTENSION	.EQ $AC
+*FAC			.EQ $9D					->$A1
+*FAC.SIGN		.EQ $A2
+*FAC.EXTENSION	.EQ $AC
 TXTPTR			.EQ $B8
 *--------------------------------------
 * ROM Entry Point
 *--------------------------------------
 ROM.FSUB		.EQ 0
 ROM.FADD		.EQ 2
-ROM.LOG			.EQ 4
-ROM.FMULT		.EQ 6
-ROM.SETARG.AY	.EQ 8
-ROM.FDIV		.EQ 10
-ROM.SETFAC.AY	.EQ 12
-ROM.GETFAC		.EQ 14					Get FAC at FORPNT
-ROM.FIN			.EQ 16
-ROM.FOUT		.EQ 18
+ROM.LTOF		.EQ 4
+ROM.LOG			.EQ 6
+ROM.FMULT		.EQ 8
+ROM.SETARG.AY	.EQ 10
+ROM.FDIV		.EQ 12
+ROM.SETFAC.AY	.EQ 14
+
+ROM.GETFAC		.EQ 16					Get FAC at FORPNT
+ROM.FCOMP		.EQ 18
+ROM.QINT		.EQ 20
+ROM.FIN			.EQ 22
+ROM.FOUT		.EQ 24
+ROM.SQR			.EQ 26
+ROM.PWR			.EQ 28
+ROM.EXP			.EQ 30
+
+ROM.COS			.EQ 32
+ROM.SIN			.EQ 34
+ROM.TAN			.EQ 36
+ROM.ATAN		.EQ 38
 *--------------------------------------
 * Memory Map
 *--------------------------------------
@@ -73,7 +85,7 @@ A2osX.SaveSX	.EQ $101				Aux
 * Aux  $3FE -> 3FF : IRQ Vector
 *--------------------------------------
 K.S.STAT		.EQ $0300				S.STAT for internal kernel operations
-K.S.DEVSTAT		.EQ $0340				S.DEVSTAT=25 or higher depends on dev type
+K.S.DSTAT		.EQ $0340				S.DSTAT=25 or higher depends on dev type
 K.SP.PARAMS		.EQ $0380				Max 9 bytes
 K.MLI.PARAMS	.EQ $0390				Main, 18 bytes min for GetFileInfo (ATLK needs MORE!!!...32 max for now)
 K.MLI.PATH		.EQ $03B0				64+1 -> $03F0
@@ -94,24 +106,24 @@ K.STACKTOP		.EQ $0F20				down to $0f00
 Z80STACK		.EQ $0FFF				(0FFFFh) Down to $0F20
 Z80JMP			.EQ $1000				(00000h) Up To $10FF
 *--------------------------------------
-FltMgr.Table	.EQ $1100				K.FLT.MAX*S.FLT.SIZE=8*32=128b
+Flt.Table		.EQ $1100				K.FLT.MAX*S.FLT.SIZE=8*32=128b
 *--------------------------------------
-EvtMgr.Table	.EQ	$1180				K.EVT.MAX*S.EVT.SIZE=16*8=128b
+Evt.Table		.EQ	$1180				K.EVT.MAX*S.EVT.SIZE=16*8=128b
 *--------------------------------------
-DevMgr.Table	.EQ	$1200				K.DEV.MAX*S.DEV.SIZE=32*16=512b
+Dev.Table		.EQ	$1200				K.DEV.MAX*S.DEV.SIZE=32*16=512b
 *--------------------------------------
 * MemMgr : $1800->$1FFF	MAIN/AUX		(2 kBytes)
 *--------------------------------------
-MemMgr.Table	.EQ $1800				Slot 0 is Reserved
-MemMgr.LoMem	.EQ $1800
-MemMgr.Free		.EQ $1802
-MemMgr.HiMem	.EQ $1804
-MemMgr.LastSlot	.EQ $1806
+Mem.Table		.EQ $1800				Slot 0 is Reserved
+Mem.LoMem		.EQ $1800
+Mem.Free		.EQ $1802
+Mem.HiMem		.EQ $1804
+Mem.LastSlot	.EQ $1806
 *--------------------------------------
-MemMgr.MLoMem	.EQ $2000
-MemMgr.MHiMem	.EQ $BD00
-MemMgr.XLoMem	.EQ $2000
-MemMgr.XHiMem	.EQ $C000
+Mem.MLoMem		.EQ $2000
+Mem.MHiMem		.EQ $BD00
+Mem.XLoMem		.EQ $2000
+Mem.XHiMem		.EQ $C000
 *--------------------------------------
 DevMgr.HiMem	.EQ $FFFA				Protect IRQ vectors in Aux LC
 *--------------------------------------
diff --git a/INC/NET.I.txt b/INC/NET.I.txt
index f046c3e7..b02c94b8 100644
--- a/INC/NET.I.txt
+++ b/INC/NET.I.txt
@@ -7,17 +7,17 @@ AUTO 6
 *--------------------------------------
 * NET Devices
 *--------------------------------------
-S.DEVSTAT.NET.FLAGS	.EQ S.DEVSTAT
-S.DEVSTAT.NET.FLAGS.ARPOFFLOAD	.EQ %00000001
-S.DEVSTAT.NET.FLAGS.IPOFFLOAD	.EQ %00000010
-S.DEVSTAT.NET.STATUS	.EQ S.DEVSTAT+1
-S.DEVSTAT.NET.STATUS.OK	.EQ $80
-S.DEVSTAT.NET.STATUS.FD	.EQ $40
-S.DEVSTAT.NET.STATUS.10		.EQ $01
-S.DEVSTAT.NET.STATUS.100	.EQ $02
-S.DEVSTAT.NET.STATUS.1000	.EQ $03
-S.DEVSTAT.NET.MAC		.EQ S.DEVSTAT+2
-S.DEVSTAT.NET	.EQ S.DEVSTAT+8
+S.DSTAT.NET.FLAGS	.EQ S.DSTAT
+S.DSTAT.NET.FLAGS.ARPOFFLOAD	.EQ %00000001
+S.DSTAT.NET.FLAGS.IPOFFLOAD	.EQ %00000010
+S.DSTAT.NET.STATUS	.EQ S.DSTAT+1
+S.DSTAT.NET.STATUS.OK	.EQ $80
+S.DSTAT.NET.STATUS.FD	.EQ $40
+S.DSTAT.NET.STATUS.10		.EQ $01
+S.DSTAT.NET.STATUS.100	.EQ $02
+S.DSTAT.NET.STATUS.1000	.EQ $03
+S.DSTAT.NET.MAC		.EQ S.DSTAT+2
+S.DSTAT.NET	.EQ S.DSTAT+8
 *--------------------------------------
 MAN
 SAVE /A2OSX.BUILD/INC/NET.I
diff --git a/LIB/LIBTCPIP.S.CFG.txt b/LIB/LIBTCPIP.S.CFG.txt
index 19021041..c166080c 100644
--- a/LIB/LIBTCPIP.S.CFG.txt
+++ b/LIB/LIBTCPIP.S.CFG.txt
@@ -44,10 +44,10 @@ SET.IPCFG		>PULLW ZPTmpPtr1
 				jsr NetDevJmp
 				
 				>STYA ZPTmpPtr2
-				ldy #S.DEVSTAT.NET.FLAGS
+				ldy #S.DSTAT.NET.FLAGS
 				lda (ZPTmpPtr2),y
 				sta DevFlags
-				and #S.DEVSTAT.NET.FLAGS.ARPOFFLOAD
+				and #S.DSTAT.NET.FLAGS.ARPOFFLOAD
 				beq .4
 				
 				>LDYA ZPTmpPtr1
diff --git a/LIB/LIBTCPIP.S.FRM.txt b/LIB/LIBTCPIP.S.FRM.txt
index 5a7aa8cd..3dd690d7 100644
--- a/LIB/LIBTCPIP.S.FRM.txt
+++ b/LIB/LIBTCPIP.S.FRM.txt
@@ -78,7 +78,7 @@ FRM.NewIP		stx	.8+1
 				sta ZPDataOutPtr+1
 				
 				lda DevFlags
-				and #S.DEVSTAT.NET.FLAGS.IPOFFLOAD
+				and #S.DSTAT.NET.FLAGS.IPOFFLOAD
 				bne .7
 				
 				ldy #S.ETH.ETHERTYPE
@@ -138,7 +138,7 @@ FRM.SendIP		ldx #3					Copy SRC.IP even if IP offload
 				bpl .1
 				
 				lda DevFlags
-				and #S.DEVSTAT.NET.FLAGS.IPOFFLOAD
+				and #S.DSTAT.NET.FLAGS.IPOFFLOAD
 				bne .21
 				
 				ldy #S.IP.TOTAL.LENGTH+1
@@ -219,7 +219,7 @@ FRM.SendIP		ldx #3					Copy SRC.IP even if IP offload
 				jsr ICMP.ComputeChecksum
 				
 .5				lda DevFlags
-				and #S.DEVSTAT.NET.FLAGS.ARPOFFLOAD
+				and #S.DSTAT.NET.FLAGS.ARPOFFLOAD
 				bne .6
 
 				jsr IP.SetDestMAC
diff --git a/SBIN/DESKTOP.S.txt b/SBIN/DESKTOP.S.txt
index 1521b887..be667ffe 100644
--- a/SBIN/DESKTOP.S.txt
+++ b/SBIN/DESKTOP.S.txt
@@ -92,7 +92,7 @@ CS.INIT			>LDYA L.MSG.INIT
 				
 				>STYA ZPPtr1
 
-				ldy #S.DEVSTAT+1
+				ldy #S.DSTAT+1
 				lda (ZPPtr1),y
 				sta MouseClamp+2
 				iny
diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt
index 1df977b2..a9ca1a7f 100644
--- a/SBIN/TCPIPD.S.txt
+++ b/SBIN/TCPIPD.S.txt
@@ -119,7 +119,7 @@ CS.INIT.DEV		>LDYA L.DEVNAME
 				bcs .9
 				>STYA ZPIPDevPtr
 				
-				ldy #S.DEVSTAT+2		MAC
+				ldy #S.DSTAT+2		MAC
 				ldx #S.IPCFG.MAC
 				
 .2				lda (ZPIPDevPtr),y
diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt
index 4de56905..26c68bda 100644
--- a/SYS/KERNEL.S.BIN.txt
+++ b/SYS/KERNEL.S.BIN.txt
@@ -415,7 +415,7 @@ BIN.InstallDRV	ldy #H.BIN.DRV.CODE.O
 
 				ldy #S.DEV-1
 				
-.1				lda (ZPPtr1),y		copy header to DevMgr.Table
+.1				lda (ZPPtr1),y		copy header to Dev.Table
 				sta (ZPPtr2),y
 				dey
 				bpl .1
diff --git a/SYS/KERNEL.S.CORE.txt b/SYS/KERNEL.S.CORE.txt
index add92911..65d8a383 100644
--- a/SYS/KERNEL.S.CORE.txt
+++ b/SYS/KERNEL.S.CORE.txt
@@ -98,7 +98,7 @@ CORE.Events		jsr CORE.GetEvents
 
 				jsr CORE.PSSelect0
 
-				lda #EvtMgr.Table
+				lda #Evt.Table
 				sta pEvent
 				
 .1				lda (pEvent)
@@ -154,7 +154,7 @@ CORE.Events		jsr CORE.GetEvents
 *   CC * event in YA
 *   (pEvent)
 *--------------------------------------
-CORE.GetEvents	lda #EvtMgr.Table
+CORE.GetEvents	lda #Evt.Table
 				sta	pEvent				point to start of event list
 				
 				stz CORE.EvtCount		reset Size
@@ -253,7 +253,7 @@ CORE.DispatchEvents
 
 				jsr CORE.PSEnter
 
-				lda #EvtMgr.Table
+				lda #Evt.Table
 				sta pEvent				Select first event in list
 				
 				lda CORE.EvtCount
@@ -408,7 +408,7 @@ CORE.DestroyEvent
 				beq .1
 				
 				pha
-				ldy #S.EVT.DATALO
+				ldy #S.EVT.B1
 				lda (pEvent),y
 				jsr K.FreeMem.A
 				pla
@@ -416,7 +416,7 @@ CORE.DestroyEvent
 .1				bit #S.EVT.F.hMEM2
 				beq .2
 				
-				ldy #S.EVT.DATAHI
+				ldy #S.EVT.B2
 				lda (pEvent),y
 				jsr K.FreeMem.A
 				
diff --git a/SYS/KERNEL.S.D01.txt b/SYS/KERNEL.S.D01.txt
index f103cd61..cb57b7bd 100644
--- a/SYS/KERNEL.S.D01.txt
+++ b/SYS/KERNEL.S.D01.txt
@@ -33,12 +33,12 @@ A2osX.DIIDrv.RW	>STYA GO.DiskII.RW.1+1
 				jsr A2osX.Blk.GetCmdAndDevAX
 				jmp GO.DiskII.RW
 *--------------------------------------
-A2osx.DIIStat	.DA #S.DEVSTAT.S.BLOCK+S.DEVSTAT.S.WRITE+S.DEVSTAT.S.READ
+A2osx.DIIStat	.DA #S.DSTAT.S.BLOCK+S.DSTAT.S.WRITE+S.DSTAT.S.READ
 				.DA 280
 				.DA #0
 				>PSTR "Disk II 5.25"
 				.BS 4
-				.DA #S.DEVSTAT.T.DISKII
+				.DA #S.DSTAT.T.DISKII
 				.DA #0
 				.DA #0,#9
 *--------------------------------------
@@ -67,8 +67,8 @@ A2osX.BlkDrv.S	jsr A2osX.Blk.GetCmdAndDev
 
 				jsr A2osX.BlkDrv.Go
 				bcs .9
-				stx A2osx.BlkStat+S.DEVSTAT.SIZE
-				sty A2osx.BlkStat+S.DEVSTAT.SIZE+1
+				stx A2osx.BlkStat+S.DSTAT.SIZE
+				sty A2osx.BlkStat+S.DSTAT.SIZE+1
 
 				>LDYAI A2osX.BlkStat
 				clc
@@ -128,10 +128,10 @@ A2osX.Blk.GetCmdAndDevAX
 
 				rts
 *--------------------------------------
-A2osX.BlkStat	.DA #S.DEVSTAT.S.BLOCK+S.DEVSTAT.S.WRITE+S.DEVSTAT.S.READ
+A2osX.BlkStat	.DA #S.DSTAT.S.BLOCK+S.DSTAT.S.WRITE+S.DSTAT.S.READ
 				.BS 3
 				>PSTR "ProDOS Block Dev"
-				.DA #S.DEVSTAT.T.PRODOS
+				.DA #S.DSTAT.T.PRODOS
 				.DA #0
 				.DA #0,#9
 *--------------------------------------
@@ -149,13 +149,13 @@ A2osX.PrtDrv	.DA A2osX.PrtDrv.S		STATUS
 				.DA A2osX.PrtDrv.P		W
 *--------------------------------------
 A2osX.PrtDrv.S	jsr A2osX.PrtDrv.GetDev
-				>LDYAI K.S.DEVSTAT
+				>LDYAI K.S.DSTAT
 				>STYA K.SP.PARAMS+2
 				lda #3
 				sta K.SP.PARAMS+4
 				jsr A2osX.PrtDrv.Go
 				bcs .9
-				>LDYAI K.S.DEVSTAT
+				>LDYAI K.S.DSTAT
 .9				rts
 *--------------------------------------
 A2osX.PrtDrv.P	jsr A2osX.PrtDrv.GetParam
@@ -221,7 +221,7 @@ DevMgr.NUL.Code .DA .1					STATUS
 .2				.DA #S.DEV.S.WRITE+S.DEV.S.READ
 				.DA #0,#0,#0
 				>PSTR "NULL DEVICE     "
-				.DA #S.DEVSTAT.T.CHAR
+				.DA #S.DSTAT.T.CHAR
 				.DA #0
 				.DA $0900
 *--------------------------------------
@@ -243,7 +243,7 @@ DevMgr.SYS.Code	.DA .1					STATUS
 .2				.DA #S.DEV.S.WRITE+S.DEV.S.READ
 				.DA #0,#0,#0
 				>PSTR "A2osX SYS Screen"
-				.DA #S.DEVSTAT.T.CHAR
+				.DA #S.DSTAT.T.CHAR
 				.DA #0
 				.DA $0900
 *--------------------------------------
diff --git a/SYS/KERNEL.S.DEV.txt b/SYS/KERNEL.S.DEV.txt
index 1a32add2..7ce9c188 100644
--- a/SYS/KERNEL.S.DEV.txt
+++ b/SYS/KERNEL.S.DEV.txt
@@ -21,12 +21,12 @@ K.GetDevByID.A	cmp DevMgr.Count
 				asl
 				php
 				clc
-				adc	#DevMgr.Table
+				adc	#Dev.Table
 				tay
 				
 				plp
 				lda #0
-				adc /DevMgr.Table
+				adc /Dev.Table
 				rts						CC		
 */--------------------------------------
 * # GetDevByName.YA
@@ -39,7 +39,7 @@ K.GetDevByID.A	cmp DevMgr.Count
 *\--------------------------------------
 K.GetDevByName.YA
 				>STYA ZPPtr1
-				>LDYAI DevMgr.Table+S.DEV.NAME
+				>LDYAI Dev.Table+S.DEV.NAME
 				>STYA ZPPtr2
 				
 				ldx #0
diff --git a/SYS/KERNEL.S.GP.txt b/SYS/KERNEL.S.GP.txt
index 59189bc9..7d03f08f 100644
--- a/SYS/KERNEL.S.GP.txt
+++ b/SYS/KERNEL.S.GP.txt
@@ -114,20 +114,22 @@ A2osX.ROMCALL1	phx
 
 .2				.DA $E7A7				FSUB
 				.DA $E7BE				FADD
-*				.DA $E82E				NORMALIZE.FAC.2 (L->F)
+				.DA $E82E				NORMALIZE.FAC.2 (L->F)
 				.DA $E941				LOG
 				.DA $E97F				FMULT
 				.DA $E9E3				LOAD.ARG.FROM.YA
 				.DA $EA66				FDIV
 				.DA $EAF9				LOAD.FAC.FROM.YA
+				
 				.DA $EB27				SETFOR
-*				.DA $EBB2				FCOMP
-*				.DA $EBF2				QINT		(F->L)
+				.DA $EBB2				FCOMP
+				.DA $EBF2				QINT		(F->L)
 				.DA $EC4A				FIN
 				.DA $ED36				FOUT.1
 				.DA $EE8D				SQR
 				.DA $EE97				FPWRT
 				.DA $EF09				EXP
+
 				.DA $EFEA				COS
 				.DA $EFF1				SIN
 				.DA $F03A				TAN
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index 49917ec4..77bc2ed3 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -408,21 +408,21 @@ Z80Code.Start	.HS	31FFFF				START:	LD SP,0FFFFH		Init Stack
 				.HS 00					FLAG:	.DB 0
 Z80Code.Size	.EQ *-Z80Code.Start
 *--------------------------------------
-MemMgrInit		>LDYAI MemMgr.MHiMem
-				>STYA MemMgr.HiMem
-				>STYA MemMgr.Free
-				>LDYAI MemMgr.MLoMem
-				>STYA MemMgr.LoMem
-				stz MemMgr.LastSlot		Reserve Slot #0
+MemMgrInit		>LDYAI Mem.MHiMem
+				>STYA Mem.HiMem
+				>STYA Mem.Free
+				>LDYAI Mem.MLoMem
+				>STYA Mem.LoMem
+				stz Mem.LastSlot		Reserve Slot #0
 
 				sta SETWRITEAUX
 				
-				>LDYAI MemMgr.XHiMem
-				>STYA MemMgr.HiMem
-				>STYA MemMgr.Free
-				>LDYAI MemMgr.XLoMem
-				>STYA MemMgr.LoMem
-				stz MemMgr.LastSlot		Reserve Slot #0
+				>LDYAI Mem.XHiMem
+				>STYA Mem.HiMem
+				>STYA Mem.Free
+				>LDYAI Mem.XLoMem
+				>STYA Mem.LoMem
+				stz Mem.LastSlot		Reserve Slot #0
 				
 				sta CLRWRITEAUX
 
@@ -431,7 +431,7 @@ MemMgrInit		>LDYAI MemMgr.MHiMem
 PS0Init			ldx #S.DEV*2			NUL,SYS
 
 .1				lda DevMgr.NUL-1,x
-				sta DevMgr.Table-1,x
+				sta Dev.Table-1,x
 				dex
 				bne .1
 
@@ -799,7 +799,7 @@ DevMgrInit.SP	ldy #$ff
 				.DA #0					Status
 				.DA SP.DEV.STATUS
 				bcs .7
-				lda SP.DEV.STATUS.DATA+S.DEVSTAT.S
+				lda SP.DEV.STATUS.DATA+S.DSTAT.S
 				sta DEV.HEADER+S.DEV.S
 				
 				jsr DevMgrInit.AddDev
@@ -867,7 +867,7 @@ SP.DEV.STATUS.DEVID
 				.DA SP.DEV.STATUS.DATA
 				.DA #3					return DIB
 SP.DEV.STATUS.DATA
-				.BS S.DEVSTAT
+				.BS S.DSTAT
 *--------------------------------------
 EvtMgrInit		>LDYAI MSG.EVT
 				>SYSCALL PrintF.YA
@@ -876,14 +876,14 @@ EvtMgrInit		>LDYAI MSG.EVT
 				lda #$9B
 				sta A2osX.TIMER16+1
 
-				lda /EvtMgr.Table
+				lda /Evt.Table
 				sta pEvent+1
 				clc
 				rts
 *--------------------------------------
 FltMgrInit		>LDYAI MSG.FLT
 				>SYSCALL PrintF.YA
-				stz FltMgr.Table
+				stz Flt.Table
 				clc
 				rts
 *--------------------------------------
diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt
index 1ed4ec46..aed37f9a 100644
--- a/SYS/KERNEL.S.IRQ.txt
+++ b/SYS/KERNEL.S.IRQ.txt
@@ -28,7 +28,7 @@ K.IrqHandlerAuxLC
 				pha
 				lda RDREADAUX
 				pha
-				sta CLRREADAUX			Make sure we can access DevMgr.Table
+				sta CLRREADAUX			Make sure we can access Dev.Table
 				
 				jsr K.IrqHandler
 					
@@ -103,7 +103,7 @@ K.IrqHandler.VBL
 				rts
 *--------------------------------------			
 K.IrqHandler.DEV
-				>LDYAI DevMgr.Table
+				>LDYAI Dev.Table
 				>STYA $fe
 
 				ldx DevMgr.Count
diff --git a/SYS/KERNEL.S.MATH.txt b/SYS/KERNEL.S.MATH.txt
index b7d7aa68..623f3648 100644
--- a/SYS/KERNEL.S.MATH.txt
+++ b/SYS/KERNEL.S.MATH.txt
@@ -4,40 +4,40 @@ LOMEM $A00
 INC 1
 AUTO 6
 */--------------------------------------
-* # FAdd
-* Return X+Y 
+* # FAdd,FSub,FMult,FDiv
+* Return X+Y,X-Y,X*Y,X/Y 
 * ## In:
 *  PUSHW = X (*Float)
 *  PUSHW = Y (*Float)
+*  Y,A = Dest (*Float)
 *\--------------------------------------
 K.FAdd			ldx #ROM.FADD
 				.HS 2C					BIT ABS
-*/--------------------------------------
-* # FSub
-* Return X-Y 
-* ## In:
-*  PUSHW = X (*Float)
-*  PUSHW = Y (*Float)
-*\--------------------------------------
 K.FSub			ldx #ROM.FSUB
+				.HS 2C					BIT ABS
+K.FMult			ldx #ROM.FMULT
+				.HS 2C					BIT ABS
+K.FDiv			ldx #ROM.FDIV
 
 				phx
-				
 				jsr MATH.PullFAC
 				jsr MATH.PullARG
-				
+				>PULLW FORPNT
 				plx
 				jsr A2osX.ROMCALL
-
-				
-				
-				
-*--------------------------------------
+				>ROMCALL GETFAC
+				clc
+				rts
+*/--------------------------------------
+* # Log,Cos,Sin,Tan,ATan
+* Return  
+* ## In:
+*  PUSHW = X (*Float)
+*  Y,A = Dest (*Float)
+*\--------------------------------------
 K.Cos			jsr MATH.PullFAC
 *				>ROMCALL COS	
 *--------------------------------------
-*--------------------------------------
-*--------------------------------------
 MATH.PullFAC	>PULLA
 				tay
 				>PULLA
diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt
index 2faa0f0d..bb10ae2d 100644
--- a/SYS/KERNEL.S.MEM.txt
+++ b/SYS/KERNEL.S.MEM.txt
@@ -8,8 +8,8 @@ AUTO 6
 *--------------------------------------
 ZPMemMgrSPtr 	.EQ ZPMEMMGR			Pointer To Slot selected
 ZPMemMgrTmp1	.EQ ZPMEMMGR+2
-MemMgr.ReqSize 	.EQ ZPMEMMGR+4			store requested Size
-MemMgr.ReqFlags	.EQ ZPMEMMGR+6			store requested Flags
+Mem.ReqSize 	.EQ ZPMEMMGR+4			store requested Size
+Mem.ReqFlags	.EQ ZPMEMMGR+6			store requested Flags
 *--------------------------------------
 * TODO :
 *  - Create a 256 bytes table
@@ -32,14 +32,14 @@ MemMgr.ReqFlags	.EQ ZPMEMMGR+6			store requested Flags
 *  CS :
 *   A = EC
 *\--------------------------------------
-K.GetMem		>PULLB MemMgr.ReqFlags	store requested flags
+K.GetMem		>PULLB Mem.ReqFlags	store requested flags
 
 				>PULLA					get requested size LO
 				tay
 				>PULLA					get requested size HI
-				sta MemMgr.ReqSize+1
+				sta Mem.ReqSize+1
 				
-				bit MemMgr.ReqFlags		S.MEM.F.AUX ?
+				bit Mem.ReqFlags		S.MEM.F.AUX ?
 				bpl K.GetMem.I
 				
 				sta SETREADAUX			Aux Mem requested,switch to AUX
@@ -63,7 +63,7 @@ K.GetMem		>PULLB MemMgr.ReqFlags	store requested flags
 *   A = EC
 *\--------------------------------------
 K.GetMem0.YA	ldx #S.MEM.F.INIT0
-				stx MemMgr.ReqFlags
+				stx Mem.ReqFlags
 				.HS 2C					bit abs			
 */--------------------------------------
 * # GetMem.YA
@@ -76,8 +76,8 @@ K.GetMem0.YA	ldx #S.MEM.F.INIT0
 *  CS :
 *   A = EC
 *\--------------------------------------
-K.GetMem.YA		stz MemMgr.ReqFlags
-				sta MemMgr.ReqSize+1
+K.GetMem.YA		stz Mem.ReqFlags
+				sta Mem.ReqSize+1
 				
 K.GetMem.I		tya
 				bit #$0F				16 bytes aligned ?
@@ -87,11 +87,11 @@ K.GetMem.I		tya
 				clc
 				adc #$10
 				bcc .10
-				inc MemMgr.ReqSize+1
+				inc Mem.ReqSize+1
 				
-.10				sta MemMgr.ReqSize
+.10				sta Mem.ReqSize
 				
-				>LDYAI MemMgr.Table
+				>LDYAI Mem.Table
 				>STYA ZPMemMgrSPtr
 				
 				ldx #0					Current slot=0
@@ -99,11 +99,11 @@ K.GetMem.I		tya
 				bra .4					skip slot 0, Check if some free slot to reuse first
 				
 .1				inx						move to next slot
-				jsr MemMgr.NextSlot
+				jsr Mem.NextSlot
 				lda (ZPMemMgrSPtr)		Get Flags
 				bmi .4					in use ?
 				
-.2				lda MemMgr.ReqFlags		Found an empty slot
+.2				lda Mem.ReqFlags		Found an empty slot
 				and #S.MEM.F.ALIGN		is request needs a page align ?
 				beq .3
 				
@@ -113,45 +113,45 @@ K.GetMem.I		tya
 				
 .3				ldy #S.MEM.LEN
 				lda (ZPMemMgrSPtr),y	get LEN of this block
-				cmp MemMgr.ReqSize		compare with requested size
+				cmp Mem.ReqSize		compare with requested size
 				bne .4
 				
 				iny
 				lda (ZPMemMgrSPtr),y
-				cmp MemMgr.ReqSize+1
+				cmp Mem.ReqSize+1
 				beq .7					requested size matches slot size !!!
 				
-.4				cpx MemMgr.LastSlot		any other slot to check?
+.4				cpx Mem.LastSlot		any other slot to check?
 				bne .1					last one, create a new slot
 				
 *-------------- Create a New SLOT
-				lda MemMgr.ReqFlags
+				lda Mem.ReqFlags
 				and #S.MEM.F.ALIGN		is request needs a page align ?
 				beq .6
 				
-				lda MemMgr.Free			target PTR will be page aligned ?
+				lda Mem.Free			target PTR will be page aligned ?
 				sec
-				sbc MemMgr.ReqSize
+				sbc Mem.ReqSize
 				beq .6					yes, allocate
 				
 				tay						no, reserve a free slot to fill gap
 				lda #0
-				jsr MemMgr.AddSlot		X = new slot
+				jsr Mem.AddSlot		X = new slot
 				bcs .9
 				
-.6				>LDYA MemMgr.ReqSize
-				jsr MemMgr.AddSlot		X = new slot
+.6				>LDYA Mem.ReqSize
+				jsr Mem.AddSlot		X = new slot
 				bcs .9
 				
 *-------------- Reuse this SLOT
-.7				lda MemMgr.ReqFlags		get requested flags
+.7				lda Mem.ReqFlags		get requested flags
 				ora #S.MEM.F.INUSE		mark as in use
 				sta (ZPMemMgrSPtr)
 				
 				and #S.MEM.F.INIT0
 				beq .8
 
-				jsr MemMgr.Init0		X not modified
+				jsr Mem.Init0		X not modified
 				
 .8				lda #0
 				ldy #S.MEM.BIN
@@ -176,38 +176,38 @@ K.GetMem.I		tya
 				
 .9				rts						
 *--------------------------------------
-* MemMgr.AddSlot
+* Mem.AddSlot
 *  In:
 *   Y,A = Requested size
 *  Out: 
 *--------------------------------------
-MemMgr.AddSlot  >STYA ZPMemMgrTmp1		save req size
-				ldx MemMgr.LastSlot		
+Mem.AddSlot  >STYA ZPMemMgrTmp1		save req size
+				ldx Mem.LastSlot		
 				inx
 				beq .99					> 255 ERR:OUT OF SLOT
 				
-				lda MemMgr.Free			Compute base PTR=FREE-REQ size
+				lda Mem.Free			Compute base PTR=FREE-REQ size
 				sec
 				sbc ZPMemMgrTmp1
-				tay						save new MemMgr.Free LO
-				lda MemMgr.Free+1
+				tay						save new Mem.Free LO
+				lda Mem.Free+1
 				sbc ZPMemMgrTmp1+1
-				pha						save new MemMgr.Free HI				
+				pha						save new Mem.Free HI				
 
-				cpy MemMgr.LoMem
-				sbc MemMgr.LoMem+1
+				cpy Mem.LoMem
+				sbc Mem.LoMem+1
 				bcc .98					ERR out of mem
 
-				jsr MemMgr.NextSlot		X,Y unmodified
+				jsr Mem.NextSlot		X,Y unmodified
 				
-				tya						get back MemMgr.Free LO
+				tya						get back Mem.Free LO
 				
 				ldy #S.MEM.PTR
-				sta MemMgr.Free			set as system MemMgr.Free value
+				sta Mem.Free			set as system Mem.Free value
 				sta (ZPMemMgrSPtr),y	store is as base address of new slot
 				iny
-				pla						get back MemMgr.Free HI
-				sta MemMgr.Free+1
+				pla						get back Mem.Free HI
+				sta Mem.Free+1
 				sta (ZPMemMgrSPtr),y
 
 				iny
@@ -217,11 +217,11 @@ MemMgr.AddSlot  >STYA ZPMemMgrTmp1		save req size
 				lda ZPMemMgrTmp1+1
 				sta (ZPMemMgrSPtr),y
 
-				stx MemMgr.LastSlot		mark this slot allocated
+				stx Mem.LastSlot		mark this slot allocated
 				clc
 				rts
 				
-.98				pla						discard new MemMgr.Free HI
+.98				pla						discard new Mem.Free HI
 				lda #K.E.OOM
 				sec
 				rts
@@ -230,7 +230,7 @@ MemMgr.AddSlot  >STYA ZPMemMgrTmp1		save req size
 				sec
 				rts	
 *--------------------------------------
-MemMgr.NextSlot	lda ZPMemMgrSPtr
+Mem.NextSlot	lda ZPMemMgrSPtr
 				clc
 				adc #S.MEM
 				sta ZPMemMgrSPtr
@@ -238,7 +238,7 @@ MemMgr.NextSlot	lda ZPMemMgrSPtr
 				inc ZPMemMgrSPtr+1
 .8				rts								
 *--------------------------------------
-MemMgr.Init0	ldy #S.MEM.PTR
+Mem.Init0	ldy #S.MEM.PTR
 				lda (ZPMemMgrSPtr),y	ZPMemMgrSPtr already set
 				sta .2+1
 				iny
@@ -309,34 +309,34 @@ K.FreeMem.A	    phy
 				lda #0					mark BINPATH slot as free
 				sta (ZPMemMgrSPtr)
 				
-.1				lda MemMgr.LastSlot
+.1				lda Mem.LastSlot
 				beq .8
 				
 				jsr K.GetMemByID.A		X unmodified
 				lda (ZPMemMgrSPtr)
 				bmi .8					used, exit
 
-.2				dec	MemMgr.LastSlot		free! get previous....
-				beq .3					empty list: go set MemMgr.Free=MemMgr.HiMem
+.2				dec	Mem.LastSlot		free! get previous....
+				beq .3					empty list: go set Mem.Free=Mem.HiMem
 				
-				lda MemMgr.LastSlot
+				lda Mem.LastSlot
 				jsr K.GetMemByID.A		X unmodified
 				lda (ZPMemMgrSPtr)
 				bpl .2					free again! loop
 				
 				ldy #S.MEM.PTR
-				lda (ZPMemMgrSPtr),y	set MemMgr.Free... 
-				sta MemMgr.Free
+				lda (ZPMemMgrSPtr),y	set Mem.Free... 
+				sta Mem.Free
 				iny
 				lda (ZPMemMgrSPtr),y
-				sta MemMgr.Free+1
+				sta Mem.Free+1
 
 .8				ply
 				clc
 				rts
 				
-.3				>LDYA MemMgr.HiMem
-				>STYA MemMgr.Free
+.3				>LDYA Mem.HiMem
+				>STYA Mem.Free
 				bra .8
 *--------------------------------------				
 .9				ply						discard	saved Y
@@ -393,10 +393,10 @@ K.GetMemPtr.A	jsr K.GetMemByID.A
 *  X unmodified
 *\--------------------------------------
 * Optimized for :
-* MemMgr.Table is page aligned at $1800
+* Mem.Table is page aligned at $1800
 * S.MEM is 8 bytes
 *--------------------------------------
-				.DO MemMgr.Table=$1800
+				.DO Mem.Table=$1800
 				.ELSE
 				!!!!!WARNING!!!!!
 				.FIN
@@ -406,7 +406,7 @@ K.GetMemPtr.A	jsr K.GetMemByID.A
 				.FIN
 *--------------------------------------
 K.GetMemByID.A	sta ZPMemMgrSPtr
-				lda /MemMgr.Table/8
+				lda /Mem.Table/8
 				asl ZPMemMgrSPtr
 				rol
 				asl ZPMemMgrSPtr
@@ -427,10 +427,10 @@ K.GetMemByID.A	sta ZPMemMgrSPtr
 *				asl
 *				rol ZPMemMgrSPtr+1
 **				clc						IMPLICIT
-*				adc #MemMgr.Table
+*				adc #Mem.Table
 *				tay
 *				lda ZPMemMgrSPtr+1
-*				adc /MemMgr.Table				
+*				adc /Mem.Table				
 *				sty ZPMemMgrSPtr
 *				sta ZPMemMgrSPtr+1
 *				rts
@@ -453,8 +453,8 @@ K.SetLoMem
 K.NewStr.YA		>STYA .1+1
 				>STYA .4+1
 				
-				stz MemMgr.ReqFlags
-				stz MemMgr.ReqSize+1
+				stz Mem.ReqFlags
+				stz Mem.ReqSize+1
 
 				ldy #0
 				
@@ -462,13 +462,13 @@ K.NewStr.YA		>STYA .1+1
 				beq .2
 				iny
 				bne .1
-				inc MemMgr.ReqSize+1
+				inc Mem.ReqSize+1
 				inc .1+2
 				bne .1
 				
 .2				iny						Add one for ending 0
 				bne .3
-				inc MemMgr.ReqSize+1
+				inc Mem.ReqSize+1
 						
 .3				jsr K.GetMem.I
 				bcs .9
@@ -577,7 +577,7 @@ K.GetMemStat.YA	>STYA ZPMemMgrTmp1
 				
 				ldy #6
 				
-.1				lda MemMgr.Table,y
+.1				lda Mem.Table,y
 				sta (ZPMemMgrTmp1),y
 				dey
 				bpl .1
@@ -588,7 +588,7 @@ K.GetMemStat.YA	>STYA ZPMemMgrTmp1
 				
 				sta SETREADAUX
 				
-.2				lda MemMgr.Table,x
+.2				lda Mem.Table,x
 				sta (ZPMemMgrTmp1),y
 				dey
 				dex
@@ -614,11 +614,11 @@ K.GetMemStat.YA	>STYA ZPMemMgrTmp1
 *   X = hMem
 *--------------------------------------
 MEM.GetMemByNameYA
-				ldx MemMgr.LastSlot
+				ldx Mem.LastSlot
 				beq .9
 
 				>STYA .2+1
-				>LDYAI MemMgr.Table
+				>LDYAI Mem.Table
 				>STYA ZPMemMgrTmp1		
 
 				ldx #0
@@ -655,7 +655,7 @@ MEM.GetMemByNameYA
 				inc ZPMemMgrTmp1+1
 				
 .7				inx
-				cpx MemMgr.LastSlot
+				cpx Mem.LastSlot
 				bne .1
 				
 .9				sec
diff --git a/SYS/KERNEL.S.PFT.txt b/SYS/KERNEL.S.PFT.txt
index f33e319d..8c33dc84 100644
--- a/SYS/KERNEL.S.PFT.txt
+++ b/SYS/KERNEL.S.PFT.txt
@@ -34,7 +34,7 @@ PFT.CheckPathSTK
 PFT.CheckPathYA
 				>STYA ZPPtr1
 				
-				>LDYAI FltMgr.Table
+				>LDYAI Flt.Table
 				>STYA ZPPtr2
 				
 .1				lda (ZPPtr2)			Get Filter char....