Merge pull request #7 from fourstix/b_asm_02_update

Updated files for Kernel 4 and Asm/02 Assembler
fourstix · Aug 21, 2021 · b667050 · b667050
2 parents 7c15c95 + 4aa08a9
commit b667050
Show file tree

Hide file tree

Showing 67 changed files with 233 additions and 192 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # Elfos-utils  
-A set of simple utility commands for the Elf/OS.  These commands were all assembled into Intel hex files using the 
-[RcAsm 1802 Assembler](https://github.com/rileym65/RcAsm) by Mike Riley. The hex files were converted into binary files using
-[hex2bin](https://sourceforge.net/projects/hex2bin/) for Windows.  
+A set of simple utility commands for the Elf/OS.  These commands were all assembled into 1802 binary files using the 
+[Asm/02 1802 Assembler](https://github.com/rileym65/Asm-02) by Mike Riley.
 
 Platform  
 --------
@@ -112,7 +111,7 @@ Repository Contents
   * cmd.asm - Run commands from a file.
   * cls.asm - Clear the screen
   * MemoryHog.asm - Allocate block of memory from heap for testing.
-  * make_xxx.bat - Windows batch file to assemble xxx.asm and create binary
+  * asm.bat - Windows batch file to assemble source file with Asm/02 to create binary file. Use the command *asm xxx.asm* to assemble the xxx.asm file.
   * bios.inc - Bios definitions from Elf/OS
   * kernel.inc - Kernel definitions from Elf/OS
 * **/src/stg/**  -- Source files for STG NVR/RTC/UART and STG EPROM utilities.  
@@ -121,15 +120,15 @@ Repository Contents
   * xsb.asm - XMODEM Send using the STG Expansion card UART
   * seq.asm - Set Q. (The Q bit is available when using the STG Expansion card UART)
   * req.asm - Reset Q. (The Q bit is available when using the STG Expansion card UART)
-  * make_xxx.bat - Windows batch file to assemble xxx.asm and create binary
+  * asm.bat - Windows batch file to assemble source file with Asm/02 to create binary file. Use the command *asm xxx.asm* to assemble the xxx.asm file.
   * bios.inc - Bios definitions from Elf/OS
   * kernel.inc - Kernel definitions from Elf/OS
 * **/src/video/**  -- Source files for 1861 Pixie Video utilities and demo programs
   * spaceship - Joseph A Weisbecker's Pixie Graphic Demo program (Press Input /EF4 to exit)
   * dma_test -Tom Pittman's Video DMA program (Press Input /EF4 to exit)
   * tvclock - Tom Pittman's TV Clock Demo program (Press Input /EF4 to exit)
   * voff - Turn 1861 Pixie Video Off (OUT 1 and disable interrupts)  
-  * make_xxx.bat - Windows batch file to assemble xxx.asm and create binary
+  * asm.bat - Windows batch file to assemble source file with Asm/02 to create binary file. Use the command *asm xxx.asm* to assemble the xxx.asm file.
   * bios.inc - Bios definitions from Elf/OS
   * kernel.inc - Kernel definitions from Elf/OS
 * **/bin/**  -- Binary files for miscellaneous Elf/OS utilities.  
@@ -158,14 +157,11 @@ Repository Contents
   Elf/OS 
   Copyright (c) 2004-2021 by Mike Riley
 
-  RcAsm 1802 Assembler
+  Asm/02 1802 Assembler
   Copyright (c) 2004-2021 by Mike Riley
 
   Elf/OS Init Program 
   Copyright (c) 2021 by David Madole
-
-  Hex2bin
-  Copyright (C) 1998-2021 by Jacques Pelletier
 
   The Pico/Elf Microcomputer Hardware
   Copyright (c) 2020-2021 by Mike Riley

diff --git a/bin/MemoryHog.bin b/bin/MemoryHog.bin
diff --git a/bin/cls.bin b/bin/cls.bin
diff --git a/bin/cmd.bin b/bin/cmd.bin
diff --git a/bin/input.bin b/bin/input.bin
diff --git a/bin/nop.bin b/bin/nop.bin
diff --git a/bin/output.bin b/bin/output.bin
diff --git a/bin/pwd.bin b/bin/pwd.bin
diff --git a/bin/say.bin b/bin/say.bin
diff --git a/bin/stack.bin b/bin/stack.bin
diff --git a/bin/stg/req.bin b/bin/stg/req.bin
diff --git a/bin/stg/seq.bin b/bin/stg/seq.bin
diff --git a/bin/stg/stg.bin b/bin/stg/stg.bin
diff --git a/bin/stg/visualstg.bin b/bin/stg/visualstg.bin
diff --git a/bin/stg/xsb.bin b/bin/stg/xsb.bin
diff --git a/bin/video/dma_test.bin b/bin/video/dma_test.bin
diff --git a/bin/video/spaceship.bin b/bin/video/spaceship.bin
diff --git a/bin/video/tvclock.bin b/bin/video/tvclock.bin
diff --git a/bin/video/voff.bin b/bin/video/voff.bin
diff --git a/lbr/misc_utils.lbr b/lbr/misc_utils.lbr
diff --git a/lbr/stg_utils.lbr b/lbr/stg_utils.lbr
diff --git a/lbr/video_utils.lbr b/lbr/video_utils.lbr
diff --git a/src/MemoryHog.asm b/src/MemoryHog.asm
@@ -1,9 +1,8 @@
 ; *******************************************************************************************
 ; MemoryHog - Allocate a block of memory on the heap for testing low memory conditions.
-;
 ; Copyright (c) 2021 by Gaston Williams
-;
 ; *******************************************************************************************
+
 include bios.inc
 include kernel.inc
                                                  
@@ -21,7 +20,7 @@ include kernel.inc
 
 ; Build information
 binfo:              db  80H+8             ; Month, 80H offset means extended info
-                    db  18                ; Day
+                    db  21                ; Day
                     dw  2021              ; Year
 
                     ; Current build number
@@ -52,7 +51,7 @@ good:  ghi     ra          ; copy argument address to rf
        sep     scall       ; convert input to integer value
        dw      f_atoi
 
-start: ghi     rd          ; RD contains the block size in bytes
+       ghi     rd          ; RD contains the block size in bytes
        phi     rc          ; Move size into RC for allocate
        glo     rd
        plo     rc          ; load block size

diff --git a/src/MemoryHog.bat b/src/MemoryHog.bat
diff --git a/src/asm.bat b/src/asm.bat
@@ -0,0 +1 @@
+[Your Path]\Asm02\asm02 -b -l -pev2 %1
diff --git a/src/bios.inc b/src/bios.inc
@@ -77,23 +77,21 @@ f_version:  equ  (BIOS+0f9h)           ; 3 bytes holding bios version number
 
 ; "Extended" BIOS vectors
 
-f_bread     equ  (EBIOS+00h)        ; read from onboard serial port
-f_btype     equ  (EBIOS+03h)        ; write to onboard serial port
-f_btest     equ  (EBIOS+06h)        ; test onboard serial port
-f_utype     equ  (EBIOS+09h)        ; write to disk board UART
-f_uread     equ  (EBIOS+0ch)        ; read from disk board UART
-f_utest     equ  (EBIOS+0fh)        ; test disk board UART
-f_usetbd    equ  (EBIOS+12h)        ; set disk board UART baud rate and format
-f_gettod    equ  (EBIOS+15h)        ; read time of day clock
-f_settod    equ  (EBIOS+18h)        ; set time of day clock
-f_rdnvr     equ  (EBIOS+1bh)        ; read non volatile RAM
-f_wrnvr     equ  (EBIOS+1eh)        ; write non volatile RAM
-f_idesize   equ  (EBIOS+21h)        ; return size of attached IDE drive(s)
-f_ideid     equ  (EBIOS+24h)        ; return device data for IDE drive(s)
-f_tmtoas    equ  (EBIOS+2ah)        ; time to ASCII string
-f_dttoas    equ  (EBIOS+27h)        ; date to ASCII string
-f_rtctest   equ  (EBIOS+2dh)        ; test size and presence of RTC/NVR
-f_astodt    equ  (EBIOS+30h)        ; convert ASCII string to date
-f_astotm    equ  (EBIOS+33h)        ; convert ASCII string to time
-
-
+f_bread:    equ  (EBIOS+00h)        ; read from onboard serial port
+f_btype:    equ  (EBIOS+03h)        ; write to onboard serial port
+f_btest:    equ  (EBIOS+06h)        ; test onboard serial port
+f_utype:    equ  (EBIOS+09h)        ; write to disk board UART
+f_uread:    equ  (EBIOS+0ch)        ; read from disk board UART
+f_utest:    equ  (EBIOS+0fh)        ; test disk board UART
+f_usetbd:   equ  (EBIOS+12h)        ; set disk board UART baud rate and format
+f_gettod:   equ  (EBIOS+15h)        ; read time of day clock
+f_settod:   equ  (EBIOS+18h)        ; set time of day clock
+f_rdnvr:    equ  (EBIOS+1bh)        ; read non volatile RAM
+f_wrnvr:    equ  (EBIOS+1eh)        ; write non volatile RAM
+f_idesize:  equ  (EBIOS+21h)        ; return size of attached IDE drive(s)
+f_ideid:    equ  (EBIOS+24h)        ; return device data for IDE drive(s)
+f_tmtoas:   equ  (EBIOS+2ah)        ; time to ASCII string
+f_dttoas:   equ  (EBIOS+27h)        ; date to ASCII string
+f_rtctest:  equ  (EBIOS+2dh)        ; test size and presence of RTC/NVR
+f_astodt:   equ  (EBIOS+30h)        ; convert ASCII string to date
+f_astotm:   equ  (EBIOS+33h)        ; convert ASCII string to time
diff --git a/src/cls.asm b/src/cls.asm
@@ -30,7 +30,7 @@ include kernel.inc
         br      start           ; Jump past build information
         ; Build date
 date:   db      80H+8           ; Month 80H offset means extended info
-        db      16              ; Day
+        db      21              ; Day
         dw      2021            ; Year
 
         ; Current build number

diff --git a/src/cmd.asm b/src/cmd.asm
@@ -16,13 +16,13 @@
 
 
            ; Include bios ad kernel API
-           include bios.inc
-           include kernel.inc
+include bios.inc
+include kernel.inc
 
            ; Define internal kernel AP
-d_reapheap equ 044dh
-d_progend  equ 0450h
-d_lowmem   equ 0465h
+d_reapheap: equ 044dh
+d_progend:  equ 0450h
+d_lowmem:   equ 0465h
 
            ; Program header to start at $5000
 
@@ -37,7 +37,7 @@ start:     org     5000h
            ; Build information
 
            db      8+80h              ; month
-           db      18                 ; day
+           db      21                 ; day
            dw      2021               ; year
            dw      4                  ; build
 text:      db      'Copyright 2021 Gaston Williams',0

diff --git a/src/input.asm b/src/input.asm
@@ -1,5 +1,6 @@
 ; -------------------------------------------------------------------
 ; Input a data byte from port 4
+; Copyright 2021 by Gaston Williams
 ; -------------------------------------------------------------------
 ; Based on software written by Michael H Riley
 ; Thanks to the author for making this code available.
@@ -30,7 +31,7 @@ include kernel.inc
 
         ; Build date
 date:   db      80H+8           ; Month, 80H offset means extended info
-        db      7               ; Day
+        db      21              ; Day
         dw      2021            ; Year
 
         ; Current build number

diff --git a/src/kernel.inc b/src/kernel.inc
@@ -24,4 +24,39 @@ O_EXECBIN: equ     0342h               ; execute from default directory
 O_SETDEF:  equ     0345h               ; set/get default directory
 O_KINIT:   equ     0348h               ; reserved - do not use!!!
 O_INMSG:   equ     034bh               ; passthrough for console output
+O_GETDEV:  equ     034eh               ; passthrough to f_getdef
+O_GETTOD:  equ     0351h               ; passthrough to f_gettod
+O_SETTOD:  equ     0354h               ; passthrough to f_settod
+O_INPUTL:  equ     0357h               ; passthrough to f_inputl
+O_BOOT:    equ     035ah               ; passthrough to f_boot
+O_SETBD:   equ     0360h               ; passthrough to f_setbd
+O_INITCALL: equ    0363h               ; passthrough to f_initcall
+O_BRKTEST: equ     0366h               ; passthrough to f_brktest
+O_DEVCTRL: equ     0369h               ; Hook for device control drivers
+O_ALLOC:   equ     036ch               ; passthrough to alloc
+O_DEALLOC: equ     036fh               ; passthrough to dealloc
+O_TERMCTRL: equ    0372h               ; Hook for terminal control drivers
+O_MEMCTRL: equ     0375h               ; Hook for memory control drivers
+I_SERVE:   equ     03f6h               ; address of interrupt chain head
+V_IVEC:    equ     03fdh               ; interrupt head
+V_DVEC:    equ     036ah               ; device head
+K_VER:     equ     0400h               ; kernel version number
+K_BUILD:   equ     0403h               ; kernel build number
+K_BMONTH:  equ     0405h               ; kernel build month
+K_BDAY:    equ     0406h               ; kernel build day
+K_BYEAR:   equ     0407h               ; kernel build month
+K_HIMEM:   equ     0442h               ; high memory pointer
+K_LOWMEM:  equ     0465h               ; lowest memory heap can use
+K_RETVAL:  equ     0467h               ; D on program exit
+K_HEAP:    equ     0468h               ; heap pointer
+K_CLKFREQ: equ     0470h               ; system clock frequency
+K_MONTH:   equ     0475h               ; date/time
+K_DAY:     equ     0476h
+K_YEAR:    equ     0477h
+K_HOUR:    equ     0478h
+K_MINUTE:  equ     0479h
+K_SECOND:  equ     047ah
+K_SECDEN:  equ     047bh
+K_SECNUM:  equ     047dh
+
 
diff --git a/src/make_cls.bat b/src/make_cls.bat
diff --git a/src/make_cmd.bat b/src/make_cmd.bat
diff --git a/src/make_input.bat b/src/make_input.bat
diff --git a/src/make_nop.bat b/src/make_nop.bat
diff --git a/src/make_output.bat b/src/make_output.bat
diff --git a/src/make_pwd.bat b/src/make_pwd.bat
diff --git a/src/make_say.bat b/src/make_say.bat
diff --git a/src/make_stack.bat b/src/make_stack.bat
diff --git a/src/nop.asm b/src/nop.asm
@@ -1,5 +1,6 @@
 ; -------------------------------------------------------------------
 ; Do nothing but return to the Elf/OS
+; Copyright 2021 by Gaston Williams
 ; -------------------------------------------------------------------
 ; Based on software written by Michael H Riley
 ; Thanks to the author for making this code available.
@@ -30,7 +31,7 @@ include kernel.inc
 
         ; Build date
 date:   db      80H+8           ; Month, 80H offset means extended info
-        db      7               ; Day
+        db      21              ; Day
         dw      2021            ; Year
 
         ; Current build number

diff --git a/src/output.asm b/src/output.asm
@@ -1,5 +1,6 @@
 ; -------------------------------------------------------------------
 ; Output data byte to port 4
+; Copyright 2021 by Gaston Williams
 ; -------------------------------------------------------------------
 ; Based on software written by Michael H Riley
 ; Thanks to the author for making this code available.
@@ -12,11 +13,9 @@
 ; *** without express written permission from the author.         ***
 ; *******************************************************************
 
-
 include bios.inc
 include kernel.inc
 
-
 ; ************************************************************
 ; This block generates the Execution header
 ; It occurs 6 bytes before the program start.
@@ -30,7 +29,7 @@ include kernel.inc
         br      start           ; Jump past build information
         ; Build date
 date:   db      80H+8           ; Month, 80H offset means extended info
-        db      7               ; Day
+        db      21              ; Day
         dw      2021            ; Year
 
         ; Current build number

diff --git a/src/pwd.asm b/src/pwd.asm
@@ -32,8 +32,8 @@ include    kernel.inc
 
            ; Build date
 date:      db      80h+8          ; Month, 80h offset means extended info
-           db      7              ; Day
-           dw      2021           ; year = 2021
+           db      21             ; Day
+           dw      2021           ; Year
 
            ; Current build number
 build:     dw      4              ; build

diff --git a/src/say.asm b/src/say.asm
@@ -1,14 +1,11 @@
 ; *******************************************************************************************
 ; Say - Write input string to console
-;
 ; Copyright (c) 2021 by Gaston Williams
-;
 ; *******************************************************************************************
+
 include   bios.inc
 include   kernel.inc
 
-
-
 ; ************************************************************
 ; This block generates the Execution header
 ; It occurs 6 bytes before the program start.
@@ -23,7 +20,7 @@ include   kernel.inc
 
 ; Build information
 binfo:              db  80H+8           ; Month, 80H offset means extended info
-                    db  7               ; Day
+                    db  21              ; Day
                     dw  2021            ; Year
 
                     ; Current build number
@@ -48,7 +45,8 @@ start:              lda  ra                 ; move past any spaces
                     plo  rf
                     sep  scall              ; otherwise display
                     dw   o_msg              ; usage message and
-                    sep  sret               ; return to Elf/OS
+                    ;sep  sret               ; return to Elf/OS
+                    lbr  o_wrmboot          ; return to Elf/OS
                           
 good:               ghi  ra                 ; copy RA to RF
                     phi  rf
@@ -57,7 +55,8 @@ good:               ghi  ra                 ; copy RA to RF
          
                     sep  scall             ; display
                     dw   o_msg             ; text message and            
-                    sep  sret              ; return to Elf/OS
+                    ; sep  sret              ; return to Elf/OS
+                    lbr  o_wrmboot          ; return to Elf/OS
                         
 usage:              db   'Usage: say text',10,13,0 
                         

diff --git a/src/stack.asm b/src/stack.asm
@@ -30,9 +30,9 @@ include kernel.inc
         br      start           ; Jump past build information
 
         ; Build date
-date:   db      80H + 8         ; Month (3) 80H offset means extended info
-        db      7               ; Day (2)
-        dw      2021            ; Year (2021)
+date:   db      80H + 8         ; Month 80H offset means extended info
+        db      21              ; Day
+        dw      2021            ; Year
 
         ; Current build number
 build:  dw      4

diff --git a/src/stg/asm.bat b/src/stg/asm.bat
@@ -0,0 +1 @@
+[Your Path]\Asm02\asm02 -b -l -pev2 %1