diff --git a/sys/arch/sparc64/sparc64/compat_13_machdep.c b/sys/arch/sparc64/sparc64/compat_13_machdep.c
index e87cdb6e72ec..d7d8404830f5 100644
--- a/sys/arch/sparc64/sparc64/compat_13_machdep.c
+++ b/sys/arch/sparc64/sparc64/compat_13_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.5 1999/03/26 04:29:21 eeh Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.6 1999/11/06 20:18:13 eeh Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@ compat_13_sys_sigreturn(p, v, retval)
 	} */ *uap = v;
 	struct sigcontext13 sc, *scp;
 	sigset_t mask;
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 
 	/* First ensure consistent stack state (see sendsig). */
 	write_user_windows();
diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c
index 5bf0f8027030..b9bab245d196 100644
--- a/sys/arch/sparc64/sparc64/cpu.c
+++ b/sys/arch/sparc64/sparc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.4 1999/05/30 19:13:34 eeh Exp $ */
+/*	$NetBSD: cpu.c,v 1.5 1999/11/06 20:18:13 eeh Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -158,8 +158,8 @@ cpu_attach(parent, dev, aux)
 	int impl, vers, fver;
 	char *fpuname;
 	struct mainbus_attach_args *ma = aux;
-	struct fpstate *fpstate;
-	struct fpstate fps[2];
+	struct fpstate64 *fpstate;
+	struct fpstate64 fps[2];
 	char *sep;
 	char fpbuf[40];
 	register int i, l;
diff --git a/sys/arch/sparc64/sparc64/cpuvar.h b/sys/arch/sparc64/sparc64/cpuvar.h
index 590e2f8a3732..5d94576168d3 100644
--- a/sys/arch/sparc64/sparc64/cpuvar.h
+++ b/sys/arch/sparc64/sparc64/cpuvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuvar.h,v 1.1.1.1 1998/06/20 04:58:52 eeh Exp $ */
+/*	$NetBSD: cpuvar.h,v 1.2 1999/11/06 20:18:13 eeh Exp $ */
 
 /*
  *  Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/device.h>
 
-#include <sparc/sparc64/cache.h>	/* for cacheinfo */
+#include <sparc64/sparc64/cache.h>	/* for cacheinfo */
 
 /*
  * CPU/MMU module information.
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 5e85de6b1c62..9f0a76dd9bde 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.23 1999/10/28 06:56:31 lukem Exp $ */
+/*	$NetBSD: db_interface.c,v 1.24 1999/11/06 20:18:13 eeh Exp $ */
 
 /*
  * Mach Operating System
@@ -108,7 +108,7 @@ int	db_active = 0;
 
 extern char *trap_type[];
 
-void kdb_kbd_trap __P((struct trapframe *));
+void kdb_kbd_trap __P((struct trapframe64 *));
 void db_prom_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_proc_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_ctx_cmd __P((db_expr_t, int, db_expr_t, char *));
@@ -136,7 +136,7 @@ static void db_dump_pmap __P((struct pmap*));
  */
 void
 kdb_kbd_trap(tf)
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 {
 	if (db_active == 0 /* && (boothowto & RB_KDB) */) {
 		printf("\n\nkernel: keyboard interrupt tf=%p\n", tf);
@@ -153,7 +153,7 @@ int traptrace_enabled = 0;
 int
 kdb_trap(type, tf)
 	int	type;
-	register struct trapframe *tf;
+	register struct trapframe64 *tf;
 {
 	int i, s, tl;
 	struct trapstate {
@@ -294,7 +294,7 @@ db_write_bytes(addr, size, data)
 }
 
 void
-cpu_Debugger()
+Debugger()
 {
 	/* We use the breakpoint to trap into DDB */
 	asm("ta 1; nop");
diff --git a/sys/arch/sparc64/sparc64/db_trace.c b/sys/arch/sparc64/sparc64/db_trace.c
index d560f417fec2..cde0a6802ce2 100644
--- a/sys/arch/sparc64/sparc64/db_trace.c
+++ b/sys/arch/sparc64/sparc64/db_trace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_trace.c,v 1.9 1999/04/12 20:38:20 pk Exp $ */
+/*	$NetBSD: db_trace.c,v 1.10 1999/11/06 20:18:50 eeh Exp $ */
 
 /*
  * Mach Operating System
@@ -293,7 +293,7 @@ db_dump_trap(addr, have_addr, count, modif)
 	db_expr_t count;
 	char *modif;
 {
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 
 	/* Use our last trapframe? */
 	tf = &ddb_regs.ddb_tf;
@@ -306,7 +306,7 @@ db_dump_trap(addr, have_addr, count, modif)
 	}
 	/* Or an arbitrary trapframe */
 	if (have_addr)
-		tf = (struct trapframe *)addr;
+		tf = (struct trapframe64 *)addr;
 
 	db_printf("Trapframe %p:\ttstate: %p\tpc: %p\tnpc: %p\n",
 		  tf, (long)tf->tf_tstate, (long)tf->tf_pc, (long)tf->tf_npc);
diff --git a/sys/arch/sparc64/sparc64/emul.c b/sys/arch/sparc64/sparc64/emul.c
index 34ccc07d670e..a0d1ca092a55 100644
--- a/sys/arch/sparc64/sparc64/emul.c
+++ b/sys/arch/sparc64/sparc64/emul.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.4 1998/11/24 12:50:56 mrg Exp $	*/
+/*	$NetBSD: emul.c,v 1.5 1999/11/06 20:18:50 eeh Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #include <machine/instr.h>
 #include <machine/cpu.h>
 #include <machine/psl.h>
-#include <sparc/sparc/cpuvar.h>
+#include <sparc64/sparc64/cpuvar.h>
 
 #define DEBUG_EMUL
 #ifdef DEBUG_EMUL
@@ -56,12 +56,12 @@
 #define IPR(tf, i)	((int32_t *) tf->tf_out[6])[i - 16]
 #define FPR(p, i)	((int32_t) p->p_md.md_fpstate->fs_regs[i])
 
-static __inline int readgpreg __P((struct trapframe *, int, void *));
+static __inline int readgpreg __P((struct trapframe64 *, int, void *));
 static __inline int readfpreg __P((struct proc *, int, void *));
-static __inline int writegpreg __P((struct trapframe *, int, const void *));
+static __inline int writegpreg __P((struct trapframe64 *, int, const void *));
 static __inline int writefpreg __P((struct proc *, int, const void *));
-static __inline int decodeaddr __P((struct trapframe *, union instr *, void *));
-static int muldiv __P((struct trapframe *, union instr *, int32_t *, int32_t *,
+static __inline int decodeaddr __P((struct trapframe64 *, union instr *, void *));
+static int muldiv __P((struct trapframe64 *, union instr *, int32_t *, int32_t *,
     int32_t *));
 
 #define	REGNAME(i)	"goli"[i >> 3], i & 7
@@ -69,7 +69,7 @@ static int muldiv __P((struct trapframe *, union instr *, int32_t *, int32_t *,
 
 static __inline int
 readgpreg(tf, i, val)
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 	int i;
 	void *val;
 {
@@ -87,7 +87,7 @@ readgpreg(tf, i, val)
 		
 static __inline int
 writegpreg(tf, i, val)
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 	int i;
 	const void *val;
 {
@@ -128,7 +128,7 @@ writefpreg(p, i, val)
 
 static __inline int
 decodeaddr(tf, code, val)
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 	union instr *code;
 	void *val;
 {
@@ -148,7 +148,7 @@ decodeaddr(tf, code, val)
 
 static int
 muldiv(tf, code, rd, rs1, rs2)
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 	union instr *code;
 	int32_t *rd, *rs1, *rs2;
 {
@@ -236,7 +236,7 @@ muldiv(tf, code, rd, rs1, rs2)
 int
 fixalign(p, tf)
 	struct proc *p;
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 {
 	static u_char sizedef[] = { 0x4, 0xff, 0x2, 0x8 };
 
@@ -397,7 +397,7 @@ fixalign(p, tf)
 int
 emulinstr(pc, tf)
 	vaddr_t pc;
-	struct trapframe *tf;
+	struct trapframe64 *tf;
 {
 	union instr code;
 	int32_t rs1, rs2, rd;
diff --git a/sys/arch/sparc64/sparc64/genassym.c b/sys/arch/sparc64/sparc64/genassym.c
index 1e14924cafcc..538cf31ff482 100644
--- a/sys/arch/sparc64/sparc64/genassym.c
+++ b/sys/arch/sparc64/sparc64/genassym.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: genassym.c,v 1.10 1999/03/24 05:51:13 mrg Exp $ */
+/*	$NetBSD: genassym.c,v 1.11 1999/11/06 20:18:50 eeh Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -142,11 +142,11 @@ main()
 	off("V_FAULTS", struct uvmexp, faults);
 
 	/* FPU state */
-	off("FS_REGS", struct fpstate, fs_regs);
-	off("FS_FSR", struct fpstate, fs_fsr);
-	off("FS_QSIZE", struct fpstate, fs_qsize);
-	off("FS_QUEUE", struct fpstate, fs_queue);
-	siz("FS_SIZE", struct fpstate);
+	off("FS_REGS", struct fpstate64, fs_regs);
+	off("FS_FSR", struct fpstate64, fs_fsr);
+	off("FS_QSIZE", struct fpstate64, fs_qsize);
+	off("FS_QUEUE", struct fpstate64, fs_queue);
+	siz("FS_SIZE", struct fpstate64);
 	def("FSR_QNE", FSR_QNE);
 	def("FPRS_FEF",FPRS_FEF);
 	def("FPRS_DU",FPRS_DU);
@@ -173,26 +173,26 @@ main()
 	off("PCB_LASTCALL", struct pcb, lastcall);
 	siz("PCB_SIZE", struct pcb);
 
-	/* trapframe fields */
-	off("TF_TSTATE", struct trapframe, tf_tstate);
-	off("TF_PC", struct trapframe, tf_pc);
-	off("TF_NPC", struct trapframe, tf_npc);
-	off("TF_FAULT", struct trapframe, tf_fault);
-	off("TF_KSTACK", struct trapframe, tf_kstack);
-	off("TF_Y", struct trapframe, tf_y);
-	off("TF_PIL", struct trapframe, tf_pil);
-	off("TF_OLDPIL", struct trapframe, tf_oldpil);
-	off("TF_TT", struct trapframe, tf_tt);
-	off("TF_GLOBAL", struct trapframe, tf_global);
-	off("TF_OUT", struct trapframe, tf_out);
-	off("TF_LOCAL", struct trapframe, tf_local);
-	off("TF_IN", struct trapframe, tf_in);
+	/* trapframe64 fields */
+	off("TF_TSTATE", struct trapframe64, tf_tstate);
+	off("TF_PC", struct trapframe64, tf_pc);
+	off("TF_NPC", struct trapframe64, tf_npc);
+	off("TF_FAULT", struct trapframe64, tf_fault);
+	off("TF_KSTACK", struct trapframe64, tf_kstack);
+	off("TF_Y", struct trapframe64, tf_y);
+	off("TF_PIL", struct trapframe64, tf_pil);
+	off("TF_OLDPIL", struct trapframe64, tf_oldpil);
+	off("TF_TT", struct trapframe64, tf_tt);
+	off("TF_GLOBAL", struct trapframe64, tf_global);
+	off("TF_OUT", struct trapframe64, tf_out);
+	off("TF_LOCAL", struct trapframe64, tf_local);
+	off("TF_IN", struct trapframe64, tf_in);
 	/* shortened versions */
-	off("TF_G", struct trapframe, tf_global);
-	off("TF_O", struct trapframe, tf_out);
-	off("TF_L", struct trapframe, tf_local);
-	off("TF_I", struct trapframe, tf_in);
-	siz("TF_SIZE", struct trapframe);
+	off("TF_G", struct trapframe64, tf_global);
+	off("TF_O", struct trapframe64, tf_out);
+	off("TF_L", struct trapframe64, tf_local);
+	off("TF_I", struct trapframe64, tf_in);
+	siz("TF_SIZE", struct trapframe64);
 
 #if 0
 	/* clockframe fields */
diff --git a/sys/arch/sparc64/sparc64/genassym.cf b/sys/arch/sparc64/sparc64/genassym.cf
index 4dbd3060df6c..d7fb09df1d5c 100644
--- a/sys/arch/sparc64/sparc64/genassym.cf
+++ b/sys/arch/sparc64/sparc64/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.11 1999/03/26 04:29:22 eeh Exp $
+#	$NetBSD: genassym.cf,v 1.12 1999/11/06 20:18:50 eeh Exp $
 
 #
 # Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -148,11 +148,11 @@ define	V_FAULTS	offsetof(struct uvmexp, faults)
 #define	CPUINFO_FAULTSTATUS	offsetof(struct cpu_softc, get_faultstatus)
 
 # FPU state
-define	FS_REGS		offsetof(struct fpstate, fs_regs)
-define	FS_FSR		offsetof(struct fpstate, fs_fsr)
-define	FS_QSIZE	offsetof(struct fpstate, fs_qsize)
-define	FS_QUEUE	offsetof(struct fpstate, fs_queue)
-define	FS_SIZE		sizeof(struct fpstate)
+define	FS_REGS		offsetof(struct fpstate64, fs_regs)
+define	FS_FSR		offsetof(struct fpstate64, fs_fsr)
+define	FS_QSIZE	offsetof(struct fpstate64, fs_qsize)
+define	FS_QUEUE	offsetof(struct fpstate64, fs_queue)
+define	FS_SIZE		sizeof(struct fpstate64)
 define	FSR_QNE		FSR_QNE
 define	FPRS_FEF	FPRS_FEF
 define	FPRS_DL		FPRS_DL
@@ -180,26 +180,26 @@ define  PCB_LASTCALL	offsetof(struct pcb, lastcall)
 define	PCB_SIZE	sizeof(struct pcb)
 
 
-# trapframe fields
-define	TF_TSTATE	offsetof(struct trapframe, tf_tstate)
-define	TF_PC		offsetof(struct trapframe, tf_pc)
-define	TF_NPC		offsetof(struct trapframe, tf_npc)
-define	TF_FAULT	offsetof(struct trapframe, tf_fault)
-define	TF_KSTACK	offsetof(struct trapframe, tf_kstack)
-define	TF_Y		offsetof(struct trapframe, tf_y)
-define	TF_PIL		offsetof(struct trapframe, tf_pil)
-define	TF_OLDPIL	offsetof(struct trapframe, tf_oldpil)
-define	TF_TT		offsetof(struct trapframe, tf_tt)
-define	TF_GLOBAL	offsetof(struct trapframe, tf_global)
-define	TF_OUT		offsetof(struct trapframe, tf_out)
-define	TF_LOCAL	offsetof(struct trapframe, tf_local)
-define	TF_IN		offsetof(struct trapframe, tf_in)
+# trapframe64 fields
+define	TF_TSTATE	offsetof(struct trapframe64, tf_tstate)
+define	TF_PC		offsetof(struct trapframe64, tf_pc)
+define	TF_NPC		offsetof(struct trapframe64, tf_npc)
+define	TF_FAULT	offsetof(struct trapframe64, tf_fault)
+define	TF_KSTACK	offsetof(struct trapframe64, tf_kstack)
+define	TF_Y		offsetof(struct trapframe64, tf_y)
+define	TF_PIL		offsetof(struct trapframe64, tf_pil)
+define	TF_OLDPIL	offsetof(struct trapframe64, tf_oldpil)
+define	TF_TT		offsetof(struct trapframe64, tf_tt)
+define	TF_GLOBAL	offsetof(struct trapframe64, tf_global)
+define	TF_OUT		offsetof(struct trapframe64, tf_out)
+define	TF_LOCAL	offsetof(struct trapframe64, tf_local)
+define	TF_IN		offsetof(struct trapframe64, tf_in)
 # shortened versions
-define	TF_G		offsetof(struct trapframe, tf_global)
-define	TF_O		offsetof(struct trapframe, tf_out)
-define	TF_L		offsetof(struct trapframe, tf_local)
-define	TF_I		offsetof(struct trapframe, tf_in)
-define	TF_SIZE		sizeof(struct trapframe)
+define	TF_G		offsetof(struct trapframe64, tf_global)
+define	TF_O		offsetof(struct trapframe64, tf_out)
+define	TF_L		offsetof(struct trapframe64, tf_local)
+define	TF_I		offsetof(struct trapframe64, tf_in)
+define	TF_SIZE		sizeof(struct trapframe64)
 
 ifdef notyet
 # clockframe fields 
diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c
index ebda51529d5d..af391fabcf29 100644
--- a/sys/arch/sparc64/sparc64/intr.c
+++ b/sys/arch/sparc64/sparc64/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.16 1999/06/28 08:20:48 itojun Exp $ */
+/*	$NetBSD: intr.c,v 1.17 1999/11/06 20:18:50 eeh Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -105,7 +105,7 @@
  */
 struct intrhand *intrlev[MAXINTNUM];
 
-void	strayintr __P((const struct trapframe *));
+void	strayintr __P((const struct trapframe64 *));
 int	soft01intr __P((void *));
 
 /*
@@ -114,7 +114,7 @@ int	soft01intr __P((void *));
  */
 void
 strayintr(fp)
-	const struct trapframe *fp;
+	const struct trapframe64 *fp;
 {
 	static int straytime, nstray;
 	int timesince;