[openfirmware] r1613 - cpu/x86/pc/olpc/via

[svn at openfirmware.info]

Author: wmb
Date: 2009-12-15 17:01:37 +0100 (Tue, 15 Dec 2009)
New Revision: 1613

Modified:
   cpu/x86/pc/olpc/via/runin.fth
Log:
Via manufacturing tests - fixed stack cleanup error in runin.fth:handle-tag


Modified: cpu/x86/pc/olpc/via/runin.fth
===================================================================
--- cpu/x86/pc/olpc/via/runin.fth	2009-12-15 08:53:07 UTC (rev 1612)
+++ cpu/x86/pc/olpc/via/runin.fth	2009-12-15 16:01:37 UTC (rev 1613)
@@ -54,9 +54,11 @@
 
 0 0 2value response$
 
+: final-filename$  ( -- adr len )  board#$ " %s.txt" sprintf  ;
+
 \ Send the board number as the request and return the response data
 : final-tag-exchange  ( -- )
-   board#$ " %s.txt" sprintf open-temp-file
+   final-filename$ open-temp-file
    sn$              " SN:"  put-key+value
    " Request" submit-file
    " Response" get-response  to response$ 
@@ -118,7 +120,7 @@
    2dup find-tag  if  ( value$ key$ old-value$ )       \ Tag already exists, check it
       2over " KA" $=  0=  if  ?-null  then   ( value$ key$ old-value$' )
       2>r 2over 2r@ $=  if                   ( value$ key$ r: old-value$' )
-         2drop 2drop r> 2drop                ( )
+         2drop 2drop 2r> 2drop               ( )
       else                                   ( value$ key$ r: old-value$' )
          type ." tag changed!" cr            ( value$ r: old-value$' )
          ."   Old: " r> show-tag cr          ( value$ )