Changeset 3366

Timestamp:

Oct 13, 2012 3:30:13 AM (7 months ago)

Author:

wmb

Message:

OLPC trac #12106 and #12181 - inflate initrd images from inside a .zip bundle.

Files:

• cpu/x86/pc/olpc/security.fth (modified) (1 diff)
• ofw/core/infltdi.fth (modified) (1 diff)

cpu/x86/pc/olpc/security.fth

@@ -797 +797 @@
       img$  sig$  sha-valid?  if
          show-unlock
-         img$ place-ramdisk
+         img$ $inflated? drop  place-ramdisk
          exit
       else

ofw/core/infltdi.fth

@@ -52 +52 @@
 ' try-inflate to ?inflate
 
-: (?inflate-loaded)  ( -- )
-   load-base  " "(1f8b08)"  comp 0=  if
-      load-base  loaded +  tuck  inflate  !load-size  ( infl-adr )
-      loaded move                                     ( )
+\ Inflates the image at adr len if it is compressed.
+\ The uncompressed image is placed after the compressed image in memory,
+\ so sufficient space must be available there.  In practice, this
+\ usually means that adr should be in the region beginning at load-base .
+
+: $inflated?  ( adr len -- adr' len' true | adr len false )
+   over " "(1f8b08)"  comp 0=  if    ( adr len )
+      over +  4 round-up  tuck       ( adr+len adr adr+len )
+      inflate  true                  ( adr' len' true )
+   else                              ( adr len )
+      false                          ( adr len false )
    then
 ;
+: (?inflate-loaded)  ( -- )
+   loaded $inflated?  if       ( adr len )
+      !load-size  loaded move  ( )
+   else                        ( adr len )
+      2drop                    ( )
+   then
+;
+
 ' (?inflate-loaded) to ?inflate-loaded
 headers