From c7ced3bb6085789716405f236355c30e087d1b9a Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Fri, 2 Apr 2021 00:33:57 +0200
Subject: [PATCH] Move load +load thru +thru --> from vf-cbm-core to
 vf-cbm-bufs

---
 6502/C64/src/vf-cbm-bufs.fth | 18 ++++++++++++++++++
 6502/C64/src/vf-cbm-core.fth | 31 ++-----------------------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/6502/C64/src/vf-cbm-bufs.fth b/6502/C64/src/vf-cbm-bufs.fth
index d7c04e1..bb5c809 100644
--- a/6502/C64/src/vf-cbm-bufs.fth
+++ b/6502/C64/src/vf-cbm-bufs.fth
@@ -1,6 +1,24 @@
 \ *** Block No. 102, Hexblock 66
 66 fthpage
 
+( load +load thru +thru --> )
+
+: load   ( blk --)
+ ?dup 0= ?exit blk push  blk !
+ >in push  >in off
+ .status interpret ;
+
+: +load  ( offset --)  blk @  + load ;
+
+: thru  ( from to --)
+ 1+  swap  DO  I load  LOOP ;
+
+: +thru  ( off0 off1 --)
+ 1+  swap  DO  I +load LOOP ;
+
+: -->
+ 1 blk +! >in off .status  ;  immediate
+
 ( buffer mechanism            15dec83ks)
 
 User file           0 file !
diff --git a/6502/C64/src/vf-cbm-core.fth b/6502/C64/src/vf-cbm-core.fth
index 4120af0..5cb5d52 100644
--- a/6502/C64/src/vf-cbm-core.fth
+++ b/6502/C64/src/vf-cbm-core.fth
@@ -2122,7 +2122,7 @@ Code ?stack
 \ *** Block No. 92, Hexblock 5c
 5c fthpage
 
-( .status push load           08sep84ks)
+( .status push           08sep84ks)
 
 Defer .status    ' noop Is .status
 
@@ -2132,37 +2132,10 @@ Defer .status    ' noop Is .status
  r> swap dup >r @ >r  pull >r >r  ;
  restrict
 
-: load   ( blk --)
- ?dup 0= ?exit blk push  blk !
- >in push  >in off
- .status interpret ;
-
-
-
-
-
-
-
-
-
-
-
-
 \ *** Block No. 93, Hexblock 5d
 5d fthpage
 
-( +load thru +thru --> rdepth depth  ks)
-
-: +load  ( offset --)  blk @  + load ;
-
-: thru  ( from to --)
- 1+  swap  DO  I load  LOOP ;
-
-: +thru  ( off0 off1 --)
- 1+  swap  DO  I +load LOOP ;
-
-: -->
- 1 blk +! >in off .status  ;  immediate
+( rdepth depth  ks)
 
 : rdepth  ( -- +n)  r0 @  rp@ 2+ - 2/ ;