From owner-p4-projects@FreeBSD.ORG Fri May 30 20:10:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 151C537B405; Fri, 30 May 2003 20:10:36 -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 A9D2D37B401 for ; Fri, 30 May 2003 20:10:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F6C043FAF for ; Fri, 30 May 2003 20:10:35 -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 h4V3AY0U097116 for ; Fri, 30 May 2003 20:10:34 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4V3AYsl097113 for perforce@freebsd.org; Fri, 30 May 2003 20:10:34 -0700 (PDT) Date: Fri, 30 May 2003 20:10:34 -0700 (PDT) Message-Id: <200305310310.h4V3AYsl097113@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 32146 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: Sat, 31 May 2003 03:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=32146 Change 32146 by jmallett@jmallett_dalek on 2003/05/30 20:09:51 Use trapframe sanely. Affected files ... .. //depot/projects/mips/sys/mips/include/db_machdep.h#5 edit .. //depot/projects/mips/sys/mips/mips/db_interface.c#4 edit .. //depot/projects/mips/sys/mips/mips/db_trace.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/db_machdep.h#5 (text+ko) ==== @@ -81,7 +81,7 @@ * Entrypoints to DDB for kernel, keyboard drivers, init hook */ void kdb_kbd_trap(db_regs_t *); -void db_set_ddb_regs(int type, register_t *); +void db_set_ddb_regs(int type, struct trapframe *); int kdb_trap(int type, struct trapframe *); #define DB_SMALL_VALUE_MAX (0x7fffffff) ==== //depot/projects/mips/sys/mips/mips/db_interface.c#4 (text+ko) ==== @@ -190,7 +190,7 @@ #endif /* !KGDB */ void -db_set_ddb_regs(int type, register_t *tfp) +db_set_ddb_regs(int type, struct trapframe *tfp) { struct frame *f = (struct frame *)&ddb_regs; @@ -200,28 +200,28 @@ *f = *(struct frame *)curthread->td_md.md_regs; else { /* Synthetic full scale register context when trap happens */ - f->f_regs[AST] = tfp[TF_AST]; - f->f_regs[V0] = tfp[TF_V0]; - f->f_regs[V1] = tfp[TF_V1]; - f->f_regs[A0] = tfp[TF_A0]; - f->f_regs[A1] = tfp[TF_A1]; - f->f_regs[A2] = tfp[TF_A2]; - f->f_regs[A3] = tfp[TF_A3]; - f->f_regs[T0] = tfp[TF_T0]; - f->f_regs[T1] = tfp[TF_T1]; - f->f_regs[T2] = tfp[TF_T2]; - f->f_regs[T3] = tfp[TF_T3]; - f->f_regs[TA0] = tfp[TF_TA0]; - f->f_regs[TA1] = tfp[TF_TA1]; - f->f_regs[TA2] = tfp[TF_TA2]; - f->f_regs[TA3] = tfp[TF_TA3]; - f->f_regs[T8] = tfp[TF_T8]; - f->f_regs[T9] = tfp[TF_T9]; - f->f_regs[RA] = tfp[TF_RA]; - f->f_regs[SR] = tfp[TF_SR]; - f->f_regs[MULLO] = tfp[TF_MULLO]; - f->f_regs[MULHI] = tfp[TF_MULHI]; - f->f_regs[PC] = tfp[TF_EPC]; + f->f_regs[AST] = tfp->tf_regs[TF_AST]; + f->f_regs[V0] = tfp->tf_regs[TF_V0]; + f->f_regs[V1] = tfp->tf_regs[TF_V1]; + f->f_regs[A0] = tfp->tf_regs[TF_A0]; + f->f_regs[A1] = tfp->tf_regs[TF_A1]; + f->f_regs[A2] = tfp->tf_regs[TF_A2]; + f->f_regs[A3] = tfp->tf_regs[TF_A3]; + f->f_regs[T0] = tfp->tf_regs[TF_T0]; + f->f_regs[T1] = tfp->tf_regs[TF_T1]; + f->f_regs[T2] = tfp->tf_regs[TF_T2]; + f->f_regs[T3] = tfp->tf_regs[TF_T3]; + f->f_regs[TA0] = tfp->tf_regs[TF_TA0]; + f->f_regs[TA1] = tfp->tf_regs[TF_TA1]; + f->f_regs[TA2] = tfp->tf_regs[TF_TA2]; + f->f_regs[TA3] = tfp->tf_regs[TF_TA3]; + f->f_regs[T8] = tfp->tf_regs[TF_T8]; + f->f_regs[T9] = tfp->tf_regs[TF_T9]; + f->f_regs[RA] = tfp->tf_regs[TF_RA]; + f->f_regs[SR] = tfp->tf_regs[TF_SR]; + f->f_regs[MULLO] = tfp->tf_regs[TF_MULLO]; + f->f_regs[MULHI] = tfp->tf_regs[TF_MULHI]; + f->f_regs[PC] = tfp->tf_regs[TF_EPC]; f->f_regs[S0] = kdbaux[0]; f->f_regs[S1] = kdbaux[1]; f->f_regs[S2] = kdbaux[2]; ==== //depot/projects/mips/sys/mips/mips/db_trace.c#3 (text+ko) ====