izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-10 09:38:06 +11:00
Code Issues Releases Wiki Activity
d2dcd96ce1
collapseos/apps/zasm/glue.asm

89 lines
2.4 KiB
NASM
Raw Normal View History

zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
; zasm
;
; Reads input from specified blkdev ID, assemble the binary in two passes and
; spit the result in another specified blkdev ID.
;
; We don't buffer the whole source in memory, so we need our input blkdev to
; support Seek so we can read the file a second time. So, for input, we need
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-31 07:59:35 +11:00
; GetB and Seek.
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10: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-31 07:59:35 +11:00
; For output, we only need PutB. Output doesn't start until the second pass.
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
;
; The goal of the second pass is to assign values to all symbols so that we
; can have forward references (instructions referencing a label that happens
; later).
;
; Labels and constants are both treated the same way, that is, they can be
; forward-referenced in instructions. ".equ" directives, however, are evaluated
; during the first pass so forward references are not allowed.
;
; *** Requirements ***
; strncmp
; upcase
; findchar
; blkSel
fs: further adjust to previous blkdev refactoring Previous refacoring broke all seek/tell within fs. fs handles now lost the responsibility to keep track of current position. It's blkdev's job.
2019-06-05 10:45:01 +10:00
; blkSet
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
; fsFindFN
; 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-31 07:59:35 +11:00
; fsGetB
; _blkGetB
; _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-05 01:53:02 +10:00
; _blkSeek
; _blkTell
zasm: print progress indicator while assembling
2019-06-20 01:42:39 +10:00
; printstr
zasm: use printcrlf instead of hardcoded CRLF
2020-02-24 10:52:25 +11:00
; printcrlf
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "user.h"
recipes/sms/romasm: make zasm's memory usage fit the SMS
2019-07-24 06:50:19 +10:00
; *** Overridable consts ***
zasm: lower RAM requirements I've tested RAM usage when self-assembling and there weren't as high as I thought. zasm's defaults now use less than 0x1800 bytes of RAM, making it possible, theoretically for now, for a Sega Master System to assemble Collapse OS from within itself.
2019-10-07 06:42:09 +11:00
; NOTE: These limits below are designed to be *just* enough for zasm to assemble
; itself. Considering that this app is Collapse OS' biggest app, it's safe to
; assume that it will be enough for many many use cases. If you need to compile
; apps with lots of big symbols, you'll need to adjust these.
; With these default settings, zasm runs with less than 0x1800 bytes of RAM!
recipes/sms/romasm: make zasm's memory usage fit the SMS
2019-07-24 06:50:19 +10:00
; Maximum number of symbols we can have in the global and consts registry
.equ ZASM_REG_MAXCNT 0xff
; Maximum number of symbols we can have in the local registry
zasm: lower RAM requirements I've tested RAM usage when self-assembling and there weren't as high as I thought. zasm's defaults now use less than 0x1800 bytes of RAM, making it possible, theoretically for now, for a Sega Master System to assemble Collapse OS from within itself.
2019-10-07 06:42:09 +11:00
.equ ZASM_LREG_MAXCNT 0x20
recipes/sms/romasm: make zasm's memory usage fit the SMS
2019-07-24 06:50:19 +10:00
; Size of the symbol name buffer size. This is a pool. There is no maximum name
; length for a single symbol, just a maximum size for the whole pool.
; Global labels and consts have the same buf size
zasm: lower RAM requirements I've tested RAM usage when self-assembling and there weren't as high as I thought. zasm's defaults now use less than 0x1800 bytes of RAM, making it possible, theoretically for now, for a Sega Master System to assemble Collapse OS from within itself.
2019-10-07 06:42:09 +11:00
.equ ZASM_REG_BUFSZ 0x700
recipes/sms/romasm: make zasm's memory usage fit the SMS
2019-07-24 06:50:19 +10:00
; Size of the names buffer for the local context registry
zasm: lower RAM requirements I've tested RAM usage when self-assembling and there weren't as high as I thought. zasm's defaults now use less than 0x1800 bytes of RAM, making it possible, theoretically for now, for a Sega Master System to assemble Collapse OS from within itself.
2019-10-07 06:42:09 +11:00
.equ ZASM_LREG_BUFSZ 0x100
recipes/sms/romasm: make zasm's memory usage fit the SMS
2019-07-24 06:50:19 +10:00
; ******
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11: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-14 12:38:06 +11: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-16 07:37:49 +11:00
.inc "blkdev.h"
.inc "fs.h"
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
jp zasmMain
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-15 01:55:31 +11:00
.inc "core.asm"
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/const.asm"
.inc "lib/util.asm"
lib/expr: refactor for easier operator addition
2019-11-23 06:45:12 +11:00
.inc "lib/ari.asm"
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-16 07:37:49 +11:00
.inc "lib/parse.asm"
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/util.asm"
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
.equ IO_RAMSTART USER_RAMSTART
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/io.asm"
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
.equ TOK_RAMSTART IO_RAMEND
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/tok.asm"
zasm: remove last remnants of "old style" variables This makes zasm suitable to run from ROM.
2019-07-26 04:02:04 +10:00
.equ INS_RAMSTART TOK_RAMEND
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/instr.asm"
zasm: remove last remnants of "old style" variables This makes zasm suitable to run from ROM.
2019-07-26 04:02:04 +10:00
.equ DIREC_RAMSTART INS_RAMEND
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/directive.asm"
.inc "zasm/parse.asm"
basic: add expression support to print Again, same thing as in zasm.
2019-11-19 07:52:07 +11:00
.equ EXPR_PARSE parseNumberOrSymbol
.inc "lib/expr.asm"
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
.equ SYM_RAMSTART DIREC_RAMEND
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/symbol.asm"
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
.equ ZASM_RAMSTART SYM_RAMEND
zasm: rename #inc to .inc scas, it's not needed any more.
2019-10-07 05:32:23 +11:00
.inc "zasm/main.asm"
Modify userspace .org and RAMSTART expectations Instead of expecting a `USER_CODE` symbol to be set, we expect `.org` to be set in all userspace glue code. This gives us more flexibility with regards to how we manage that. Moreover, instead of making `USER_RAMSTART` mandatory, we make it default to the end of the binary, which is adequate in a majority of cases. Will be useful for my upcoming mega-commit... :)
2019-11-16 02:33:13 +11:00
USER_RAMSTART:
Reference in New Issue Copy Permalink