6502/VolksForth
1
0
Fork 0
mirror of https://github.com/forth-ev/VolksForth.git synced 2025-01-09 13:32:05 +00:00
Code Issues Projects Releases Wiki Activity

Switch from custom-implemented -keybuf flag in x16emu to stock -bas flag.

Browse Source
This commit is contained in:
Philip Zembrod 2020-12-21 22:26:26 +01:00
parent 211926629c
commit 18c25d110e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
6502/C64/Makefile
View File

@ -24,7 +24,7 @@ update: $(vf_blk_fth_files) $(vf_fth_files_petscii)
clean:
rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log
rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log tmp/*
rm -f *.log *.result *.golden
rm -f cbmfiles/c??-testbase
rm -f disks/scratch.d64 emulator/sdcard.img
@ -132,7 +132,7 @@ test-v4th-c16-.log: emulator/v4th-c16-.T64
test-v4th-x16.log: cbmfiles/v4th-x16 emulator/sdcard.img
rm -f cbmfiles/test.log
emulator/run-in-x16emu.sh v4th-x16 \
"INCLUDE RUN-STD-TESTS.FTH\\X0D1234567890\\X0D"
"include run-std-tests.fth\n1234567890\n"
mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
petscii2ascii cbmfiles/test.log $@

16
6502/C64/emulator/run-in-x16emu.sh
View File

@ -5,9 +5,10 @@ emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
cbmfilesdir="${basedir}/cbmfiles"
sdcard="${emulatordir}/sdcard.img"
x16script="${basedir}/tmp/x16script"
mformat -i "${sdcard}" -F
for asciifile in $(cd "${cbmfilesdir}" && ls *.fth *fr)
for asciifile in $(cd "${cbmfilesdir}" && ls)
do
# Convert filename to PETSCII, remove trailing CR.
petsciifile="$(echo ${asciifile} | ascii2petscii - |tr -d '\r')"
@ -20,13 +21,18 @@ then
autostart="-prg ${cbmfilesdir}/${1} -run"
fi
keybuf=""
script=""
warp=""
scale=""
debug=""
if [ -n "$2" ]
then
keybuf="${2}"
test -d tmp || mkdir tmp
rm -f "${x16script}".*
echo "load\"${1}\"\nrun\n${2}" | sed 's/\\n/\n/g' > "${x16script}".ascii
ascii2petscii "${x16script}.ascii" "${x16script}.petscii"
script="-bas ${x16script}.petscii"
autostart=""
mcopy -i "${sdcard}" "${emulatordir}/notdone" "::NOTDONE"
warp="-warp"
else
@ -39,13 +45,13 @@ x16emu \
-keymap de \
-sdcard "${sdcard}" \
$autostart \
-keybuf "$keybuf" \
$script \
$warp \
$scale \
$debug \
&
if [ -n "$keybuf" ]
if [ -n "$script" ]
then
while mtype -i "${sdcard}" "::NOTDONE" > /dev/null
do sleep 1