Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc Add COMPAT_MACH and EXEC_MACHO support on t...



details:   https://anonhg.NetBSD.org/src/rev/e8264618259c
branches:  trunk
changeset: 538791:e8264618259c
user:      manu <manu%NetBSD.org@localhost>
date:      Wed Oct 30 06:41:45 2002 +0000

description:
Add COMPAT_MACH and EXEC_MACHO support on the PowerPC

diffstat:

 sys/arch/powerpc/conf/files.powerpc      |    9 +-
 sys/arch/powerpc/include/Makefile        |    4 +-
 sys/arch/powerpc/include/macho_machdep.h |  185 +++++++++++++++++++++++++++++++
 sys/arch/powerpc/powerpc/mach_machdep.c  |   94 +++++++++++++++
 sys/arch/powerpc/powerpc/mach_sigcode.S  |   88 ++++++++++++++
 sys/arch/powerpc/powerpc/mach_syscall.c  |   53 ++++++++
 sys/arch/powerpc/powerpc/macho_machdep.c |   64 ++++++++++
 sys/arch/powerpc/powerpc/syscall.c       |   30 ++++-
 8 files changed, 521 insertions(+), 6 deletions(-)

diffs (truncated from 610 to 300 lines):

diff -r 9e04c7761068 -r e8264618259c sys/arch/powerpc/conf/files.powerpc
--- a/sys/arch/powerpc/conf/files.powerpc       Wed Oct 30 06:37:37 2002 +0000
+++ b/sys/arch/powerpc/conf/files.powerpc       Wed Oct 30 06:41:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.powerpc,v 1.37 2002/10/30 06:37:37 manu Exp $
+#      $NetBSD: files.powerpc,v 1.38 2002/10/30 06:41:46 manu Exp $
 
 defflag        opt_altivec.h   ALTIVEC K_ALTIVEC
 defflag        opt_openpic.h   OPENPIC OPENPIC_SERIAL_MODE
@@ -53,6 +53,13 @@
 # Binary compatibility with previous NetBSD releases (COMPAT_XX)
 file   arch/powerpc/powerpc/compat_13_machdep.c        compat_13
 
+# MACH binary compatibility (COMPAT_MACH)
+include "compat/mach/files.mach"
+file   arch/powerpc/powerpc/mach_machdep.c             compat_mach
+file   arch/powerpc/powerpc/mach_sigcode.S             compat_mach
+file   arch/powerpc/powerpc/mach_syscall.c             compat_mach
+file   arch/powerpc/powerpc/macho_machdep.c            exec_macho
+
 # OSS audio driver compatibility
 include "compat/ossaudio/files.ossaudio"       
 
diff -r 9e04c7761068 -r e8264618259c sys/arch/powerpc/include/Makefile
--- a/sys/arch/powerpc/include/Makefile Wed Oct 30 06:37:37 2002 +0000
+++ b/sys/arch/powerpc/include/Makefile Wed Oct 30 06:41:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2002/08/07 05:15:53 briggs Exp $
+#      $NetBSD: Makefile,v 1.26 2002/10/30 06:41:45 manu Exp $
 
 KDIR=  /sys/arch/powerpc/include
 INCSDIR= /usr/include/powerpc
@@ -14,7 +14,7 @@
        ipkdb.h \
        kcore.h \
        limits.h lock.h \
-       math.h \
+       macho_machdep.h math.h \
        param.h pcb.h pio.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
        reg.h reloc.h \
        setjmp.h signal.h stdarg.h \
diff -r 9e04c7761068 -r e8264618259c sys/arch/powerpc/include/macho_machdep.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/powerpc/include/macho_machdep.h  Wed Oct 30 06:41:45 2002 +0000
@@ -0,0 +1,185 @@
+/*     $NetBSD: macho_machdep.h,v 1.1 2002/10/30 06:41:45 manu Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the NetBSD
+ *     Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _POWERPC_MACHO_MACHDEP_H_
+#define        _POWERPC_MACHO_MACHDEP_H_
+
+/* From Darwin's xnu/osfmk/mach/ppc/thread_status.h (s/ppc/powerpc/) */
+#define MACHO_POWERPC_THREAD_STATE     1
+
+struct exec_macho_powerpc_thread_state {
+       unsigned int srr0;
+       unsigned int srr1;
+       unsigned int r0;
+       unsigned int r1;
+       unsigned int r2;        
+       unsigned int r3;        
+       unsigned int r4;
+       unsigned int r5;                
+       unsigned int r6;
+       unsigned int r7;
+       unsigned int r8;
+       unsigned int r9;
+       unsigned int r10;
+       unsigned int r11;
+       unsigned int r12;
+       unsigned int r13;
+       unsigned int r14;
+       unsigned int r15;
+       unsigned int r16;
+       unsigned int r17;
+       unsigned int r18;
+       unsigned int r19;
+       unsigned int r20;
+       unsigned int r21;
+       unsigned int r22;
+       unsigned int r23;
+       unsigned int r24;
+       unsigned int r25;
+       unsigned int r26;
+       unsigned int r27;
+       unsigned int r28;
+       unsigned int r29;
+       unsigned int r30;
+       unsigned int r31;
+       unsigned int cr;
+       unsigned int xer;
+       unsigned int lr;
+       unsigned int ctr;
+       unsigned int mq;
+       unsigned int vrsave;
+};
+
+#define MACHO_POWERPC_NEW_THREAD_STATE 1
+
+/* 
+ * From Darwin's xnu/osfmk/ppc/savearea.h  
+ * struct exec_macho_powerpc_saved_state is called struct savearea there. 
+ */
+struct exec_macho_powerpc_saved_state {
+       struct exec_macho_powerpc_savearea_comm {
+               struct exec_macho_powerpc_saved_state *save_prev;
+               unsigned int *sac_next;
+               unsigned int *sac_prev;
+               unsigned int save_flags;
+               unsigned int save_level;
+               unsigned int save_time[2];
+               struct thread_activation *save_act;
+               unsigned int sac_vrswap;
+               unsigned int sac_alloc;
+               unsigned int sac_flags;
+               unsigned int save_misc0;
+               unsigned int save_misc1;
+               unsigned int save_misc2;
+               unsigned int save_misc3;
+               unsigned int save_misc4;
+               unsigned int save_040[8];
+       } save_hdr;
+       unsigned int save_060[8];
+       unsigned int save_r0;
+       unsigned int save_r1;
+       unsigned int save_r2;
+       unsigned int save_r3;
+       unsigned int save_r4;
+       unsigned int save_r5;
+       unsigned int save_r6;
+       unsigned int save_r7;
+       unsigned int save_r8;
+       unsigned int save_r9;
+       unsigned int save_r10;
+       unsigned int save_r11;
+       unsigned int save_r12;
+       unsigned int save_r13;
+       unsigned int save_r14;
+       unsigned int save_r15;
+       unsigned int save_r16;
+       unsigned int save_r17;
+       unsigned int save_r18;
+       unsigned int save_r19;
+       unsigned int save_r20;
+       unsigned int save_r21;
+       unsigned int save_r22;
+       unsigned int save_r23;
+       unsigned int save_r24;
+       unsigned int save_r25;
+       unsigned int save_r26;
+       unsigned int save_r27;
+       unsigned int save_r28;
+       unsigned int save_r29;
+       unsigned int save_r30;
+       unsigned int save_r31;
+       unsigned int save_srr0;
+       unsigned int save_srr1;
+       unsigned int save_cr;
+       unsigned int save_xer;
+       unsigned int save_lr;
+       unsigned int save_ctr;
+       unsigned int save_dar;
+       unsigned int save_dsisr;
+       unsigned int save_vscr[4];
+       unsigned int save_fpscrpad;
+       unsigned int save_fpscr;
+       unsigned int save_exception;
+       unsigned int save_vrsave;
+       unsigned int save_sr0;
+       unsigned int save_sr1;
+       unsigned int save_sr2;
+       unsigned int save_sr3;
+       unsigned int save_sr4;
+       unsigned int save_sr5;
+       unsigned int save_sr6;
+       unsigned int save_sr7;
+       unsigned int save_sr8;
+       unsigned int save_sr9;
+       unsigned int save_sr10;
+       unsigned int save_sr11;
+       unsigned int save_sr12;
+       unsigned int save_sr13;
+       unsigned int save_sr14;
+       unsigned int save_sr15;
+       unsigned int save_180[8];
+       unsigned int save_1A0[8];
+       unsigned int save_1C0[8];
+       unsigned int save_1E0[8];
+       unsigned int save_200[8];
+       unsigned int save_220[8];
+       unsigned int save_240[8];
+       unsigned int save_260[8];
+};
+
+#endif /* !_POWERPC_MACHO_MACHDEP_H_ */
diff -r 9e04c7761068 -r e8264618259c sys/arch/powerpc/powerpc/mach_machdep.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/powerpc/powerpc/mach_machdep.c   Wed Oct 30 06:41:45 2002 +0000
@@ -0,0 +1,94 @@
+/*     $NetBSD: mach_machdep.c,v 1.1 2002/10/30 06:41:45 manu Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas and Emmanuel Dreyfus.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: mach_machdep.c,v 1.1 2002/10/30 06:41:45 manu Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/exec.h>
+#include <sys/user.h>
+#include <sys/filedesc.h>
+#include <sys/ioctl.h>
+#include <sys/kernel.h>
+#include <sys/signal.h>
+#include <sys/signalvar.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/syscallargs.h>
+#include <sys/exec_elf.h>
+
+#include <compat/mach/mach_types.h>
+
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <machine/vmparam.h>
+
+void mach_trap __P((struct trapframe *));
+



Home | Main Index | Thread Index | Old Index