[commit] r3718 - ofw/core

[repository service]

Author: quozl
Date: Thu Mar 20 05:06:05 2014
New Revision: 3718
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3718

Log:
core - use initial values from a current instance package if there is one, fixes clearing of display on subsequent select, caused by my-termemu not persisting, fixes OLPC #12765, thanks to Mitch Bradley.

Modified:
   ofw/core/ofwcore.fth

Modified: ofw/core/ofwcore.fth
==============================================================================
--- ofw/core/ofwcore.fth	Wed Mar 19 22:20:04 2014	(r3717)
+++ ofw/core/ofwcore.fth	Thu Mar 20 05:06:05 2014	(r3718)
@@ -992,16 +992,16 @@
 \ resource).  If we ever need to make this ROMable, we can implement copy-on-
 \ write for initial values.

-: >initial-value  ( pfa -- adr )
-   @
+: initial-values'  ( -- adr )
    my-self  if	\ Use current instance's package if there is a current instance
       my-voc (push-package)  initial-values  (pop-package)
    else		\ Otherwise use the active package
       initial-values
    then
-   +
 ;

+: >initial-value  ( pfa -- adr )  @  initial-values' +  ;
+
 3 actions
 action:  >initial-value @  ;
 action:  >initial-value !  ;
@@ -1055,7 +1055,7 @@
 ;

\ Returns the address of the initial value of the named instance data.
-: (initial-addr)  ( adr -- adr' )    my-self -  initial-values +  ;
+: (initial-addr)  ( adr -- adr' )    my-self -  initial-values' +  ;
 : initial-addr  \ name  ( -- addr )
    [compile] addr
    state @  if  compile (initial-addr)  else  (initial-addr)  then