izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-17 06:58:05 +11:00
Code Issues Releases Wiki Activity

zasm: can now assemble the shell!

Browse Source
This commit is contained in:
Virgil Dupras 2019-05-17 19:36:32 -04:00
parent d58cf122a8
commit a3d3e0ce37
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
parts/z80/shell.asm
View File

@ -26,40 +26,40 @@
; *** CONSTS *** ; *** CONSTS ***
; number of entries in shellCmdTbl ; number of entries in shellCmdTbl
SHELL_CMD_COUNT .equ 7+SHELL_EXTRA_CMD_COUNT .equ SHELL_CMD_COUNT 7+SHELL_EXTRA_CMD_COUNT
; maximum number of bytes to receive as args in all commands. Determines the ; maximum number of bytes to receive as args in all commands. Determines the
; size of the args variable. ; size of the args variable.
SHELL_CMD_ARGS_MAXSIZE .equ 3 .equ SHELL_CMD_ARGS_MAXSIZE 3
; The command that was type isn't known to the shell ; The command that was type isn't known to the shell
SHELL_ERR_UNKNOWN_CMD .equ 0x01 .equ SHELL_ERR_UNKNOWN_CMD 0x01
; Arguments for the command weren't properly formatted ; Arguments for the command weren't properly formatted
SHELL_ERR_BAD_ARGS .equ 0x02 .equ SHELL_ERR_BAD_ARGS 0x02
; IO routines (GetC, PutC) returned an error in a load/save command ; IO routines (GetC, PutC) returned an error in a load/save command
SHELL_ERR_IO_ERROR .equ 0x05 .equ SHELL_ERR_IO_ERROR 0x05
; Size of the shell command buffer. If a typed command reaches this size, the ; Size of the shell command buffer. If a typed command reaches this size, the
; command is flushed immediately (same as pressing return). ; command is flushed immediately (same as pressing return).
SHELL_BUFSIZE .equ 0x20 .equ SHELL_BUFSIZE 0x20
; *** VARIABLES *** ; *** VARIABLES ***
; Memory address that the shell is currently "pointing at" for peek, load, call ; Memory address that the shell is currently "pointing at" for peek, load, call
; operations. Set with mptr. ; operations. Set with mptr.
SHELL_MEM_PTR .equ SHELL_RAMSTART .equ SHELL_MEM_PTR SHELL_RAMSTART
; Places where we store arguments specifiers and where resulting values are ; Places where we store arguments specifiers and where resulting values are
; written to after parsing. ; written to after parsing.
SHELL_CMD_ARGS .equ SHELL_MEM_PTR+2 .equ SHELL_CMD_ARGS SHELL_MEM_PTR+2
; Command buffer. We read types chars into this buffer until return is pressed ; Command buffer. We read types chars into this buffer until return is pressed
; This buffer is null-terminated and we don't keep an index around: we look ; This buffer is null-terminated and we don't keep an index around: we look
; for the null-termination every time we write to it. Simpler that way. ; for the null-termination every time we write to it. Simpler that way.
SHELL_BUF .equ SHELL_CMD_ARGS+SHELL_CMD_ARGS_MAXSIZE .equ SHELL_BUF SHELL_CMD_ARGS+SHELL_CMD_ARGS_MAXSIZE
SHELL_RAMEND .equ SHELL_BUF+SHELL_BUFSIZE .equ SHELL_RAMEND SHELL_BUF+SHELL_BUFSIZE
; *** CODE *** ; *** CODE ***
shellInit: shellInit:
@ -178,8 +178,7 @@ shellParse:
; let's have DE point to the jump line ; let's have DE point to the jump line
ld a, SHELL_CMD_ARGS_MAXSIZE ld a, SHELL_CMD_ARGS_MAXSIZE
call addDE call addDE
ld ixh, d push ix \ pop de
ld ixl, e
; Ready to roll! ; Ready to roll!
call callIX call callIX
cp 0 cp 0
@ -467,10 +466,7 @@ shellCall:
; 2. our A arg as the first byte of (HL) ; 2. our A arg as the first byte of (HL)
; 2. our HL arg as (HL+1) and (HL+2) ; 2. our HL arg as (HL+1) and (HL+2)
; Ready, set, go! ; Ready, set, go!
ld a, (SHELL_MEM_PTR) ld ix, (SHELL_MEM_PTR)
ld ixl, a
ld a, (SHELL_MEM_PTR+1)
ld ixh, a
ld a, (hl) ld a, (hl)
ex af, af' ex af, af'
inc hl inc hl

6
tools/tests/zasm/test6.asm
View File

@ -12,5 +12,9 @@
#include "blockdev.asm" #include "blockdev.asm"
.dw aciaGetC, aciaPutC, 0, 0 .dw aciaGetC, aciaPutC, 0, 0
.equ STDIO_RAMSTART BLOCKDEV_RAMEND .equ STDIO_RAMSTART BLOCKDEV_RAMEND
#include "stdio.asm" #include "stdio.asm"
.equ SHELL_RAMSTART STDIO_RAMEND
.equ SHELL_EXTRA_CMD_COUNT 0
#include "shell.asm"