changeset 1166:bb618bed0bdc

Miscellaneous source improvements
author boisy
date Mon, 19 May 2003 11:06:54 +0000
parents b91cc65dbe4a
children a3d0ac951684
files level1/ChangeLog level1/cmds/cputype.asm level1/cmds/debug.asm level1/cmds/free.asm level1/cmds/login.asm level1/cmds/makefile level1/cmds/os9gen.asm level1/cmds/pd.asm level1/cmds/tmode.asm level1/makefile level1/modules/boot_1773.asm level1/sys/makefile
diffstat 12 files changed, 119 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/level1/ChangeLog	Wed May 14 00:36:18 2003 +0000
+++ b/level1/ChangeLog	Mon May 19 11:06:54 2003 +0000
@@ -1,3 +1,6 @@
+OS-9 Level One V03.01.02:
+- The cputype command has been optimized for size.
+
 OS-9 Level One V03.01.01:
 - SYS/helpmsg expanded to include new commands.
 - ident now correctly reports modules with a language byte of Obj6309.
--- a/level1/cmds/cputype.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/cputype.asm	Mon May 19 11:06:54 2003 +0000
@@ -30,16 +30,16 @@
 name     fcs   /CPUType/
          fcb   edition
 
-c.6309   fcc   /CPU: 6309, /
+c.6309   fcc   /CPU: 6309, running in /
 L6309    equ   *-c.6309
 c.6809   fcc   /CPU: 6809/
          fcb   C$CR
 L6809    equ   *-c.6809
 
-m.6809   fcc   /running in 6809 mode./
+m.6809   fcc   /6809 mode./
          fcb   C$CR
 
-m.6309   fcc   /running in 6309 native mode./
+m.6309   fcc   /6309 native mode./
          fcb   C$CR
 
 is.6809  leax  c.6809,pc
--- a/level1/cmds/debug.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/debug.asm	Mon May 19 11:06:54 2003 +0000
@@ -1,5 +1,5 @@
 ********************************************************************
-* debug - 6809 debugger
+* debug - 6809/6309 debugger
 *
 * $Id$
 *
@@ -11,7 +11,7 @@
 *  10    Start of optimizations, works under NitrOS-9   BGP 03/01/05
 
          nam   debug
-         ttl   6809 debugger
+         ttl   6809/6309 debugger
 
 * Disassembled 02/07/06 13:05:58 by Disasm v1.6 (C) 1988 by RML
 
--- a/level1/cmds/free.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/free.asm	Mon May 19 11:06:54 2003 +0000
@@ -67,7 +67,7 @@
 L0083    fcs   " free sectors, largest block"
 L009F    fcs   " sectors"
 
-start    leay  u000D,u
+start    leay  $0D,u
          sty   <u0001
          cmpd  #$0000
          beq   L00E0
@@ -86,22 +86,23 @@
          lbra  ExitOk			and branch
 L00CC    leax  -$01,x
          pshs  x
-         os9   F$PrsNam 
+         os9   F$PrsNam 		parse the device name on cmd line
          puls  x
-         bcs   L00BC
+         bcs   L00BC			branch if error
 L00D7    lda   ,x+
          lbsr  L0218
+* try decb here
          subb  #$01
          bcc   L00D7
-L00E0    lda   #$40
+L00E0    lda   #PENTIR			we want the entire device
          lbsr  L0218
          lbsr  L0216
          leax  u000D,u
          stx   <u0001
-         lda   #READ.
-         os9   I$Open   
-         sta   <devpath
-         bcs   L00FF
+         lda   #READ.			read mode
+         os9   I$Open   		open the device
+         sta   <devpath			save the path
+         bcs   L00FF			branch if error
          leax  <u005D,u
          ldy   #$003F
          os9   I$Read   
@@ -143,8 +144,8 @@
          lda   <devpath
          ldx   #$0000
          pshs  u
-         ldu   #$0100
-         os9   I$Seek   
+         ldu   #256
+         os9   I$Seek   	seek to bitmap sector
          puls  u
 L016A    leax  >u009E,u
          ldd   #$1000
@@ -226,25 +227,31 @@
          bsr   L0218
          lda   ,y+
          bpl   L020C
-L0216    lda   #$20
+L0216    lda   #C$SPAC
 L0218    pshs  x
          ldx   <u0001
          sta   ,x+
          stx   <u0001
          puls  pc,x
 L0222    pshs  y,x,a
-         lda   #$0D
+         lda   #C$CR
          bsr   L0218
          leax  u000D,u
          stx   <u0001
-         ldy   #$0050
-         lda   #$01
-         os9   I$WritLn 
+         ldy   #80
+         lda   #$01			standard output
+         os9   I$WritLn 		write the line
          puls  pc,y,x,a
-L0237    fcb   $98
-         fdb   $9680,$0f42,$4001,$86a0,$0027,$1000,$03e8,$0000
-         fdb   $6400,$000a,$0000
-         fcb   $01
+
+L0237    fcb   $98,$96,$80
+         fcb   $0f,$42,$40
+         fcb   $01,$86,$a0
+         fcb   $00,$27,$10
+         fcb   $00,$03,$e8
+         fcb   $00,$00,$64
+         fcb   $00,$00,$0a
+         fcb   $00,$00,$01
+
 L024F    lda   #$0A
          pshs  y,x,b,a
          leay  <L0237,pcr
--- a/level1/cmds/login.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/login.asm	Mon May 19 11:06:54 2003 +0000
@@ -61,7 +61,11 @@
          IFEQ  Level-1
          fcc   "One"
          ELSE
+         IFEQ  Level-2
          fcc   "Two"
+         ELSE
+         fcc   "Three"
+         ENDC
          ENDC
          fcc   " Vr. 0"
          fcb   48+OS9Vrsn
@@ -79,7 +83,11 @@
          IFEQ  Level-1
          fcc   "One"
          ELSE
+         IFEQ  Level-2
          fcc   "Two"
+         ELSE
+         fcc   "Three"
+         ENDC
          ENDC
          fcc   " Vr. 0"
          fcb   48+OS9Vrsn
--- a/level1/cmds/makefile	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/makefile	Mon May 19 11:06:54 2003 +0000
@@ -1,5 +1,9 @@
+# Makefile for OS-9 Level One CMDS/
+
 include ../../Makefile.rules
 
+vpath %.asm $(3RDPARTY)/packages/basic09
+
 DEPENDS		= ./Makefile
 
 BASIC09FILES	= runb.asm gfx.asm inkey.asm syscall.asm
@@ -22,7 +26,7 @@
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
 
 clean:
-	$(RM) $(ALLOBJS) $(BASIC09FILES)
+	$(RM) $(ALLOBJS)
 
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
@@ -35,6 +39,3 @@
 
 showdragonobjs:
 	@$(ECHO) $(CMDS) $(DRAGONCMDS)
-
-$(BASIC09FILES): $(BASEDIR)/3rdparty/packages/basic09/$@
-	-$(SOFTLINK) $(BASEDIR)/3rdparty/packages/basic09/$@
--- a/level1/cmds/os9gen.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/os9gen.asm	Mon May 19 11:06:54 2003 +0000
@@ -7,7 +7,7 @@
 * ------------------------------------------------------------------
 *   9    From OS-9 Level Two Vr. 2.00.01
 
-         nam   OS9gen
+         nam   OS9Gen
          ttl   OS-9 bootfile generator
 
 * Disassembled 02/07/06 13:11:11 by Disasm v1.6 (C) 1988 by RML
--- a/level1/cmds/pd.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/pd.asm	Mon May 19 11:06:54 2003 +0000
@@ -45,12 +45,13 @@
          fcb   edition
 
          IFNE   PXD
-badnam   fcc   "pxd: bad name in path"
+badnam   fcc   "pxd"
          ELSE
          IFNE  PWD
-badnam   fcc   "pwd: bad name in path"
+badnam   fcc   "pwd"
          ENDC
          ENDC
+         fcc   ": bad name in path"
          fcb   C$CR
 dotdot   fcc   "."
 dot      fcc   "."
--- a/level1/cmds/tmode.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/cmds/tmode.asm	Mon May 19 11:06:54 2003 +0000
@@ -38,122 +38,143 @@
 name     fcs   /Tmode/
          fcb   edition
 
-         fcb   $00 
-         fcb   $17 
-L0015    fcb   $FF 
-         fcb   $01 
-         fcb   $01 
+         fdb   $0017 		Number of options in table
+OptTable fcb   $FF 		$FF = boolean, $00 = value
+         fcb   $01 		default value
+         fcb   PD.UPC-PD.OPT	offset into path descriptor
          fcb   $01 
          fcs   "upc"
+
          fcb   $FF 
          fcb   $01 
-         fcb   $02 
+         fcb   PD.BSO-PD.OPT
          fcb   $01 
          fcs   "bsb"
+
          fcb   $FF 
          fcb   $00 
-         fcb   $03 
+         fcb   PD.DLO-PD.OPT
          fcb   $00 
          fcs   "bsl"
+
          fcb   $FF 
          fcb   $01 
-         fcb   $04 
+         fcb   PD.EKO-PD.OPT
          fcb   $01 
          fcs   "echo"
+
          fcb   $FF 
          fcb   $01 
-         fcb   $05 
+         fcb   PD.ALF-PD.OPT
          fcb   $01 
          fcs   "lf"
+
          fcb   $00 
          fcb   $00 
-         fcb   $06 
+         fcb   PD.NUL-PD.OPT
          fcb   $00 
          fcs   "null"
+
          fcb   $FF 
          fcb   $01 
-         fcb   $07 
+         fcb   PD.PAU-PD.OPT
          fcb   $01 
          fcs   "pause"
+
          fcb   $00 
          fcb   $18 
-         fcb   $08 
+         fcb   PD.PAG-PD.OPT
          fcb   $00 
          fcs   "pag"
+
          fcb   $01 
          fcb   $08 
-         fcb   $09 
+         fcb   PD.BSP-PD.OPT
          fcb   $00 
          fcs   "bsp"
+
          fcb   $01 
          fcb   $18 
-         fcb   $0A 
+         fcb   PD.DEL-PD.OPT
          fcb   $00 
          fcs   "del"
+
          fcb   $01 
          fcb   $0D 
-         fcb   $0B 
+         fcb   PD.EOR-PD.OPT
          fcb   $00 
          fcs   "eor"
+
          fcb   $01 
          fcb   $1B 
-         fcb   $0C 
+         fcb   PD.EOF-PD.OPT
          fcb   $00 
          fcs   "eof"
+
          fcb   $01 
          fcb   $04 
-         fcb   $0D 
+         fcb   PD.RPR-PD.OPT
          fcb   $00 
          fcs   "reprint"
+
          fcb   $01 
          fcb   $01 
-         fcb   $0E 
+         fcb   PD.DUP-PD.OPT
          fcb   $00 
          fcs   "dup"
+
          fcb   $01 
          fcb   $17 
-         fcb   $0F 
+         fcb   PD.PSC-PD.OPT
          fcb   $00 
          fcs   "psc"
+
          fcb   $01 
          fcb   $03 
-         fcb   $10 
+         fcb   PD.INT-PD.OPT
          fcb   $00 
          fcs   "abort"
+
          fcb   $01 
          fcb   $05 
-         fcb   $11 
+         fcb   PD.QUT-PD.OPT
          fcb   $00 
          fcs   "quit"
+
          fcb   $01 
          fcb   $08 
-         fcb   $12 
+         fcb   PD.BSE-PD.OPT
          fcb   $00 
          fcs   "bse"
+
          fcb   $01 
          fcb   $07 
-         fcb   $13 
+         fcb   PD.OVF-PD.OPT
          fcb   $00 
          fcs   "bell"
+
          fcb   $01 
          fcb   $15 
-         fcb   $14 
+         fcb   PD.PAR-PD.OPT
          fcb   $00 
          fcs   "type"
+
          fcb   $01 
          fcb   $02 
-         fcb   $15 
+         fcb   PD.BAU-PD.OPT
          fcb   $00 
          fcs   "baud"
+
          fcb   $01 
          fcb   $11 
-         fcb   $18 
+         fcb   PD.XON-PD.OPT
          fcb   $00 
          fcs   "xon"
+
          fcb   $01 
          fcb   $13 
-         fcb   $19 
-         fcb   $00 
+         fcb   PD.XOFF-PD.OPT
+         fcb   $00
          fcs   "xoff"
 
 start    lda   #$32
@@ -216,7 +237,7 @@
          inc   <u0001
          leay  $01,y
 L0140    sty   <u0003
-         leax  >L0015,pcr
+         leax  >OptTable,pcr
          lbsr  L02D1
          bcs   L0181
          lda   ,x
@@ -310,7 +331,7 @@
          bsr   L024A
          lda   #C$CR
          lbsr  L02AF
-         leax  >L0015,pcr
+         leax  >OptTable,pcr
          leay  u0007,u
          clrb  
 L020F    lda   b,y
--- a/level1/makefile	Wed May 14 00:36:18 2003 +0000
+++ b/level1/makefile	Mon May 19 11:06:54 2003 +0000
@@ -1,3 +1,5 @@
+# Makefile for OS-9 Level One
+
 include ../Makefile.rules
 
 RELEASE		= os9l1v030101
--- a/level1/modules/boot_1773.asm	Wed May 14 00:36:18 2003 +0000
+++ b/level1/modules/boot_1773.asm	Mon May 19 11:06:54 2003 +0000
@@ -61,23 +61,23 @@
          lda   #$FF
          sta   u0004,u
          leax  >NMIRtn,pcr
-         ifgt  Level-1
+         IFGT  Level-1
          stx   <D.NMI
          lda   #$09
-         else
+         ELSE
          stx   >$010A
          lda   #$7E
          sta   >$0109
          lda   #$08
-         endc
+         ENDC
          sta   >DPort
 
 * delay loop
-         ifgt  Level-1
+         IFGT  Level-1
          ldd   #$C350
-         else
+         ELSE
          ldd   #$61A8
-         endc
+         ENDC
 L003A    nop   
          nop   
          subd  #$0001
@@ -115,11 +115,11 @@
          ldu   u0002,u
          os9   F$SRtMem 
          ldd   $02,s
-         ifgt  Level-1
+         IFGT  Level-1
          os9   F$BtMem  
-         else
+         ELSE
          os9   F$SRqMem
-         endc
+         ENDC
          puls  x
          bcs   L00AA
          stu   $02,s
@@ -145,9 +145,9 @@
 L00A8    leas  $04,s
 L00AA    leas  $02,s
 L00AC
-         ifgt  Level-1
+         IFGT  Level-1
          sta   >$FFD9
-         endc
+         ENDC
          puls  u,y,x
          leas  size,s
          rts   
@@ -276,7 +276,7 @@
 L01AA    lbsr  L01AD
 L01AD    rts   
 
-         ifgt  Level-1
+         IFGT  Level-1
 
          rts   
          rts   
@@ -310,7 +310,7 @@
          rts   
          rts   
 
-         endc
+         ENDC
 
          emod
 eom      equ   *
--- a/level1/sys/makefile	Wed May 14 00:36:18 2003 +0000
+++ b/level1/sys/makefile	Mon May 19 11:06:54 2003 +0000
@@ -1,3 +1,5 @@
+# Makefile for OS-9 Level One SYS/
+
 include ../../Makefile.rules
 
 DEPENDS		= ./Makefile