o) Add COMPAT_FREEBSD32 support for MIPS kernels using the n64 ABI with userlands

   using the o32 ABI.  This mostly follows nwhitehorn's lead in implementing
   COMPAT_FREEBSD32 on powerpc64.
o) Add a new type to the freebsd32 compat layer, time32_t, which is time_t in the
   32-bit ABI being used.  Since the MIPS port is relatively-new, even the 32-bit
   ABIs use a 64-bit time_t.
o) Because time{spec,val}32 has the same size and layout as time{spec,val} on MIPS
   with 32-bit compatibility, then, disable some code which assumes otherwise
   wrongly when built for MIPS.  A more general macro to check in this case would
   seem like a good idea eventually.  If someone adds support for using n32
   userland with n64 kernels on MIPS, then they will have to add a variety of
   flags related to each piece of the ABI that can vary.  That's probably the
   right time to generalize further.
o) Add MIPS to the list of architectures which use PAD64_REQUIRED in the
   freebsd32 compat code.  Probably this should be generalized at some point.

Reviewed by:	gonzo

1 files changed, 18 insertions, 0 deletions

diff --git a/sys/mips/include/sigframe.h b/sys/mips/include/sigframe.h
index 6919882..69c7c02 100644
--- a/sys/mips/include/sigframe.h
+++ b/sys/mips/include/sigframe.h
@@ -32,6 +32,10 @@
 #ifndef _MACHINE_SIGFRAME_H_
 #define	_MACHINE_SIGFRAME_H_
 
+#if defined(_KERNEL) && !defined(KLD_MODULE) && !defined(_STANDALONE)
+#include "opt_compat.h"
+#endif
+
 /*
  * WARNING: code in locore.s assumes the layout shown for sf_signum
  * thru sf_addr so... don't alter them!
@@ -46,4 +50,18 @@ struct sigframe {
 	unsigned long	__spare__[2];
 };
 
+#if (defined(__mips_n32) || defined(__mips_n64)) && defined(COMPAT_FREEBSD32)
+#include <compat/freebsd32/freebsd32_signal.h>
+
+struct sigframe32 {
+	int32_t		sf_signum;
+	int32_t		sf_siginfo;	/* code or pointer to sf_si */
+	int32_t		sf_ucontext;	/* points to sf_uc */
+	int32_t		sf_addr;	/* undocumented 4th arg */
+	ucontext32_t	sf_uc;		/* = *sf_ucontext */
+	struct siginfo32	sf_si;	/* = *sf_siginfo (SA_SIGINFO case) */
+	uint32_t	__spare__[2];
+};
+#endif
+
 #endif /* !_MACHINE_SIGFRAME_H_ */