From owner-svn-src-all@FreeBSD.ORG  Mon Jul 12 10:22:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 469691065673;
	Mon, 12 Jul 2010 10:22:59 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C8078FC15;
	Mon, 12 Jul 2010 10:22:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6CAMxd1067970;
	Mon, 12 Jul 2010 10:22:59 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6CAMwXx067967;
	Mon, 12 Jul 2010 10:22:58 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201007121022.o6CAMwXx067967@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Mon, 12 Jul 2010 10:22:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209935 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jul 2010 10:22:59 -0000

Author: jchandra
Date: Mon Jul 12 10:22:58 2010
New Revision: 209935
URL: http://svn.freebsd.org/changeset/base/209935

Log:
  Merge jmallett@'s n64 work into HEAD
  
  Initial set of ddb changes to support n64
  
  Reviewed by:	imp
  Obtained from:	jmallett (http://svn.freebsd.org/base/user/jmallett/octeon)

Modified:
  head/sys/mips/mips/db_interface.c
  head/sys/mips/mips/db_trace.c

Modified: head/sys/mips/mips/db_interface.c
==============================================================================
--- head/sys/mips/mips/db_interface.c	Mon Jul 12 10:18:10 2010	(r209934)
+++ head/sys/mips/mips/db_interface.c	Mon Jul 12 10:22:58 2010	(r209935)
@@ -115,12 +115,12 @@ int (*do_db_log_stack_trace_cmd)(char *)
 static int
 db_frame(struct db_variable *vp, db_expr_t *valuep, int op)
 {
-	int *reg;
+	register_t *reg;
 
 	if (kdb_frame == NULL)
 		return (0);
 
-	reg = (int *)((uintptr_t)kdb_frame + (db_expr_t)vp->valuep);
+	reg = (register_t *)((uintptr_t)kdb_frame + (size_t)(intptr_t)vp->valuep);
 	if (op == DB_VAR_GET)
 		*valuep = *reg;
 	else

Modified: head/sys/mips/mips/db_trace.c
==============================================================================
--- head/sys/mips/mips/db_trace.c	Mon Jul 12 10:18:10 2010	(r209934)
+++ head/sys/mips/mips/db_trace.c	Mon Jul 12 10:22:58 2010	(r209935)
@@ -140,7 +140,7 @@ loop:
 	}
 	/* check for bad SP: could foul up next frame */
 	/*XXX MIPS64 bad: this hard-coded SP is lame */
-	if (sp & 3 || sp < 0x80000000) {
+	if (sp & 3 || (uintptr_t)sp < 0x80000000u) {
 		(*printfn) ("SP 0x%x: not in kernel\n", sp);
 		ra = 0;
 		subr = 0;
@@ -377,7 +377,7 @@ db_md_set_watchpoint(db_expr_t addr, db_
 
 
 int
-db_md_clr_watchpoint( db_expr_t addr, db_expr_t size)
+db_md_clr_watchpoint(db_expr_t addr, db_expr_t size)
 {
 
 	return(0);
@@ -403,8 +403,8 @@ db_trace_thread(struct thread *thr, int 
 	struct pcb *ctx;
 
 	if (thr == curthread) {
-		sp = (register_t)__builtin_frame_address(0);
-		ra = (register_t)__builtin_return_address(0);
+		sp = (register_t)(intptr_t)__builtin_frame_address(0);
+		ra = (register_t)(intptr_t)__builtin_return_address(0);
 
         	__asm __volatile(
 			"jal 99f\n"