Diff for /gforth/blocks.fs between versions 1.6 and 1.17

version 1.6, 1995/09/06 21:00:10 version 1.17, 1997/07/31 16:17:06
Line 1 Line 1
 \ A less simple implementation of the blocks wordset.   \ A less simple implementation of the blocks wordset. 
   
 \ An more efficient implementation would use mmap on OSs that  \ Copyright (C) 1995 Free Software Foundation, Inc.
   
   \ This file is part of Gforth.
   
   \ Gforth is free software; you can redistribute it and/or
   \ modify it under the terms of the GNU General Public License
   \ as published by the Free Software Foundation; either version 2
   \ of the License, or (at your option) any later version.
   
   \ This program is distributed in the hope that it will be useful,
   \ but WITHOUT ANY WARRANTY; without even the implied warranty of
   \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   \ GNU General Public License for more details.
   
   \ You should have received a copy of the GNU General Public License
   \ along with this program; if not, write to the Free Software
   \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
   
   \ A more efficient implementation would use mmap on OSs that
 \ provide it and many buffers on OSs that do not provide mmap.  \ provide it and many buffers on OSs that do not provide mmap.
   
 \ Now, the replacement algorithm is "direct mapped"; change to LRU  \ Now, the replacement algorithm is "direct mapped"; change to LRU
Line 13 Line 32
 require struct.fs  require struct.fs
   
 struct  struct
     1           cells: field buffer-block   \ the block number      cell%               field buffer-block   \ the block number
     1           cells: field buffer-fid     \ the block's fid      cell%               field buffer-fid     \ the block's fid
     1           cells: field buffer-dirty   \ the block dirty flag      cell%               field buffer-dirty   \ the block dirty flag
     chars/block chars: field block-buffer   \ the data      char% chars/block * field block-buffer   \ the data
     0           cells: field next-buffer      cell% 0 *           field next-buffer
 end-struct buffer-struct  end-struct buffer-struct
   
 Variable block-buffers  Variable block-buffers
Line 27  $20 Value buffers Line 46  $20 Value buffers
   
 User block-fid  User block-fid
   
 : block-cold  : block-cold ( -- )
     defers 'cold  block-fid off  last-block off      block-fid off  last-block off
     buffers buffer-struct drop * allocate throw dup block-buffers !      buffer-struct buffers * %alloc dup block-buffers ! ( addr )
     buffers buffer-struct drop * erase ;      buffer-struct %size buffers * erase ;
   
 ' block-cold IS 'cold  ' block-cold INIT8 chained
   
 block-cold  block-cold
   
 Defer flush-file  Defer flush-blocks
   
 : use-file ( addr u -- )  : open-blocks ( addr u -- ) \ gforth
     2dup r/w bin open-file 0<>      \g use the file, whose name is given by @var{addr u}, as blocks file 
       2dup ['] open-fpath-file catch 0<>
     if      if
         drop r/w bin create-file throw          2drop r/w bin create-file throw
     else      else
         nip nip          rot close-file throw  2dup file-status throw bin open-file throw
           >r 2drop r>
     then      then
     block-fid @ IF  flush-file block-fid @ close-file throw  THEN      block-fid @ IF  flush-blocks block-fid @ close-file throw  THEN
     block-fid ! ;      block-fid ! ;
   
   : use ( "file" -- ) \ gforth
       \g use @var{file} as blocks file
       name open-blocks ;
   
 \ the file is opened as binary file, since it either will contain text  \ the file is opened as binary file, since it either will contain text
 \ without newlines or binary data  \ without newlines or binary data
 : get-block-fid ( -- fid )  : get-block-fid ( -- fid )
     block-fid @ 0=      block-fid @ 0=
     if      if
         s" blocks.fb" use-file          s" blocks.fb" open-blocks
     then      then
     block-fid @ ;      block-fid @ ;
   
Line 86  Defer flush-file Line 111  Defer flush-file
     save-buffers      save-buffers
     empty-buffers ;      empty-buffers ;
   
 ' flush IS flush-file  ' flush IS flush-blocks
   
 : get-buffer ( n -- a-addr )  : get-buffer ( n -- a-addr )
     buffers mod buffer-struct drop * block-buffers @ + ;      buffers mod buffer-struct %size * block-buffers @ + ;
   
 : block ( u -- a-addr )  : block ( u -- a-addr )
     dup 0= -35 and throw      dup 0= -35 and throw
     dup get-buffer >r      dup get-buffer >r
     dup r@ buffer-block @ <>      dup r@ buffer-block @ <>
     r@ buffer-fid @ block-fid @ <> and      r@ buffer-fid @ block-fid @ <> or
     if      if
         r@ save-buffer          r@ save-buffer
         dup block-position          dup block-position
Line 143  User scr 0 scr ! Line 168  User scr 0 scr !
   pop-file ( throw ) ;    pop-file ( throw ) ;
   
 : thru ( i*x n1 n2 -- j*x )  : thru ( i*x n1 n2 -- j*x )
   1+ swap 0 ?DO  I load  LOOP ;    1+ swap ?DO  I load  LOOP ;
   
 : +load ( i*x n -- j*x )  blk @ + load ;  : +load ( i*x n -- j*x )  blk @ + load ;
   
 : +thru ( i*x n1 n2 -- j*x )  : +thru ( i*x n1 n2 -- j*x )
   1+ swap 0 ?DO  I +load  LOOP ;    1+ swap ?DO  I +load  LOOP ;
   
 : --> ( -- )  refill drop ; immediate  : --> ( -- )  refill drop ; immediate
   
 : block-included ( addr u -- )  : block-included ( addr u -- )
     block-fid @ >r block-fid off use-file      block-fid @ >r block-fid off open-blocks
     1 load block-fid @ close-file throw flush      1 load block-fid @ close-file throw flush
     r> block-fid ! ;      r> block-fid ! ;
   
 : include ( "name" -- )  \ thrown out because it may provide unpleasant surprises - anton
     name 2dup dup 3 - /string s" .fb" compare  \ : include ( "name" -- )
     0= IF  block-included  ELSE  included  THEN ;  \     name 2dup dup 3 - /string s" .fb" compare
   \     0= IF  block-included  ELSE  included  THEN ;
   
 get-current environment-wordlist set-current  get-current environment-wordlist set-current
 true constant block  true constant block
 true constant block-ext  true constant block-ext
 set-current  set-current
   
 : bye  ['] flush catch drop bye ;  
   
   : bye  ['] flush catch drop bye ;

Removed from v.1.6  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>