From bf4dcca1b45384762c6bcbb58b97f31f88a80aa1 Mon Sep 17 00:00:00 2001 From: Philip Zembrod Date: Sun, 26 Jul 2020 13:24:30 +0200 Subject: [PATCH] Move including the buffer/block mechanism to the top level source files --- 6502/C64/src/vf-c16-32k.fth | 2 ++ 6502/C64/src/vf-c16-main.fth | 1 + 6502/C64/src/vf-c64-main.fth | 2 ++ 6502/C64/src/vf-cbm-bufs.fth | 2 ++ 6502/C64/src/vf-cbm-core.fth | 7 ++++--- 6502/C64/src/vf-sys-cbm.fth | 2 -- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/6502/C64/src/vf-c16-32k.fth b/6502/C64/src/vf-c16-32k.fth index 19e097e..5b2e038 100644 --- a/6502/C64/src/vf-c16-32k.fth +++ b/6502/C64/src/vf-c16-32k.fth @@ -26,10 +26,12 @@ cr .( Host is: ) include vf-pr-target.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-cbm-bufs.fth include vf-finalize.fth include vf-pr-target.fth diff --git a/6502/C64/src/vf-c16-main.fth b/6502/C64/src/vf-c16-main.fth index 2797890..d9768b4 100644 --- a/6502/C64/src/vf-c16-main.fth +++ b/6502/C64/src/vf-c16-main.fth @@ -33,6 +33,7 @@ include vf-head-c16.fth include vf-cbm-core.fth include vf-sys-c16.fth include vf-cbm-file.fth +include vf-cbm-bufs.fth include vf-finalize.fth include vf-pr-target.fth diff --git a/6502/C64/src/vf-c64-main.fth b/6502/C64/src/vf-c64-main.fth index a4689be..7bf6f4f 100644 --- a/6502/C64/src/vf-c64-main.fth +++ b/6502/C64/src/vf-c64-main.fth @@ -26,10 +26,12 @@ cr .( Host is: ) include vf-pr-target.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-cbm-bufs.fth include vf-finalize.fth include vf-pr-target.fth diff --git a/6502/C64/src/vf-cbm-bufs.fth b/6502/C64/src/vf-cbm-bufs.fth index 814b18d..d7c04e1 100644 --- a/6502/C64/src/vf-cbm-bufs.fth +++ b/6502/C64/src/vf-cbm-bufs.fth @@ -297,3 +297,5 @@ Defer diskerr ' (diskerr Is diskerr : all-buffers BEGIN first @ allotbuffer first @ = UNTIL ; + +include vf-sys-cbmrw.fth diff --git a/6502/C64/src/vf-cbm-core.fth b/6502/C64/src/vf-cbm-core.fth index e4c5525..6a50b4b 100644 --- a/6502/C64/src/vf-cbm-core.fth +++ b/6502/C64/src/vf-cbm-core.fth @@ -2374,7 +2374,10 @@ Label wake wake >wake ! end-code - +\ Hooks for buffer mechanism to hook into the +\ overall system. +\ Needed somewhere around here so that +\ loading vf-cbm-bufs.fth o can be ptional. E400 Constant limit Variable first @@ -2385,8 +2388,6 @@ Defer r/w Defer save-buffers ' noop IS save-buffers Defer init-buffers ' noop IS init-buffers -include vf-cbm-bufs.fth - \ *** Block No. 113, Hexblock 71 71 fthpage diff --git a/6502/C64/src/vf-sys-cbm.fth b/6502/C64/src/vf-sys-cbm.fth index fcc4e28..97b41d2 100644 --- a/6502/C64/src/vf-sys-cbm.fth +++ b/6502/C64/src/vf-sys-cbm.fth @@ -224,5 +224,3 @@ Code bus@ ( -- 8b) IF BEGIN emit bus@ dup #cr = UNTIL 0= cr ELSE BEGIN bus@ #cr = UNTIL THEN 0= busoff ; - -include vf-sys-cbmrw.fth