From owner-p4-projects@FreeBSD.ORG Fri May 30 13:28:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E02137B404; Fri, 30 May 2003 13:28:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E61A137B401 for ; Fri, 30 May 2003 13:28:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7007E43FA3 for ; Fri, 30 May 2003 13:28:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4UKSA0U068624 for ; Fri, 30 May 2003 13:28:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4UKS9pm068621 for perforce@freebsd.org; Fri, 30 May 2003 13:28:09 -0700 (PDT) Date: Fri, 30 May 2003 13:28:09 -0700 (PDT) Message-Id: <200305302028.h4UKS9pm068621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2003 20:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=32117 Change 32117 by jmallett@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 #include #include +#include #include #include @@ -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);