izaya/collapseos
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
501fe96e07
collapseos/recipes/rc2014/zasm/glue.asm

136 lines
2.3 KiB
NASM
Raw Normal View History

recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
; classic RC2014 setup (8K ROM + 32K RAM) and a stock Serial I/O module
; The RAM module is selected on A15, so it has the range 0x8000-0xffff
.equ RAMSTART 0x8000
recipes/rc2014: add missing calls to fsInit Also, tighten RAM addresses. They were unecessarily loose.
2019-06-17 13:44:36 -04:00
; kernel RAM usage, because of SDC, is a bit high and bring us almost to 0x8500
; We allocate at least 0x200 bytes for the stack, which is why we have this
; threshold.
.equ RAMEND 0x8700
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ PGM_CODEADDR RAMEND
.equ ACIA_CTL 0x80 ; Control and status. RS off.
.equ ACIA_IO 0x81 ; Transmit. RS on.
jp init ; 3 bytes
; *** Jump Table ***
jp strncmp
jp upcase
jp findchar
jp parseHex
jp parseHexPair
jp blkSel
sdc: add second buffer
2019-06-06 22:16:28 -04:00
jp blkSet
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
jp fsFindFN
jp fsOpen
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp fsGetB
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
jp parseArgs
jp printstr
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp _blkGetB
jp _blkPutB
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-04 11:53:02 -04:00
jp _blkSeek
jp _blkTell
Extract str.asm from core.asm and make core included by userspace Most of register fiddling routines (which is now the only thing contained in care.asm) are used by almost all userspace apps, often in inner loops. That makes the penalty of using jump tables for those a bit too high. Moreover, it burdens jump tables needlessly. Because this unit is very small (now that string routines are out), it makes sense to always include it in binaries.
2019-11-14 09:55:31 -05:00
jp printHexPair ; approaching 0x38...
; interrupt hook
.fill 0x38-$
jp aciaInt
; *** Jump Table (cont.) ***
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp sdcGetB
jp sdcPutB
jp blkGetB
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "err.h"
Move ASCII consts to ascii.h And made them shorter in name. The new ascii.h file allow reuse in userspace code.
2019-11-13 20:38:06 -05:00
.inc "ascii.h"
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
.inc "blkdev.h"
.inc "fs.h"
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "core.asm"
Extract str.asm from core.asm and make core included by userspace Most of register fiddling routines (which is now the only thing contained in care.asm) are used by almost all userspace apps, often in inner loops. That makes the penalty of using jump tables for those a bit too high. Moreover, it burdens jump tables needlessly. Because this unit is very small (now that string routines are out), it makes sense to always include it in binaries.
2019-11-14 09:55:31 -05:00
.inc "str.asm"
sdc: support 24-bit addressing Needed if we want to compile the kernel and zasm from within a SD card. I didn't go straight for 32-bit because it was significantly more complex and 24-bit give us 16M. Enough to go on for a while...
2019-06-15 13:41:20 -04:00
.equ ACIA_RAMSTART RAMSTART
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "acia.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ BLOCKDEV_RAMSTART ACIA_RAMEND
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
.equ BLOCKDEV_COUNT 4
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "blockdev.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
; List of devices
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
.dw sdcGetB, sdcPutB
.dw blk1GetB, blk1PutB
.dw blk2GetB, blk2PutB
.dw mmapGetB, mmapPutB
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ MMAP_START 0xe000
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "mmap.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-04 11:53:02 -04:00
.equ STDIO_RAMSTART BLOCKDEV_RAMEND
stdio: remove a layer of indirection in GetC/PutC We use zasm's ability to use labels in .equ directive. We didn't do it before because for a while, we were in between scas and zasm (scas was used in automated tests) so we needed to use the lowest common denominator: zasm doesn't have macros and scas can't use labels in .equ directives. This forced us to add this layer of indirection. But now that we are completely cut from scas' dependency, we can use this nice zasm's ability.
2019-11-04 09:55:12 -05:00
.equ STDIO_GETC aciaGetC
.equ STDIO_PUTC aciaPutC
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "stdio.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ FS_RAMSTART STDIO_RAMEND
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
.equ FS_HANDLE_COUNT 2
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "fs.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
; *** Shell ***
.inc "lib/util.asm"
.inc "lib/parse.asm"
.inc "lib/args.asm"
.inc "lib/stdio.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ SHELL_RAMSTART FS_RAMEND
.equ SHELL_EXTRA_CMD_COUNT 11
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
.inc "shell/main.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.dw sdcInitializeCmd, sdcFlushCmd
.dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd
.dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
.inc "shell/fs.asm"
.inc "shell/blkdev.asm"
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-04 11:53:02 -04:00
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ PGM_RAMSTART SHELL_RAMEND
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
.inc "shell/pgm.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.equ SDC_RAMSTART PGM_RAMEND
.equ SDC_PORT_CSHIGH 6
.equ SDC_PORT_CSLOW 5
.equ SDC_PORT_SPI 4
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-06 14:32:23 -04:00
.inc "sdc.asm"
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
.out SDC_RAMEND
init:
di
; setup stack
ld hl, RAMEND
ld sp, hl
im 1
call aciaInit
recipes/rc2014: add missing calls to fsInit Also, tighten RAM addresses. They were unecessarily loose.
2019-06-17 13:44:36 -04:00
call fsInit
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
call shellInit
ld hl, pgmShellHook
ld (SHELL_CMDHOOK), hl
xor a
blockdev: make selection structure opaque I'm about to change that structure and I don't want fs to be messed up by this. I'm proceeding step by step...
2019-06-04 09:56:36 -04:00
ld de, BLOCKDEV_SEL
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
call blkSel
ei
jp shellLoop
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
; *** blkdev 1: file handle 0 ***
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
blk1GetB:
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
ld ix, FS_HANDLES
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp fsGetB
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
blk1PutB:
recipe/rc2014/zasm: new recipe
2019-06-03 13:34:16 -04:00
ld ix, FS_HANDLES
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp fsPutB
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
; *** blkdev 2: file handle 1 ***
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
blk2GetB:
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
ld ix, FS_HANDLES+FS_HANDLE_SIZE
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp fsGetB
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
blk2PutB:
recipes/rc2014/zasm: zasm can now assemble *and* write to file
2019-06-07 19:53:50 -04:00
ld ix, FS_HANDLES+FS_HANDLE_SIZE
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-30 16:59:35 -04:00
jp fsPutB
Reference in New Issue Copy Permalink