Fix ThirdParty/GCC/ATmega formatting (#965)

Unnecessary white space was introduced in PR #768
which affected the formatting of assembly code. This PR
returns the correct formatting. No functional change.
This commit is contained in:
Phillip Stevens 2024-01-30 16:42:20 +11:00 committed by GitHub
parent 04cb022e44
commit 8622bd5f49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 31 deletions

View file

@ -100,11 +100,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
{ {
__asm__ __volatile__ ( __asm__ __volatile__ (
"in __tmp_reg__,__SREG__" "\n\t" "in __tmp_reg__,__SREG__" "\n\t"
"cli" "\n\t" "cli" "\n\t"
"wdr" "\n\t" "wdr" "\n\t"
"out %0, %1" "\n\t" "out %0, %1" "\n\t"
"out __SREG__,__tmp_reg__" "\n\t" "out __SREG__,__tmp_reg__" "\n\t"
"out %0, %2" "\n\t" "out %0, %2" "\n\t"
: /* no outputs */ : /* no outputs */
: "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ), : "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ),
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ), "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
@ -117,11 +117,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
{ {
__asm__ __volatile__ ( __asm__ __volatile__ (
"in __tmp_reg__,__SREG__" "\n\t" "in __tmp_reg__,__SREG__" "\n\t"
"cli" "\n\t" "cli" "\n\t"
"wdr" "\n\t" "wdr" "\n\t"
"sts %0, %1" "\n\t" "sts %0, %1" "\n\t"
"out __SREG__,__tmp_reg__" "\n\t" "out __SREG__,__tmp_reg__" "\n\t"
"sts %0, %2" "\n\t" "sts %0, %2" "\n\t"
: /* no outputs */ : /* no outputs */
: "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ), : "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ),
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ), "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
@ -167,11 +167,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
{ {
__asm__ __volatile__ ( __asm__ __volatile__ (
"in __tmp_reg__,__SREG__" "\n\t" "in __tmp_reg__,__SREG__" "\n\t"
"cli" "\n\t" "cli" "\n\t"
"wdr" "\n\t" "wdr" "\n\t"
"out %0, %1" "\n\t" "out %0, %1" "\n\t"
"out __SREG__,__tmp_reg__" "\n\t" "out __SREG__,__tmp_reg__" "\n\t"
"out %0, %2" "\n\t" "out %0, %2" "\n\t"
: /* no outputs */ : /* no outputs */
: "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ), : "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ),
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ), "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
@ -184,11 +184,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
{ {
__asm__ __volatile__ ( __asm__ __volatile__ (
"in __tmp_reg__,__SREG__" "\n\t" "in __tmp_reg__,__SREG__" "\n\t"
"cli" "\n\t" "cli" "\n\t"
"wdr" "\n\t" "wdr" "\n\t"
"sts %0, %1" "\n\t" "sts %0, %1" "\n\t"
"out __SREG__,__tmp_reg__" "\n\t" "out __SREG__,__tmp_reg__" "\n\t"
"sts %0, %2" "\n\t" "sts %0, %2" "\n\t"
: /* no outputs */ : /* no outputs */
: "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ), : "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ),
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ), "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),

View file

@ -73,20 +73,20 @@ typedef uint8_t UBaseType_t;
/* Critical section management. */ /* Critical section management. */
#define portENTER_CRITICAL() \ #define portENTER_CRITICAL() \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
"in __tmp_reg__, __SREG__" "\n\t" \ "in __tmp_reg__, __SREG__" "\n\t" \
"cli" "\n\t" \ "cli" "\n\t" \
"push __tmp_reg__" "\n\t" \ "push __tmp_reg__" "\n\t" \
::: "memory" \ ::: "memory" \
) )
#define portEXIT_CRITICAL() \ #define portEXIT_CRITICAL() \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
"pop __tmp_reg__" "\n\t" \ "pop __tmp_reg__" "\n\t" \
"out __SREG__, __tmp_reg__" "\n\t" \ "out __SREG__, __tmp_reg__" "\n\t" \
::: "memory" \ ::: "memory" \
) )