some support for amd64

6 files changed, 252 insertions, 0 deletions

diff --git a/usr.bin/pmdb/arch/amd64/Makefile.inc b/usr.bin/pmdb/arch/amd64/Makefile.inc
new file mode 100644
index 00000000000..f08e807d82d
--- /dev/null
+++ b/usr.bin/pmdb/arch/amd64/Makefile.inc
@@ -0,0 +1,3 @@
+# $OpenBSD: Makefile.inc,v 1.1 2004/01/29 12:44:40 mickey Exp $
+
+SRCS+=	x86_64.c
diff --git a/usr.bin/pmdb/arch/amd64/pmdb_machdep.h b/usr.bin/pmdb/arch/amd64/pmdb_machdep.h
new file mode 100644
index 00000000000..48c77bda09a
--- /dev/null
+++ b/usr.bin/pmdb/arch/amd64/pmdb_machdep.h
@@ -0,0 +1,29 @@
+/*	$OpenBSD: pmdb_machdep.h,v 1.1 2004/01/29 12:44:40 mickey Exp $	*/
+/*
+ * Copyright (c) 2002 Artur Grabowski <art@openbsd.org>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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. 
+ */
+
+#define BREAKPOINT		{ 0xcc }
+#define BREAKPOINT_LEN		1
+#define BREAKPOINT_DECR_PC	1
diff --git a/usr.bin/pmdb/arch/amd64/x86_64.c b/usr.bin/pmdb/arch/amd64/x86_64.c
new file mode 100644
index 00000000000..2cd2d5c3966
--- /dev/null
+++ b/usr.bin/pmdb/arch/amd64/x86_64.c
@@ -0,0 +1,94 @@
+/*	$OpenBSD: x86_64.c,v 1.1 2004/01/29 12:44:40 mickey Exp $	*/
+
+/*
+ * Copyright (c) 2002 Federico Schwindt <fgsch@openbsd.org>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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/param.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+#include <machine/frame.h>
+#include <string.h>
+#include "pmdb.h"
+
+/* 
+ * No frame for x86?
+ */
+struct frame {
+	int fp; 
+	int pc;
+};
+
+static const char *md_reg_names[] = {
+	"%rdi", "%rsi", "%rdx", "%rcx", "%r8", "%r9", "%r10", "%r11",
+	"%r12", "%r13", "%r14", "%r15", "%rbp", "%rbx", "%rax", "%rsp",
+	"%rip", "%rflags", "%cs", "%ss", "%ds", "%es", "%fs", "%gs",
+};
+
+struct md_def md_def = { md_reg_names, 16, 8 };
+
+void
+md_def_init(void)
+{
+	/* no need to do anything */
+}
+
+int
+md_getframe(struct pstate *ps, int frame, struct md_frame *fram)
+{
+	struct frame fr;
+	struct reg r;
+	int count;
+
+	if (process_getregs(ps, &r) != 0)
+		return (-1);
+
+	fr.fp = r.r_rbp;
+	fr.pc = r.r_rip;
+	for (count = 0; count < frame; count++) {
+		if (process_read(ps, fr.fp, &fr, sizeof(fr)) < 0)
+			return (-1);
+
+		if (fr.pc < 0x1000)
+			return (-1);
+	}
+
+	fram->pc = fr.pc;
+	fram->fp = fr.fp;
+
+	return (0);
+}
+
+int
+md_getregs(struct pstate *ps, reg *regs)
+{
+	struct reg r;
+
+	if (process_getregs(ps, &r) != 0)
+		return (-1);
+
+	memcpy(regs, &r, sizeof(r));
+
+	return (0);
+}
diff --git a/usr.bin/pmdb/arch/x86_64/Makefile.inc b/usr.bin/pmdb/arch/x86_64/Makefile.inc
new file mode 100644
index 00000000000..f08e807d82d
--- /dev/null
+++ b/usr.bin/pmdb/arch/x86_64/Makefile.inc
@@ -0,0 +1,3 @@
+# $OpenBSD: Makefile.inc,v 1.1 2004/01/29 12:44:40 mickey Exp $
+
+SRCS+=	x86_64.c
diff --git a/usr.bin/pmdb/arch/x86_64/pmdb_machdep.h b/usr.bin/pmdb/arch/x86_64/pmdb_machdep.h
new file mode 100644
index 00000000000..48c77bda09a
--- /dev/null
+++ b/usr.bin/pmdb/arch/x86_64/pmdb_machdep.h
@@ -0,0 +1,29 @@
+/*	$OpenBSD: pmdb_machdep.h,v 1.1 2004/01/29 12:44:40 mickey Exp $	*/
+/*
+ * Copyright (c) 2002 Artur Grabowski <art@openbsd.org>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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. 
+ */
+
+#define BREAKPOINT		{ 0xcc }
+#define BREAKPOINT_LEN		1
+#define BREAKPOINT_DECR_PC	1
diff --git a/usr.bin/pmdb/arch/x86_64/x86_64.c b/usr.bin/pmdb/arch/x86_64/x86_64.c
new file mode 100644
index 00000000000..2cd2d5c3966
--- /dev/null
+++ b/usr.bin/pmdb/arch/x86_64/x86_64.c
@@ -0,0 +1,94 @@
+/*	$OpenBSD: x86_64.c,v 1.1 2004/01/29 12:44:40 mickey Exp $	*/
+
+/*
+ * Copyright (c) 2002 Federico Schwindt <fgsch@openbsd.org>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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/param.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+#include <machine/frame.h>
+#include <string.h>
+#include "pmdb.h"
+
+/* 
+ * No frame for x86?
+ */
+struct frame {
+	int fp; 
+	int pc;
+};
+
+static const char *md_reg_names[] = {
+	"%rdi", "%rsi", "%rdx", "%rcx", "%r8", "%r9", "%r10", "%r11",
+	"%r12", "%r13", "%r14", "%r15", "%rbp", "%rbx", "%rax", "%rsp",
+	"%rip", "%rflags", "%cs", "%ss", "%ds", "%es", "%fs", "%gs",
+};
+
+struct md_def md_def = { md_reg_names, 16, 8 };
+
+void
+md_def_init(void)
+{
+	/* no need to do anything */
+}
+
+int
+md_getframe(struct pstate *ps, int frame, struct md_frame *fram)
+{
+	struct frame fr;
+	struct reg r;
+	int count;
+
+	if (process_getregs(ps, &r) != 0)
+		return (-1);
+
+	fr.fp = r.r_rbp;
+	fr.pc = r.r_rip;
+	for (count = 0; count < frame; count++) {
+		if (process_read(ps, fr.fp, &fr, sizeof(fr)) < 0)
+			return (-1);
+
+		if (fr.pc < 0x1000)
+			return (-1);
+	}
+
+	fram->pc = fr.pc;
+	fram->fp = fr.fp;
+
+	return (0);
+}
+
+int
+md_getregs(struct pstate *ps, reg *regs)
+{
+	struct reg r;
+
+	if (process_getregs(ps, &r) != 0)
+		return (-1);
+
+	memcpy(regs, &r, sizeof(r));
+
+	return (0);
+}