From 55e3b9f74391282bda18d90e05df78c331b59392 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 27 Jun 2005 17:25:54 -0400 Subject: Major system code cleanup and formatting remove unused code console/Makefile: cleanup Makefile. Remove unneeded -D options console/console.c: Major cleanup and formatting remove unused #ifdef code remove unused #includes rename xxm -> m5 rename simos -> m5 console/dbmentry.S: console/paljtokern.S: console/paljtoslave.S: console/printf.c: Major cleanup and formatting remove unused #ifdef code remove unused #includes rename __start -> _start to get rid of warning. h/cserve.h: h/dc21164FromGasSources.h: h/ev5_alpha_defs.h: h/ev5_defs.h: h/ev5_osfalpha_defs.h: h/ev5_paldef.h: h/fromHudsonMacros.h: h/fromHudsonOsf.h: h/rpb.h: Major cleanup and formatting h/ev5_impure.h: Major cleanup and formatting remove unused #ifdef code palcode/Makefile: cleanup Makefile remove unused -D options unify platform_tlaser.S and platform_tsunami.S into platform.S and generate multiple .o files using various #defines unify osfpal.S osfpal_cache_copy.S and osfpal_cache_copy_unaligned.S into osfpal.S and generate multiple .o files using various #defines palcode/osfpal.S: Major cleanup and formatting remove unused #defines remove unused #if code merge copy code into this file. palcode/platform.S: Major cleanup and formatting remove unused #defines remove unused #if code merge platform code into this file. --- system/alpha/h/ev5_osfalpha_defs.h | 154 +++++++++++++++---------------------- 1 file changed, 60 insertions(+), 94 deletions(-) (limited to 'system/alpha/h/ev5_osfalpha_defs.h') diff --git a/system/alpha/h/ev5_osfalpha_defs.h b/system/alpha/h/ev5_osfalpha_defs.h index 6bc98de47..b16f119db 100644 --- a/system/alpha/h/ev5_osfalpha_defs.h +++ b/system/alpha/h/ev5_osfalpha_defs.h @@ -1,44 +1,40 @@ /* -Copyright 1993 Hewlett-Packard Development Company, L.P. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ + * Copyright 1993 Hewlett-Packard Development Company, L.P. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ #ifndef EV5_OSFALPHA_DEFS_INCLUDED #define EV5_OSFALPHA_DEFS_INCLUDED 1 - // from ev5_osfalpha_defs.mar from Lance's fetch directory // lowercaseified and $ changed to _ and reformatting for gas...pb Nov/95 -//orig .MACRO $OSF_ALPHADEFS -//orig OSF_ALPHADEF_VER == 5 ; Flag the version number of this file. -//orig .ENDM -//orig .MACRO $OSF_PSDEF,$GBL -//orig $DEFINI OSFPS,$GBL -//orig;+ -//orig; PS Layout - PS -//orig; Loc Size name function -//orig; ------ ------ ----- ----------------------------------- -//orig; <0:2> 3 IPL Prio level -//orig; <3> 1 CM Current Mode -//orig;- +// +// PS Layout - PS +// Loc Size name function +// ------ ------ ----- ----------------------------------- +// <0:2> 3 IPL Prio level +// <3> 1 CM Current Mode +// #define osfps_v_mode 3 #define osfps_m_mode (1< 32 PFN Page Frame Number -//orig; <31:16> 16 SOFT Bits reserved for software use -//orig; <15:14> 2 -//orig; <13> 1 UWE User write enable -//orig; <12> 1 KWE Kernel write enable -//orig; <11:10> 2 -//orig; <9> 1 URE User read enable -//orig; <8> 1 KRE Kernel read enable -//orig; <7:6> 2 RES Reserved SBZ -//orig; <5> 1 HPF Huge Page Flag -//orig; <4> 1 ASM Wild card address space number match -//orig; <3> 1 FOE Fault On execute -//orig; <2> 1 FOW Fault On Write -//orig; <1> 1 FOR Fault On Read -//orig; <0> 1 V valid bit -//orig;- - -//orig .MACRO _OSF_PTEDEF,_GBL -//orig _DEFINI OSFPTE,_GBL +// +// PTE layout - symbol prefix osfpte_ +// +// Loc Size name function +// ------ ------ ------ ----------------------------------- +// <63:32> 32 PFN Page Frame Number +// <31:16> 16 SOFT Bits reserved for software use +// <15:14> 2 +// <13> 1 UWE User write enable +// <12> 1 KWE Kernel write enable +// <11:10> 2 +// <9> 1 URE User read enable +// <8> 1 KRE Kernel read enable +// <7:6> 2 RES Reserved SBZ +// <5> 1 HPF Huge Page Flag +// <4> 1 ASM Wild card address space number match +// <3> 1 FOE Fault On execute +// <2> 1 FOW Fault On Write +// <1> 1 FOR Fault On Read +// <0> 1 V valid bit +// #define osfpte_v_pfn 32 #define osfpte_m_soft (0xFFFF0000) @@ -116,21 +106,16 @@ SOFTWARE. #define osfpte_m_ksegbits (osfpte_m_kre | osfpte_m_kwe | osfpte_m_v | osfpte_m_asm) #define osfpte_m_prot (osfpte_m_ure+osfpte_m_uwe | osfpte_m_kre | osfpte_m_kwe) -//orig _DEFEND OSFPTE,_GBL,DEF -//orig .ENDM - -//orig;+ -//orig; VA layout - symbol prefix VA_ -//orig; -//orig; Loc Size name function -//orig; ------ ------ ------- ----------------------------------- -//orig; <42:33> 10 SEG1 First seg table offset for mapping -//orig; <32:23> 10 SEG2 Second seg table offset for mapping -//orig; <22:13> 10 SEG3 Third seg table offset for mapping -//orig; <12:0> 13 OFFSET Byte within page -//orig;- -//orig .MACRO _OSF_VADEF,_GBL -//orig _DEFINI OSFVA,_GBL +// +// VA layout - symbol prefix VA_ +// +// Loc Size name function +// ------ ------ ------- ----------------------------------- +// <42:33> 10 SEG1 First seg table offset for mapping +// <32:23> 10 SEG2 Second seg table offset for mapping +// <22:13> 10 SEG3 Third seg table offset for mapping +// <12:0> 13 OFFSET Byte within page +// #define osfva_m_offset (0x000000001FFF) #define osfva_v_offset 0 @@ -141,14 +126,6 @@ SOFTWARE. #define osfva_m_seg1 (0x7FE00000000) #define osfva_v_seg1 33 -//orig _DEFEND OSFVA,_GBL,DEF -//orig .ENDM -//orig;+ -//orig; PRIVILEGED CONTEXT BLOCK (PCB) -//orig;- -//orig .MACRO _OSF_PCBDEF,_GBL -//orig _DEFINI OSFPCB,_GBL - #define osfpcb_q_ksp (0x0000) #define osfpcb_q_usp (0x0008) #define osfpcb_q_Usp (0x0008) @@ -160,14 +137,6 @@ SOFTWARE. #define osfpcb_q_fen (0x0028) #define osfpcb_v_pme 62 -//orig _DEFEND OSFPCB,_GBL,DEF -//orig .ENDM -//orig;+ -//orig; Stack Frame -//orig;- -//orig .MACRO _OSF_SFDEF,_GBL -//orig _DEFINI OSFSF,_GBL - #define osfsf_ps (0x00) #define osfsf_pc (0x08) #define osfsf_gp (0x10) @@ -176,7 +145,4 @@ SOFTWARE. #define osfsf_a2 (0x28) #define osfsf_c_size (0x30) -//orig _DEFEND OSFSF,_GBL,DEF -//orig .ENDM - #endif -- cgit v1.2.3