From owner-svn-src-head@FreeBSD.ORG  Wed Jul 14 00:52:30 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A2D51065673;
	Wed, 14 Jul 2010 00:52:30 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A0A38FC16;
	Wed, 14 Jul 2010 00:52:30 +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 o6E0qT3A006417;
	Wed, 14 Jul 2010 00:52:29 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6E0qTPS006415;
	Wed, 14 Jul 2010 00:52:29 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201007140052.o6E0qTPS006415@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 14 Jul 2010 00:52:29 +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: r210041 - head/sys/mips/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jul 2010 00:52:30 -0000

Author: imp
Date: Wed Jul 14 00:52:29 2010
New Revision: 210041
URL: http://svn.freebsd.org/changeset/base/210041

Log:
  Use cpuregs.h spellings over the cpu.h spellings.

Modified:
  head/sys/mips/include/db_machdep.h

Modified: head/sys/mips/include/db_machdep.h
==============================================================================
--- head/sys/mips/include/db_machdep.h	Wed Jul 14 00:48:53 2010	(r210040)
+++ head/sys/mips/include/db_machdep.h	Wed Jul 14 00:52:29 2010	(r210041)
@@ -55,7 +55,7 @@ typedef	register_t	db_expr_t;	/* express
 #define	SOFTWARE_SSTEP_EMUL	/* next_instr_address() emulates 100% */
 db_addr_t	next_instr_address(db_addr_t, boolean_t);
 #define	BKPT_SIZE			(4)
-#define	BKPT_SET(ins)			(BREAK_DDB)
+#define	BKPT_SET(ins)			(MIPS_BREAK_DDB)
 #define	DB_VALID_BREAKPOINT(addr)	(((addr) & 3) == 0)
 
 #define	IS_BREAKPOINT_TRAP(type, code)	((type) == T_BREAK)
@@ -65,7 +65,7 @@ db_addr_t	next_instr_address(db_addr_t, 
 #define	BKPT_SKIP					\
 	do {							\
 		if((db_get_value(kdb_frame->pc, sizeof(int), FALSE) &	\
-		    ~BREAK_VAL_MASK) == BREAK_INSTR) {			\
+		    ~MIPS_BREAK_VAL_MASK) == MIPS_BREAK_INSTR) {	\
 			kdb_frame->pc += BKPT_SIZE;			\
 			kdb_thrctx->pcb_regs.pc +=  BKPT_SIZE;		\
 		}							\