Move the ia32_sigcode structure from ia32_sigtramp.c to ia32_signal.c.

It's a bit excessive to have it in a file of its own.

3 files changed, 19 insertions, 45 deletions

diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 856e5c5..95d63db 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -91,7 +91,6 @@ ia64/disasm/disasm_extract.c	standard
 ia64/disasm/disasm_format.c	standard
 ia64/ia32/ia32_reg.c		optional	compat_ia32
 ia64/ia32/ia32_signal.c		optional	compat_ia32
-ia64/ia32/ia32_sigtramp.c	optional        compat_ia32
 ia64/ia32/ia32_trap.c		optional	compat_ia32
 ia64/ia64/autoconf.c		standard
 ia64/ia64/busdma_machdep.c	standard
diff --git a/sys/ia64/ia32/ia32_signal.c b/sys/ia64/ia32/ia32_signal.c
index 913cd15..b001ae1 100644
--- a/sys/ia64/ia32/ia32_signal.c
+++ b/sys/ia64/ia32/ia32_signal.c
@@ -22,10 +22,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_compat.h"
 
 #define __ELF_WORD_SIZE 32
@@ -74,6 +75,22 @@
 #include <i386/include/segments.h>
 #include <i386/include/specialreg.h>
 
+char ia32_sigcode[] = {
+	0xff, 0x54, 0x24, 0x10,		/* call *SIGF_HANDLER(%esp) */
+	0x8d, 0x44, 0x24, 0x14,		/* lea SIGF_UC(%esp),%eax */
+	0x50,				/* pushl %eax */
+	0xf7, 0x40, 0x54, 0x00, 0x00, 0x02, 0x02, /* testl $PSL_VM,UC_EFLAGS(%ea
+x) */
+	0x75, 0x03,			/* jne 9f */
+	0x8e, 0x68, 0x14,		/* movl UC_GS(%eax),%gs */
+	0xb8, 0x57, 0x01, 0x00, 0x00,	/* 9: movl $SYS_sigreturn,%eax */
+	0x50,				/* pushl %eax */
+	0xcd, 0x80,			/* int $0x80 */
+	0xeb, 0xfe,			/* 0: jmp 0b */
+	0
+};
+int sz_ia32_sigcode = sizeof(ia32_sigcode);
+
 /*
  * Signal sending has not been implemented on ia64.  This causes
  * the sigtramp code to not understand the arguments and the application
diff --git a/sys/ia64/ia32/ia32_sigtramp.c b/sys/ia64/ia32/ia32_sigtramp.c
deleted file mode 100644
index 7934df1..0000000
--- a/sys/ia64/ia32/ia32_sigtramp.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2002 Doug Rabson
- * All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-char ia32_sigcode[] = {
-	0xff, 0x54, 0x24, 0x10,		/* call *SIGF_HANDLER(%esp) */
-	0x8d, 0x44, 0x24, 0x14,		/* lea SIGF_UC(%esp),%eax */
-	0x50,				/* pushl %eax */
-	0xf7, 0x40, 0x54, 0x00, 0x00, 0x02, 0x02, /* testl $PSL_VM,UC_EFLAGS(%eax) */
-	0x75, 0x03,			/* jne 9f */
-	0x8e, 0x68, 0x14,		/* movl UC_GS(%eax),%gs */
-	0xb8, 0x57, 0x01, 0x00, 0x00,	/* 9: movl $SYS_sigreturn,%eax */
-	0x50,				/* pushl %eax */
-	0xcd, 0x80,			/* int $0x80 */
-	0xeb, 0xfe,			/* 0: jmp 0b */
-	0
-};
-int sz_ia32_sigcode = sizeof(ia32_sigcode);