.gitignore

@@ -11,6 +11,6 @@
 *.srec
 *.s19
 *.elf
-*.map
+
 AGENTS.md
 .pre-commit-config.yaml

Makefile

@@ -2,16 +2,12 @@
 # SPDX-FileCopyrightText: (c) 2025 A.M. Rowsell
 ASM=vasm_z80_std
 LINK=vlink
-MAP=zone.map
 
 ASMFLAGS=-Fvobj
-LINKFLAGS=-b ihex -T linker.cmd -M
+LINKFLAGS=-b ihex -T linker.cmd
-BINLINKFLAGS=-b rawbin -T linker.cmd -M
 
 all: zone.hex
 
-binary: zone.bin
-
 float.o: float.asm
 	$(ASM) $(ASMFLAGS) -o $@ $<
 
@@ -25,12 +21,9 @@ boot.o: boot.asm
 	$(ASM) $(ASMFLAGS) -o $@ $<
 
 zone.hex: float.o vectorTable.o zone.o boot.o linker.cmd
-	$(LINK) $(LINKFLAGS) -o $@ float.o vectorTable.o zone.o boot.o > $(MAP)
+	$(LINK) $(LINKFLAGS) -o $@ float.o vectorTable.o zone.o boot.o
-
-zone.bin: float.o vectorTable.o zone.o boot.o linker.cmd
-	$(LINK) $(BINLINKFLAGS) -o $@ float.o vectorTable.o zone.o boot.o > $(MAP)
 
 clean:
-	rm -f float.o vectorTable.o zone.o boot.o zone.hex zone.bin $(MAP)
+	rm -f float.o vectorTable.o zone.o boot.o zone.hex
 
 .PHONY: all clean

boot.asm

@@ -1,20 +1,13 @@
-	;        SPDX-License-Identifier: MPL-2.0
+; SPDX-License-Identifier: MPL-2.0
-	;        SPDX-FileCopyrightText: (c) 2025 A.M. Rowsell
+; SPDX-FileCopyrightText: (c) 2025 A.M. Rowsell
-	.section "boot", "acrx"
+.section "boot","acrx"
-	.global  zone_setup
+.global zone_setup
-	.global  os_warm_boot
+.global os_warm_boot
-	.extern  os_main_loop
+.extern os_main_loop
 
-	; ==================================
-	; This is the cold boot entry point!
-	; It is linked to land at 0xC3C3
-	; ==================================
-
-_start:
 zone_setup:
-	ld a, ixl
+    ld sp, 0x6FFF
-	ld sp, 0x6FFF
+    jp os_main_loop
-	jp os_main_loop
 
 os_warm_boot:
-	ret
+    ret

linker.cmd

@@ -2,10 +2,10 @@
 /* SPDX-FileCopyrightText: (c) 2025 A.M. Rowsell */
 SECTIONS
 {
-  .zone     0xA000 : { zone.o(zone) float.o(zone) *(.zone) *(zone) }
+  .zone     0xA000 : { *(.zone) *(zone) }
   .boot     0xC3C3 : { *(.boot) *(boot) }
+  .text     0xE000 : { *(.text) *(.float) *(float) }
   .vectors  0xF000 : { *(.vectors) }
   .data     0x7000 : { *(.data) }
-  __data_end = .;
+  .bss            : { *(.bss)  }
-  .bss      __data_end : { *(.bss)  }
 }

zone.asm

@@ -1,135 +1,30 @@
-	;        SPDX-License-Identifier: MPL-2.0
+; SPDX-License-Identifier: MPL-2.0
-	;        SPDX-FileCopyrightText: (c) 2025 A.M. Rowsell
+; SPDX-FileCopyrightText: (c) 2025 A.M. Rowsell
-	;        ============================================================
+; ============================================================
-	;        ZONE OS main section
+; ZONE OS main section
-	;        ============================================================
+; ============================================================
-	.section "zone", "acrx"
+.section "zone","acrx"
-	.global  os_print_vec
+.global zone_start
-	.global  os_getch_vec
+.global os_print_vec
-	.global  os_outbyte_vec
+.global os_getch_vec
-	.global  os_inbyte_vec
+.global os_outbyte_vec
-	.global  os_main_loop
+.global os_inbyte_vec
-	.local   os_print_signon
+.global os_main_loop
 
-	.set UARTSTATUS, 6
+zone_start:
-	.set UARTDATA, 7
+    ret
 
 os_print_vec:
-	;    this takes a character in a and sends it to the UART
+    ret
-	push af
-	push bc
-	push de
-	ld   d, a
-	ld   c, UARTSTATUS
-
-$1:
-	in  a, (c); get status byte
-	bit 0, a; test bit 0
-	jr  z, $1; jump back if UART not ready
-	ld  a, d
-	ld  c, UARTDATA
-	out (c), a; send byte to uart
-	pop de
-	pop bc
-	pop af
-	ret
 
 os_getch_vec:
-	;    this gets a character from the UART and puts in in a
+    ret
-	push bc
-	ld   c, UARTSTATUS
-
-a2:
-	in  a, (c); get status byte
-	bit 1, a
-	jr  z, a2
-	ld  c, UARTDATA
-	in  a, (c)
-	pop bc
-	ret
 
 os_outbyte_vec:
-	;    this takes a byte in a and sends it to port in hl
+    ret
-	push af
-	push bc
-	push hl
-	ld   c, l
-	out  (c), a
-	pop  hl
-	pop  bc
-	pop  af
-	ret
 
 os_inbyte_vec:
-	;    this gets a byte from port in hl and returns it in a
+    ret
-	push bc
-	push hl
-	ld   c, l
-	in   a, (c)
-	pop  hl
-	pop  bc
-	ret
 
 os_main_loop:
-	call os_print_signon
+    jp os_main_loop
-
-os_busy_loop:
-	jp os_busy_loop
-
-	; ======================
-	; non-vectored functions
-	; ======================
-
-os_print_signon:
-	ld hl, zoneSignon
-	ld a, (hl)
-
-$2:
-	call os_print_vec
-	inc  hl
-	ld   a, (hl)
-	jr   nz, $2
-
-$3:
-	ld hl, zoneCopyright
-	ld a, (hl)
-
-$4:
-	call os_print_vec
-	inc  hl
-	ld   a, (hl)
-	jr   nz, $4
-	ret
-
-zoneSignon:
-	.byte "ZONE OS ver. 0.01"
-	.byte 10, 13, 0
-
-zoneCopyright:
-	.byte "(c) A.M. Rowsell, license MPLv2"
-	.byte 10, 13, 0
-
-zonePrompt:
-	.string "z] "
-
-	; error messages
-
-errorSyntax:
-	.string "Syntax error!"
-
-errorTimeout:
-	.string "Command timed out."
-
-errorNotFound:
-	.string "Command/file not found."
-
-errorHardware:
-	.string "Hardware error!"
-
-errorRAMFailed:
-	.string "RAM test failed!"
-
-stringTable:
-	.word zoneSignon, zoneCopyright, zonePrompt
-	.word errorSyntax, errorTimeout, errorNotFound
-	.word errorHardware, errorRAMFailed