[src/netbsd-1-6]: src/sys/arch/alpha/stand/common Pull up revision 1.11 (requ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15c5b8819952
branches:  netbsd-1-6
changeset: 528657:15c5b8819952
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Jul 31 00:26:19 2002 +0000

description:
Pull up revision 1.11 (requested by nathanw in ticket #591):
Experimentation reveals that the implementation of GET_ENV on at least
some systems chokes if the buffer is not 8-byte aligned. GCC only aligns
character arrays to 4-byte boundaries by default, so it's possible to get
unlucky and die in the boot blocks with a "kernel stack not valid halt".
Avoid the problem by using a local, aligned buffer as the argument to GET_ENV,
and copying the result into the caller's buffer.
Should fix PRs port-alpha/17682 and port-alpha/17717.

diffstat:

 sys/arch/alpha/stand/common/prom.c |  19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 311c9216cbfb -r 15c5b8819952 sys/arch/alpha/stand/common/prom.c
--- a/sys/arch/alpha/stand/common/prom.c        Wed Jul 31 00:23:17 2002 +0000
+++ b/sys/arch/alpha/stand/common/prom.c        Wed Jul 31 00:26:19 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.10 1999/04/02 03:11:57 cgd Exp $ */
+/* $NetBSD: prom.c,v 1.10.36.1 2002/07/31 00:26:19 lukem Exp $ */
 
 /*  
  * Mach Operating System
@@ -26,6 +26,8 @@
  * the rights to redistribute these changes.
  */
 
+#include <lib/libkern/libkern.h>
+
 #include <sys/types.h>
 
 #include <machine/prom.h>
@@ -125,12 +127,21 @@
        int id, len;
        char *buf;
 {
+       /* 
+        * On at least some systems, the GETENV call requires a
+        * 8-byte-aligned buffer, or it bails out with a "kernel stack
+        * not valid halt". Provide a local, aligned buffer here and
+        * then copy to the caller's buffer.
+        */
+       static char abuf[128] __attribute__((aligned (8)));
        prom_return_t ret;
 
-       ret.bits = prom_dispatch(PROM_R_GETENV, id, buf, len-1);
+       ret.bits = prom_dispatch(PROM_R_GETENV, id, abuf, 128);
        if (ret.u.status & 0x4)
                ret.u.retval = 0;
-       buf[ret.u.retval] = '\0';
+       len = min(len - 1, ret.u.retval);
+       memcpy(buf, abuf, len);
+       buf[len] = '\0';
 
-       return (ret.u.retval);
+       return (len);
 }