PERFORCE change 150076 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=150076

Change 150076 by imp at imp_paco-paco on 2008/09/19 03:20:43

	merge kgdb support from svn.

Affected files ...

.. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#3 edit

Differences ...

==== //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#3 (text+ko) ====

@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2006 Bruce M. Simpson
+ * Copyright (c) 2007 Juniper Networks, Inc.
+ * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,12 @@
  * 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.
+ *
+ * from: src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c,v 1.2.2.1 2005/09/15 05:32:10 marcel
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_mips.c,v 1.3 2008/06/18 14:23:28 jhb Exp $");
+__FBSDID("$FreeBSD: head/gnu/usr.bin/gdb/kgdb/trgt_mips.c 179859 2008-06-18 14:23:28Z jhb $");
 
 #include <sys/types.h>
 #include <machine/asm.h>
@@ -45,11 +48,11 @@
 
 #include "kgdb.h"
 
-/* XXX: This file is currently full of stubs. */
-
 void
 kgdb_trgt_fetch_registers(int regno __unused)
 {
+	struct kthr *kt;
+	struct pcb pcb;
 
 	kt = kgdb_thr_lookup_tid(ptid_get_pid(inferior_ptid));
 	if (kt == NULL)
@@ -87,46 +90,124 @@
 struct kgdb_frame_cache {
 	CORE_ADDR	pc;
 	CORE_ADDR	sp;
-	CORE_ADDR	fp;
+};
+
+static int kgdb_trgt_frame_offset[] = {
+	offsetof(struct trapframe, zero),
+	offsetof(struct trapframe, ast),
+	offsetof(struct trapframe, v0),
+	offsetof(struct trapframe, v1),
+	offsetof(struct trapframe, a0),
+	offsetof(struct trapframe, a1),
+	offsetof(struct trapframe, a2),
+	offsetof(struct trapframe, a3),
+	offsetof(struct trapframe, t0),
+	offsetof(struct trapframe, t1),
+	offsetof(struct trapframe, t2),
+	offsetof(struct trapframe, t3),
+	offsetof(struct trapframe, t4),
+	offsetof(struct trapframe, t5),
+	offsetof(struct trapframe, t6),
+	offsetof(struct trapframe, t7),
+	offsetof(struct trapframe, s0),
+	offsetof(struct trapframe, s1),
+	offsetof(struct trapframe, s2),
+	offsetof(struct trapframe, s3),
+	offsetof(struct trapframe, s4),
+	offsetof(struct trapframe, s5),
+	offsetof(struct trapframe, s6),
+	offsetof(struct trapframe, s7),
+	offsetof(struct trapframe, t8),
+	offsetof(struct trapframe, t9),
+	offsetof(struct trapframe, k0),
+	offsetof(struct trapframe, k1),
+	offsetof(struct trapframe, gp),
+	offsetof(struct trapframe, sp),
+	offsetof(struct trapframe, s8),
+	offsetof(struct trapframe, ra),
 };
 
-#ifdef notyet
 static struct kgdb_frame_cache *
 kgdb_trgt_frame_cache(struct frame_info *next_frame __unused, void **this_cache __unused)
 {
+	char buf[MAX_REGISTER_SIZE];
+	struct kgdb_frame_cache *cache;
 
-	fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
-	return (NULL);
+	cache = *this_cache;
+	if (cache == NULL) {
+		cache = FRAME_OBSTACK_ZALLOC(struct kgdb_frame_cache);
+		*this_cache = cache;
+		cache->pc = frame_func_unwind(next_frame);
+		frame_unwind_register(next_frame, SP_REGNUM, buf);
+		cache->sp = extract_unsigned_integer(buf,
+		    register_size(current_gdbarch, SP_REGNUM));
+	}
+	return (cache);
 }
-#endif
 
 static void
 kgdb_trgt_trapframe_this_id(struct frame_info *next_frame, void **this_cache,
     struct frame_id *this_id)
 {
+	struct kgdb_frame_cache *cache;
 
-	fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
+	cache = kgdb_trgt_frame_cache(next_frame, this_cache);
+	*this_id = frame_id_build(cache->sp, cache->pc);
 }
 
 static void
 kgdb_trgt_trapframe_prev_register(struct frame_info *next_frame __unused,
-    void **this_cache __unused, int regnum __unused, int *optimizedp __unused, enum lval_type *lvalp __unused,
-    CORE_ADDR *addrp __unused, int *realnump __unused, void *valuep __unused)
+    void **this_cache __unused, int regnum __unused, int *optimizedp __unused,
+    enum lval_type *lvalp __unused, CORE_ADDR *addrp __unused,
+    int *realnump __unused, void *valuep __unused)
 {
+	char dummy_valuep[MAX_REGISTER_SIZE];
+	struct kgdb_frame_cache *cache;
+	int ofs, regsz;
+
+	regsz = register_size(current_gdbarch, regnum);
+
+	if (valuep == NULL)
+		valuep = dummy_valuep;
+	memset(valuep, 0, regsz);
+	*optimizedp = 0;
+	*addrp = 0;
+	*lvalp = not_lval;
+	*realnump = -1;
 
-	fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
+	ofs = (regnum >= 0 && regnum <= MIPS_RA_REGNUM) ?
+	    kgdb_trgt_frame_offset[regnum] : -1;
+	if (ofs == -1)
+		return;
+
+	cache = kgdb_trgt_frame_cache(next_frame, this_cache);
+	*addrp = cache->sp + ofs * 8;
+	*lvalp = lval_memory;
+	target_read_memory(*addrp, valuep, regsz);
 }
 
 static const struct frame_unwind kgdb_trgt_trapframe_unwind = {
-        UNKNOWN_FRAME,
-        &kgdb_trgt_trapframe_this_id,
-        &kgdb_trgt_trapframe_prev_register
+	UNKNOWN_FRAME,
+	&kgdb_trgt_trapframe_this_id,
+	&kgdb_trgt_trapframe_prev_register
 };
 
 const struct frame_unwind *
 kgdb_trgt_trapframe_sniffer(struct frame_info *next_frame __unused)
 {
+	char *pname;
+	CORE_ADDR pc;
 
-	fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
+	pc = frame_pc_unwind(next_frame);
+	pname = NULL;
+	find_pc_partial_function(pc, &pname, NULL, NULL);
+	if (pname == NULL)
+		return (NULL);
+	if ((strcmp(pname, "MipsKernIntr") == 0) ||
+	    (strcmp(pname, "MipsKernGenException") == 0) ||
+	    (strcmp(pname, "MipsUserIntr") == 0) ||
+	    (strcmp(pname, "MipsUserGenException") == 0))
+		return (&kgdb_trgt_trapframe_unwind);
+	/* printf("%s: %llx =%s\n", __func__, pc, pname); */
 	return (NULL);
 }