From a6ad91e4b45ebfb5fe1c6ef7c2d870088f1b9b8c Mon Sep 17 00:00:00 2001
From: rahnds <rahnds@openbsd.org>
Date: Tue, 18 Feb 1997 15:54:26 +0000
Subject: [PATCH] Ok, these are more stragglers in my source tree. These
 changes were necessary to clean up the interdependancies caused by the
 siginfo changes.

---
 sys/arch/powerpc/include/param.h  |  4 ++--
 sys/arch/powerpc/include/signal.h | 23 ++++++++++++-----------
 sys/arch/powerpc/include/types.h  |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h
index 03a73522c2a..53d5ddc4f9d 100644
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.2 1996/12/28 06:25:17 rahnds Exp $	*/
+/*	$OpenBSD: param.h,v 1.3 1997/02/18 15:54:26 rahnds Exp $	*/
 /*	$NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $	*/
 
 /*-
@@ -43,7 +43,7 @@
  */
 #define	MACHINE		"powerpc"
 #define	MACHINE_ARCH	"powerpc"
-#define	MID_MACHINE	MID_POWERPC
+#define	MID_MACHINE	MID_ZERO
 
 #define	ALIGNBYTES	(sizeof(double) - 1)
 #define	ALIGN(p)	(((u_int)(p) + ALIGNBYTES) & ~ALIGNBYTES)
diff --git a/sys/arch/powerpc/include/signal.h b/sys/arch/powerpc/include/signal.h
index 3c629efde6c..cec57b43580 100644
--- a/sys/arch/powerpc/include/signal.h
+++ b/sys/arch/powerpc/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.2 1997/02/05 01:33:53 rahnds Exp $	*/
+/*	$OpenBSD: signal.h,v 1.3 1997/02/18 15:54:27 rahnds Exp $	*/
 /*	$NetBSD: signal.h,v 1.1 1996/09/30 16:34:34 ws Exp $	*/
 
 /*
@@ -36,6 +36,8 @@
 
 typedef int sig_atomic_t;
 
+#include <machine/types.h>
+
 /*
  * We have to save all registers on every trap, because
  *	1. user could attach this process every time
@@ -44,19 +46,18 @@ typedef int sig_atomic_t;
  * these are not used by the kernel. They are saved only when switching
  * between processes using the FPU.
  *
- * Change ordering to cluster together these register_t's.		XXX
  */
 struct trapframe {
-	register_t fixreg[32];
-	register_t lr;
-	int cr;
-	int xer;
-	register_t ctr;
-	register_t srr0;
-	register_t srr1;
-	register_t dar;			/* dar & dsisr are only filled on a DSI trap */
+	u_int32_t fixreg[32];
+	u_int32_t lr;
+	u_int32_t cr;
+	u_int32_t xer;
+	u_int32_t ctr;
+	int srr0;
+	int srr1;
+	int dar;			/* dar & dsisr are only filled on a DSI trap */
 	int dsisr;
-	int exc;
+	u_int32_t exc;
 };
 
 struct sigcontext {
diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h
index 3233b6e6f03..f8198aee5b2 100644
--- a/sys/arch/powerpc/include/types.h
+++ b/sys/arch/powerpc/include/types.h
@@ -46,7 +46,7 @@ typedef	unsigned int		u_int32_t;
 typedef	long long		int64_t;
 typedef	unsigned long long	u_int64_t;
 
-typedef	int32_t			register_t;
+typedef	u_int32_t		register_t;
 
 typedef	unsigned long		vm_size_t;
 typedef	unsigned long		vm_offset_t;
-- 
2.20.1