diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c index 05fbbbb0318..27788451daf 100644 --- a/arch/arm/src/arm/up_assert.c +++ b/arch/arm/src/arm/up_assert.c @@ -99,7 +99,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -126,12 +126,12 @@ static inline void up_registerdump(void) for (regs = REG_R0; regs <= REG_R15; regs += 8) { uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs]; - alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", regs, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } - alert("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); + _alert("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); } } #else @@ -200,12 +200,12 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_intstack()); + _alert(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -223,24 +223,24 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_tcbstack(rtcb)); + _alert(" used: %08x\n", up_check_tcbstack(rtcb)); #endif #else - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert("stack used: %08x\n", up_check_tcbstack(rtcb)); + _alert("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif #endif @@ -251,7 +251,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); #endif } else @@ -318,10 +318,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c index 621a42d328a..926352fac4e 100644 --- a/arch/arm/src/arm/up_dataabort.c +++ b/arch/arm/src/arm/up_dataabort.c @@ -156,7 +156,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) segfault: #endif - alert("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr); + _alert("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr); PANIC(); } @@ -172,7 +172,7 @@ void up_dataabort(uint32_t *regs) /* Crash -- possibly showing diagnost debug information. */ - alert("Data abort. PC: %08x\n", regs[REG_PC]); + _alert("Data abort. PC: %08x\n", regs[REG_PC]); PANIC(); } diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c index 5d9d9561dcf..070c1ce5d2e 100644 --- a/arch/arm/src/arm/up_prefetchabort.c +++ b/arch/arm/src/arm/up_prefetchabort.c @@ -137,7 +137,7 @@ void up_prefetchabort(uint32_t *regs) else #endif { - alert("Prefetch abort. PC: %08x\n", regs[REG_PC]); + _alert("Prefetch abort. PC: %08x\n", regs[REG_PC]); PANIC(); } } diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c index f7ee6f1312c..c52b0369519 100644 --- a/arch/arm/src/arm/up_syscall.c +++ b/arch/arm/src/arm/up_syscall.c @@ -66,7 +66,7 @@ void up_syscall(uint32_t *regs) { - alert("Syscall from 0x%x\n", regs[REG_PC]); + _alert("Syscall from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c index 22a895b8165..364b072acde 100644 --- a/arch/arm/src/arm/up_undefinedinsn.c +++ b/arch/arm/src/arm/up_undefinedinsn.c @@ -57,7 +57,7 @@ void up_undefinedinsn(uint32_t *regs) { - alert("Undefined instruction at 0x%x\n", regs[REG_PC]); + _alert("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c index ef1757126ad..93ff4a9f6fb 100644 --- a/arch/arm/src/armv6-m/up_assert.c +++ b/arch/arm/src/armv6-m/up_assert.c @@ -98,7 +98,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -117,11 +117,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #if CONFIG_TASK_NAME_SIZE > 0 - alert("%s: PID=%d Stack Used=%lu of %lu\n", + _alert("%s: PID=%d Stack Used=%lu of %lu\n", tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #else - alert("PID: %d Stack Used=%lu of %lu\n", + _alert("PID: %d Stack Used=%lu of %lu\n", tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #endif @@ -156,22 +156,22 @@ static inline void up_registerdump(void) { /* Yes.. dump the interrupt registers */ - alert("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R0], CURRENT_REGS[REG_R1], CURRENT_REGS[REG_R2], CURRENT_REGS[REG_R3], CURRENT_REGS[REG_R4], CURRENT_REGS[REG_R5], CURRENT_REGS[REG_R6], CURRENT_REGS[REG_R7]); - alert("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R8], CURRENT_REGS[REG_R9], CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11], CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13], CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]); #ifdef CONFIG_BUILD_PROTECTED - alert("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n", + _alert("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK], CURRENT_REGS[REG_EXC_RETURN]); #else - alert("xPSR: %08x PRIMASK: %08x\n", + _alert("xPSR: %08x PRIMASK: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK]); #endif } @@ -242,12 +242,12 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_intstack()); + _alert(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -269,14 +269,14 @@ static void up_dumpstate(void) if (CURRENT_REGS) { sp = CURRENT_REGS[REG_R13]; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_tcbstack(rtcb)); + _alert(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -289,11 +289,11 @@ static void up_dumpstate(void) } #else - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert("stack used: %08x\n", up_check_tcbstack(rtcb)); + _alert("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -302,7 +302,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); } else { @@ -373,10 +373,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c index d79200e0f5c..bdeffa763cf 100644 --- a/arch/arm/src/armv7-a/arm_assert.c +++ b/arch/arm/src/armv7-a/arm_assert.c @@ -97,7 +97,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -116,11 +116,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #if CONFIG_TASK_NAME_SIZE > 0 - alert("%s: PID=%d Stack Used=%lu of %lu\n", + _alert("%s: PID=%d Stack Used=%lu of %lu\n", tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #else - alert("PID: %d Stack Used=%lu of %lu\n", + _alert("PID: %d Stack Used=%lu of %lu\n", tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #endif @@ -160,12 +160,12 @@ static inline void up_registerdump(void) for (regs = REG_R0; regs <= REG_R15; regs += 8) { uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs]; - alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", regs, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } - alert("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); + _alert("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); } } #else @@ -229,7 +229,7 @@ static void up_dumpstate(void) ustacksize = (uint32_t)rtcb->adj_stack_size; } - alert("Current sp: %08x\n", sp); + _alert("Current sp: %08x\n", sp); #if CONFIG_ARCH_INTERRUPTSTACK > 3 /* Get the limits on the interrupt stack memory */ @@ -239,21 +239,21 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - alert("Interrupt stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("Interrupt stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_intstack()); + _alert(" used: %08x\n", up_check_intstack()); #endif #endif /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_tcbstack(rtcb)); + _alert(" used: %08x\n", up_check_tcbstack(rtcb)); #endif #ifdef CONFIG_ARCH_KERNEL_STACK @@ -263,9 +263,9 @@ static void up_dumpstate(void) { kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4; - alert("Kernel stack:\n"); - alert(" base: %08x\n", kstackbase); - alert(" size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE); + _alert("Kernel stack:\n"); + _alert(" base: %08x\n", kstackbase); + _alert(" size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE); } #endif @@ -276,7 +276,7 @@ static void up_dumpstate(void) { /* Yes.. dump the interrupt stack */ - alert("Interrupt Stack\n", sp); + _alert("Interrupt Stack\n", sp); up_stackdump(sp, istackbase); /* Extract the user stack pointer which should lie @@ -284,7 +284,7 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - alert("User sp: %08x\n", sp); + _alert("User sp: %08x\n", sp); } #endif @@ -294,7 +294,7 @@ static void up_dumpstate(void) if (sp > ustackbase - ustacksize && sp < ustackbase) { - alert("User Stack\n", sp); + _alert("User Stack\n", sp); up_stackdump(sp, ustackbase); } @@ -305,7 +305,7 @@ static void up_dumpstate(void) if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase) { - alert("Kernel Stack\n", sp); + _alert("Kernel Stack\n", sp); up_stackdump(sp, kstackbase); } #endif @@ -313,7 +313,7 @@ static void up_dumpstate(void) #ifdef CONFIG_SMP /* Show the CPU number */ - alert("CPU%d:\n", up_cpu_index()); + _alert("CPU%d:\n", up_cpu_index()); #endif /* Then dump the CPU registers (if available) */ @@ -378,10 +378,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif up_dumpstate(); diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c index 00a686f8a75..dae3b926e06 100644 --- a/arch/arm/src/armv7-a/arm_dataabort.c +++ b/arch/arm/src/armv7-a/arm_dataabort.c @@ -152,7 +152,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) return regs; segfault: - alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", + _alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", regs[REG_PC], dfar, dfsr); PANIC(); return regs; /* To keep the compiler happy */ @@ -170,7 +170,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) /* Crash -- possibly showing diagnostic debug information. */ - alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", + _alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", regs[REG_PC], dfar, dfsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c index a6b73e3ad2a..4e211436425 100644 --- a/arch/arm/src/armv7-a/arm_prefetchabort.c +++ b/arch/arm/src/armv7-a/arm_prefetchabort.c @@ -123,7 +123,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) } else { - alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", + _alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", regs[REG_PC], ifar, ifsr); PANIC(); } @@ -143,7 +143,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) /* Crash -- possibly showing diagnostic debug information. */ - alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", + _alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", regs[REG_PC], ifar, ifsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c index 482345c4170..0259acb5c6f 100644 --- a/arch/arm/src/armv7-a/arm_syscall.c +++ b/arch/arm/src/armv7-a/arm_syscall.c @@ -500,7 +500,7 @@ uint32_t *arm_syscall(uint32_t *regs) uint32_t *arm_syscall(uint32_t *regs) { - alert("SYSCALL from 0x%x\n", regs[REG_PC]); + _alert("SYSCALL from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c index 70442b49ffa..54dbcc25b8a 100644 --- a/arch/arm/src/armv7-a/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c @@ -57,7 +57,7 @@ uint32_t *arm_undefinedinsn(uint32_t *regs) { - alert("Undefined instruction at 0x%x\n", regs[REG_PC]); + _alert("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c index fbf29b29e7f..eedfa522d81 100644 --- a/arch/arm/src/armv7-m/up_assert.c +++ b/arch/arm/src/armv7-m/up_assert.c @@ -97,7 +97,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -116,11 +116,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #if CONFIG_TASK_NAME_SIZE > 0 - alert("%s: PID=%d Stack Used=%lu of %lu\n", + _alert("%s: PID=%d Stack Used=%lu of %lu\n", tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #else - alert("PID: %d Stack Used=%lu of %lu\n", + _alert("PID: %d Stack Used=%lu of %lu\n", tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #endif @@ -155,29 +155,29 @@ static inline void up_registerdump(void) { /* Yes.. dump the interrupt registers */ - alert("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R0], CURRENT_REGS[REG_R1], CURRENT_REGS[REG_R2], CURRENT_REGS[REG_R3], CURRENT_REGS[REG_R4], CURRENT_REGS[REG_R5], CURRENT_REGS[REG_R6], CURRENT_REGS[REG_R7]); - alert("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R8], CURRENT_REGS[REG_R9], CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11], CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13], CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]); #ifdef CONFIG_ARMV7M_USEBASEPRI - alert("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n", + _alert("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_BASEPRI], getcontrol()); #else - alert("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n", + _alert("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK], getcontrol()); #endif #ifdef REG_EXC_RETURN - alert("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]); + _alert("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]); #endif } } @@ -247,12 +247,12 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_intstack()); + _alert(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -274,14 +274,14 @@ static void up_dumpstate(void) if (CURRENT_REGS) { sp = CURRENT_REGS[REG_R13]; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_tcbstack(rtcb)); + _alert(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -297,11 +297,11 @@ static void up_dumpstate(void) /* Show user stack info */ - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert("stack used: %08x\n", up_check_tcbstack(rtcb)); + _alert("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -310,7 +310,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - alert("ERROR: Stack pointer is not within the allocated stack\n"); + _alert("ERROR: Stack pointer is not within the allocated stack\n"); } else { @@ -382,10 +382,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c index 56cf88d8bc4..52f5d124365 100644 --- a/arch/arm/src/armv7-r/arm_dataabort.c +++ b/arch/arm/src/armv7-r/arm_dataabort.c @@ -75,7 +75,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) /* Crash -- possibly showing diagnostic debug information. */ - alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", + _alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", regs[REG_PC], dfar, dfsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c index ee9c38be0af..74713f5ad3e 100644 --- a/arch/arm/src/armv7-r/arm_prefetchabort.c +++ b/arch/arm/src/armv7-r/arm_prefetchabort.c @@ -71,7 +71,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) /* Crash -- possibly showing diagnostic debug information. */ - alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", + _alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", regs[REG_PC], ifar, ifsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c index c8a33f36c38..7d36ccb0d9c 100644 --- a/arch/arm/src/armv7-r/arm_syscall.c +++ b/arch/arm/src/armv7-r/arm_syscall.c @@ -498,7 +498,7 @@ uint32_t *arm_syscall(uint32_t *regs) uint32_t *arm_syscall(uint32_t *regs) { - alert("SYSCALL from 0x%x\n", regs[REG_PC]); + _alert("SYSCALL from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c index d23af753018..733fb06cb2b 100644 --- a/arch/arm/src/armv7-r/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c @@ -57,7 +57,7 @@ uint32_t *arm_undefinedinsn(uint32_t *regs) { - alert("Undefined instruction at 0x%x\n", regs[REG_PC]); + _alert("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c index c552f462a97..1983e1f34f1 100644 --- a/arch/avr/src/at32uc3/at32uc3_irq.c +++ b/arch/avr/src/at32uc3/at32uc3_irq.c @@ -177,7 +177,7 @@ static int up_getgrp(unsigned int irq) static int avr32_xcptn(int irq, FAR void *context) { (void)up_irq_save(); - alert("PANIC!!! Exception IRQ: %d\n", irq); + _alert("PANIC!!! Exception IRQ: %d\n", irq); PANIC(); return 0; } diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c index 9e406b6cab2..5a1660b81b4 100644 --- a/arch/avr/src/avr/up_dumpstate.c +++ b/arch/avr/src/avr/up_dumpstate.c @@ -90,7 +90,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base) for (stack = sp & ~3; stack < stack_base; stack += 12) { uint8_t *ptr = (uint8_t *)stack; - alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" + _alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" " %02x %02x %02x %02x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], @@ -108,28 +108,28 @@ static inline void up_registerdump(void) if (g_current_regs) { - alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + _alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 0, g_current_regs[REG_R0], g_current_regs[REG_R1], g_current_regs[REG_R2], g_current_regs[REG_R3], g_current_regs[REG_R4], g_current_regs[REG_R5], g_current_regs[REG_R6], g_current_regs[REG_R7]); - alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + _alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 8, g_current_regs[REG_R8], g_current_regs[REG_R9], g_current_regs[REG_R10], g_current_regs[REG_R11], g_current_regs[REG_R12], g_current_regs[REG_R13], g_current_regs[REG_R14], g_current_regs[REG_R15]); - alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + _alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 16, g_current_regs[REG_R16], g_current_regs[REG_R17], g_current_regs[REG_R18], g_current_regs[REG_R19], g_current_regs[REG_R20], g_current_regs[REG_R21], g_current_regs[REG_R22], g_current_regs[REG_R23]); - alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + _alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 24, g_current_regs[REG_R24], g_current_regs[REG_R25], g_current_regs[REG_R26], g_current_regs[REG_R27], @@ -137,12 +137,12 @@ static inline void up_registerdump(void) g_current_regs[REG_R30], g_current_regs[REG_R31]); #if !defined(REG_PC2) - alert("PC: %02x%02x SP: %02x%02x SREG: %02x\n", + _alert("PC: %02x%02x SP: %02x%02x SREG: %02x\n", g_current_regs[REG_PC0], g_current_regs[REG_PC1], g_current_regs[REG_SPH], g_current_regs[REG_SPL], g_current_regs[REG_SREG]); #else - alert("PC: %02x%02x%02x SP: %02x%02x SREG: %02x\n", + _alert("PC: %02x%02x%02x SP: %02x%02x SREG: %02x\n", g_current_regs[REG_PC0], g_current_regs[REG_PC1], g_current_regs[REG_PC2], g_current_regs[REG_SPH], g_current_regs[REG_SPL], g_current_regs[REG_SREG]); @@ -190,12 +190,12 @@ void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %04x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %04x\n", istackbase); - alert(" size: %04x\n", istacksize); + _alert("sp: %04x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %04x\n", istackbase); + _alert(" size: %04x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_intstack()); + _alert(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -217,14 +217,14 @@ void up_dumpstate(void) if (g_current_regs) { sp = g_current_regs[REG_R13]; - alert("sp: %04x\n", sp); + _alert("sp: %04x\n", sp); } - alert("User stack:\n"); - alert(" base: %04x\n", ustackbase); - alert(" size: %04x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %04x\n", ustackbase); + _alert(" size: %04x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_tcbstack(rtcb)); + _alert(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -236,11 +236,11 @@ void up_dumpstate(void) up_stackdump(sp, ustackbase); } #else - alert("sp: %04x\n", sp); - alert("stack base: %04x\n", ustackbase); - alert("stack size: %04x\n", ustacksize); + _alert("sp: %04x\n", sp); + _alert("stack base: %04x\n", ustackbase); + _alert("stack size: %04x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert("stack used: %08x\n", up_check_tcbstack(rtcb)); + _alert("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -249,7 +249,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); } else { diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c index 16a5406aa42..c15b3314405 100644 --- a/arch/avr/src/avr32/up_dumpstate.c +++ b/arch/avr/src/avr32/up_dumpstate.c @@ -86,7 +86,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -102,21 +102,21 @@ static inline void up_registerdump(void) if (g_current_regs) { - alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0, g_current_regs[REG_R0], g_current_regs[REG_R1], g_current_regs[REG_R2], g_current_regs[REG_R3], g_current_regs[REG_R4], g_current_regs[REG_R5], g_current_regs[REG_R6], g_current_regs[REG_R7]); - alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8, g_current_regs[REG_R8], g_current_regs[REG_R9], g_current_regs[REG_R10], g_current_regs[REG_R11], g_current_regs[REG_R12], g_current_regs[REG_R13], g_current_regs[REG_R14], g_current_regs[REG_R15]); - alert("SR: %08x\n", g_current_regs[REG_SR]); + _alert("SR: %08x\n", g_current_regs[REG_SR]); } } @@ -156,12 +156,12 @@ void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_intstack()); + _alert(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -183,14 +183,14 @@ void up_dumpstate(void) if (g_current_regs) { sp = g_current_regs[REG_R13]; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert(" used: %08x\n", up_check_tcbstack(rtcb)); + _alert(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -202,11 +202,11 @@ void up_dumpstate(void) up_stackdump(sp, ustackbase); } #else - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - alert("stack used: %08x\n", up_check_tcbstack(rtcb)); + _alert("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -215,7 +215,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); } else { diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c index dc6411081e4..a93187c5238 100644 --- a/arch/avr/src/common/up_assert.c +++ b/arch/avr/src/common/up_assert.c @@ -138,10 +138,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c index 1074adfb800..2f859314f1d 100644 --- a/arch/hc/src/m9s12/m9s12_assert.c +++ b/arch/hc/src/m9s12/m9s12_assert.c @@ -80,7 +80,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base) for (stack = sp; stack < stack_base; stack += 16) { uint8_t *ptr = (uint8_t*)stack; - alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" + _alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" " %02x %02x %02x %02x %02x %02x %02x %02x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]); @@ -101,11 +101,11 @@ static inline void up_registerdump(void) if (g_current_regs) { - alert("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n", + _alert("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n", g_current_regs[REG_A], g_current_regs[REG_B], g_current_regs[REG_XH], g_current_regs[REG_XL], g_current_regs[REG_YH], g_current_regs[REG_YL], g_current_regs[REG_PCH], g_current_regs[REG_PCL], g_current_regs[REG_CCR]); - alert("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n", + _alert("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n", g_current_regs[REG_SPH], g_current_regs[REG_SPL], g_current_regs[REG_FRAMEH], g_current_regs[REG_FRAMEL], g_current_regs[REG_TMPL], g_current_regs[REG_TMPH], g_current_regs[REG_ZL], @@ -114,16 +114,16 @@ static inline void up_registerdump(void) #if CONFIG_HCS12_MSOFTREGS > 2 # error "Need to save more registers" #elif CONFIG_HCS12_MSOFTREGS == 2 - alert("SOFTREGS: %02x%02x :%02x%02x\n", + _alert("SOFTREGS: %02x%02x :%02x%02x\n", g_current_regs[REG_SOFTREG1], g_current_regs[REG_SOFTREG1+1], g_current_regs[REG_SOFTREG2], g_current_regs[REG_SOFTREG2+1]); #elif CONFIG_HCS12_MSOFTREGS == 1 - alert("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1], + _alert("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1], g_current_regs[REG_SOFTREG1+1]); #endif #ifndef CONFIG_HCS12_NONBANKED - alert("PPAGE: %02x\n", g_current_regs[REG_PPAGE],); + _alert("PPAGE: %02x\n", g_current_regs[REG_PPAGE],); #endif } } @@ -193,10 +193,10 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %04x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %04x\n", istackbase); - alert(" size: %04x\n", istacksize); + _alert("sp: %04x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %04x\n", istackbase); + _alert(" size: %04x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -213,18 +213,18 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - alert("sp: %04x\n", sp); + _alert("sp: %04x\n", sp); } /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %04x\n", ustackbase); - alert(" size: %04x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %04x\n", ustackbase); + _alert(" size: %04x\n", ustacksize); #else - alert("sp: %04x\n", sp); - alert("stack base: %04x\n", ustackbase); - alert("stack size: %04x\n", ustacksize); + _alert("sp: %04x\n", sp); + _alert("stack base: %04x\n", ustackbase); + _alert("stack size: %04x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -234,7 +234,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); #endif } else @@ -301,10 +301,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c index 1f4ab15d6be..119844eb997 100644 --- a/arch/mips/src/mips32/up_assert.c +++ b/arch/mips/src/mips32/up_assert.c @@ -138,10 +138,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c index f5a2a8474d2..db9fcda6573 100644 --- a/arch/mips/src/mips32/up_dumpstate.c +++ b/arch/mips/src/mips32/up_dumpstate.c @@ -86,7 +86,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -102,27 +102,27 @@ static inline void up_registerdump(void) if (g_current_regs) { - alert("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n", + _alert("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n", g_current_regs[REG_MFLO], g_current_regs[REG_MFHI], g_current_regs[REG_EPC], g_current_regs[REG_STATUS]); - alert("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n", + _alert("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n", g_current_regs[REG_AT], g_current_regs[REG_V0], g_current_regs[REG_V1], g_current_regs[REG_A0], g_current_regs[REG_A1], g_current_regs[REG_A2], g_current_regs[REG_A3]); - alert("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n", + _alert("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n", g_current_regs[REG_T0], g_current_regs[REG_T1], g_current_regs[REG_T2], g_current_regs[REG_T3], g_current_regs[REG_T4], g_current_regs[REG_T5], g_current_regs[REG_T6], g_current_regs[REG_T7]); - alert("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n", + _alert("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n", g_current_regs[REG_S0], g_current_regs[REG_S1], g_current_regs[REG_S2], g_current_regs[REG_S3], g_current_regs[REG_S4], g_current_regs[REG_S5], g_current_regs[REG_S6], g_current_regs[REG_S7]); #ifdef MIPS32_SAVE_GP - alert("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n", + _alert("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n", g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_GP], g_current_regs[REG_SP], g_current_regs[REG_FP], g_current_regs[REG_RA]); #else - alert("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n", + _alert("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n", g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_SP], g_current_regs[REG_FP], g_current_regs[REG_RA]); #endif @@ -169,10 +169,10 @@ void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -189,18 +189,18 @@ void up_dumpstate(void) */ sp = g_intstackbase; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #else - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -210,7 +210,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); #endif } else diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c index 7ff728db319..86d8ddf133e 100644 --- a/arch/mips/src/pic32mx/pic32mx-exception.c +++ b/arch/mips/src/pic32mx/pic32mx-exception.c @@ -90,88 +90,88 @@ uint32_t *pic32mx_exception(uint32_t *regs) switch (cause & CP0_CAUSE_EXCCODE_MASK) { case CP0_CAUSE_EXCCODE_INT: /* Interrupt */ - alert("EXCEPTION: Interrupt" + _alert("EXCEPTION: Interrupt" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBL: /* TLB exception (load or instruction fetch) */ - alert("EXCEPTION: TLB exception (load or instruction fetch)" + _alert("EXCEPTION: TLB exception (load or instruction fetch)" " CAUSE: %08x EPC:%08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBS: /* TLB exception (store) */ - alert("EXCEPTION: TLB exception (store)" + _alert("EXCEPTION: TLB exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADEL: /* Address error exception (load or instruction fetch) */ - alert("EXCEPTION: Address error exception (load or instruction fetch)" + _alert("EXCEPTION: Address error exception (load or instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADES: /* Address error exception (store) */ - alert("EXCEPTION: Address error exception (store)" + _alert("EXCEPTION: Address error exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_IBE: /* Bus error exception (instruction fetch) */ - alert("EXCEPTION: Bus error exception (instruction fetch)" + _alert("EXCEPTION: Bus error exception (instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_DBE: /* Bus error exception (data reference: load or store) */ - alert("EXCEPTION: Bus error exception (data reference: load or store)" + _alert("EXCEPTION: Bus error exception (data reference: load or store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_SYS: /* Syscall exception */ - alert("EXCEPTION: Syscall exception" + _alert("EXCEPTION: Syscall exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_BP: /* Breakpoint exception */ - alert("EXCEPTION: Breakpoint exception" + _alert("EXCEPTION: Breakpoint exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_RI: /* Reserved instruction exception */ - alert("EXCEPTION: Reserved instruction exception" + _alert("EXCEPTION: Reserved instruction exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CPU: /* Coprocessor Unusable exception */ - alert("EXCEPTION: Coprocessor Unusable exception" + _alert("EXCEPTION: Coprocessor Unusable exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_OV: /* Arithmetic Overflow exception */ - alert("EXCEPTION: Arithmetic Overflow exception" + _alert("EXCEPTION: Arithmetic Overflow exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TR: /* Trap exception */ - alert("EXCEPTION: Trap exception" + _alert("EXCEPTION: Trap exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_FPE: /* Floating point exception */ - alert("EXCEPTION: Floating point exception" + _alert("EXCEPTION: Floating point exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_C2E: /* Precise Coprocessor 2 exceptions */ - alert("EXCEPTION: Precise Coprocessor 2 exceptions" + _alert("EXCEPTION: Precise Coprocessor 2 exceptions" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MDMX: /* MDMX Unusable (MIPS64) */ - alert("EXCEPTION: MDMX Unusable (MIPS64)" + _alert("EXCEPTION: MDMX Unusable (MIPS64)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_WATCH: /* WatchHi/WatchLo address */ - alert("EXCEPTION: WatchHi/WatchLo address" + _alert("EXCEPTION: WatchHi/WatchLo address" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MCHECK: /* Machine check */ - alert("EXCEPTION: Machine check" + _alert("EXCEPTION: Machine check" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */ - alert("EXCEPTION: Cache error" + _alert("EXCEPTION: Cache error" " CAUSE: %08x EPC: %08x\n", cause, epc); break; default: - alert("EXCEPTION: Unknown" + _alert("EXCEPTION: Unknown" " CAUSE: %08x EPC: %08x\n", cause, epc); break; } #else - alert("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); + _alert("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); #endif #endif diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c index 1397d1063f9..256010e910a 100644 --- a/arch/mips/src/pic32mz/pic32mz-exception.c +++ b/arch/mips/src/pic32mz/pic32mz-exception.c @@ -90,88 +90,88 @@ uint32_t *pic32mz_exception(uint32_t *regs) switch (cause & CP0_CAUSE_EXCCODE_MASK) { case CP0_CAUSE_EXCCODE_INT: /* Interrupt */ - alert("EXCEPTION: Interrupt" + _alert("EXCEPTION: Interrupt" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBL: /* TLB exception (load or instruction fetch) */ - alert("EXCEPTION: TLB exception (load or instruction fetch)" + _alert("EXCEPTION: TLB exception (load or instruction fetch)" " CAUSE: %08x EPC:%08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBS: /* TLB exception (store) */ - alert("EXCEPTION: TLB exception (store)" + _alert("EXCEPTION: TLB exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADEL: /* Address error exception (load or instruction fetch) */ - alert("EXCEPTION: Address error exception (load or instruction fetch)" + _alert("EXCEPTION: Address error exception (load or instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADES: /* Address error exception (store) */ - alert("EXCEPTION: Address error exception (store)" + _alert("EXCEPTION: Address error exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_IBE: /* Bus error exception (instruction fetch) */ - alert("EXCEPTION: Bus error exception (instruction fetch)" + _alert("EXCEPTION: Bus error exception (instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_DBE: /* Bus error exception (data reference: load or store) */ - alert("EXCEPTION: Bus error exception (data reference: load or store)" + _alert("EXCEPTION: Bus error exception (data reference: load or store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_SYS: /* Syscall exception */ - alert("EXCEPTION: Syscall exception" + _alert("EXCEPTION: Syscall exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_BP: /* Breakpoint exception */ - alert("EXCEPTION: Breakpoint exception" + _alert("EXCEPTION: Breakpoint exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_RI: /* Reserved instruction exception */ - alert("EXCEPTION: Reserved instruction exception" + _alert("EXCEPTION: Reserved instruction exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CPU: /* Coprocessor Unusable exception */ - alert("EXCEPTION: Coprocessor Unusable exception" + _alert("EXCEPTION: Coprocessor Unusable exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_OV: /* Arithmetic Overflow exception */ - alert("EXCEPTION: Arithmetic Overflow exception" + _alert("EXCEPTION: Arithmetic Overflow exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TR: /* Trap exception */ - alert("EXCEPTION: Trap exception" + _alert("EXCEPTION: Trap exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_FPE: /* Floating point exception */ - alert("EXCEPTION: Floating point exception" + _alert("EXCEPTION: Floating point exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_C2E: /* Precise Coprocessor 2 exceptions */ - alert("EXCEPTION: Precise Coprocessor 2 exceptions" + _alert("EXCEPTION: Precise Coprocessor 2 exceptions" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MDMX: /* MDMX Unusable (MIPS64) */ - alert("EXCEPTION: MDMX Unusable (MIPS64)" + _alert("EXCEPTION: MDMX Unusable (MIPS64)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_WATCH: /* WatchHi/WatchLo address */ - alert("EXCEPTION: WatchHi/WatchLo address" + _alert("EXCEPTION: WatchHi/WatchLo address" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MCHECK: /* Machine check */ - alert("EXCEPTION: Machine check" + _alert("EXCEPTION: Machine check" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */ - alert("EXCEPTION: Cache error" + _alert("EXCEPTION: Cache error" " CAUSE: %08x EPC: %08x\n", cause, epc); break; default: - alert("EXCEPTION: Unknown" + _alert("EXCEPTION: Unknown" " CAUSE: %08x EPC: %08x\n", cause, epc); break; } #else - alert("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); + _alert("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); #endif #endif diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c index 4919a30363b..95abc9b1903 100644 --- a/arch/sh/src/common/up_assert.c +++ b/arch/sh/src/common/up_assert.c @@ -139,10 +139,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c index 6cd4f545d4c..7dc1a74ee43 100644 --- a/arch/sh/src/m16c/m16c_dumpstate.c +++ b/arch/sh/src/m16c/m16c_dumpstate.c @@ -97,7 +97,7 @@ static void m16c_stackdump(uint16_t sp, uint16_t stack_base) for (stack = sp & ~7; stack < stack_base; stack += 8) { uint8_t *ptr = (uint8_t*)stack; - alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n", + _alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } } @@ -116,14 +116,14 @@ static inline void m16c_registerdump(void) { /* Yes.. dump the interrupt registers */ - alert("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n", + _alert("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n", ptr[REG_FLGPCHI] & 0xff, ptr[REG_PC], ptr[REG_PC+1], ptr[REG_FLGPCHI] >> 8, ptr[REG_FLG], ptr[REG_FB], ptr[REG_FB+1], ptr[REG_SB], ptr[REG_SB+1], ptr[REG_SP], ptr[REG_SP+1]); - alert("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n", + _alert("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n", ptr[REG_R0], ptr[REG_R0+1], ptr[REG_R1], ptr[REG_R1+1], ptr[REG_R2], ptr[REG_R2+1], ptr[REG_R3], ptr[REG_R3+1], ptr[REG_A0], ptr[REG_A0+1], ptr[REG_A1], ptr[REG_A1+1]); @@ -179,10 +179,10 @@ void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %04x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %04x\n", istackbase); - alert(" size: %04x\n", istacksize); + _alert("sp: %04x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %04x\n", istackbase); + _alert(" size: %04x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -197,18 +197,18 @@ void up_dumpstate(void) /* Extract the user stack pointer from the register area */ sp = m16c_getusersp(); - alert("sp: %04x\n", sp); + _alert("sp: %04x\n", sp); } /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %04x\n", ustackbase); - alert(" size: %04x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %04x\n", ustackbase); + _alert(" size: %04x\n", ustacksize); #else - alert("sp: %04x\n", sp); - alert("stack base: %04x\n", ustackbase); - alert("stack size: %04x\n", ustacksize); + _alert("sp: %04x\n", sp); + _alert("stack base: %04x\n", ustackbase); + _alert("stack size: %04x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -218,7 +218,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); #endif } else diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c index 487bc854ad5..e9b0e590784 100644 --- a/arch/sh/src/sh1/sh1_dumpstate.c +++ b/arch/sh/src/sh1/sh1_dumpstate.c @@ -84,7 +84,7 @@ static void sh1_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t*)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -104,17 +104,17 @@ static inline void sh1_registerdump(void) { /* Yes.. dump the interrupt registers */ - alert("PC: %08x SR=%08x\n", + _alert("PC: %08x SR=%08x\n", ptr[REG_PC], ptr[REG_SR]); - alert("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n", + _alert("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n", ptr[REG_PR], ptr[REG_GBR], ptr[REG_MACH], ptr[REG_MACL]); - alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0, + _alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0, ptr[REG_R0], ptr[REG_R1], ptr[REG_R2], ptr[REG_R3], ptr[REG_R4], ptr[REG_R5], ptr[REG_R6], ptr[REG_R7]); - alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8, + _alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8, ptr[REG_R8], ptr[REG_R9], ptr[REG_R10], ptr[REG_R11], ptr[REG_R12], ptr[REG_R13], ptr[REG_R14], ptr[REG_R15]); } @@ -160,10 +160,10 @@ void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -180,18 +180,18 @@ void up_dumpstate(void) */ sp = g_intstackbase; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #else - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -201,7 +201,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); #endif } else diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c index 5d450e6fd94..3b6caececce 100644 --- a/arch/x86/src/common/up_assert.c +++ b/arch/x86/src/common/up_assert.c @@ -81,7 +81,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t*)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -152,10 +152,10 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - alert("sp: %08x\n", sp); - alert("IRQ stack:\n"); - alert(" base: %08x\n", istackbase); - alert(" size: %08x\n", istacksize); + _alert("sp: %08x\n", sp); + _alert("IRQ stack:\n"); + _alert(" base: %08x\n", istackbase); + _alert(" size: %08x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -172,18 +172,18 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - alert("sp: %08x\n", sp); + _alert("sp: %08x\n", sp); } /* Show user stack info */ - alert("User stack:\n"); - alert(" base: %08x\n", ustackbase); - alert(" size: %08x\n", ustacksize); + _alert("User stack:\n"); + _alert(" base: %08x\n", ustackbase); + _alert(" size: %08x\n", ustacksize); #else - alert("sp: %08x\n", sp); - alert("stack base: %08x\n", ustackbase); - alert("stack size: %08x\n", ustacksize); + _alert("sp: %08x\n", sp); + _alert("stack base: %08x\n", ustackbase); + _alert("stack size: %08x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -193,7 +193,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); #endif } else @@ -263,10 +263,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c index b3da1b603e2..d28ec481eda 100644 --- a/arch/x86/src/i486/up_regdump.c +++ b/arch/x86/src/i486/up_regdump.c @@ -54,13 +54,13 @@ void up_registerdump(uint32_t *regs) { - alert(" ds:%08x irq:%08x err:%08x\n", + _alert(" ds:%08x irq:%08x err:%08x\n", regs[REG_DS], regs[REG_IRQNO], regs[REG_ERRCODE]); - alert("edi:%08x esi:%08x ebp:%08x esp:%08x\n", + _alert("edi:%08x esi:%08x ebp:%08x esp:%08x\n", regs[REG_EDI], regs[REG_ESI], regs[REG_EBP], regs[REG_ESP]); - alert("ebx:%08x edx:%08x ecx:%08x eax:%08x\n", + _alert("ebx:%08x edx:%08x ecx:%08x eax:%08x\n", regs[REG_EBX], regs[REG_EDX], regs[REG_ECX], regs[REG_EAX]); - alert("eip:%08x cs:%08x flg:%08x sp:%08x ss:%08x\n", + _alert("eip:%08x cs:%08x flg:%08x sp:%08x ss:%08x\n", regs[REG_EIP], regs[REG_CS], regs[REG_EFLAGS], regs[REG_SP], regs[REG_SS]); } diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c index 1ef880a0416..628c34f1faa 100644 --- a/arch/z16/src/common/up_assert.c +++ b/arch/z16/src/common/up_assert.c @@ -143,17 +143,17 @@ void up_assert(void) #ifdef CONFIG_HAVE_FILENAME #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif #else #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed: task: %s\n", rtcb->name); + _alert("Assertion failed: task: %s\n", rtcb->name); #else - alert("Assertion failed\n"); + _alert("Assertion failed\n"); #endif #endif diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c index f167926a52b..dbee6553dd3 100644 --- a/arch/z16/src/common/up_registerdump.c +++ b/arch/z16/src/common/up_registerdump.c @@ -62,14 +62,14 @@ static void up_registerdump(void) #ifdef CONFIG_DEBUG_INFO FAR uint32_t *regs32 = (FAR uint32_t*)g_current_regs; - alert("R0 :%08x R1 :%08x R2 :%08x R3 :%08x " + _alert("R0 :%08x R1 :%08x R2 :%08x R3 :%08x " "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n" regs32[REG_R0/2], regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2], regs32[REG_R4/2], regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]); - alert("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n" + _alert("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n" regs32[REG_R8/2], regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2], regs32[REG_R12/2], regs32[REG_R13/2]); - alert("FP :%08x SP :%08x FLG:%04x\n" + _alert("FP :%08x SP :%08x FLG:%04x\n" regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]); #endif } diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c index 35bc6d49795..0abb3a33aea 100644 --- a/arch/z16/src/common/up_stackdump.c +++ b/arch/z16/src/common/up_stackdump.c @@ -67,9 +67,9 @@ static void up_stackdump(void) chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr; chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size; - alert("stack_base: %08x\n", stack_base); - alert("stack_size: %08x\n", stack_size); - alert("sp: %08x\n", sp); + _alert("stack_base: %08x\n", stack_base); + _alert("stack_size: %08x\n", stack_size); + _alert("sp: %08x\n", sp); if (sp >= stack_base || sp < stack_base - stack_size) { @@ -83,7 +83,7 @@ static void up_stackdump(void) for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(chipreg_t)) { chipreg_t *ptr = (chipreg_t*)stack; - alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c index ea1dd0c5d76..49b72409289 100644 --- a/arch/z80/src/common/up_assert.c +++ b/arch/z80/src/common/up_assert.c @@ -142,17 +142,17 @@ void up_assert(void) #ifdef CONFIG_HAVE_FILENAME #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed at file:%s line: %d task: %s\n", + _alert("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - alert("Assertion failed at file:%s line: %d\n", + _alert("Assertion failed at file:%s line: %d\n", filename, lineno); #endif #else #if CONFIG_TASK_NAME_SIZE > 0 - alert("Assertion failed: task: %s\n", rtcb->name); + _alert("Assertion failed: task: %s\n", rtcb->name); #else - alert("Assertion failed\n"); + _alert("Assertion failed\n"); #endif #endif diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c index 0e4e4ea9c4d..1ad64c66a94 100644 --- a/arch/z80/src/common/up_stackdump.c +++ b/arch/z80/src/common/up_stackdump.c @@ -68,13 +68,13 @@ static void up_stackdump(void) uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr; uint16_t stack_size = (uint16_t)rtcb->adj_stack_size; - alert("stack_base: %04x\n", stack_base); - alert("stack_size: %04x\n", stack_size); - alert("sp: %04x\n", sp); + _alert("stack_base: %04x\n", stack_base); + _alert("stack_size: %04x\n", stack_size); + _alert("sp: %04x\n", sp); if (sp >= stack_base || sp < stack_base - stack_size) { - alert("ERROR: Stack pointer is not within allocated stack\n"); + _alert("ERROR: Stack pointer is not within allocated stack\n"); return; } else @@ -84,7 +84,7 @@ static void up_stackdump(void) for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t)) { uint16_t *ptr = (uint16_t*)stack; - alert("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n", + _alert("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c index 43faf25fee4..7257627a81d 100644 --- a/arch/z80/src/ez80/ez80_registerdump.c +++ b/arch/z80/src/ez80/ez80_registerdump.c @@ -70,22 +70,22 @@ static void ez80_registerdump(void) if (g_current_regs) { #ifdef CONFIG_EZ80_Z80MODE - alert("AF: %04x I: %04x\n", + _alert("AF: %04x I: %04x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - alert("BC: %04x DE: %04x HL: %04x\n", + _alert("BC: %04x DE: %04x HL: %04x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - alert("IX: %04x IY: %04x\n", + _alert("IX: %04x IY: %04x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - alert("SP: %04x PC: %04x\n" + _alert("SP: %04x PC: %04x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); #else - alert("AF: %06x I: %06x\n", + _alert("AF: %06x I: %06x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - alert("BC: %06x DE: %06x HL: %06x\n", + _alert("BC: %06x DE: %06x HL: %06x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - alert("IX: %06x IY: %06x\n", + _alert("IX: %06x IY: %06x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - alert("SP: %06x PC: %06x\n" + _alert("SP: %06x PC: %06x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); #endif } diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c index 32b351c36d8..00be16de85e 100644 --- a/arch/z80/src/z180/z180_registerdump.c +++ b/arch/z80/src/z180/z180_registerdump.c @@ -61,15 +61,15 @@ static void z180_registerdump(void) { if (g_current_regs) { - alert("AF: %04x I: %04x\n", + _alert("AF: %04x I: %04x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - alert("BC: %04x DE: %04x HL: %04x\n", + _alert("BC: %04x DE: %04x HL: %04x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - alert("IX: %04x IY: %04x\n", + _alert("IX: %04x IY: %04x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - alert("SP: %04x PC: %04x\n" + _alert("SP: %04x PC: %04x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); - alert("CBAR: %02x BBR: %02x CBR: %02x\n" + _alert("CBAR: %02x BBR: %02x CBR: %02x\n" inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR)); } } diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c index 92ba675b406..0b0cdc6c2e4 100644 --- a/arch/z80/src/z8/z8_registerdump.c +++ b/arch/z80/src/z8/z8_registerdump.c @@ -56,7 +56,7 @@ static inline void z8_dumpregs(FAR chipret_t *regs) { - alert("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n", + _alert("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n", regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6], regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]); } @@ -64,7 +64,7 @@ static inline void z8_dumpregs(FAR chipret_t *regs) static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl, chipreg_t rpflags) { - alert("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n", + _alert("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n", sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff); } diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c index 7f02662a062..9d87ccc9c07 100644 --- a/arch/z80/src/z80/z80_registerdump.c +++ b/arch/z80/src/z80/z80_registerdump.c @@ -61,13 +61,13 @@ static void z80_registerdump(void) { if (g_current_regs) { - alert("AF: %04x I: %04x\n", + _alert("AF: %04x I: %04x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - alert("BC: %04x DE: %04x HL: %04x\n", + _alert("BC: %04x DE: %04x HL: %04x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - alert("IX: %04x IY: %04x\n", + _alert("IX: %04x IY: %04x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - alert("SP: %04x PC: %04x\n" + _alert("SP: %04x PC: %04x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); } } diff --git a/include/debug.h b/include/debug.h index 7251839ea6f..9994b3a4217 100644 --- a/include/debug.h +++ b/include/debug.h @@ -106,7 +106,7 @@ * information that you probably not want to suppress during normal debug * general debugging. * - * alert() - is a special, high-priority, unconditional version that is really + * _alert() - is a special, high-priority, unconditional version that is really * intended only for crash error reporting. */ @@ -138,10 +138,10 @@ #endif #ifdef CONFIG_ARCH_LOWPUTC -# define alert(format, ...) \ +# define _alert(format, ...) \ __arch_lowsyslog(LOG_EMERG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # else -# define alert(x...) +# define _alert(x...) # endif #ifdef CONFIG_DEBUG_ERROR @@ -892,7 +892,7 @@ /* Variadic macros NOT supported */ #ifndef CONFIG_ARCH_LOWPUTC -# define alert (void) +# define _alert (void) # endif #ifdef CONFIG_DEBUG_ERROR @@ -1895,7 +1895,7 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, #ifndef CONFIG_CPP_HAVE_VARARGS #ifndef CONFIG_ARCH_LOWPUTC -int alert(const char *format, ...); +int _alert(const char *format, ...); #endif #ifdef CONFIG_DEBUG_ERROR