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

zasm: can now assemble fs.asm!

Browse Source
This commit is contained in:
Virgil Dupras 2019-05-18 15:18:19 -04:00
parent d47d07757e
commit 8832408e95
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
parts/z80/fs.asm
View File

@ -77,40 +77,40 @@
; Number of handles we want to support ; Number of handles we want to support
; FS_HANDLE_COUNT ; FS_HANDLE_COUNT
; *** CONSTS *** ; *** CONSTS ***
FS_MAX_NAME_SIZE .equ 0x1a .equ FS_MAX_NAME_SIZE 0x1a
FS_BLOCKSIZE .equ 0x100 .equ FS_BLOCKSIZE 0x100
FS_METASIZE .equ 0x20 .equ FS_METASIZE 0x20
FS_META_ALLOC_OFFSET .equ 3 .equ FS_META_ALLOC_OFFSET 3
FS_META_FSIZE_OFFSET .equ 4 .equ FS_META_FSIZE_OFFSET 4
FS_META_FNAME_OFFSET .equ 6 .equ FS_META_FNAME_OFFSET 6
; Size in bytes of a FS handle: ; Size in bytes of a FS handle:
; * 2 bytes for current position. (absolute) ; * 2 bytes for current position. (absolute)
; * 2 bytes for starting offset, after metadata ; * 2 bytes for starting offset, after metadata
; * 2 bytes for maximum offset ; * 2 bytes for maximum offset
; * 2 bytes for file size (we could fetch it from metadata all the time, but it ; * 2 bytes for file size (we could fetch it from metadata all the time, but it
; could be time consuming depending on the underlying device). ; could be time consuming depending on the underlying device).
FS_HANDLE_SIZE .equ 8 .equ FS_HANDLE_SIZE 8
FS_ERR_NO_FS .equ 0x5 .equ FS_ERR_NO_FS 0x5
FS_ERR_NOT_FOUND .equ 0x6 .equ FS_ERR_NOT_FOUND 0x6
; *** VARIABLES *** ; *** VARIABLES ***
; A copy of BLOCKDEV routines when the FS was mounted. 0 if no FS is mounted. ; A copy of BLOCKDEV routines when the FS was mounted. 0 if no FS is mounted.
FS_GETC .equ FS_RAMSTART .equ FS_GETC FS_RAMSTART
FS_PUTC .equ FS_GETC+2 .equ FS_PUTC FS_GETC+2
FS_SEEK .equ FS_PUTC+2 .equ FS_SEEK FS_PUTC+2
FS_TELL .equ FS_SEEK+2 .equ FS_TELL FS_SEEK+2
; Offset at which our FS start on mounted device ; Offset at which our FS start on mounted device
FS_START .equ FS_TELL+2 .equ FS_START FS_TELL+2
; Offset at which we are currently pointing to with regards to our routines ; Offset at which we are currently pointing to with regards to our routines
; below, which all assume this offset as a context. This offset is not relative ; below, which all assume this offset as a context. This offset is not relative
; to FS_START. It can be used directly with fsblkSeek. ; to FS_START. It can be used directly with fsblkSeek.
FS_PTR .equ FS_START+2 .equ FS_PTR FS_START+2
; This variable below contain the metadata of the last block FS_PTR was moved ; This variable below contain the metadata of the last block FS_PTR was moved
; to. We read this data in memory to avoid constant seek+read operations. ; to. We read this data in memory to avoid constant seek+read operations.
FS_META .equ FS_PTR+2 .equ FS_META FS_PTR+2
FS_HANDLES .equ FS_META+FS_METASIZE .equ FS_HANDLES FS_META+FS_METASIZE
FS_RAMEND .equ FS_HANDLES+(FS_HANDLE_COUNT*FS_HANDLE_SIZE) .equ FS_RAMEND FS_HANDLES+FS_HANDLE_COUNT*FS_HANDLE_SIZE
; *** DATA *** ; *** DATA ***
P_FS_MAGIC: P_FS_MAGIC:
@ -371,7 +371,7 @@ fsOpen:
push hl push hl
push de push de
push af push af
ex hl, de ex de, hl
ld hl, (FS_PTR) ld hl, (FS_PTR)
ld a, FS_METASIZE ld a, FS_METASIZE
call addHL call addHL
@ -454,15 +454,13 @@ fsPutC:
; It is an offset that starts at actual data. ; It is an offset that starts at actual data.
; Sets Z if offset is within bounds, unsets Z if it isn't. ; Sets Z if offset is within bounds, unsets Z if it isn't.
fsSeek: fsSeek:
ld ixh, d push de \ pop ix
ld ixl, e
ld (ix), l ld (ix), l
ld (ix+1), h ld (ix+1), h
ret ret
fsTell: fsTell:
ld ixh, d push de \ pop ix
ld ixl, e
ld l, (ix) ld l, (ix)
ld h, (ix+1) ld h, (ix+1)
ret ret

16
tools/tests/zasm/test7.asm
View File

@ -5,4 +5,18 @@
.equ ZASM_RAMEND ZASM_CTX_PC+2 .equ ZASM_RAMEND ZASM_CTX_PC+2
#include "core.asm" #include "core.asm"
#include "zasm/util.asm" #include "parse.asm"
.equ BLOCKDEV_RAMSTART ZASM_RAMEND
.equ BLOCKDEV_COUNT 0
#include "blockdev.asm"
.equ FS_RAMSTART BLOCKDEV_RAMEND
.equ FS_HANDLE_COUNT 0
#include "fs.asm"
;#include "zasm/util.asm"
;.equ IO_RAMSTART ZASM_RAMEND
;#include "zasm/io.asm"
zasmIsFirstPass:
nop