You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2015/11/26 00:56:30 UTC
[5/7] incubator-mynewt-larva git commit: Baselibc printf does not
take fancy formatting used by trap reporter. Simplify the format.
Baselibc printf does not take fancy formatting used by trap reporter.
Simplify the format.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/47c7037a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/47c7037a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/47c7037a
Branch: refs/heads/master
Commit: 47c7037acc3e75b0ca8c5609339dbf07350c1bf0
Parents: 52e3cf3
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Nov 25 15:47:10 2015 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Nov 25 15:47:10 2015 -0800
----------------------------------------------------------------------
libs/os/src/arch/cortex_m4/os_fault.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/47c7037a/libs/os/src/arch/cortex_m4/os_fault.c
----------------------------------------------------------------------
diff --git a/libs/os/src/arch/cortex_m4/os_fault.c b/libs/os/src/arch/cortex_m4/os_fault.c
index c9983d5..55adc5b 100644
--- a/libs/os/src/arch/cortex_m4/os_fault.c
+++ b/libs/os/src/arch/cortex_m4/os_fault.c
@@ -68,18 +68,18 @@ void
os_default_irq(struct trap_frame *tf)
{
console_blocking_mode();
- console_printf("Unhandled interrupt (%d), exception sp %8.8x\n",
+ console_printf("Unhandled interrupt (%d), exception sp 0x%x\n",
SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk, (uint32_t)tf->ef);
- console_printf(" r0:%8.8x r1:%8.8x r2:%8.8x r3:%8.8x\n",
+ console_printf(" r0:0x%x r1:0x%x r2:0x%x r3:0x%x\n",
tf->ef->r0, tf->ef->r1, tf->ef->r2, tf->ef->r3);
- console_printf(" r4:%8.8x r5:%8.8x r6:%8.8x r7:%8.8x\n",
+ console_printf(" r4:0x%x r5:0x%x r6:0x%x r7:0x%x\n",
tf->r4, tf->r5, tf->r6, tf->r7);
- console_printf(" r8:%8.8x r9:%8.8x r10:%8.8x r11:%8.8x\n",
+ console_printf(" r8:0x%x r9:0x%x r10:0x%x r11:0x%x\n",
tf->r8, tf->r9, tf->r10, tf->r11);
- console_printf("r12:%8.8x lr:%8.8x pc:%8.8x psr:%8.8x\n",
+ console_printf("r12:0x%x lr:0x%x pc:0x%x psr:0x%x\n",
tf->ef->r12, tf->ef->lr, tf->ef->pc, tf->ef->psr);
- console_printf("ICSR:%8.8x HFSR:%8.8x CFSR:%8.8x\n",
+ console_printf("ICSR:0x%x HFSR:0x%x CFSR:0x%x\n",
SCB->ICSR, SCB->HFSR, SCB->CFSR);
- console_printf("BFAR:%8.8x MMFAR:%8.8x\n", SCB->BFAR, SCB->MMFAR);
+ console_printf("BFAR:0x%x MMFAR:0x%x\n", SCB->BFAR, SCB->MMFAR);
system_reset();
}