Changeset 3201

Timestamp:

Aug 20, 2012 11:35:44 AM (9 months ago)

Author:

quozl

Message:

core - rename the loaded file size variable file-size to load-size, as it conflicts with a standard word file-size, rename other references in tree.

Files:

• cpu/x86/pc/olpc/lzip.fth (modified) (1 diff)
• cpu/x86/small.bth (modified) (1 diff)
• ofw/core/bootparm.fth (modified) (1 diff)

cpu/x86/pc/olpc/lzip.fth

@@ -22 +22 @@
    0 to seek-ptr                                    ( )
    load-base to base-adr                            ( )
-   file-size @ to image-size                        ( )
+   load-size @ to image-size                        ( )
    my-args  dup  if                                 ( adr len )
       " zip-file-system"  find-package  0=  if      ( adr len ph )

cpu/x86/small.bth

@@ -188 +188 @@
 alias lpoke l!
 0 value load-base
-variable file-size
-: loaded load-base file-size @  ;
-: !load-size  file-size !  ;
+variable load-size
+: loaded load-base load-size @  ;
+: !load-size  load-size !  ;
 defer ?inflate-loaded  ' noop is ?inflate-loaded
 alias external noop

ofw/core/bootparm.fth

@@ -57 +57 @@
 \needs load-base 0  config-int load-base        \ The default value can be changed later
 
-variable file-size
-: loaded  ( -- adr len )  load-base file-size @  ;
-
-headerless
-: !load-size  ( len -- )  file-size !  ;
+variable load-size
+: loaded  ( -- adr len )  load-base load-size @  ;
+
+headerless
+: !load-size  ( len -- )  load-size !  ;
 
 d# 1024 buffer: path-buf