From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 22:07: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 2ED2F16A4E1; Thu,  6 Jul 2006 22:07: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 BC9D216A4DF
	for <perforce@FreeBSD.org>; Thu,  6 Jul 2006 22:07:22 +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 8CC2B43D46
	for <perforce@FreeBSD.org>; Thu,  6 Jul 2006 22:07:22 +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 k66M7MqP053624
	for <perforce@FreeBSD.org>; Thu, 6 Jul 2006 22:07:22 GMT
	(envelope-from wkoszek@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66M7MOO053621
	for perforce@freebsd.org; Thu, 6 Jul 2006 22:07:22 GMT
	(envelope-from wkoszek@FreeBSD.org)
Date: Thu, 6 Jul 2006 22:07:22 GMT
Message-Id: <200607062207.k66M7MOO053621@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 100806 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: Thu, 06 Jul 2006 22:07:23 -0000

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

Change 100806 by wkoszek@wkoszek_laptop on 2006/07/06 22:07:06

	Disable intr_enable() and intr_disable() for now. Let other MIPS
	hackers to play with MIPS assembler.
	
	XXX: Remember to put files/functions names here, since otherwise it
	makes commit logs completely useless while looking at list of
	submits.
	
	Changed files: cpufunc.h

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/cpufunc.h#5 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/cpufunc.h#5 (text+ko) ====

@@ -42,32 +42,39 @@
 static __inline register_t
 intr_disable(void)
 {
-	register_t ret, tmp;
-	
+	register_t ret;
+#if 0
+	register_t tmp;
+
 	__asm __volatile("mfc0	%0, $12\n" /* MIPS_COP_0_STATUS */
-	 		 "and	%1, $%0, ~1\n" /* MIPS_SR_INT_IE */
+	 		 "and	%1, %0, $~1\n" /* MIPS_SR_INT_IE */
 			 "mtc0	%1, $12\n" /* MIPS_COP_0_STATUS */
 			 : "=r" (ret), "=r" (tmp));
+#endif
 	return (ret);
 }
 
 static __inline void
 intr_enable(void)
 {
+#if 0
 	register_t tmp;
 
 	__asm __volatile("mfc %0, $12\n" /* MIPS_COP_0_STATUS */
-	    		 "and %0, %0, 1\n" /* MIPS_SR_INT_IE */
+	    		 "or  %0, %0, $1\n" /* MIPS_SR_INT_IE */
 			 "mtc0 %0, $12\n" /* MIPS_COP_0_STATUS */
 			 : "=r" (tmp));
+#endif
 }
 
 static __inline void
 intr_restore(register_t flag)
 {
 
+#if 0
 	__asm __volatile("mtc0 %0, $12\n" /* MIPS_COP_0_STATUS */
 	   : : "r" (flag));
+#endif
 }
 
 /*