6502/VolksForth
1
0
Fork 0
mirror of https://github.com/forth-ev/VolksForth.git synced 2024-12-22 21:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Add main files and build rules for lite versions (w/o block mechanism) incl. tests and binaries

Browse Source
This commit is contained in:
Philip Zembrod 2020-08-02 01:22:13 +02:00
parent d75a22451a
commit 262c80cd3e
11 changed files with 126 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
6502/C64/Makefile
View File

@ -3,9 +3,6 @@
# the file format conversion tools from the tools/ subdir of
# https://github.com/pzembrod/cc64 to be installed.
# VERSION=volksforth83
VERSION=vf-latest
vf_blk_d64_files = $(wildcard disks/*.d64)
vf_blk_fth_files = $(patsubst %.d64, %.fth, $(vf_blk_d64_files))
vf_fth_files = $(wildcard src/vf-*.fth)
@ -16,6 +13,8 @@ vf_binaries = $(patsubst %, cbmfiles/vf-%, $(vf_flavours))
test_files = $(wildcard tests/*.f*)
test_files_petscii = $(patsubst tests/%, cbmfiles/%, $(test_files))
test_logs = $(patsubst %, test-%.log, $(vf_flavours))
working_vf_flavours = full-c64 full-c16+ lite-c64 lite-c16+
test_resuls = $(patsubst %, test-%.result, $(working_vf_flavours))
# Target to convert all .d64 images into .fth files for easier reading.
vf_blk_fth: $(vf_blk_fth_files)
@ -30,10 +29,12 @@ clean:
# Convenience targets
test: test-full-c64.result test-full-c16+.result
test: $(test_resuls)
test64: test-full-c64.result
lite64: test-lite-c64.result
debug-64: emulator/tcbase.T64 emulator/build-vf.sh \
disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
emulator/build-vf.sh vf-c64-main.fth
@ -82,12 +83,22 @@ $(test_logs): $(test_files_petscii) emulator/run-in-vice.sh
test-full-c64.log: emulator/vf-full-c64.T64 disks/scratch.d64
DISK9=scratch emulator/run-in-vice.sh vf-full-c64 \
"include run-vf-tests.fth\n1234567890\n"
"include run-full-tests.fth\n1234567890\n"
petscii2ascii cbmfiles/test.log $@
test-lite-c64.log: emulator/vf-lite-c64.T64
emulator/run-in-vice.sh vf-lite-c64 \
"include run-lite-tests.fth\n1234567890\n"
petscii2ascii cbmfiles/test.log $@
test-full-c16+.log: emulator/vf-full-c16+.T64
VICE=xplus4 emulator/run-in-vice.sh vf-full-c16+ \
"include run-vf-tests.fth\n1234567890\n"
"include run-min-tests.fth\n1234567890\n"
petscii2ascii cbmfiles/test.log $@
test-lite-c16+.log: emulator/vf-lite-c16+.T64
VICE=xplus4 emulator/run-in-vice.sh vf-lite-c16+ \
"include run-min-tests.fth\n1234567890\n"
petscii2ascii cbmfiles/test.log $@
test-%.result: test-%.log test-%.golden tests/evaluate-test.sh
@ -98,18 +109,21 @@ disks/scratch.d64: disks/empty.d64
cp $< $@
c64_golden_parts = prelim core coreext double block report-blk
c64_golden_files = $(patsubst %, tests/golden/%.golden, \
$(c64_golden_parts))
test-full-c64.golden: $(c64_golden_files)
test-full-c64.golden: $(patsubst %, tests/golden/%.golden, \
prelim core coreext double block report-blk)
cat $? > $@
c16_golden_parts = prelim core
c16_golden_files = $(patsubst %, tests/golden/%.golden, \
$(c16_golden_parts))
test-full-c16+.golden: $(c16_golden_files)
test-lite-c64.golden: $(patsubst %, tests/golden/%.golden, \
prelim core coreext double report-noblk)
cat $? > $@
test-full-c16-.golden: $(c16_golden_files)
c16_golden_parts = $(patsubst %, tests/golden/%.golden, \
prelim core)
test-full-c16+.golden: $(c16_golden_parts)
cat $? > $@
test-lite-c16+.golden: $(c16_golden_parts)
cat $? > $@
# Rules for building Forth binaries on top of the plain vanilla
@ -120,15 +134,6 @@ cbmfiles/devenv: emulator/run-in-vice.sh emulator/build-devenv.sh \
disks/vforth4_1.d64 disks/vforth4_3.d64 disks/file-words.d64
emulator/build-devenv.sh
# Deprecated
# cbmfiles/c64-testbase: emulator/run-in-vice.sh emulator/build-testbase.sh \
# emulator/c64-$(VERSION).T64 disks/file-words.d64
# emulator/build-testbase.sh c64 $(VERSION)
# cbmfiles/c16-testbase: emulator/run-in-vice.sh emulator/build-testbase.sh \
# emulator/c16-$(VERSION).T64 disks/file-words.d64
# VICE=xplus4 emulator/build-testbase.sh c16 $(VERSION)
# Generic T64 tape image rule

BIN
6502/C64/cbmfiles/vf-full-c16+ Normal file
View File

Binary file not shown.

BIN
6502/C64/cbmfiles/vf-full-c64 Normal file
View File

Binary file not shown.

BIN
6502/C64/cbmfiles/vf-lite-c16+ Normal file
View File

Binary file not shown.

BIN
6502/C64/cbmfiles/vf-lite-c64 Normal file
View File

Binary file not shown.

15
6502/C64/src/vf-lite-c16+.fth Normal file
View File

@ -0,0 +1,15 @@
include vf-tc-prep.fth
include vf-trg-c16+.fth
\ The actual volksForth sources
include vf-head-c16.fth
include vf-cbm-core.fth
include vf-sys-c16.fth
include vf-cbm-file.fth
include vf-finalize.fth
include vf-pr-target.fth
quit

15
6502/C64/src/vf-lite-c16-.fth Normal file
View File

@ -0,0 +1,15 @@
include vf-tc-prep.fth
include vf-trg-c16-.fth
\ The actual volksForth sources
include vf-head-c16.fth
include vf-cbm-core.fth
include vf-sys-c16.fth
include vf-cbm-file.fth
include vf-finalize.fth
include vf-pr-target.fth
quit

15
6502/C64/src/vf-lite-c64.fth Normal file
View File

@ -0,0 +1,15 @@
include vf-tc-prep.fth
include vf-trg-c64.fth
\ The actual volksForth sources
include vf-head-c64.fth
include vf-cbm-core.fth
include vf-sys-c64.fth
include vf-cbm-file.fth
include vf-finalize.fth
include vf-pr-target.fth
quit

26
6502/C64/tests/run-full-tests.fth Normal file
View File

@ -0,0 +1,26 @@
include vf-cbm-dos.fth
include logtofile.fth
logopen" test.log"
include ans-shim.fth
: \vf [compile] \ ; immediate
include prelimtest.fth
include tester.fth
\ 1 verbose !
include core.fr
include coreplustest.fth
include utilities.fth
include errorreport.fth
include coreexttest.fth
include doubletest.fth
1 drive include blocktest.fth
REPORT-ERRORS
logclose
dos s0:notdone

25
6502/C64/tests/run-lite-tests.fth Normal file
View File

@ -0,0 +1,25 @@
include vf-cbm-dos.fth
include logtofile.fth
logopen" test.log"
include ans-shim.fth
: \vf [compile] \ ; immediate
include prelimtest.fth
include tester.fth
\ 1 verbose !
include core.fr
include coreplustest.fth
include utilities.fth
include errorreport.fth
include coreexttest.fth
include doubletest.fth
REPORT-ERRORS
logclose
dos s0:notdone

21
6502/C64/tests/run-vf-tests.fth → 6502/C64/tests/run-min-tests.fth
View File

@ -1,39 +1,20 @@
include vf-cbm-dos.fth
include logtofile.fth
logopen" test.log"
include ans-shim.fth
: \vf [compile] \ ; immediate
include ans-shim.fth
include prelimtest.fth
include tester.fth
\ 1 verbose !
include core.fr
include coreplustest.fth
\ The C16 VolksForth has LIMIT at $8000.
\ More tests than up to here fill the dictionary.
(64 include utilities.fth C)
(64 include errorreport.fth C)
(64 include coreexttest.fth C)
(64 include doubletest.fth C)
(64 1 drive C)
(64 include blocktest.fth C)
(64 REPORT-ERRORS C)
logclose
dos s0:notdone