[OpenBIOS] r48 - in openbios-devel: arch/sparc32 forth/admin

[svn@openbios.org]

Author: stepan
Date: 2006-06-05 22:34:53 +0200 (Mon, 05 Jun 2006)
New Revision: 48

Modified:
   openbios-devel/arch/sparc32/init.fs
   openbios-devel/arch/sparc32/romvec.c
   openbios-devel/forth/admin/reset.fs
Log:
add reset-all and reset for sparc32


Modified: openbios-devel/arch/sparc32/init.fs
===================================================================
--- openbios-devel/arch/sparc32/init.fs	2006-06-05 20:02:44 UTC (rev 47)
+++ openbios-devel/arch/sparc32/init.fs	2006-06-05 20:34:53 UTC (rev 48)
@@ -51,6 +51,13 @@
 ; CONSOLE-IN-initializer
  
 device-end
+
+: sparc32-reset-all
+  h# 71f00000 1 iow!
+  ;
+
+' sparc32-reset-all to reset-all
+
 : rmap@    ( virt -- rmentry )
   drop 0
   ;

Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c	2006-06-05 20:02:44 UTC (rev 47)
+++ openbios-devel/arch/sparc32/romvec.c	2006-06-05 20:34:53 UTC (rev 48)
@@ -413,7 +413,7 @@
     return 0;
 }
 
-void v2_eval(char *str)
+static void obp_fortheval_v2(char *str)
 {
   // for now, move something to the stack so we
   // don't get a stack underrun.
@@ -422,11 +422,10 @@
   // 
   fword("0");
   fword("0");
-  DPRINTF("\n---------------\n");
-  DPRINTF("  %s", str);
-  DPRINTF("\n---------------\n");
-  feval(str);
-  DPRINTF("\n---------------\n");
+
+  DPRINTF("obp_fortheval_v2(%s)\n", str);
+  push_str(str);
+  fword("eval");
 }
 
 void *
@@ -476,7 +475,7 @@
     romvec0.pv_halt = obp_halt;
     romvec0.pv_synchook = &sync_hook;
     romvec0.pv_v0bootargs = &obp_argp;
-    romvec0.pv_fortheval.v2_eval = v2_eval;
+    romvec0.pv_fortheval.v2_eval = obp_fortheval_v2;
     romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg;
     romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap;
     romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap;

Modified: openbios-devel/forth/admin/reset.fs
===================================================================
--- openbios-devel/forth/admin/reset.fs	2006-06-05 20:02:44 UTC (rev 47)
+++ openbios-devel/forth/admin/reset.fs	2006-06-05 20:34:53 UTC (rev 48)
@@ -1,5 +1,14 @@
 \ 7.4.7    Reset
 
-: reset-all    ( -- )
+defer reset-all    ( -- )
+
+: no-reset-all
+  s" reset-all is not available on this platform." type cr
   ;
 
+' no-reset-all to reset-all 
+
+\ OpenBOOT knows reset as well.
+: reset reset-all ;
+
+