Adding upstream version 2.06.upstream/2.06upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 376 insertions, 0 deletions

diff --git a/grub-core/gdb/i386/idt.c b/grub-core/gdb/i386/idt.c
new file mode 100644
index 0000000..69bfcb0
--- /dev/null
+++ b/grub-core/gdb/i386/idt.c
@@ -0,0 +1,78 @@
+/* idt.c - routines for constructing IDT fot the GDB stub */
+/*
+ *  Copyright (C) 2006  Lubomir Kundrak
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/machine/memory.h>
+#include <grub/misc.h>
+#include <grub/cpu/gdb.h>
+#include <grub/gdb.h>
+
+static struct grub_cpu_interrupt_gate grub_gdb_idt[GRUB_GDB_LAST_TRAP + 1]
+  __attribute__ ((aligned(16)));
+
+/* Sets up a gate descriptor in the IDT table.  */
+static void
+grub_idt_gate (struct grub_cpu_interrupt_gate *gate, void (*offset) (void),
+	       grub_uint16_t selector, grub_uint8_t type, grub_uint8_t dpl)
+{
+  gate->offset_lo = (int) offset & 0xffff;
+  gate->selector = selector & 0xffff;
+  gate->unused = 0;
+  gate->gate = (type & 0x1f) | ((dpl & 0x3) << 5) | 0x80;
+  gate->offset_hi = ((int) offset >> 16) & 0xffff;
+}
+
+static struct grub_cpu_idt_descriptor grub_gdb_orig_idt_desc
+  __attribute__ ((aligned(16)));
+static struct grub_cpu_idt_descriptor grub_gdb_idt_desc
+  __attribute__ ((aligned(16)));
+
+/* Set up interrupt and trap handler descriptors in IDT.  */
+void
+grub_gdb_idtinit (void)
+{
+  int i;
+  grub_uint16_t seg;
+
+  asm volatile ("xorl %%eax, %%eax\n"
+		"mov %%cs, %%ax\n" :"=a" (seg));
+
+  for (i = 0; i <= GRUB_GDB_LAST_TRAP; i++)
+    {
+      grub_idt_gate (&grub_gdb_idt[i],
+		     grub_gdb_trapvec[i], seg,
+                     GRUB_CPU_TRAP_GATE, 0);
+    }
+
+  grub_gdb_idt_desc.base = (grub_addr_t) grub_gdb_idt;
+  grub_gdb_idt_desc.limit = sizeof (grub_gdb_idt) - 1;
+  asm volatile ("sidt %0" : : "m" (grub_gdb_orig_idt_desc));
+  asm volatile ("lidt %0" : : "m" (grub_gdb_idt_desc));
+}
+
+void
+grub_gdb_idtrestore (void)
+{
+  asm volatile ("lidt %0" : : "m" (grub_gdb_orig_idt_desc));
+}
+
+void
+grub_gdb_breakpoint (void)
+{
+  asm volatile ("int $3");
+}
diff --git a/grub-core/gdb/i386/machdep.S b/grub-core/gdb/i386/machdep.S
new file mode 100644
index 0000000..f96d2b9
--- /dev/null
+++ b/grub-core/gdb/i386/machdep.S
@@ -0,0 +1,245 @@
+/* machdep.S - machine dependent assembly routines for the GDB stub */
+/*
+ *  Copyright (C) 2006  Lubomir Kundrak
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/cpu/gdb.h>
+#include <grub/symbol.h>
+
+#define EC_PRESENT	1
+#define EC_ABSENT	0
+
+#define GRUB_GDB_STACKSIZE	40000
+
+#define SEP ,
+
+#ifdef __APPLE__
+	.zerofill __DATA, __bss, LOCAL(grub_gdb_stack_end), GRUB_GDB_STACKSIZE, 4
+	LOCAL(grub_gdb_stack) = LOCAL(grub_gdb_stack_end)
+#else
+/*
+ * The .data index for the address vector.
+ */
+
+#define	VECTOR		1
+
+	.bss
+	.space GRUB_GDB_STACKSIZE
+VARIABLE(grub_gdb_stack)
+#endif
+
+/*
+ * Supplemental macros for register saving/restoration
+ * on exception handler entry/leave.
+ */
+
+#ifdef __APPLE__
+.macro save32
+#define REG $0
+#define NDX $1
+#else
+.macro save32 reg ndx
+#define REG \reg
+#define NDX \ndx
+#endif
+	movl REG, EXT_C(grub_gdb_regs)+(NDX * 4)
+.endm
+
+#undef REG
+#undef NDX
+
+#ifdef __APPLE__
+.macro save16
+#define REG $0
+#define NDX $1
+#else
+.macro save16 reg ndx
+#define REG \reg
+#define NDX \ndx
+#endif
+	xorl %eax, %eax
+	movw REG, EXT_C(grub_gdb_regs)+(NDX * 4)
+	movw %ax, EXT_C(grub_gdb_regs)+(NDX * 4 + 2)
+	movl EXT_C(grub_gdb_regs)+(EAX * 4), %eax
+.endm
+
+#undef REG
+#undef NDX
+
+#ifdef __APPLE__
+.macro load32
+#define NDX $0
+#define REG $1
+#else
+.macro load32 ndx reg
+#define REG \reg
+#define NDX \ndx
+#endif
+	movl EXT_C(grub_gdb_regs)+(NDX * 4), REG
+.endm
+
+#undef REG
+#undef NDX
+
+#ifdef __APPLE__
+.macro load16
+#define NDX $0
+#define REG $1
+#else
+.macro load16 ndx reg 
+#define NDX \ndx
+#define REG \reg
+#endif
+	movw EXT_C(grub_gdb_regs)+(NDX * 4), REG
+.endm
+
+#undef REG
+#undef NDX
+
+.macro save_context
+	save32 %eax, EAX
+
+	save32 %ecx, ECX
+	save32 %edx, EDX
+	save32 %ebx, EBX
+	save32 %ebp, EBP
+	save32 %esi, ESI
+	save32 %edi, EDI
+
+	popl %ebx
+	save32 %ebx, EIP
+	popl %ebx
+	save32 %ebx, CS
+	popl %ebx
+	save32 %ebx, EFLAGS
+
+	save32 %esp, ESP
+
+	save16 %ds, DS
+	save16 %es, ES
+	save16 %fs, FS
+	save16 %gs, GS
+	save16 %ss, SS
+.endm
+
+.macro load_context
+	load16 SS, %ss
+	load32 ESP, %esp
+
+	load32 EBP, %ebp
+	load32 ESI, %esi
+	load32 EDI, %edi
+
+	load16 DS, %ds
+	load16 ES, %es
+	load16 FS, %fs
+	load16 GS, %gs
+
+	load32 EFLAGS, %eax
+	pushl %eax
+	load32 CS, %eax
+	pushl %eax
+	load32 EIP, %eax
+	pushl %eax
+
+	load32 EBX, %ebx
+	load32 EDX, %edx
+	load32 ECX, %ecx
+	load32 EAX, %eax
+.endm
+
+/*
+ * This macro creates handlers for a given range of exception numbers
+ * and adds their addresses to the grub_gdb_trapvec array.
+ */
+
+#ifdef __APPLE__
+.macro ent
+#define EC $0
+#define BEG $1
+#define END $2
+#else
+.macro ent ec beg end=0
+#define EC \ec
+#define BEG \beg
+#define END \end
+#endif
+
+	/*
+	 * Wrapper body itself.
+	 */
+
+	.text
+1:	
+	.if EC
+		add MACRO_DOLLAR(4), %esp
+	.endif
+
+	save_context
+#ifdef __APPLE__
+	mov	$LOCAL(grub_gdb_stack), %esp
+#else
+	mov	$EXT_C(grub_gdb_stack), %esp
+#endif
+	mov	$(BEG), %eax	/* trap number */
+	call	EXT_C(grub_gdb_trap)
+	load_context
+	iret
+
+	/*
+	 * Address entry in trapvec array.
+	 */
+
+#ifdef __APPLE__
+	.section __DATA, VECTOR
+#else
+       .data VECTOR
+#endif
+	.long 1b
+
+	/*
+	 * Next... (recursion).
+	 */
+
+	.if END-BEG > 0
+#ifdef __APPLE__
+		ent EC, (BEG+1), END
+#else
+		ent \ec "(\beg+1)" \end
+#endif
+	.endif
+.endm
+
+/*
+ * Here does the actual construction of the address array and handlers
+ * take place.
+ */
+#ifdef __APPLE__
+	.section __DATA, VECTOR
+#else
+       .data VECTOR
+#endif
+VARIABLE(grub_gdb_trapvec)
+	ent EC_ABSENT,	0, 7
+	ent EC_PRESENT,	8
+	ent EC_ABSENT,	9
+	ent EC_PRESENT,	10, 14
+	/*
+	 * You may have to split this further or as(1)
+	 * will complain about nesting being too deep.
+	 */
+	ent EC_ABSENT,	15, GRUB_GDB_LAST_TRAP
diff --git a/grub-core/gdb/i386/signal.c b/grub-core/gdb/i386/signal.c
new file mode 100644
index 0000000..1ac3bbd
--- /dev/null
+++ b/grub-core/gdb/i386/signal.c
@@ -0,0 +1,53 @@
+/* idt.c - routines for constructing IDT fot the GDB stub */
+/*
+ *  Copyright (C) 2006  Lubomir Kundrak
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/machine/memory.h>
+#include <grub/misc.h>
+#include <grub/cpu/gdb.h>
+#include <grub/gdb.h>
+
+/* Converting CPU trap number to UNIX signal number as
+   described in System V ABI i386 Processor Supplement, 3-25.  */
+unsigned int
+grub_gdb_trap2sig (int trap_no)
+{
+  const int signals[] = {
+    SIGFPE,			/* 0:   Divide error fault              */
+    SIGTRAP,			/* 1:   Single step trap fault          */
+    SIGABRT,			/* 2:   # Nonmaskable interrupt         */
+    SIGTRAP,			/* 3:   Breakpoint trap                 */
+    SIGSEGV,			/* 4:   Overflow trap                   */
+    SIGSEGV,			/* 5:   Bounds check fault              */
+    SIGILL,			/* 6:   Invalid opcode fault            */
+    SIGFPE,			/* 7:   No coprocessor fault            */
+    SIGABRT,			/* 8:   # Double fault abort            */
+    SIGSEGV,			/* 9:   Coprocessor overrun abort       */
+    SIGSEGV,			/* 10:  Invalid TSS fault               */
+    SIGSEGV,			/* 11:  Segment not present fault       */
+    SIGSEGV,			/* 12:  Stack exception fault           */
+    SIGSEGV,			/* 13:  General protection fault abort  */
+    SIGSEGV,			/* 14:  Page fault                      */
+    SIGABRT,			/* 15:  (reserved)                      */
+    SIGFPE,			/* 16:  Coprocessor error fault         */
+    SIGUSR1			/* other                                */
+  };
+
+  return signals[trap_no < 17 ? trap_no : 17];
+}
+