From owner-p4-projects@FreeBSD.ORG  Fri Jul  7 12:30:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C147C16A4E2; Fri,  7 Jul 2006 12:30:23 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 9D38916A4DD
	for <perforce@FreeBSD.org>; Fri,  7 Jul 2006 12:30:23 +0000 (UTC)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3967A43D60
	for <perforce@FreeBSD.org>; Fri,  7 Jul 2006 12:30:23 +0000 (GMT)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k67CUMTH005200
	for <perforce@FreeBSD.org>; Fri, 7 Jul 2006 12:30:23 GMT
	(envelope-from wkoszek@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67CUM4l005196
	for perforce@freebsd.org; Fri, 7 Jul 2006 12:30:22 GMT
	(envelope-from wkoszek@FreeBSD.org)
Date: Fri, 7 Jul 2006 12:30:22 GMT
Message-Id: <200607071230.k67CUM4l005196@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wkoszek@FreeBSD.org using -f
From: "Wojciech A. Koszek" <wkoszek@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 100871 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: Fri, 07 Jul 2006 12:30:24 -0000

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

Change 100871 by wkoszek@wkoszek_laptop on 2006/07/07 12:29:44

	Fix branch_taken() as it's needed by MI code (db_interface.c stuff).
	Note we have no 'regs' anymore as the function's arguments.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/db_interface.c#4 edit

Differences ...

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

@@ -608,18 +608,21 @@
  * Return the next pc if the given branch is taken.
  * MachEmulateBranch() runs analysis for branch delay slot.
  */
-#if 0
 db_addr_t
-branch_taken(int inst, db_addr_t pc, db_regs_t *regs)
+branch_taken(int inst, db_addr_t pc)
 {
 	db_addr_t ra;
 	unsigned long fpucsr;
 
+	ra = (db_addr_t) 0;
+	fpucsr = 0;
+#if 0
 	fpucsr = curthread ? PCB_FSR(curthread->td_pcb) : 0;
 	ra = MachEmulateBranch((struct frame *)regs, pc, fpucsr, 0);
 	return ra;
+#endif
+	return ((db_addr_t) 0);
 }
-#endif
 
 /*
  * Return the next pc of an arbitrary instruction.