openfirmware January 2012

openfirmware@openfirmware.info

1 participants
55 discussions

[commit] r2800 - cpu/arm cpu/arm/olpc ofw/core
by repository service 06 Jan '12

06 Jan '12

Author: wmb Date: Fri Jan 6 17:31:16 2012 New Revision: 2800 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2800 Log: OLPC trac #11568 - ARM - added flattened device tree support. Added: ofw/core/fdt.fth Modified: cpu/arm/linux.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Fri Jan 6 17:31:11 2012 (r2799) +++ cpu/arm/linux.fth Fri Jan 6 17:31:16 2012 (r2800) @@ -89,16 +89,28 @@ 0 tag-l, \ ATAG_NONE ; +0 value use-fdt? +: use-fdt ( -- ) true to use-fdt? ; : linux-fixup ( -- ) [ifdef] linux-logo linux-logo [then] - args-buf cscount set-parameters ( ) + use-fdt? 0= if + args-buf cscount set-parameters ( ) + then disable-interrupts linux-base linux-base (init-program) \ Starting address, SP 0 to r0 arm-linux-machine-type to r1 +[ifdef] flatten-device-tree + use-fdt? if + flatten-device-tree to r2 + else + linux-params to r2 + then +[else] linux-params to r2 +[then] linux-hook ; @@ -114,6 +126,9 @@ tuck /ramdisk move ( new-ramdisk-adr ) \ dup to linux-memtop to ramdisk-adr + + ramdisk-adr " linux,initd-start" chosen-int-property + ramdisk-adr /ramdisk + " linux,initd-end" chosen-int-property ; : $load-ramdisk ( name$ -- ) 0 to /ramdisk ( name$ ) Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Jan 6 17:31:11 2012 (r2799) +++ cpu/arm/olpc/build-fw.fth Fri Jan 6 17:31:16 2012 (r2800) @@ -361,6 +361,7 @@ fload ${BP}/cpu/arm/marvell/utmiphy.fth +fload ${BP}/ofw/core/fdt.fth fload ${BP}/cpu/arm/linux.fth \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth Added: ofw/core/fdt.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ ofw/core/fdt.fth Fri Jan 6 17:31:16 2012 (r2800) @@ -0,0 +1,193 @@ +\ See license at end of file +purpose: Construct a flattened device tree blob for Linux + +0 value boot-cpu + +8 constant /fdt-align +0 value fdt +0 value fdt-end +0 value fdt-ptr +0 value fdt-strings +0 value fdt-strings-ptr +0 value fdt-strings-end +h# 40000 value /fdt + +0 value the-node + +: fdt-remaining ( -- n ) fdt-end fdt-ptr - ; +: ?fdt-enough ( n -- ) + +; + +: +fdt ( n -- ptr ) + dup fdt-remaining > abort" FDT buffer overflow" ( n ) + fdt-ptr tuck + to fdt-ptr ( ptr ) +; +: fdt-align ( boundary -- ) + fdt-ptr swap round-up fdt-ptr - ( n ) + +fdt drop +; +: fdt-c, ( c -- ) /c +fdt c! ; +: fdt$, ( adr len -- ) dup +fdt ( adr len ptr ) swap move ( ) ; +: fdt, ( l -- ) /l +fdt be-l! ; +: fdt-strings-remaining ( -- n ) fdt-strings-end fdt-strings-ptr - ; +: fdt-strings-len ( -- n ) fdt-strings-ptr fdt-strings - ; + +: fdt-string, ( adr len -- ) + >r ( adr r: len ) + fdt-strings-ptr r@ move ( r: len ) + 0 fdt-strings-ptr r@ + c! ( r: len ) + fdt-strings-ptr r> + 1+ to fdt-strings-ptr ( ) +; +: >string-offset ( $ -- offset ) + \ If the string is already in the table, return its offset + fdt-strings 4 + begin dup fdt-strings-ptr u< while ( $ adr ) + cscount ( $ adr len ) + 4dup $= if ( $ adr len ) + drop nip nip fdt-strings - exit ( -- offset ) + then ( $ adr ) + + 1+ ( $ adr' ) + repeat ( $ adr ) + + \ Otherwise add it to the table + fdt-strings-ptr <> abort" FDT string table error" ( $ ) + fdt-strings-ptr fdt-strings - -rot ( offset $ ) + fdt-string, ( offset ) +; + +also client-services +: flatten-path ( -- ) + the-node phandle>devname ( adr len ) + fdt$, 0 fdt-c, 4 fdt-align ( ) +; +: (flatten-property) ( propname$ propvalue$ -- ) + 3 fdt, ( propname$ propvalue$ ) \ OF_DT_PROP + dup fdt, ( propname$ propvalue$ ) \ Value length + 2swap >string-offset fdt, ( propvalue$ ) \ Name offset + fdt$, ( ) \ Value data + 4 fdt-align ( ) +; +: flatten-property ( propname$ -- ) + 2dup the-node get-package-property abort" FDT missing property" ( propname$ propvalue$ ) + (flatten-property) ( ) +; +variable fdt-phandle +: add-phandle-property ( -- ) + the-node fdt-phandle be-l! + " phandle" fdt-phandle /l (flatten-property) +; +: flatten-properties ( -- ) + " " ( propname$ ) + begin the-node next-property while ( propname$' ) + 2dup " name" $= 0= if ( propname$' ) + 2dup flatten-property ( propname$' ) + then ( propname$' ) + repeat ( ) +; +: flatten-node ( phandle -- ) recursive + to the-node + 1 fdt, \ OF_DT_BEGIN_NODE + + flatten-path + add-phandle-property + flatten-properties + + the-node child ( phandle ) + begin ?dup while ( phandle ) + dup flatten-node ( phandle ) + peer ( phandle' ) + repeat ( ) + + 2 fdt, \ OF_DT_END_NODE +; + +: flatten-device-tree ( -- adr ) + /fdt alloc-mem /fdt-align round-up to fdt + fdt /fdt erase + fdt to fdt-ptr + fdt /fdt + to fdt-end + + /fdt alloc-mem to fdt-strings + fdt-strings /fdt erase + 0 fdt-strings l! + fdt-strings 4 + to fdt-strings-ptr + fdt-strings /fdt + to fdt-strings-end + + h# d00dfeed fdt, \ 00: magic + 0 fdt, \ 04: Size, set later + h# 80 fdt, \ 08: Offset to structure + 0 fdt, \ 0c: Offset to strings, set later + h# 40 fdt, \ 10: Offset to memory reserve map + d# 17 fdt, \ 14: version + d# 16 fdt, \ 18: last compatible version + boot-cpu fdt, \ 1c: CPU ID (version 2) + 0 fdt, \ 20: Strings size (version 3) + 0 fdt, \ 24: Reserved for struct size (version 17) + + fdt h# 40 + to fdt-ptr + + \ 40: Reserve map + 0 fdt, \ 40: initrd-start.high + 0 fdt, \ 44: initrd-start.low + 0 fdt, \ 48: initrd-size.high + 0 fdt, \ 4c: initrd-size.low + + 0 fdt, \ 50: reserve map terminator + 0 fdt, \ 54: reserve map terminator + 0 fdt, \ 58: reserve map terminator + 0 fdt, \ 5c: reserve map terminator + + fdt h# 80 + to fdt-ptr + + \ 80: Structure + 0 peer flatten-node + 9 fdt, \ OF_DT_END + +\ fdt-ptr fdt h# 80 + - fdt h# 24 + be-l! \ Set struct size + fdt-strings-len fdt h# 20 + be-l! \ Set strings size + + fdt-ptr /fdt-align round-up to fdt-ptr + fdt-ptr fdt - fdt h# 0c + be-l! \ Set strings offset + + \ Copy string into the blob + fdt-strings fdt-ptr fdt-strings-len move + fdt-strings /fdt free-mem + fdt-ptr fdt-strings-len + to fdt-ptr + + fdt-ptr fdt - fdt h# 04 + be-l! \ Set total size + +[ifdef] notdef + \ This is redundant because the Linux kernel reserves the initrd explicitly, + \ independent of the reserve map (and it reserves the device tree blob too). + " linux,initrd-start" get-chosen-int dup fdt h# 40 + be-l! ( start ) + " linux,initrd-end" get-chosen-int swap - ( length ) + fdt h# 4c + be-l! ( start ) +[then] + + fdt +; +previous + +\ LICENSE_BEGIN +\ Copyright (c) 2012 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r2799 - ofw/fs/ext2fs
by repository service 06 Jan '12

06 Jan '12

Author: wmb Date: Fri Jan 6 17:31:11 2012 New Revision: 2799 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2799 Log: EXT2/3/4 file systemsystem - OLPC trac #11184 - added the ability to delete extent-mapped files from an EXT4 filesystem. Modified: ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/extent.fth ofw/fs/ext2fs/layout.fth Modified: ofw/fs/ext2fs/dir.fth ============================================================================== --- ofw/fs/ext2fs/dir.fth Wed Jan 4 09:51:42 2012 (r2798) +++ ofw/fs/ext2fs/dir.fth Fri Jan 6 17:31:11 2012 (r2799) @@ -195,7 +195,9 @@ : idelete ( -- ) \ Short symlinks hold no blocks, but have a string in the direct block list, \ so we must not interpret that string as a block list. - d.#blks-held d0<> if delete-blocks then + d.#blks-held d0<> if + extent? if delete-extents else delete-blocks then + then \ clear d.#blks-held, link-count, etc. 0 +i /inode 6 /l* /string erase Modified: ofw/fs/ext2fs/extent.fth ============================================================================== --- ofw/fs/ext2fs/extent.fth Wed Jan 4 09:51:42 2012 (r2798) +++ ofw/fs/ext2fs/extent.fth Fri Jan 6 17:31:11 2012 (r2799) @@ -1,4 +1,6 @@ -\ EXT4 extents +\ See license at end of file +purpose: EXT4 extent handling + d# 12 constant /extent-header d# 12 constant /extent-record @@ -59,19 +61,22 @@ r> >extent ( block# 'extent ) ; +: get-extent-block ( 'extent-index -- 'eh ) + d.block ( 'eh ) + + \ Error check + dup ext-magic? 0= if ( 'eh ) + ." EXT4 bad index block" cr + debug-me + then ( 'eh ) +; + : extent->pblk# ( logical-block# -- d.physical-block# ) direct0 ( logical-block# 'eh ) dup >eh_depth short@ 0 ?do ( logical-block# 'eh ) ext-binsearch ( logical-block# 'extent-index ) index-block@ ( logical-block# d.block# ) - d.block ( logical-block# 'eh' ) - - \ Error check - dup ext-magic? 0= if ( logical-block# 'eh' ) - ." EXT4 bad index block" cr - debug-me - then ( logical-block# 'eh' ) - + get-extent-block ( logical-block# 'eh' ) loop ( logical-block# 'eh ) ext-binsearch >r ( logical-block# r: 'extent ) @@ -85,3 +90,67 @@ then ( block-offset r: 'extent ) u>d r> extent-block@ d+ ( d.block# ) ; + +: free-extent-blocks ( 'extent -- ) + dup extent-block@ ( 'extent d.block# ) + rot >ee_len short@ 0 ?do ( d.block# ) + 2dup d.free-block ( d.block# ) + 1. d+ ( d.block#' ) + loop ( d.block#' ) + 2drop ( ) +; + +: (delete-extents) ( 'eh level -- ) recursive + ?dup if ( 'eh level ) + \ Level nonzero means 'eh is an index, so recursively free its blocks. + 1- ( 'eh level' ) + over >eh_entries short@ ( 'eh level #entries ) + 0 ?do ( 'eh level ) + i third >extent ( 'eh level 'extent-index ) + index-block@ 2>r ( 'eh level r: d.block# ) + 2r@ get-extent-block ( 'eh level 'subordinate-eh r: d.block# ) + over (delete-extents) ( 'eh level r: d.block# ) + 2r> d.free-block ( 'eh level ) + loop ( 'eh level ) + 2drop ( ) + else ( 'eh ) + \ Level 0 means 'eh is an extent list + \ For each extent in the list ... + dup >eh_entries short@ 0 ?do ( 'eh ) + \ Free all the blocks in that extent + i over >extent free-extent-blocks ( 'eh ) + loop ( 'eh ) + drop ( ) + then ( ) +; + +\ Delete blocks listed in the current set of extents +: delete-extents ( -- ) + direct0 ( 'eh ) + dup >eh_depth short@ ( 'eh depth ) + (delete-extents) ( ) +; + +\ LICENSE_BEGIN +\ Copyright (c) 2012 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: ofw/fs/ext2fs/layout.fth ============================================================================== --- ofw/fs/ext2fs/layout.fth Wed Jan 4 09:51:42 2012 (r2798) +++ ofw/fs/ext2fs/layout.fth Fri Jan 6 17:31:11 2012 (r2799) @@ -195,6 +195,7 @@ loop ; : delete-blocks ( -- ) + extent? if delete-extents exit then delete-directs indirect1 del-blk1 if 0 indirect1 int! update then indirect2 del-blk2 if 0 indirect2 int! update then

1 0

[commit] r2798 - ofw/fs/ext2fs
by repository service 04 Jan '12

04 Jan '12

Author: wmb Date: Wed Jan 4 09:51:42 2012 New Revision: 2798 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2798 Log: EXT4 extents support. OFW can now read, but not write, EXT4 filesystems. Added: ofw/fs/ext2fs/extent.fth Modified: ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/ext2fs.fth ofw/fs/ext2fs/layout.fth ofw/fs/ext2fs/recovery.fth Modified: ofw/fs/ext2fs/dir.fth ============================================================================== --- ofw/fs/ext2fs/dir.fth Tue Jan 3 03:01:40 2012 (r2797) +++ ofw/fs/ext2fs/dir.fth Wed Jan 4 09:51:42 2012 (r2798) @@ -4,7 +4,7 @@ decimal 2 constant root-dir# -0 instance value dir-block# +0. instance 2value d.dir-block# 0 instance value lblk# instance variable diroff @@ -17,14 +17,17 @@ 0 instance value wf-inum \ Inumber of file or directory found 0 instance value wf-type \ Type - 4 for directory, d# 10 for symlink, etc +: find-dirblk ( -- ) + lblk# >d.pblk# 0= abort" EXT2 - missing directory block" to d.dir-block# +; : get-dirblk ( -- end? ) lblk# bsize um* dfile-size d< 0= if true exit then - lblk# >pblk# to dir-block# + find-dirblk false ; \ **** Return the address of the current directory entry -: dirent ( -- adr ) dir-block# block diroff @ + ; +: dirent ( -- adr ) d.dir-block# d.block diroff @ + ; \ Dirent fields: \ 00.l inode \ 04.w offset to next dirent @@ -87,10 +90,10 @@ \ On entry: \ inode# refers to the directory block's inode -\ dir-block# is the physical block number of the first directory block +\ d.dir-block# is the physical block number of the first directory block \ diroff @ is 0 \ On successful exit: -\ dir-block# is the physical block number of the current directory block +\ d.dir-block# is the physical block number of the current directory block \ diroff @ is the within-block offset of the new dirent : no-dir-space? ( #needed -- true | offset-to-next false ) begin ( #needed ) @@ -131,7 +134,7 @@ ; : last-dirent ( -- free-bytes ) dfile-size bsize um/mod nip swap 0= if 1- then to lblk# ( ) - lblk# >pblk# to dir-block# + find-dirblk (last-dirent) drop dirent-len@ dirent-reclen - ; @@ -293,10 +296,10 @@ \ On entry: \ inode# is the inode of the directory file -\ dir-block# is the physical block number of the first directory block +\ d.dir-block# is the physical block number of the first directory block \ diroff @ and totoff @ are 0 \ On successful exit: -\ dir-block# is the physical block number of the current directory block +\ d.dir-block# is the physical block number of the current directory block \ diroff @ is the within-block offset of the directory entry that matches name$ \ totoff @ is the overall offset of the directory entry that matches name$ Modified: ofw/fs/ext2fs/ext2fs.fth ============================================================================== --- ofw/fs/ext2fs/ext2fs.fth Tue Jan 3 03:01:40 2012 (r2797) +++ ofw/fs/ext2fs/ext2fs.fth Wed Jan 4 09:51:42 2012 (r2798) @@ -8,6 +8,7 @@ fload ${BP}/ofw/fs/ext2fs/blocks.fth fload ${BP}/ofw/fs/ext2fs/inode.fth fload ${BP}/ofw/fs/ext2fs/bitmap.fth +fload ${BP}/ofw/fs/ext2fs/extent.fth fload ${BP}/ofw/fs/ext2fs/layout.fth fload ${BP}/ofw/fs/ext2fs/dir.fth fload ${BP}/ofw/fs/ext2fs/recovery.fth Added: ofw/fs/ext2fs/extent.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ ofw/fs/ext2fs/extent.fth Wed Jan 4 09:51:42 2012 (r2798) @@ -0,0 +1,87 @@ +\ EXT4 extents +d# 12 constant /extent-header +d# 12 constant /extent-record + +struct + /w field >eh_magic + /w field >eh_entries + /w field >eh_max + /w field >eh_depth + /l field >eh_generation +constant /extent-header + +: ext-magic? ( 'eh -- flag ) >eh_magic short@ h# f30a = ; +: extent? ( -- flag ) direct0 ext-magic? ; + +struct + /l field >ee_block + /w field >ee_len + /w field >ee_start_hi + /l field >ee_start_lo +constant /extent + +struct + /l field >ei_block \ Same offset and size as >ee_block + /l field >ei_leaf_lo + /w field >ei_leaf_hi + /w + ( >ei_unused ) +constant /extent-index \ Same length as /extent + +: index-block@ ( 'extent-index -- d.block# ) + dup >ei_leaf_lo int@ swap >ei_leaf_hi short@ +; +: extent-block@ ( 'extent -- d.block# ) + dup >ee_start_lo int@ swap >ee_start_hi short@ +; + +: >extent ( index 'eh -- 'extent ) + /extent-header + swap /extent * + +; + +\ Works for both extents and extent-index's because they are the +\ same length and their block fields are in the same place. +: ext-binsearch ( block# 'eh -- block# 'extent ) + >r ( block# r: 'eh ) + 1 ( block# left r: 'eh ) + r@ >eh_entries short@ 1- ( block# left right r: 'eh ) + begin 2dup <= while ( block# left right r: 'eh ) + 2dup + 2/ ( block# left right middle r: 'eh ) + dup r@ >extent ( block# left right middle 'extent r: 'eh ) + >ei_block int@ ( block# left right middle extent-block r: 'eh ) + 4 pick > if ( block# left right middle r: 'eh ) + nip 1- ( block# left right' r: 'eh ) + else ( block# left right middle r: 'eh ) + rot drop ( block# right middle r: 'eh ) + 1+ swap ( block# left' right r: 'eh ) + then ( block# left right r: 'eh ) + repeat ( block# left right r: 'eh ) + drop 1- ( block# left r: 'eh) + r> >extent ( block# 'extent ) +; + +: extent->pblk# ( logical-block# -- d.physical-block# ) + direct0 ( logical-block# 'eh ) + dup >eh_depth short@ 0 ?do ( logical-block# 'eh ) + ext-binsearch ( logical-block# 'extent-index ) + index-block@ ( logical-block# d.block# ) + d.block ( logical-block# 'eh' ) + + \ Error check + dup ext-magic? 0= if ( logical-block# 'eh' ) + ." EXT4 bad index block" cr + debug-me + then ( logical-block# 'eh' ) + + loop ( logical-block# 'eh ) + + ext-binsearch >r ( logical-block# r: 'extent ) + \ At this point the extent should contain the logical block + r@ >ee_block int@ - ( block-offset r: 'extent ) + + \ Error check + dup r@ >ee_len short@ >= if ( block-offset r: 'extent ) + ." EXT4 block not in extent" cr + debug-me + then ( block-offset r: 'extent ) + u>d r> extent-block@ d+ ( d.block# ) +; Modified: ofw/fs/ext2fs/layout.fth ============================================================================== --- ofw/fs/ext2fs/layout.fth Tue Jan 3 03:01:40 2012 (r2797) +++ ofw/fs/ext2fs/layout.fth Wed Jan 4 09:51:42 2012 (r2798) @@ -42,36 +42,42 @@ swap la+ int@ ( index-low block# ) >ind2 ( adr ) ; -: >pblk ( logical-block# -- 0 | physical-block-adr ) +: >pblk-adr ( logical-block# -- 0 | physical-block-adr ) dup #direct-blocks < if ( lblk# ) - >direct exit + >direct exit ( -- adr ) then ( lblk# ) #direct-blocks - ( lblk#' ) dup #ind-blocks1 < if ( lblk# ) - #direct-blocks get-direct >ind1 exit + #direct-blocks get-direct >ind1 exit ( -- adr ) then #ind-blocks1 - ( lblk#' ) - dup #ind-blocks2 < if - #direct-blocks 1+ get-direct >ind2 exit - then + dup #ind-blocks2 < if ( lblk# ) + #direct-blocks 1+ get-direct >ind2 exit ( -- adr ) + then ( lblk# ) #ind-blocks2 - ( lblk#' ) - dup #ind-blocks3 < if - #direct-blocks 2+ get-direct >ind3 exit - then - - drop 0 -; -: >pblk# ( logical-block# -- physical-block# ) - >pblk dup 0= if exit then int@ + dup #ind-blocks3 < if ( lblk# ) + #direct-blocks 2+ get-direct >ind3 exit ( -- adr ) + then ( lblk# ) + + drop 0 ( 0 ) +; +: >d.pblk# ( logical-block# -- false | d.physical-block# true ) + extent? if ( logical-block# ) + extent->pblk# true exit ( -- d.physical-block# true ) + then ( logical-block# ) + >pblk-adr dup 0= if ( 0 ) + exit ( -- false ) + then ( adr ) + int@ u>d true ( d.physical-block# true ) ; \ writes: if any indir block is 0, allocate and return it. -: get-ind1 ( index block# -- adr ) +: get-ind1 ( index ind1-block# -- block# ) >r ( index ) ( r: ind3-block# ) r@ block over la+ int@ ( index block# ) dup if ( index block# ) @@ -80,7 +86,7 @@ drop u.add-block ( index new-block# ) dup rot r@ block swap la+ int! update ( new-block# ) then ( block# ) - r> drop + r> drop ( block# ) ; : get-ind2 ( index ind2-block# -- block# ) >r ( index ) ( r: ind3-block# ) @@ -92,8 +98,8 @@ drop u.add-block ( index-low index-high new-block# ) dup rot r@ block swap la+ int! update ( index-low new-block# ) then ( index-low block# ) - get-ind1 ( adr ) - r> drop + get-ind1 ( block# ) + r> drop ( block# ) ; : get-ind3 ( index ind3-block# -- block# ) >r ( index ) ( r: ind3-block# ) @@ -105,43 +111,50 @@ drop u.add-block ( index-low index-high new-block# ) dup rot r@ block swap la+ int! update ( index-low new-block# ) then ( index-low block# ) - get-ind2 ( adr ) - r> drop + get-ind2 ( block# ) + r> drop ( block# ) ; \ get-pblk# will allocate the block if necessary, used for writes : get-pblk# ( logical-block# -- 0 | physical-block# ) dup #direct-blocks < if ( lblk# ) - dup get-direct ?dup if nip exit then ( lblk# ) + dup get-direct ?dup if ( lblk# pblk# ) + nip exit ( -- pblk# ) + then ( lblk# ) - u.add-block dup rot >direct int! update exit + u.add-block ( lblk# pblk# ) + dup rot >direct int! update ( pblk# ) + exit ( -- pblk# ) then ( lblk# ) #direct-blocks - ( lblk#' ) dup #ind-blocks1 < if ( lblk# ) #direct-blocks get-direct ?dup 0= if ( lblk# ) - u.add-block dup #direct-blocks put-direct - then ( lblk# block ) - get-ind1 exit - then + u.add-block ( lblk# ind1-pblk# ) + dup #direct-blocks put-direct ( lblk# ind1-pblk# ) + then ( lblk# ind1-pblk# ) + get-ind1 exit ( -- pblk# ) + then ( lblk# ) #ind-blocks1 - ( lblk#' ) dup #ind-blocks2 < if - #direct-blocks 1+ get-direct ?dup 0= if - u.add-block dup #direct-blocks 1+ put-direct - then ( lblk# block ) - get-ind2 exit - then - #ind-blocks2 - ( lblk#' ) + #direct-blocks 1+ get-direct ?dup 0= if ( lblk# ) + u.add-block ( lblk# ind2-pblk# ) + dup #direct-blocks 1+ put-direct ( lblk# ind2-pblk# ) + then ( lblk# ind2-pblk# ) + get-ind2 exit ( -- pblk# ) + then ( lblk# ) + #ind-blocks2 - ( lblk#' ) - dup #ind-blocks3 < if - #direct-blocks 2+ get-direct ?dup 0= if - u.add-block dup #direct-blocks 2+ put-direct - then ( lblk# block ) - get-ind3 exit - then + dup #ind-blocks3 < if ( lblk#' ) + #direct-blocks 2+ get-direct ?dup 0= if ( lblk# ) + u.add-block ( lblk# ind3-pblk# ) + dup #direct-blocks 2+ put-direct ( lblk# ind3-pblk# ) + then ( lblk# ind3-pblk# ) + get-ind3 exit ( -- pblk# ) + then ( lblk# ) - drop 0 + drop 0 ( 0 ) ; \ deletes @@ -189,14 +202,14 @@ ; : append-block ( -- ) - u.add-block ( block ) - dfile-size bsize um/mod nip dup bsize um* dfile-size! ( block #blocks ) - 1+ >pblk int! update + u.add-block ( pblk# ) + dfile-size bsize um/mod nip dup bsize um* dfile-size! ( pblk# #blocks ) + 1+ >pblk-adr int! update ; : read-file-block ( adr lblk# -- ) - >pblk# ?dup if ( adr pblk# ) - block swap bsize move + >d.pblk# if ( adr d.pblk# ) + d.block swap bsize move else ( adr ) bsize erase ( ) then @@ -206,10 +219,13 @@ 0 swap bsize bounds do i l@ or 4 +loop 0= ; : write-file-block ( adr lblk# -- ) - over zeroed? if \ see if it is already allocated (XXX later: deallocate it) - >pblk# dup 0= if 2drop exit then - else \ find or allocate physical block - get-pblk# ( adr pblk# ) + \ see if it is already allocated (XXX later: deallocate it) + over zeroed? if ( adr lblk# ) + >d.pblk# 0= if ( adr ) + drop exit ( -- ) + then ( d.pblk# ) + else ( adr lblk# ) \ find or allocate physical block + get-pblk# u>d ( adr d.pblk# ) then \ This interferes with journal recovery \ dup h# f8 < if dup . ." attempt to destroy file system" cr abort then Modified: ofw/fs/ext2fs/recovery.fth ============================================================================== --- ofw/fs/ext2fs/recovery.fth Tue Jan 3 03:01:40 2012 (r2797) +++ ofw/fs/ext2fs/recovery.fth Wed Jan 4 09:51:42 2012 (r2798) @@ -209,7 +209,7 @@ listnode /n 2* field >o_block# - /n field >o_pblock# + /n 2* field >o_pblock# /n field >o_escaped? nodetype: overlay-node @@ -229,19 +229,19 @@ ; : j-read-file-block ( adr lblk# -- ) - >pblk# ?dup if ( adr pblk# ) - u>d find-overlay? if ( adr d.pblk# node ) + >d.pblk# if ( adr d.pblk# ) + find-overlay? if ( adr d.pblk# node ) nip nip ( adr node ) - tuck >o_pblock# l@ ( node adr pblk# ) - block over bsize move ( node adr ) + tuck >o_pblock# 2@ ( node adr d.pblk# ) + d.block over bsize move ( node adr ) swap >o_escaped? l@ if ( adr ) jbd_magic swap be-l! ( ) else ( adr ) drop ( ) then ( ) else ( adr d.pblk# node ) - 2drop ( adr pblk# ) - block swap bsize move ( ) + drop ( adr d.pblk# ) + d.block swap bsize move ( ) then ( ) else ( adr ) bsize erase ( ) @@ -252,7 +252,9 @@ : set-overlay-node ( escaped? log-blk# d.block# node -- ) >r ( escaped? log-blk# d.block# r: node ) r@ >o_block# 2! ( escaped? log-blk# r: node ) - >pblk# r@ >o_pblock# l! ( escaped? r: node ) + >d.pblk# 0= abort" EXT3/4 bad block number in journal" + ( escaped? d.pblk# r: node ) + r@ >o_pblock# 2! ( escaped? r: node ) r> >o_escaped? l! ( ) ; : note-jblock ( d.block# escaped? log-blk# -- )

1 0

[commit] r2797 - cpu/arm/olpc
by repository service 03 Jan '12

03 Jan '12

Author: quozl Date: Tue Jan 3 03:01:40 2012 New Revision: 2797 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2797 Log: OLPC XO-1.75 - give EDI more time if busy, #11565. Modified: cpu/arm/olpc/edi.fth Modified: cpu/arm/olpc/edi.fth ============================================================================== --- cpu/arm/olpc/edi.fth Tue Jan 3 01:54:24 2012 (r2796) +++ cpu/arm/olpc/edi.fth Tue Jan 3 03:01:40 2012 (r2797) @@ -26,7 +26,7 @@ ; [ifndef] edi-wait-b : edi-wait-b ( -- b ) \ Wait for and receive EC response byte - d# 10 0 do + d# 100 0 do spi-in h# 50 = if spi-in ( b ) spi-cs-off ( b )

1 0

[commit] r2796 - cpu/arm forth/kernel ofw/fs/ext2fs
by repository service 03 Jan '12

03 Jan '12

Author: wmb Date: Tue Jan 3 01:54:24 2012 New Revision: 2796 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2796 Log: EXT2 file system - converted many internal routines to use 64-bit block numbers as a step toward ext4 support. Modified: cpu/arm/kerncode.fth forth/kernel/double.fth ofw/fs/ext2fs/bitmap.fth ofw/fs/ext2fs/blocks.fth ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/inode.fth ofw/fs/ext2fs/layout.fth ofw/fs/ext2fs/methods.fth ofw/fs/ext2fs/recovery.fth ofw/fs/ext2fs/sb.fth Modified: cpu/arm/kerncode.fth ============================================================================== --- cpu/arm/kerncode.fth Sat Dec 31 23:25:58 2011 (r2795) +++ cpu/arm/kerncode.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -813,12 +813,24 @@ sbcs tos,r1,tos mov tos,tos,asr #0 c; +code d>= ( d1 d2 -- f ) + ldmia sp!,{r0,r1,r2} \ tos r0 r1 r2 + subs r2,r2,r0 + sbcs tos,r1,tos + mvn tos,tos,asr #0 +c; code d> ( d1 d2 -- f ) ldmia sp!,{r0,r1,r2} \ tos r0 r1 r2 subs r0,r0,r2 sbcs tos,tos,r1 mov tos,tos,asr #0 c; +code d<= ( d1 d2 -- f ) + ldmia sp!,{r0,r1,r2} \ tos r0 r1 r2 + subs r0,r0,r2 + sbcs tos,tos,r1 + mvn tos,tos,asr #0 +c; code du< ( d1 d2 -- f ) ldmia sp!,{r0,r1,r2} \ tos r0 r1 r2 subs r2,r2,r0 @@ -863,6 +875,12 @@ mvneq tos,#0 movne tos,#0 c; +code d0<> ( d -- f ) + pop r0,sp + orrs r0,r0,tos + mvnne tos,#0 + moveq tos,#0 +c; code d0< ( d -- f ) inc sp,1cell mov tos,tos,asr #0 Modified: forth/kernel/double.fth ============================================================================== --- forth/kernel/double.fth Sat Dec 31 23:25:58 2011 (r2795) +++ forth/kernel/double.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -5,12 +5,15 @@ : 2literal ( d -- ) swap [compile] literal [compile] literal ; immediate : d0= ( d -- flag ) or 0= ; +: d0<> ( d -- flag ) or 0<> ; : d0< ( d -- flag ) nip 0< ; : d= ( d1 d2 -- flag ) d- d0= ; : d<> ( d1 d2 -- flag ) d= 0= ; : du< ( ud1 ud2 -- flag ) rot swap 2dup <> if 2swap then 2drop u< ; : d< ( d1 d2 -- flag ) 2 pick over = if drop nip u< else nip < nip then ; +: d>= ( d1 d2 -- flag ) d< 0= ; : d> ( d1 d2 -- flag ) 2swap d< ; +: d<= ( d1 d2 -- flag ) 2swap d< 0= ; : dnegate ( d -- -d ) 0 0 2swap d- ; : dabs ( d -- +d ) 2dup d0< if dnegate then ; Modified: ofw/fs/ext2fs/bitmap.fth ============================================================================== --- ofw/fs/ext2fs/bitmap.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/bitmap.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -8,18 +8,74 @@ 0 instance value gd-modified? : gd-update ( -- ) true to gd-modified? ; -: block-bitmap ( group# -- block# ) group-desc le-l@ ; -: inode-bitmap ( group# -- block# ) group-desc 4 + le-l@ ; -: inode-table ( group# -- block# ) group-desc 8 + le-l@ ; -: free-blocks ( group# -- n ) group-desc h# 0c + le-w@ ; +: d.block-bitmap ( group# -- d.block# ) + group-desc dup le-l@ ( adr n ) + desc64? if ( adr n ) + swap h# 20 + le-l@ ( d.block# ) + else ( adr n ) + nip u>d ( d.block# ) + then ( d.block# ) +; +: d.inode-bitmap ( group# -- d.block# ) + group-desc dup 4 + le-l@ ( adr n ) + desc64? if ( adr n ) + swap h# 24 + le-l@ ( d.block# ) + else ( adr n ) + nip u>d ( d.block# ) + then ( d.block# ) +; +[ifdef] notdef +: d.inode-table ( group# -- d.block# ) + group-desc dup 8 + le-l@ ( adr n ) + desc64? if ( adr n ) + swap h# 28 + le-l@ ( d.block# ) + else ( adr n ) + nip u>d ( d.block# ) + then ( d.block# ) +; +[then] +: free-blocks@ ( group# -- n ) + group-desc dup h# 0c + le-w@ ( adr w ) + desc64? if ( adr w ) + swap h# 2c + le-w@ wljoin ( n ) + else ( adr w ) + nip ( n ) + then ( n ) +; +: free-blocks! ( n group# -- ) + group-desc >r ( n r: adr ) + desc64? if ( n r: adr ) + lwsplit ( lo hi r: adr ) + r@ h# 2c + le-w! ( lo r: adr ) + then ( n r: adr ) + r> h# 0c + le-w! ( ) +; + : free-blocks+! ( n group# -- ) - group-desc h# 0c + - tuck le-w@ + 0 max swap le-w! gd-update + tuck free-blocks@ + 0 max ( group# n' ) + swap free-blocks! ( ) + gd-update ( ) +; +: free-inodes@ ( group# -- n ) + group-desc dup h# 0e + le-w@ ( adr lo ) + desc64? if ( adr lo ) + swap h# 2e + le-w@ wljoin ( n ) + else ( adr lo ) + nip ( n ) + then ( n ) +; +: free-inodes! ( n group# -- ) + group-desc >r ( n r: adr ) + desc64? if ( n r: adr ) + lwsplit ( lo hi r: adr ) + r@ h# 2e + le-w! ( lo r: adr ) + then ( n r: adr ) + r> h# 0e + le-w! ( ) ; -: free-inodes ( group# -- n ) group-desc h# 0e + le-w@ ; : free-inodes+! ( n inode# -- ) - group-desc h# 0e + - tuck le-w@ + swap le-w! gd-update + tuck free-inodes@ + ( group# n' ) + swap free-inodes! ( ) + gd-update ( ) ; [ifdef] 386-assembler @@ -64,8 +120,8 @@ [then] \ Find the first clear bit in a bitmap, set it if found -: first-free ( len block# -- false | block#-in-group true ) - block swap ( map len ) +: d.first-free ( len d.block# -- false | block#-in-group true ) + d.block swap ( map len ) 2dup h# ff bskip dup 0= if ( map len 0 ) 3drop false exit @@ -88,42 +144,69 @@ swap ; -: clear-bit? ( bit# block# -- cleared? ) - block bitup ( mask adr' ) +: d.clear-bit? ( bit# d.block# -- cleared? ) + d.block bitup ( mask adr' ) tuck c@ ( adr mask byte ) 2dup and 0= if \ Already free ( adr mask byte ) - 3drop false exit + 3drop false exit ( -- false ) then ( adr mask byte ) swap invert and ( adr byte' ) swap c! ( ) update ( ) - true + true ( true ) ; -: free-block ( block# -- ) - datablock0 - bpg /mod ( bit# group# ) - tuck block-bitmap ( group# bit# block# ) - clear-bit? if ( group# ) - 1 swap free-blocks+! +: d.free-block ( d.block# -- ) + datablock0 u>d d- bpg um/mod ( bit# group# ) + tuck d.block-bitmap ( group# bit# d.block# ) + d.clear-bit? if ( group# ) + 1 swap free-blocks+! ( ) else ( group# ) - drop - then + drop ( ) + then ( ) ; +: n.free-block ( block# -- ) u>d d.free-block ; -: alloc-block ( -- block# ) +: d.alloc-block ( -- d.block# ) + #groups 0 ?do ( ) + i free-blocks@ if ( ) + bpg 3 rshift bsize min ( len ) \ XXX stay in this block + i d.block-bitmap ( len d.block# ) + d.first-free if ( block#-in-group ) + -1 i free-blocks+! ( block#-in-group ) + u>d ( d.block#-in-group ) + i bpg um* d+ ( d.block#-offset ) + datablock0 u>d d+ ( d.block# ) + 2dup d.buffer bsize erase update ( d.block# ) + unloop exit ( -- d.block# ) + else ( ) + \ The allocation bitmap disagrees with the free block count, + \ so fix the free block count to prevent thrashing. + i free-blocks@ negate i free-blocks+! + then + then + loop + true abort" no free blocks found" +; +: u.alloc-block ( -- n.block# ) #groups 0 ?do ( ) - i free-blocks if ( ) + i 1+ bpg um* datablock0 u>d d+ ( d.end-block# ) + h# 1.0000.0000. d> abort" No free blocks found with 32-bit block number" ( ) + + i free-blocks@ if ( ) bpg 3 rshift bsize min ( len ) \ XXX stay in this block - i block-bitmap ( len block# ) - first-free if ( block#-in-group ) + i d.block-bitmap ( len d.block# ) + d.first-free if ( block#-in-group ) -1 i free-blocks+! ( block#-in-group ) - i bpg * + datablock0 + ( block# ) - dup buffer bsize erase update ( block# ) - unloop exit - else + u>d ( d.block#-in-group ) + i bpg um* d+ ( d.block#-offset ) + datablock0 u>d d+ ( d.block# ) + 2dup d.buffer bsize erase update ( d.block# ) + drop unloop exit ( -- n.block# ) + else ( ) \ The allocation bitmap disagrees with the free block count, \ so fix the free block count to prevent thrashing. - i free-blocks negate i free-blocks+! + i free-blocks@ negate i free-blocks+! then then loop @@ -132,8 +215,8 @@ : free-inode ( inode# -- ) 1- ipg /mod ( bit# group# ) - tuck inode-bitmap ( group# bit# block# ) - clear-bit? if ( group# ) + tuck d.inode-bitmap ( group# bit# d.block# ) + d.clear-bit? if ( group# ) 1 swap free-inodes+! else ( group# ) drop @@ -143,8 +226,8 @@ : alloc-inode ( -- inode# ) #groups 0 ?do ipg 3 rshift bsize min ( len ) \ XXX stay in this block - i inode-bitmap ( len block# ) - first-free if ( inode#-in-group ) + i d.inode-bitmap ( len d.block# ) + d.first-free if ( inode#-in-group ) -1 i free-inodes+! ( inode#-in-group ) i ipg * + 1+ ( inode# ) dup inode /inode erase update ( inode# ) @@ -155,10 +238,10 @@ ; : update-sb ( -- ) - 0 #groups 0 ?do i free-inodes + loop total-free-inodes! - 0 #groups 0 ?do i free-blocks + loop total-free-blocks! + 0 #groups 0 ?do i free-inodes@ + loop total-free-inodes! + 0. #groups 0 ?do i free-blocks@ u>d d+ loop d.total-free-blocks! put-super-block abort" failed to update superblock " - gds /gds gds-block# write-ublocks abort" failed to update group descriptors " + gds /gds d.gds-block# d.write-ublocks abort" failed to update group descriptors " ; : update-gds ( -- ) @@ -169,23 +252,27 @@ \ the block bitmap number in the group descriptor. If it is larger than \ the calculated block number, do the backup. #groups 1 do - i bpg * gds-fs-block# + ( possible-gn ) - dup i block-bitmap < if ( possible-gn ) - block ( gdn-adr ) - 0 group-desc ( gdn-adr gd0-adr ) - swap bsize move update ( ) - else ( possible-gn ) - drop ( ) - then ( ) + i bpg * u>d d.gds-fs-block# d+ ( d.possible-gn ) + 2dup i d.block-bitmap d< if ( d.possible-gn ) + d.block ( gdn-adr ) + 0 group-desc ( gdn-adr gd0-adr ) + swap bsize move update ( ) + else ( d.possible-gn ) + 2drop ( ) + then ( ) loop false to gd-modified? update-sb then ; -: add-block ( -- block# ) - #blks-held 2+ #blks-held! - alloc-block +: d.add-block ( -- d.block# ) + d.#blks-held 2. d+ d.#blks-held! + d.alloc-block +; +: u.add-block ( -- block# ) + d.#blks-held 2. d+ d.#blks-held! + u.alloc-block ; \ LICENSE_BEGIN Modified: ofw/fs/ext2fs/blocks.fth ============================================================================== --- ofw/fs/ext2fs/blocks.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/blocks.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -13,7 +13,7 @@ struct \ buffer /n field >dirty - /n field >blk# + 2 /n * field >d.blk# \ /n field >device 0 field >data constant /buf-hdr @@ -23,21 +23,21 @@ : >buffer ( n -- adr ) >bufadr >data ; : dirty? ( n -- dirty? ) >bufadr >dirty @ ; : dirty! ( dirty? n -- ) >bufadr >dirty ! ; -: blk# ( n -- blk# ) >bufadr >blk# @ ; -: blk#! ( blk# n -- ) >bufadr >blk# ! ; +: d.blk# ( n -- d.blk# ) >bufadr >d.blk# 2@ ; +: d.blk#! ( d.blk# n -- ) >bufadr >d.blk# 2! ; create buf-table #bufs allot -: read-fs-block ( adr fs-blk# -- error? ) - bsize swap logbsize lshift read-ublocks +: d.read-fs-block ( adr d.fs-blk# -- error? ) + bsize -rot logbsize dlshift d.read-ublocks ; -: write-fs-block ( adr fs-blk# -- error? ) - bsize swap logbsize lshift write-ublocks +: d.write-fs-block ( adr d.fs-blk# -- error? ) + bsize -rot logbsize dlshift d.write-ublocks ; : empty-buffers ( -- ) block-bufs /buffer #bufs * erase - #bufs 0 do -1 i blk#! loop + #bufs 0 do -1. i d.blk#! loop buf-table #bufs 0 ?do i 2dup + c! loop drop ; @@ -65,46 +65,46 @@ : flush-buffer ( buffer# -- ) dup dirty? if ( buffer# ) false over dirty! - dup >buffer swap blk# ( buffer-adr block# ) - dup gds-fs-block# <= if - dup . ." attempt to corrupt superblock or group descriptor" abort - then - bbug? if ." W " dup . cr then - write-fs-block abort" write error " + dup >buffer swap d.blk# ( buffer-adr d.block# ) + 2dup d.gds-fs-block# d<= if ( buffer-adr d.block# ) + 2dup d. ." attempt to corrupt superblock or group descriptor" abort + then ( buffer-adr d.block# ) + bbug? if ." W " 2dup d. cr then ( buffer-adr d.block# ) + d.write-fs-block abort" write error " else drop then ; : flush ( -- ) #bufs 0 ?do i flush-buffer loop ; -: (buffer) ( block# -- buffer-adr in-buf? ) +: d.(buffer) ( d.block# -- buffer-adr in-buf? ) \ is the block already in a buffer? - 0 - begin ( block# buf# ) - 2dup blk# = if \ found it - nip dup mru! >buffer true exit - then - - 1+ dup #bufs = - until drop \ not found ( block# ) + #bufs 0 ?do ( d.block# ) + 2dup i d.blk# d= if \ found it ( d.block# ) + 2drop i mru! ( ) + i >buffer true unloop exit ( -- buffer-adr true ) + then ( d.block# ) + loop ( d.block# ) \ free up the least-recently-used buffer - lru dup flush-buffer ( block# buf# ) + lru dup flush-buffer ( d.block# buf# ) - tuck blk#! >buffer false ( buffer-adr ) + dup >r d.blk#! ( r: buf# ) + r> >buffer false ( buffer-adr false ) ; -: buffer ( block# -- a ) \ like block, but does no reads - (buffer) drop +: d.buffer ( d.block# -- a ) \ like block, but does no reads + d.(buffer) drop ; -: block ( block# -- a ) - dup (buffer) if nip exit then ( block# buffer-adr ) - - bbug? if ." r " over . cr then - dup rot read-fs-block abort" read error " ( buffer-adr ) +: d.block ( d.block# -- a ) + 2dup d.(buffer) if nip nip exit then ( d.block# buffer-adr ) + + bbug? if ." r " 2 pick over d. cr then ( d.block# buffer-adr ) + dup 2swap d.read-fs-block abort" read error " ( buffer-adr ) ; +: block ( block# -- a ) u>d d.block ; -: bd ( n -- ) block bsize dump ; +: d.bd ( d -- ) d.block bsize dump ; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: ofw/fs/ext2fs/dir.fth ============================================================================== --- ofw/fs/ext2fs/dir.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/dir.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -192,9 +192,9 @@ : idelete ( -- ) \ Short symlinks hold no blocks, but have a string in the direct block list, \ so we must not interpret that string as a block list. - #blks-held if delete-blocks then + d.#blks-held d0<> if delete-blocks then - \ clear #blks-held, link-count, etc. + \ clear d.#blks-held, link-count, etc. 0 +i /inode 6 /l* /string erase \ delete inode, and set its deletion time. @@ -257,8 +257,8 @@ ; : linkpath ( -- a ) - file-acl if bsize 9 rshift else 0 then ( #acl-blocks ) - #blks-held <> if \ long symbolic link path + d.file-acl d0<> if bsize 9 rshift else 0 then ( #acl-blocks ) + u>d d.#blks-held d<> if \ long symbolic link path direct0 int@ block else \ short symbolic link path direct0 Modified: ofw/fs/ext2fs/inode.fth ============================================================================== --- ofw/fs/ext2fs/inode.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/inode.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -7,15 +7,14 @@ : set-inode ( inode# -- ) to inode# ; : ipb ( -- n ) bsize /inode / ; -: itob ( i# -- offset block# ) +: d.itob ( i# -- offset d.block# ) 1- ipg /mod ( rel-i# group ) - gpimin swap ( block# rel-i# ) - ipb /mod ( gp-block# offset rel-blk# ) - blkstofrags - rot + ( offset block# ) + d.gpimin 2>r ( rel-i# r: d.iblock# ) + ipb /mod ( offset rel-blk# r: d.iblock# ) + u>d 2r> d+ ( offset d.block# ) ; -: inode ( i# -- adr ) itob block swap /inode * + ; +: inode ( i# -- adr ) d.itob d.block swap /inode * + ; : ind ( n -- ) inode /inode dump ; : +i ( n -- ) inode# inode + ; : file-attr ( -- attributes ) 0 +i short@ ; @@ -37,10 +36,36 @@ : gid! ( gid -- ) 24 +i short! update ; : link-count ( -- n ) 26 +i short@ ; : link-count! ( n -- ) 26 +i short! update ; -: #blks-held ( -- n ) 28 +i int@ ; -: #blks-held! ( n -- ) 28 +i int! update ; -: file-acl ( -- n ) 104 +i int@ ; -: dir-acl ( -- n ) 108 +i int@ ; + +: d.#blks-held ( -- d ) + 28 +i int@ ( n ) + \ Should be contingent on sb-huge-files? as below, but the field + \ at 116 was reserved before, so it's going to be 0 without huge files + 116 +i short@ ( d ) +\ sb-huge-files? if 116 +i short@ else u>d then ( d ) +[ifdef] inode-huge? + \ I'm not supporting the representation where the inode block + \ count is in file system blocks instead of 512-byte blocks, + \ because I can't figure out how it works in the Linux kernel. + \ I can see how it works when updating an inode, but I don't + \ see how it works with an already-created file. + inode-huge? if logbsize 9 - dlshift then ( d' ) +[then] +; + +: d.#blks-held! ( d -- ) +[ifdef] inode-huge? + 2dup h# 1.0000.0000.0000. d>= if ( d ) + logbsize 9 - drshift ( d' ) + set-inode-huge ( d ) + else ( d ) + clear-inode-huge ( d ) + then ( d ) +[then] + 116 +i short! 28 +i int! update ( ) +; +: d.file-acl ( -- d ) 104 +i int@ 118 +i short@ ; +\ : dir-acl ( -- n ) 108 +i int@ ; d# 12 constant #direct-blocks : direct0 ( -- adr ) 40 +i ; Modified: ofw/fs/ext2fs/layout.fth ============================================================================== --- ofw/fs/ext2fs/layout.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/layout.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -77,7 +77,7 @@ dup if ( index block# ) nip else - drop add-block ( index new-block# ) + drop u.add-block ( index new-block# ) dup rot r@ block swap la+ int! update ( new-block# ) then ( block# ) r> drop @@ -89,7 +89,7 @@ dup if ( index-low index-high block# ) nip else - drop add-block ( index-low index-high new-block# ) + drop u.add-block ( index-low index-high new-block# ) dup rot r@ block swap la+ int! update ( index-low new-block# ) then ( index-low block# ) get-ind1 ( adr ) @@ -102,7 +102,7 @@ dup if ( index-low index-high block# ) nip else - drop add-block ( index-low index-high new-block# ) + drop u.add-block ( index-low index-high new-block# ) dup rot r@ block swap la+ int! update ( index-low new-block# ) then ( index-low block# ) get-ind2 ( adr ) @@ -114,13 +114,13 @@ dup #direct-blocks < if ( lblk# ) dup get-direct ?dup if nip exit then ( lblk# ) - add-block dup rot >direct int! update exit + u.add-block dup rot >direct int! update exit then ( lblk# ) #direct-blocks - ( lblk#' ) dup #ind-blocks1 < if ( lblk# ) #direct-blocks get-direct ?dup 0= if ( lblk# ) - add-block dup #direct-blocks put-direct + u.add-block dup #direct-blocks put-direct then ( lblk# block ) get-ind1 exit then @@ -128,7 +128,7 @@ dup #ind-blocks2 < if #direct-blocks 1+ get-direct ?dup 0= if - add-block dup #direct-blocks 1+ put-direct + u.add-block dup #direct-blocks 1+ put-direct then ( lblk# block ) get-ind2 exit then @@ -136,7 +136,7 @@ dup #ind-blocks3 < if #direct-blocks 2+ get-direct ?dup 0= if - add-block dup #direct-blocks 2+ put-direct + u.add-block dup #direct-blocks 2+ put-direct then ( lblk# block ) get-ind3 exit then @@ -147,10 +147,10 @@ \ deletes \ this code is a bit tricky, in that after deleting a block, -\ you must update the block which pointed to it. +\ you must update the block that pointed to it. : del-blk0 ( a -- deleted? ) - int@ dup 0= if exit then free-block true + int@ dup 0= if exit then n.free-block true ; : del-blk1 ( a -- deleted? ) int@ dup 0= if exit then ( blk# ) @@ -158,7 +158,7 @@ bsize 0 do ( blk# ) dup block i + del-blk0 if 0 over block i + int! update then 4 +loop ( blk# ) - free-block true + n.free-block true ; : del-blk2 ( a -- deleted? ) int@ dup 0= if exit then ( blk# ) @@ -166,7 +166,7 @@ bsize 0 do ( blk# ) dup block i + del-blk1 if 0 over block i + int! update then 4 +loop ( blk# ) - free-block true + n.free-block true ; : del-blk3 ( a -- deleted? ) int@ dup 0= if exit then ( blk# ) @@ -174,7 +174,7 @@ bsize 0 do ( blk# ) dup block i + del-blk2 if 0 over block i + int! update then 4 +loop ( blk# ) - free-block true + n.free-block true ; : delete-directs ( -- ) #direct-blocks 0 do @@ -189,7 +189,7 @@ ; : append-block ( -- ) - add-block ( block ) + u.add-block ( block ) dfile-size bsize um/mod nip dup bsize um* dfile-size! ( block #blocks ) 1+ >pblk int! update ; @@ -228,7 +228,7 @@ then /gds do-alloc is gds - gds /gds gds-block# read-ublocks dup if + gds /gds d.gds-block# d.read-ublocks dup if gds /gds do-free super-block /super-block do-free exit then Modified: ofw/fs/ext2fs/methods.fth ============================================================================== --- ofw/fs/ext2fs/methods.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/methods.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -7,7 +7,7 @@ external -: free-bytes ( -- d ) total-free-blocks bsize um* ; +: free-bytes ( -- d ) d.total-free-blocks bsize du* ; : $create ( name$ -- error? ) o# 100666 ($create) @@ -18,10 +18,10 @@ dirent-inode@ set-inode - add-block ( block# ) - dfile-size h# 400. d+ dfile-size! ( block# ) - dup direct0 int! update ( block# ) - block bsize erase update \ flush ( ) + u.add-block ( u.block# ) + dfile-size h# 400. d+ dfile-size! ( u.block# ) + dup direct0 int! update ( u.block# ) + u>d d.block bsize erase update \ flush ( ) inode# first-dirent if true exit then ( ) " ." bsize inode# fill-dirent ( ) " .." wd-inum new-dirent ( error? ) Modified: ofw/fs/ext2fs/recovery.fth ============================================================================== --- ofw/fs/ext2fs/recovery.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/recovery.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -132,7 +132,7 @@ ; : write-jblock ( d.block# adr -- ) - -rot drop write-fs-block ( error? ) + -rot d.write-fs-block ( error? ) if ." Journal recovery write error" cr abort then ; Modified: ofw/fs/ext2fs/sb.fth ============================================================================== --- ofw/fs/ext2fs/sb.fth Sat Dec 31 23:25:58 2011 (r2795) +++ ofw/fs/ext2fs/sb.fth Tue Jan 3 01:54:24 2012 (r2796) @@ -36,17 +36,17 @@ \ /block if 1024 6 +sbl lshift to /block then /block \ ; -: ceiling ( nom div -- n ) /mod swap if 1+ then ; +: ceiling ( nom div -- n ) ; \ : total-inodes ( -- n ) 0 +sbl ; -: total-blocks ( -- n ) 1 +sbl ; -: total-free-blocks ( -- n ) 3 +sbl ; +: d.total-blocks ( -- d ) 1 +sbl 84 +sbl ; +: d.total-free-blocks ( -- d ) 3 +sbl 86 +sbl ; \ : total-free-inodes ( -- n ) 4 +sbl ; \ : total-free-blocks+! ( -- n ) 3 +sbl + super-block 3 la+ int! ; \ : total-free-inodes+! ( -- n ) 4 +sbl + super-block 4 la+ int! ; -: total-free-blocks! ( -- n ) super-block 3 la+ int! ; +: d.total-free-blocks! ( d -- ) super-block tuck 86 la+ int! 3 la+ int! ; : total-free-inodes! ( -- n ) super-block 4 la+ int! ; -: #groups ( -- n ) total-blocks bpg ceiling ; +: #groups ( -- n ) d.total-blocks bpg um/mod swap if 1+ then ; : recover? ( -- flag ) 24 +sbl 4 and 0<> ; @@ -64,21 +64,21 @@ \ Used to set partition-offset but now unnecessary as parent handles it ; -: write-ublocks ( adr len dev-block# -- error? ) - ublock um* " seek" $call-parent ?dup if exit then ( adr len ) +: d.write-ublocks ( adr len d.dev-block# -- error? ) + ublock du* " seek" $call-parent ?dup if exit then ( adr len ) tuck " write" $call-parent <> ; : put-super-block ( -- error? ) - super-block /super-block super-block# write-ublocks + super-block /super-block super-block# u>d d.write-ublocks ; -: read-ublocks ( adr len dev-block# -- error? ) - ublock um* " seek" $call-parent ?dup if exit then ( adr len ) +: d.read-ublocks ( adr len dev-block# -- error? ) + ublock du* " seek" $call-parent ?dup if exit then ( adr len ) tuck " read" $call-parent <> ; : get-super-block ( -- error? ) - super-block /super-block super-block# read-ublocks ?dup if exit then + super-block /super-block super-block# u>d d.read-ublocks ?dup if exit then ['] le-l@ to int@ ['] le-w@ to short@ ['] le-l! to int! ['] le-w! to short! @@ -89,16 +89,20 @@ magic fs-magic <> ; -: gds-fs-block# ( -- fs-block# ) - datablock0 1+ ( logical-block# ) +: d.gds-fs-block# ( -- d.fs-block# ) + datablock0 1+ u>d ( d.logical-block# ) ; -: gds-block# ( -- dev-block# ) - gds-fs-block# bsize ublock / * ( dev-block# ) +: d.gds-block# ( -- d.dev-block# ) + d.gds-fs-block# bsize ublock / du* ( dev-block# ) +; +: desc64? ( -- flag ) h# 7f +sbw 0<> ; +: /gd ( -- n ) h# 7f +sbw ?dup 0= if h# 20 then ; +: /gds ( -- size ) #groups /gd * ublock round-up ; +: group-desc ( group# -- adr ) /gd * gds + ; +: d.gpimin ( group -- d.block# ) + group-desc dup 2 la+ int@ ( adr block# ) + desc64? if swap 9 la+ int@ else nip 0 then ( d.block# ) ; -: /gds ( -- size ) #groups h# 20 * ublock round-up ; -: group-desc ( group# -- adr ) h# 20 * gds + ; -: gpimin ( group -- block# ) group-desc 2 la+ int@ ; -: blkstofrags ( #blocks -- #frags ) ; \ XXX is this needed? \ LICENSE_BEGIN

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware January 2012