Remove dependency of log2file.fb on xinout.fb, namly (type (page (at

and switch tests to use kernel.com instead of volks4th.com
This commit is contained in:
Philip Zembrod 2023-09-03 12:56:45 +02:00
parent 6daa05b8a6
commit 79ef63fdec
3 changed files with 13 additions and 10 deletions

View File

@ -38,10 +38,11 @@ run-volks4th: \
"volks4th" "volks4th"
logtest.log: \ logtest.log: \
$(patsubst %, $(cpmfilesdir)/%, volks4th.com log2file.fb) \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb log2file.fb) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"volks4th" \ "kernel fileint.fb" \
"1 load onlyforth" \
"include log2file.fb" \ "include log2file.fb" \
"logopen" \ "logopen" \
".( hello world) cr" \ ".( hello world) cr" \
@ -55,11 +56,12 @@ logtest.log: \
dos2unix -n $(runcpmdir)/logfile.txt $@ dos2unix -n $(runcpmdir)/logfile.txt $@
inctest.log: \ inctest.log: \
$(patsubst %, $(cpmfilesdir)/%, volks4th.com \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \
include.fb log2file.fb inctest.fth) \ include.fb log2file.fb inctest.fth) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"volks4th" \ "kernel fileint.fb" \
"1 load onlyforth" \
"include include.fb" \ "include include.fb" \
"include log2file.fb" \ "include log2file.fb" \
"logopen" \ "logopen" \
@ -85,12 +87,13 @@ target.log: \
dos2unix -n $(runcpmdir)/logfile.txt $@ dos2unix -n $(runcpmdir)/logfile.txt $@
test-min.log: \ test-min.log: \
$(patsubst %, $(cpmfilesdir)/%, volks4th.com \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \
include.fb log2file.fb \ include.fb log2file.fb \
ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \ ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"volks4th" \ "kernel fileint.fb" \
"1 load onlyforth" \
"include include.fb" \ "include include.fb" \
"include test-min.fth" \ "include test-min.fth" \
"bye" \ "bye" \

File diff suppressed because one or more lines are too long

View File

@ -58,19 +58,19 @@
\ *** Block No. 3, Hexblock 3 \ *** Block No. 3, Hexblock 3
\ log-emit log-type log-cr alsologtofile pphz 01jul23 \ log-emit log-type log-cr alsologtofile pphz 03sep23
: log-emit ( char -- ) : log-emit ( char -- )
dup (emit logc! ; dup (emit logc! ;
: log-type ( addr count -- ) : log-type ( addr count -- )
2dup (type 0 ?DO count logc! LOOP drop ; 0 ?DO count log-emit LOOP drop ;
: log-cr ( -- ) : log-cr ( -- )
(cr #cr logc! #lf logc! ; (cr #cr logc! #lf logc! ;
Output: alsologtofile Output: alsologtofile
log-emit log-cr log-type (del (page (at (at? ; log-emit log-cr log-type (del noop 2drop (at? ;