From 6eb6d31c323acf57525beae79df1b010c900ae9f Mon Sep 17 00:00:00 2001 From: Ouss4 Date: Thu, 7 May 2020 01:40:46 +0100 Subject: [PATCH] Fix nxstyle complaints --- arch/avr/include/avr/arch.h | 1 + arch/avr/include/avr32/arch.h | 1 + arch/hc/include/tls.h | 2 +- arch/misoc/include/tls.h | 1 - arch/renesas/src/common/up_assert.c | 1 - arch/renesas/src/m16c/m16c_dumpstate.c | 44 ++++++++++++++------------ arch/renesas/src/sh1/sh1_dumpstate.c | 4 +-- arch/risc-v/include/arch.h | 3 +- 8 files changed, 31 insertions(+), 26 deletions(-) diff --git a/arch/avr/include/avr/arch.h b/arch/avr/include/avr/arch.h index d7c695ad6b..5556add40d 100644 --- a/arch/avr/include/avr/arch.h +++ b/arch/avr/include/avr/arch.h @@ -59,6 +59,7 @@ static inline uint16_t avr_getsp(void) : "=r" (spl), "=r" (sph) : ); + return (uint16_t)sph << 8 | spl; } diff --git a/arch/avr/include/avr32/arch.h b/arch/avr/include/avr32/arch.h index c765730656..3137bd70e3 100644 --- a/arch/avr/include/avr32/arch.h +++ b/arch/avr/include/avr32/arch.h @@ -56,6 +56,7 @@ static inline uint32_t avr_getsp(void) : "=r" (retval) : ); + return retval; } diff --git a/arch/hc/include/tls.h b/arch/hc/include/tls.h index e7cc678e43..a8a5bf6f01 100644 --- a/arch/hc/include/tls.h +++ b/arch/hc/include/tls.h @@ -46,7 +46,7 @@ static inline uint16_t hc_getsp(void) __asm__ ( "\tsts %0\n" - : "=m"(ret) : + : "=m"(ret) : ); return ret; } diff --git a/arch/misoc/include/tls.h b/arch/misoc/include/tls.h index e8af51f9b0..4b093eab72 100644 --- a/arch/misoc/include/tls.h +++ b/arch/misoc/include/tls.h @@ -49,7 +49,6 @@ static inline uint32_t misoc_getsp(void) return sp; } - /**************************************************************************** * Name: up_tls_info * diff --git a/arch/renesas/src/common/up_assert.c b/arch/renesas/src/common/up_assert.c index 131782e353..fd7086c1b1 100644 --- a/arch/renesas/src/common/up_assert.c +++ b/arch/renesas/src/common/up_assert.c @@ -90,7 +90,6 @@ static void _up_assert(int errorcode) if (g_current_regs || running_task()->flink == NULL) { - up_irq_save(); for (; ; ) { #if CONFIG_BOARD_RESET_ON_ASSERT >= 1 diff --git a/arch/renesas/src/m16c/m16c_dumpstate.c b/arch/renesas/src/m16c/m16c_dumpstate.c index 95186e0a6b..f76e566fbb 100644 --- a/arch/renesas/src/m16c/m16c_dumpstate.c +++ b/arch/renesas/src/m16c/m16c_dumpstate.c @@ -69,8 +69,8 @@ static uint8_t s_last_regs[XCPTCONTEXT_REGS]; #if CONFIG_ARCH_INTERRUPTSTACK > 3 static inline uint16_t m16c_getusersp(void) { - uint8_t *ptr = (uint8_t*) g_current_regs; - return (uint16_t)ptr[REG_SP] << 8 | ptr[REG_SP+1]; + uint8_t *ptr = (uint8_t *) g_current_regs; + return (uint16_t)ptr[REG_SP] << 8 | ptr[REG_SP + 1]; } #endif @@ -84,9 +84,10 @@ 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; + uint8_t *ptr = (uint8_t *)stack; _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]); + stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], + ptr[5], ptr[6], ptr[7]); } } @@ -96,7 +97,7 @@ static void m16c_stackdump(uint16_t sp, uint16_t stack_base) static inline void m16c_registerdump(void) { - uint8_t *ptr = (uint8_t*) g_current_regs; + uint8_t *ptr = (uint8_t *) g_current_regs; /* Are user registers available from interrupt processing? */ @@ -110,17 +111,19 @@ static inline void m16c_registerdump(void) /* Dump the interrupt registers */ - _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], + _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]); + 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", - 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]); + _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]); } /**************************************************************************** @@ -159,13 +162,14 @@ void up_dumpstate(void) ustacksize = (uint16_t)rtcb->adj_stack_size; } - /* Get the limits on the interrupt stack memory. The near RAM memory map is as follows: + /* Get the limits on the interrupt stack memory. + * The near RAM memory map is as follows: * - * 0x00400 - DATA Size: Determined by linker - * BSS Size: Determined by linker - * Interrupt stack Size: CONFIG_ARCH_INTERRUPTSTACK - * Idle stack Size: CONFIG_IDLETHREAD_STACKSIZE - * Heap Size: Everything remaining + * 0x00400 - DATA Size: Determined by linker + * BSS Size: Determined by linker + * Interrupt stack Size: CONFIG_ARCH_INTERRUPTSTACK + * Idle stack Size: CONFIG_IDLETHREAD_STACKSIZE + * Heap Size: Everything remaining * 0x00bff - (end+1) */ diff --git a/arch/renesas/src/sh1/sh1_dumpstate.c b/arch/renesas/src/sh1/sh1_dumpstate.c index 973a987fbd..1028202994 100644 --- a/arch/renesas/src/sh1/sh1_dumpstate.c +++ b/arch/renesas/src/sh1/sh1_dumpstate.c @@ -71,7 +71,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; + uint32_t *ptr = (uint32_t *)stack; _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]); @@ -84,7 +84,7 @@ static void sh1_stackdump(uint32_t sp, uint32_t stack_base) static inline void sh1_registerdump(void) { - uint32_t *ptr = (uint32_t*)g_current_regs; + uint32_t *ptr = (uint32_t *)g_current_regs; /* Are user registers available from interrupt processing? */ diff --git a/arch/risc-v/include/arch.h b/arch/risc-v/include/arch.h index f2c45b63d4..4dfaf02b64 100644 --- a/arch/risc-v/include/arch.h +++ b/arch/risc-v/include/arch.h @@ -111,7 +111,8 @@ uint32_t time_hard_mul(uint32_t a, uint32_t b, uint32_t *t); #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif