From owner-p4-projects@FreeBSD.ORG  Tue Mar 20 16:25:50 2007
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 EF69F16A404; Tue, 20 Mar 2007 16:25:49 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AFE0D16A400
	for <perforce@FreeBSD.org>; Tue, 20 Mar 2007 16:25:49 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A009013C484
	for <perforce@FreeBSD.org>; Tue, 20 Mar 2007 16:25:49 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2KGPnqi003224
	for <perforce@FreeBSD.org>; Tue, 20 Mar 2007 16:25:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2KGPnnV003221
	for perforce@freebsd.org; Tue, 20 Mar 2007 16:25:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 20 Mar 2007 16:25:49 GMT
Message-Id: <200703201625.l2KGPnnV003221@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 116212 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, 20 Mar 2007 16:25:50 -0000

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

Change 116212 by gonzo@gonzo_jeeves on 2007/03/20 16:24:51

	o Implement TRAPF_USERMODE, TRAPF_PC macroses.
	o Implement cpu_getstack and cpu_setstack macroses.

Affected files ...

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

Differences ...

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

@@ -36,6 +36,8 @@
 #ifndef _MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_
 
+#include <machine/frame.h>
+
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code
@@ -44,28 +46,13 @@
 
 #define	cpu_exec(p)	/* nothing */
 #define	cpu_swapin(p)	/* nothing */
-/*
- * XXXMIPS: Change those once we'll bring header files from NetBSD.
- */
-#if 0
-#define	cpu_getstack(td)		((td)->td_frame->tf_rsp)
-#define	cpu_setstack(td, ap)		((td)->td_frame->tf_rsp = (ap))
-#define	cpu_spinwait()			/* ia32_pause() */
-#endif
-#define cpu_getstack(td)		(0)
-#define cpu_setstack(td, ap)		(0)
-#define cpu_spinwait()
+#define	cpu_getstack(td)		((td)->td_frame->tf_regs[TF_SP])
+#define	cpu_setstack(td, ap)		((td)->td_frame->tf_regs[TF_SP] = (ap))
+#define cpu_spinwait() /* XXXMIPS */
 
-/*
- * XXXMIPS: Change those once we'll bring header files from NetBSD.
- */
-#if 0
 #define	TRAPF_USERMODE(framep) \
-	(ISPL((framep)->tf_cs) == SEL_UPL)
-#define	TRAPF_PC(framep)	((framep)->tf_rip)
-#endif
-#define	TRAPF_USERMODE(framep)	(0)
-#define	TRAPF_PC(framep)	(0)
+	(((framep)->tf_regs[TF_SR] & MIPS_SR_KSU_USER) != 0)
+#define	TRAPF_PC(framep)	((framep)->tf_regs[TF_EPC])
 
 /*
  * CTL_MACHDEP definitions.