Changeset 826c203 in mainline
- Timestamp:
- 2009-01-30T16:58:35Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ee79df74
- Parents:
- 12bf33a
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/ppc32/loader/Makefile
r12bf33a r826c203 84 84 $(USPACEDIR)/srv/devmap/devmap \ 85 85 $(USPACEDIR)/srv/rd/rd \ 86 $(USPACEDIR)/srv/vfs/vfs 86 $(USPACEDIR)/srv/vfs/vfs 87 87 ifeq ($(RDFMT),tmpfs) 88 88 COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs -
kernel/arch/ppc32/include/exception.h
r12bf33a r826c203 76 76 uint32_t ctr; 77 77 uint32_t xer; 78 uint32_t dar; 78 79 uint32_t r12; 79 80 uint32_t sp; -
kernel/arch/ppc32/src/asm.S
r12bf33a r826c203 132 132 mtxer r12 133 133 134 lwz r12, 15 2(sp)135 lwz sp, 1 56(sp)134 lwz r12, 156(sp) 135 lwz sp, 160(sp) 136 136 137 137 rfi … … 198 198 mtxer r12 199 199 200 lwz r12, 15 2(sp)201 lwz sp, 1 56(sp)200 lwz r12, 156(sp) 201 lwz sp, 160(sp) 202 202 203 203 rfi -
kernel/arch/ppc32/src/exception.S
r12bf33a r826c203 61 61 2: 62 62 63 subi sp, sp, 16 063 subi sp, sp, 164 64 64 stw r0, 8(sp) 65 65 stw r2, 12(sp) … … 110 110 stw r12, 148(sp) 111 111 112 mfdar r12 113 stw r12, 152(sp) 114 112 115 mfsprg1 r12 113 stw r12, 15 2(sp)116 stw r12, 156(sp) 114 117 115 118 mfsprg2 r12 116 stw r12, 1 56(sp)119 stw r12, 160(sp) 117 120 .endm 118 121 … … 138 141 CONTEXT_STORE 139 142 143 b data_storage 144 145 .org 0x400 146 .global exc_instruction_storage 147 exc_instruction_storage: 148 CONTEXT_STORE 149 150 b instruction_storage 151 152 .org 0x500 153 .global exc_external 154 exc_external: 155 CONTEXT_STORE 156 157 li r3, 4 158 b jump_to_kernel 159 160 .org 0x600 161 .global exc_alignment 162 exc_alignment: 163 CONTEXT_STORE 164 165 li r3, 5 166 b jump_to_kernel 167 168 .org 0x700 169 .global exc_program 170 exc_program: 171 CONTEXT_STORE 172 173 li r3, 6 174 b jump_to_kernel 175 176 .org 0x800 177 .global exc_fp_unavailable 178 exc_fp_unavailable: 179 CONTEXT_STORE 180 181 li r3, 7 182 b jump_to_kernel 183 184 .org 0x900 185 .global exc_decrementer 186 exc_decrementer: 187 CONTEXT_STORE 188 189 li r3, 8 190 b jump_to_kernel 191 192 .org 0xa00 193 .global exc_reserved0 194 exc_reserved0: 195 CONTEXT_STORE 196 197 li r3, 9 198 b jump_to_kernel 199 200 .org 0xb00 201 .global exc_reserved1 202 exc_reserved1: 203 CONTEXT_STORE 204 205 li r3, 10 206 b jump_to_kernel 207 208 .org 0xc00 209 .global exc_syscall 210 exc_syscall: 211 CONTEXT_STORE 212 213 b jump_to_kernel_syscall 214 215 .org 0xd00 216 .global exc_trace 217 exc_trace: 218 CONTEXT_STORE 219 220 li r3, 12 221 b jump_to_kernel 222 223 .org 0x4000 224 data_storage: 140 225 li r3, 2 141 226 mr r4, sp … … 149 234 b jump_to_kernel 150 235 151 .org 0x400 152 .global exc_instruction_storage 153 exc_instruction_storage: 154 CONTEXT_STORE 155 236 instruction_storage: 156 237 li r3, 3 157 238 mr r4, sp … … 161 242 cmpwi r3, 0 162 243 bne iret_real 163 244 164 245 li r3, 3 165 246 b jump_to_kernel 166 247 167 .org 0x500168 .global exc_external169 exc_external:170 CONTEXT_STORE171 172 li r3, 4173 b jump_to_kernel174 175 .org 0x600176 .global exc_alignment177 exc_alignment:178 CONTEXT_STORE179 180 li r3, 5181 b jump_to_kernel182 183 .org 0x700184 .global exc_program185 exc_program:186 CONTEXT_STORE187 188 li r3, 6189 b jump_to_kernel190 191 .org 0x800192 .global exc_fp_unavailable193 exc_fp_unavailable:194 CONTEXT_STORE195 196 li r3, 7197 b jump_to_kernel198 199 .org 0x900200 .global exc_decrementer201 exc_decrementer:202 CONTEXT_STORE203 204 li r3, 8205 b jump_to_kernel206 207 .org 0xa00208 .global exc_reserved0209 exc_reserved0:210 CONTEXT_STORE211 212 li r3, 9213 b jump_to_kernel214 215 .org 0xb00216 .global exc_reserved1217 exc_reserved1:218 CONTEXT_STORE219 220 li r3, 10221 b jump_to_kernel222 223 .org 0xc00224 .global exc_syscall225 exc_syscall:226 CONTEXT_STORE227 228 b jump_to_kernel_syscall229 230 .org 0xd00231 .global exc_trace232 exc_trace:233 CONTEXT_STORE234 235 li r3, 12236 b jump_to_kernel237 238 .org 0x4000239 248 jump_to_kernel: 240 249 lis r12, iret@ha … … 323 332 mtxer r12 324 333 325 lwz r12, 15 2(sp)326 lwz sp, 1 56(sp)334 lwz r12, 156(sp) 335 lwz sp, 160(sp) 327 336 328 337 rfi -
kernel/arch/ppc32/src/mm/tlb.c
r12bf33a r826c203 112 112 char *sym2 = ""; 113 113 114 char *s = get_symtab_entry(istate->pc);115 if (s )116 symbol = s ;117 s = get_symtab_entry(istate->lr);118 if (s )119 sym2 = s ;114 char *str = get_symtab_entry(istate->pc); 115 if (str) 116 symbol = str; 117 str = get_symtab_entry(istate->lr); 118 if (str) 119 sym2 = str; 120 120 121 121 fault_if_from_uspace(istate, 122 "%p: PHT Refill Exception at %p (%s<-%s).", badvaddr, 123 istate->pc, symbol, sym2); 122 "PHT Refill Exception on %p.", badvaddr); 124 123 panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr, 125 124 istate->pc, symbol, sym2); … … 292 291 } 293 292 294 if (n == VECTOR_DATA_STORAGE) { 295 asm volatile ( 296 "mfdar %0\n" 297 : "=r" (badvaddr) 298 ); 299 } else 293 if (n == VECTOR_DATA_STORAGE) 294 badvaddr = istate->dar; 295 else 300 296 badvaddr = istate->pc; 301 297 … … 343 339 uintptr_t badvaddr; 344 340 345 if (n == VECTOR_DATA_STORAGE) { 346 asm volatile ( 347 "mfdar %0\n" 348 : "=r" (badvaddr) 349 ); 350 } else 341 if (n == VECTOR_DATA_STORAGE) 342 badvaddr = istate->dar; 343 else 351 344 badvaddr = istate->pc; 352 345
Note:
See TracChangeset
for help on using the changeset viewer.