[xtensa-cvscommit] linux/arch/xtensa/kernel handlers.S,1.12,1.13 vectors.S,1.6,1.7 sys.S,1.2,1.3
Brought to you by:
zankel
|
From: <joe...@us...> - 2003-02-13 00:17:24
|
Update of /cvsroot/xtensa/linux/arch/xtensa/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv2110/arch/xtensa/kernel Modified Files: handlers.S vectors.S sys.S Log Message: Replace "program mode / stacked mode" terminology with "user mode / kernel mode" terminology. Mostly comment updates. Macro replacements are synonyms. Index: handlers.S =================================================================== RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/handlers.S,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** handlers.S 11 Feb 2003 07:24:35 -0000 1.12 --- handlers.S 13 Feb 2003 00:17:21 -0000 1.13 *************** *** 5,14 **** * exceptions (by cause) to C handlers. * ! * There are different default handlers for user (program), ! * kernel (stacked), and double exception vectors. * ! * This file is subject to the terms and conditions of the GNU General Public ! * License. See the file "COPYING" in the main directory of this archive ! * for more details. * * Copyright (C) 2001 - 2003 Tensilica Inc. --- 5,14 ---- * exceptions (by cause) to C handlers. * ! * There are different default handlers for user, kernel, and double ! * exception vectors. * ! * This file is subject to the terms and conditions of the GNU General ! * Public License. See the file "COPYING" in the main directory of ! * this archive for more details. * * Copyright (C) 2001 - 2003 Tensilica Inc. *************** *** 144,149 **** rsr a0, PS // get PS /* slot */ ! //bbsi.l a0, PS_WOE_SHIFT, fatal... // check for unusual case ! bbci.l a0, PS_PROGSTACK_SHIFT, doubleram_kernel // stacked (kernel) mode? /* User mode, so switch stack pointers. Get pointer --- 144,149 ---- rsr a0, PS // get PS /* slot */ ! //bbsi.l a0, PS_WOE_SHIFT, fatal... // check for unusual case ! bbci.l a0, PS_UM_SHIFT, doubleram_kernel // branch if kernel mode /* User mode, so switch stack pointers. Get pointer *************** *** 179,183 **** movi a0, EXCTYPE_DOUBLE_KERNEL ! bbci.l a0, PS_PROGSTACK_SHIFT, 1f // branch if kernel mode movi a0, EXCTYPE_DOUBLE_USER 1: or a2, a2, a0 // add in window vector bit --- 179,183 ---- movi a0, EXCTYPE_DOUBLE_KERNEL ! bbci.l a0, PS_UM_SHIFT, 1f // branch if kernel mode movi a0, EXCTYPE_DOUBLE_USER 1: or a2, a2, a0 // add in window vector bit *************** *** 240,244 **** rsr a0, PS // get PS /* slot */ ! bbci.l a0, PS_PROGSTACK_SHIFT, 1f // stacked (kernel) mode? movi a0, EXCTYPE_USER // mark exception as "double-window-user" --- 240,244 ---- rsr a0, PS // get PS /* slot */ ! bbci.l a0, PS_UM_SHIFT, 1f // branch if kernel mode movi a0, EXCTYPE_USER // mark exception as "double-window-user" *************** *** 299,303 **** rsr a0, PS // get PS /* slot */ ! bbci.l a0, PS_PROGSTACK_SHIFT, 1f // stacked (kernel) mode? movi a0, EXCTYPE_USER // mark exception as "double-window-user" --- 299,303 ---- rsr a0, PS // get PS /* slot */ ! bbci.l a0, PS_UM_SHIFT, 1f // branch if kernel mode movi a0, EXCTYPE_USER // mark exception as "double-window-user" *************** *** 1303,1307 **** // If returning to kernel, skip softirq, reschedule, and signal checks l32i a3, a1, PT_PS ! bbci.l a3, PS_PROGSTACK_SHIFT, _excExitKernel // Check for softirq --- 1303,1307 ---- // If returning to kernel, skip softirq, reschedule, and signal checks l32i a3, a1, PT_PS ! bbci.l a3, PS_UM_SHIFT, _excExitKernel // Check for softirq *************** *** 2855,2859 **** wsr a2, DEPC // preserve a2 so we can use it rsr a0, PS // Check if in user or kernel mode ! extui a0, a0, PS_PROGSTACK_SHIFT, 1 bnez a0, 1f // jump if in user mode --- 2855,2859 ---- wsr a2, DEPC // preserve a2 so we can use it rsr a0, PS // Check if in user or kernel mode ! extui a0, a0, PS_UM_SHIFT, 1 bnez a0, 1f // jump if in user mode Index: vectors.S =================================================================== RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/vectors.S,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** vectors.S 11 Feb 2003 07:22:25 -0000 1.6 --- vectors.S 13 Feb 2003 00:17:21 -0000 1.7 *************** *** 2,13 **** * arch/xtensa/kernel/vectors.S * ! * vectors.S contains the Xtensa level-one exception vectors, ! * that dispatch exceptions (by cause) to exception mode handlers. ! * These are the user (program), kernel (stacked), and double ! * exception vectors. * ! * This file is subject to the terms and conditions of the GNU General Public ! * License. See the file "COPYING" in the main directory of this archive ! * for more details. * * Copyright (C) 2001 - 2003 Tensilica, Inc. --- 2,12 ---- * arch/xtensa/kernel/vectors.S * ! * vectors.S contains the Xtensa level-one exception vectors, that ! * dispatch exceptions (by cause) to exception mode handlers. These ! * are the user, kernel, and double exception vectors. * ! * This file is subject to the terms and conditions of the GNU General ! * Public License. See the file "COPYING" in the main directory of ! * this archive for more details. * * Copyright (C) 2001 - 2003 Tensilica, Inc. Index: sys.S =================================================================== RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/sys.S,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sys.S 30 Jan 2003 23:55:27 -0000 1.2 --- sys.S 13 Feb 2003 00:17:21 -0000 1.3 *************** *** 274,278 **** rsr a0, PS ! bbci.l a0, PS_PROGSTACK_SHIFT, 1f // branch if kernel mode pdtlb a0, a1 --- 274,278 ---- rsr a0, PS ! bbci.l a0, PS_UM_SHIFT, 1f // branch if kernel mode pdtlb a0, a1 |