PERFORCE change 48882 for review

[Juli Mallett]

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

Change 48882 by jmallett at jmallett_oingo on 2004/03/13 00:46:05

	Try two ways of dealing with an interrupty world, neither
	perfect.  One is to not rely on k0 (err, k1?) staying the
	same across the long call to trap().  One is to twiddle IE.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/exception.S#21 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#21 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/mips/exception.S#20 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#21 $
  */
 
 #include "opt_ddb.h"
@@ -112,6 +112,11 @@
 	move	k1, sp
 1:
 
+	mfc0	t0, MIPS_COP_0_STATUS
+	li	t1, ~MIPS_SR_IE
+	and	t0, t1
+	mtc0	t0, MIPS_COP_0_STATUS
+
 	/*
 	 * A generic exception may result in DDB being invoked.  If we
 	 * are using the kernel debugger, then set up is auxillary
@@ -133,6 +138,7 @@
 	jal	trap
 	move	a0, k1
 
+	move	k1, sp
 	jal	exception_restore_registers
 	nop
 	daddu	sp, sp, TF_SIZE