collapseos/apps/ed/glue.asm

; *** Requirements ***
; BLOCKDEV_SIZE
; FS_HANDLE_SIZE
; _blkGetB
; _blkPutB
; _blkSeek
; _blkTell
; fsFindFN
; fsOpen
; fsGetB
; fsPutB
; fsSetSize
; printstr
; printcrlf
; stdioReadLine
; stdioPutC
;
.inc "user.h"

; *** Overridable consts ***
; Maximum number of lines allowed in the buffer.
.equ	ED_BUF_MAXLINES		0x800
; Size of our scratchpad
.equ	ED_BUF_PADMAXLEN	0x1000

; ******

.inc "err.h"
.inc "fs.h"
.inc "blkdev.h"
	jp	edMain

.inc "core.asm"
.inc "lib/util.asm"
.inc "lib/parse.asm"
.inc "ed/util.asm"
.equ	IO_RAMSTART	USER_RAMSTART
.inc "ed/io.asm"
.equ	BUF_RAMSTART	IO_RAMEND
.inc "ed/buf.asm"
.equ	CMD_RAMSTART	BUF_RAMEND
.inc "ed/cmd.asm"
.equ	ED_RAMSTART	CMD_RAMEND
.inc "ed/main.asm"
USER_RAMSTART:
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			`; * Requirements *`
			`; BLOCKDEV_SIZE`
			`; FS_HANDLE_SIZE`
			`; _blkGetB`
			`; _blkPutB`
			`; _blkSeek`
			`; _blkTell`
			`; fsFindFN`
			`; fsOpen`
			`; fsGetB`
			`; fsPutB`
			`; fsSetSize`
			`; printstr`
			`; printcrlf`
			`; stdioReadLine`
			`; stdioPutC`
			`;`
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 ed's memory usage fit the SMS Yup, that's ultimately why I've just made this whole big zasm refactoring in the previous commits. To allow for this. But also, zasm is in much better shape now... 2019-07-24 06:13:52 +10:00
			`; * Overridable consts *`
			`; Maximum number of lines allowed in the buffer.`
			`.equ ED_BUF_MAXLINES 0x800`
			`; Size of our scratchpad`
			`.equ ED_BUF_PADMAXLEN 0x1000`

			`; ******`

zasm: rename #inc to .inc scas, it's not needed any more. 2019-10-07 05:32:23 +11:00			`.inc "err.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 "fs.h"`
			`.inc "blkdev.h"`
apps/ed: first steps 2019-07-13 23:57:37 +10:00			`jp edMain`

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 "lib/util.asm"`
			`.inc "lib/parse.asm"`
core: remove cpHLDE It wasn't used much, so I replaced its use in the kernel with direct code and moved the routine in apps/ed, the only other place where it was used. 2019-12-13 07:53:14 +11:00			`.inc "ed/util.asm"`
apps/ed: start implementing I/O 2019-07-14 01:29:06 +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 "ed/io.asm"`
apps/ed: print specified line 2019-07-14 04:01:20 +10:00			`.equ BUF_RAMSTART IO_RAMEND`
zasm: rename #inc to .inc scas, it's not needed any more. 2019-10-07 05:32:23 +11:00			`.inc "ed/buf.asm"`
apps/ed: refactoring 2019-07-14 11:08:16 +10:00			`.equ CMD_RAMSTART BUF_RAMEND`
zasm: rename #inc to .inc scas, it's not needed any more. 2019-10-07 05:32:23 +11:00			`.inc "ed/cmd.asm"`
apps/ed: refactoring 2019-07-14 11:08:16 +10:00			`.equ ED_RAMSTART CMD_RAMEND`
zasm: rename #inc to .inc scas, it's not needed any more. 2019-10-07 05:32:23 +11:00			`.inc "ed/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:`