From owner-p4-projects@FreeBSD.ORG  Tue Dec 11 23:31:54 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D753F16A41A; Tue, 11 Dec 2007 23:31:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 60FDF16A417
	for <perforce@FreeBSD.org>; Tue, 11 Dec 2007 23:31:53 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DC7C13C43E
	for <perforce@FreeBSD.org>; Tue, 11 Dec 2007 23:31:53 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBBNVrAJ026185
	for <perforce@FreeBSD.org>; Tue, 11 Dec 2007 23:31:53 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBBNVr6X026180
	for perforce@freebsd.org; Tue, 11 Dec 2007 23:31:53 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 11 Dec 2007 23:31:53 GMT
Message-Id: <200712112331.lBBNVr6X026180@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 130651 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2007 23:31:54 -0000

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

Change 130651 by gonzo@gonzo_jeeves on 2007/12/11 23:31:33

	o Since gcc with -O does not bother to store ra on stack for
	    breakpoint() use initial RA value from thread PCB.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/db_trace.c#6 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/db_trace.c#6 (text+ko) ====

@@ -42,7 +42,8 @@
 #include <ddb/db_variables.h>
 #include <ddb/db_sym.h>
 
-void	db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t sp, db_expr_t count);
+void	db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t ra, db_expr_t sp, 
+		db_expr_t count);
 void	db_print_backtrace(void);
 
 struct db_variable db_regs[] = {
@@ -112,7 +113,8 @@
  * this implementation is good enough for practical use.
  */
 void
-db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t sp_addr, db_expr_t count)
+db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t ra_addr, db_expr_t sp_addr,
+    db_expr_t count)
 {
 	u_register_t sp, ra = 0, pc, i, stacksize, func;
 	short ra_stack_pos = 0;
@@ -123,7 +125,10 @@
 
 	sp = sp_addr;
 	pc = pc_addr;
+	ra = ra_addr;
 
+	ra -= 2 * sizeof(insn);
+
 	for (;;) {
 		func = 0;
 		stacksize = 0;
@@ -233,15 +238,15 @@
 int
 db_trace_thread(struct thread *thr, int count)
 {
-	u_register_t pc;
-	u_register_t sp;
+	u_register_t pc, ra, sp;
 	struct pcb *ctx;
 
 	ctx = kdb_thr_ctx(thr);
 	pc = ctx->pcb_regs[PCB_REG_PC];
 	sp = ctx->pcb_regs[PCB_REG_SP];
+	ra = ctx->pcb_regs[PCB_REG_RA];
 
-	db_stack_trace_cmd(pc, sp, -1);
+	db_stack_trace_cmd(pc, ra, sp, -1);
 	return (0);
 }