diff options
| author | phk <phk@FreeBSD.org> | 2004-06-06 21:26:49 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-06-06 21:26:49 +0000 |
| commit | 4c3fd8116d1815c5e18c8569e354a99c8c7ce1c8 (patch) | |
| tree | 6b5fca44622323941a76adcf768eb12cd9c793f7 /sys/arm | |
| parent | 5c9b04429a84b964e9619870accf1c4b6209412a (diff) | |
| download | FreeBSD-src-4c3fd8116d1815c5e18c8569e354a99c8c7ce1c8.zip FreeBSD-src-4c3fd8116d1815c5e18c8569e354a99c8c7ce1c8.tar.gz | |
Remove filename+line number from panic messages.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/exception.S | 19 | ||||
| -rw-r--r-- | sys/arm/arm/in_cksum_arm.S | 6 | ||||
| -rw-r--r-- | sys/arm/arm/locore.S | 6 |
3 files changed, 5 insertions, 26 deletions
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index fb6bded..1a52946 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -65,14 +65,10 @@ AST_ALIGNMENT_FAULT_LOCALS */ ASENTRY_NP(reset_entry) adr r0, Lreset_panicmsg - adr r1, Lfile - mov r2, #__LINE__ - bl _C_LABEL(__panic) + bl _C_LABEL(panic) /* NOTREACHED */ Lreset_panicmsg: .asciz "Reset vector called, LR = 0x%08x" -Lfile: - .asciz __FILE__ .balign 4 /* @@ -122,12 +118,7 @@ _C_LABEL(prefetch_abort_handler_address): .text abortprefetch: adr r0, abortprefetchmsg - adr r1, filee - mov r2, #__LINE__ - b _C_LABEL(__panic) - -filee: - .asciz __FILE__ + b _C_LABEL(panic) abortprefetchmsg: .asciz "abortprefetch" @@ -164,14 +155,10 @@ _C_LABEL(data_abort_handler_address): .text abortdata: adr r0, abortdatamsg - adr r1, file - mov r2, #__LINE__ - b _C_LABEL(__panic) + b _C_LABEL(panic) abortdatamsg: .asciz "abortdata" -file: - .asciz __FILE__ .align 0 /* diff --git a/sys/arm/arm/in_cksum_arm.S b/sys/arm/arm/in_cksum_arm.S index d0b6452..57f43e3 100644 --- a/sys/arm/arm/in_cksum_arm.S +++ b/sys/arm/arm/in_cksum_arm.S @@ -221,11 +221,7 @@ ENTRY(in4_cksum) .Lin4_cksum_whoops: adr r0, .Lin4_cksum_whoops_str - adr r1, .LFile - mov r2, #__LINE__ - bl _C_LABEL(__panic) -.LFile: - .asciz __FILE__ + bl _C_LABEL(panic) .Lin4_cksum_whoops_str: .asciz "in4_cksum: out of mbufs\n" .align 5 diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S index ff569e8..ec8a760 100644 --- a/sys/arm/arm/locore.S +++ b/sys/arm/arm/locore.S @@ -153,9 +153,7 @@ mmu_done: bl _C_LABEL(mi_startup) /* call mi_startup()! */ adr r0, .Lmainreturned - adr r1, .LFile - mov r2, #__LINE__ - b _C_LABEL(__panic) + b _C_LABEL(panic) /* NOTEACHED */ #ifdef STARTUP_PAGETABLE_ADDR #define MMU_INIT(va,pa,n_sec,attr) \ @@ -181,8 +179,6 @@ mmu_init_table2: .word _end .word svcstk + INIT_ARM_STACK_SIZE -.LFile: - .asciz __FILE__ .Lmainreturned: .asciz "main() returned" .align 0 |
