From owner-p4-projects@FreeBSD.ORG Fri Feb 29 21:34:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5762C1065672; Fri, 29 Feb 2008 21:34:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F42081065682 for ; Fri, 29 Feb 2008 21:34:14 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E56248FC1F for ; Fri, 29 Feb 2008 21:34:14 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TLYEhY009300 for ; Fri, 29 Feb 2008 21:34:14 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TLYEeo009298 for perforce@freebsd.org; Fri, 29 Feb 2008 21:34:14 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 21:34:14 GMT Message-Id: <200802292134.m1TLYEeo009298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 21:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=136520 Change 136520 by rrs@rrs-mips2-jnpr on 2008/02/29 21:33:45 Assure when we go to user mode the SX/UX and KX bits are off. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#17 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#17 (text+ko) ==== @@ -512,8 +512,6 @@ mtlo t0 mthi t1 RESTORE_U_PCB_REG(a0, PC, k1) - .set noat - RESTORE_U_PCB_REG(AT, AST, k1) RESTORE_U_PCB_REG(v0, V0, k1) _MTC0 a0, COP_0_EXC_PC # set return address RESTORE_U_PCB_REG(v1, V1, k1) @@ -544,6 +542,13 @@ RESTORE_U_PCB_REG(k0, SR, k1) RESTORE_U_PCB_REG(s8, S8, k1) RESTORE_U_PCB_REG(ra, RA, k1) +#ifdef TARGET_OCTEON + and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX) + or k0, k0, MIPS_SR_INT_IE +#endif + .set noat + RESTORE_U_PCB_REG(AT, AST, k1) + /* * The restoration of the user SR must be done only after * k1 is no longer needed. Otherwise, k1 will get clobbered after @@ -630,6 +635,7 @@ GET_CPU_PCPU(k1) lw k1, PC_CURPCB(k1) SAVE_U_PCB_REG(AT, AST, k1) + .set at SAVE_U_PCB_REG(v0, V0, k1) SAVE_U_PCB_REG(v1, V1, k1) SAVE_U_PCB_REG(a0, A0, k1) @@ -676,7 +682,6 @@ la gp, _C_LABEL(_gp) # switch to kernel GP # Turn off fpu, disable interrupts, set kernel mode kernel mode, clear exception level. - .set at and t0, a0, ~(SR_COP_1_BIT | SR_EXL | SR_INT_ENAB | SR_KSU_MASK) mtc0 t0, COP_0_STATUS_REG ITLBNOPFIX @@ -738,9 +743,6 @@ */ move k1, a1 - .set noat - - RESTORE_U_PCB_REG(AT, AST, k1) RESTORE_U_PCB_REG(v0, V0, k1) RESTORE_U_PCB_REG(v1, V1, k1) RESTORE_U_PCB_REG(a0, A0, k1) @@ -761,6 +763,12 @@ RESTORE_U_PCB_REG(k0, SR, k1) RESTORE_U_PCB_REG(sp, SP, k1) RESTORE_U_PCB_REG(ra, RA, k1) +#ifdef TARGET_OCTEON + and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX) + or k0, k0, MIPS_SR_INT_IE +#endif + .set noat + RESTORE_U_PCB_REG(AT, AST, k1) /* * The restoration of the user SR must be done only after