Author: quozl Date: Mon Aug 20 11:35:44 2012 New Revision: 3201 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3201
Log: 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.
Modified: cpu/x86/pc/olpc/lzip.fth cpu/x86/small.bth ofw/core/bootparm.fth
Modified: cpu/x86/pc/olpc/lzip.fth ============================================================================== --- cpu/x86/pc/olpc/lzip.fth Sun Aug 19 05:43:23 2012 (r3200) +++ cpu/x86/pc/olpc/lzip.fth Mon Aug 20 11:35:44 2012 (r3201) @@ -21,7 +21,7 @@ : open ( -- flag ) 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 ) 2drop false exit
Modified: cpu/x86/small.bth ============================================================================== --- cpu/x86/small.bth Sun Aug 19 05:43:23 2012 (r3200) +++ cpu/x86/small.bth Mon Aug 20 11:35:44 2012 (r3201) @@ -187,9 +187,9 @@ alias wpoke w! 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
Modified: ofw/core/bootparm.fth ============================================================================== --- ofw/core/bootparm.fth Sun Aug 19 05:43:23 2012 (r3200) +++ ofw/core/bootparm.fth Mon Aug 20 11:35:44 2012 (r3201) @@ -56,11 +56,11 @@ headers \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 @ ; +variable load-size +: loaded ( -- adr len ) load-base load-size @ ;
headerless -: !load-size ( len -- ) file-size ! ; +: !load-size ( len -- ) load-size ! ;
d# 1024 buffer: path-buf headers