[src/netbsd-1-5]: src/sys/arch/sparc64/include Approved by thorpej:

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

details:   https://anonhg.NetBSD.org/src/rev/5bfa3a0c0806
branches:  netbsd-1-5
changeset: 488750:5bfa3a0c0806
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Jul 26 23:28:09 2000 +0000

description:
Approved by thorpej:
Enable pulling this into user-level code to get some definitions (e.g. CC64FSZ).

syssrc/sys/arch/sparc64/include/asm.h                   1.11 -> 1.13
syssrc/sys/arch/sparc64/include/frame.h                 1.6 -> 1.7

diffstat:

 sys/arch/sparc64/include/asm.h   |  13 +++++++++----
 sys/arch/sparc64/include/frame.h |   9 +++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r ba13a133c518 -r 5bfa3a0c0806 sys/arch/sparc64/include/asm.h
--- a/sys/arch/sparc64/include/asm.h    Wed Jul 26 23:21:32 2000 +0000
+++ b/sys/arch/sparc64/include/asm.h    Wed Jul 26 23:28:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.9.12.1 2000/07/18 16:23:21 mrg Exp $ */
+/*     $NetBSD: asm.h,v 1.9.12.2 2000/07/26 23:28:09 mycroft Exp $ */
 
 /*
  * Copyright (c) 1994 Allen Briggs
@@ -44,6 +44,11 @@
 #ifndef _ASM_H_
 #define _ASM_H_
 
+#ifndef _LOCORE
+#define _LOCORE
+#endif
+#include <machine/frame.h>
+
 #ifdef __arch64__
 #ifndef __ELF__
 #define __ELF__
@@ -69,9 +74,9 @@
  * to work without a stack frame (doing so requires saving %o7) .
  */
 #define PIC_PROLOGUE(dest,tmp) \
-       3: rd %pc, tmp; \
-       sethi %hi(_C_LABEL(_GLOBAL_OFFSET_TABLE_)-(3b-.)),dest; \
-       or dest,%lo(_C_LABEL(_GLOBAL_OFFSET_TABLE_)-(3b-.)),dest; \
+       sethi %hi(_GLOBAL_OFFSET_TABLE_-4),dest; \
+       rd %pc, tmp; \
+       or dest,%lo(_GLOBAL_OFFSET_TABLE_+4),dest; \
        add dest,tmp,dest
 
 /*
diff -r ba13a133c518 -r 5bfa3a0c0806 sys/arch/sparc64/include/frame.h
--- a/sys/arch/sparc64/include/frame.h  Wed Jul 26 23:21:32 2000 +0000
+++ b/sys/arch/sparc64/include/frame.h  Wed Jul 26 23:28:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frame.h,v 1.6 1999/10/11 01:57:44 eeh Exp $ */
+/*     $NetBSD: frame.h,v 1.6.10.1 2000/07/26 23:28:09 mycroft Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
  * of the frame, you must first force the kernel to write any such
  * windows to the stack.
  */
-#ifndef _LOCORE
+#if !defined(_LOCORE) && !defined(_LIBC)
 struct frame32 {
        int32_t fr_local[8];    /* space to save locals (%l0..%l7) */
        int32_t fr_arg[6];      /* space to save arguments (%i0..%i5) */
@@ -88,7 +88,7 @@
  * V9 frames have an odd bias, so you can tall a v9 frame from
  * a v8 frame by testing the stack pointer's lsb.
  */
-#ifndef _LOCORE
+#if !defined(_LOCORE) && !defined(_LIBC)
 struct frame64 {
        int64_t fr_local[8];    /* space to save locals (%l0..%l7) */
        int64_t fr_arg[6];      /* space to save arguments (%i0..%i5) */
@@ -100,9 +100,10 @@
        int64_t fr_argd[6];     /* `register save area' (lunacy) */
        int64_t fr_argx[0];     /* arg extension (args 7..n; variable size) */
 };
+
+#define v9next_frame(f)                ((struct frame64*)(f->fr_fp+BIAS))
 #endif
 
-#define v9next_frame(f)                ((struct frame64*)(f->fr_fp+BIAS))
 /*
  * CC64FSZ (C Compiler 64-bit Frame SiZe) is the size of a stack frame used
  * by the compiler in 64-bit mode.  It is (16)*8; space for 8 ins, 8 outs.