PERFORCE change 32117 for review

[Juli Mallett]

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

Change 32117 by jmallett at jmallett_dalek on 2003/05/30 13:27:50

	Use trapframes passed to us, etc.

Affected files ...

.. //depot/projects/mips/sys/mips/include/db_machdep.h#4 edit
.. //depot/projects/mips/sys/mips/mips/db_interface.c#2 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/db_machdep.h#4 (text+ko) ====

@@ -82,7 +82,7 @@
  */
 void 	kdb_kbd_trap(db_regs_t *);
 void 	db_set_ddb_regs(int type, register_t *);
-int 	kdb_trap(int type, register_t *);
+int 	kdb_trap(int type, struct trapframe *);
 
 #define	DB_SMALL_VALUE_MAX	(0x7fffffff)
 #define	DB_SMALL_VALUE_MIN	(-0x40001)

==== //depot/projects/mips/sys/mips/mips/db_interface.c#2 (text+ko) ====

@@ -39,6 +39,7 @@
 #include <machine/cache.h>
 #include <machine/pte.h>
 #include <machine/cpu.h>
+#include <machine/cpufunc.h>
 #include <machine/locore.h>
 #include <machine/mips_opcode.h>
 
@@ -95,7 +96,7 @@
 {
 
 	*(int*) addr = newval;
-	wbflush();
+	mips_wbflush();
 }
 
 static void
@@ -103,14 +104,14 @@
 {
 
 	*(short*) addr = newval;
-	wbflush();
+	mips_wbflush();
 }
 
 static void
 kdbpoke_1(db_addr_t addr, char newval)
 {
 	*(char*) addr = newval;
-	wbflush();
+	mips_wbflush();
 }
 
 #if 0 /* UNUSED */
@@ -130,7 +131,7 @@
 
 #ifndef KGDB
 int
-kdb_trap(int type, register_t /* struct trapframe */ *tfp)
+kdb_trap(int type, struct trapframe *tfp)
 {
 
 	struct frame *f = (struct frame *)&ddb_regs;
@@ -162,28 +163,7 @@
 		*(struct frame *)curthread->td_md.md_regs = *f;
 	else {
 		/* Synthetic full scale register context when trap happens */
-		tfp[TF_AST] = f->f_regs[AST];
-		tfp[TF_V0] = f->f_regs[V0];
-		tfp[TF_V1] = f->f_regs[V1];
-		tfp[TF_A0] = f->f_regs[A0];
-		tfp[TF_A1] = f->f_regs[A1];
-		tfp[TF_A2] = f->f_regs[A2];
-		tfp[TF_A3] = f->f_regs[A3];
-		tfp[TF_T0] = f->f_regs[T0];
-		tfp[TF_T1] = f->f_regs[T1];
-		tfp[TF_T2] = f->f_regs[T2];
-		tfp[TF_T3] = f->f_regs[T3];
-		tfp[TF_TA0] = f->f_regs[TA0];
-		tfp[TF_TA1] = f->f_regs[TA1];
-		tfp[TF_TA2] = f->f_regs[TA2];
-		tfp[TF_TA3] = f->f_regs[TA3];
-		tfp[TF_T8] = f->f_regs[T8];
-		tfp[TF_T9] = f->f_regs[T9];
-		tfp[TF_RA] = f->f_regs[RA];
-		tfp[TF_SR] = f->f_regs[SR];
-		tfp[TF_MULLO] = f->f_regs[MULLO];
-		tfp[TF_MULHI] = f->f_regs[MULHI];
-		tfp[TF_EPC] = f->f_regs[PC];
+#if 0
 		kdbaux[0] = f->f_regs[S0];
 		kdbaux[1] = f->f_regs[S1];
 		kdbaux[2] = f->f_regs[S2];
@@ -195,6 +175,7 @@
 		kdbaux[8] = f->f_regs[SP];
 		kdbaux[9] = f->f_regs[S8];
 		kdbaux[10] = f->f_regs[GP];
+#endif
 	}
 
 	return (1);