Skip to content

Commit d7d330d

Browse files
GorgonMeducerGorgonMeducer
authored
Merge pull request #38 from fool-cat/developing
2 parents 7fa0dad + 84d538e commit d7d330d

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

‎perf_counter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ __asm(".global __ensure_systick_wrapper\n\t");
241241
__perf_counter_printf__( \
242242
"------------------------------------\r\n"); \
243243
__perf_counter_printf__( \
244-
"%s total cycle count: %"PRIi64" [%08"PRIX64"]\r\n", \
244+
"%s total cycle count: %" PRIi64 " [%08" PRIX64 "]\r\n",\
245245
(const char *)(__STR), (int64_t)_, (int64_t)_); \
246246
} else { \
247247
__VA_ARGS__ \

‎perfc_common.h

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,9 @@ extern "C" {
287287
ALT_PERFC_CONNECT2( PERFC_CONNECT, \
288288
__PLOOC_VA_NUM_ARGS(__VA_ARGS__))(__VA_ARGS__)
289289

290+
#undef SAFE_NAME
291+
#undef PERFC_SAFE_NAME
292+
290293
#define SAFE_NAME(__NAME) PERFC_CONNECT3(__,__NAME,__LINE__)
291294
#define PERFC_SAFE_NAME(__name) PERFC_CONNECT3(__,__name,__LINE__)
292295

@@ -418,8 +421,8 @@ extern "C" {
418421
__perf_counter_printf__( \
419422
"\r\n-------------------------------------\r\n" \
420423
"%s Stack Overflow!!!" \
421-
" SP: [0x%08"PRIxPTR"]" \
422-
" Stack Limit: [0x%08"PRIxPTR"]\r\n", \
424+
" SP: [0x%08" PRIxPTR "]" \
425+
" Stack Limit: [0x%08" PRIxPTR "]\r\n", \
423426
(const char *)(__STR), \
424427
PERFC_SAFE_NAME(nSP), \
425428
PERFC_SAFE_NAME(nStackLimit)); \
@@ -434,7 +437,7 @@ extern "C" {
434437
if (__PLOOC_VA_NUM_ARGS(__VA_ARGS__) == 0) { \
435438
__perf_counter_printf__( \
436439
"\r\n-------------------------------------\r\n" \
437-
"%s Stack Used: %"PRIuPTR " bytes\r\n", \
440+
"%s Stack Used: %" PRIuPTR " bytes\r\n", \
438441
(const char *)(__STR), \
439442
__stack_used__); \
440443
} else { \
@@ -471,8 +474,8 @@ extern "C" {
471474
__perf_counter_printf__( \
472475
"\r\n-------------------------------------\r\n" \
473476
"%s Stack Overflow!!!" \
474-
" SP: [0x%08"PRIxPTR"]" \
475-
" Stack Limit: [0x%08"PRIxPTR"]\r\n", \
477+
" SP: [0x%08" PRIxPTR "]" \
478+
" Stack Limit: [0x%08" PRIxPTR "]\r\n", \
476479
(const char *)(__STR), \
477480
PERFC_SAFE_NAME(nSP), \
478481
PERFC_SAFE_NAME(nStackLimit)); \
@@ -490,7 +493,7 @@ extern "C" {
490493
if (__PLOOC_VA_NUM_ARGS(__VA_ARGS__) == 0) { \
491494
__perf_counter_printf__( \
492495
"\r\n-------------------------------------\r\n" \
493-
"%s Stack Used: %"PRIuPTR" bytes\r\n", \
496+
"%s Stack Used: %" PRIuPTR " bytes\r\n", \
494497
(const char *)(__STR), \
495498
PERFC_SAFE_NAME(__stack_used__)); \
496499
} \
@@ -530,8 +533,8 @@ extern "C" {
530533
__perf_counter_printf__( \
531534
"\r\n-------------------------------------\r\n" \
532535
__STR " Stack Overflow!!!" \
533-
" SP: [0x%08"PRIxPTR"]" \
534-
" Stack Base: [0x%08"PRIxPTR"]\r\n", \
536+
" SP: [0x%08" PRIxPTR "]" \
537+
" Stack Base: [0x%08" PRIxPTR "]\r\n", \
535538
PERFC_SAFE_NAME(nSP), \
536539
PERFC_SAFE_NAME(nStackLimit)); \
537540
} else { \
@@ -545,7 +548,7 @@ extern "C" {
545548
if (__PLOOC_VA_NUM_ARGS(__VA_ARGS__) == 0) { \
546549
__perf_counter_printf__( \
547550
"\r\n-------------------------------------\r\n" \
548-
__STR " Stack Used: %"PRIuPTR" bytes\r\n", \
551+
__STR " Stack Used: %" PRIuPTR " bytes\r\n", \
549552
__stack_used__); \
550553
} else { \
551554
__VA_ARGS__; \
@@ -581,8 +584,8 @@ extern "C" {
581584
__perf_counter_printf__( \
582585
"\r\n-------------------------------------\r\n" \
583586
__STR " Stack Overflow!!!" \
584-
" SP: [0x%08"PRIxPTR"]" \
585-
" Stack Base: [0x%08"PRIxPTR"]\r\n", \
587+
" SP: [0x%08" PRIxPTR "]" \
588+
" Stack Base: [0x%08" PRIxPTR "]\r\n", \
586589
PERFC_SAFE_NAME(nSP), \
587590
PERFC_SAFE_NAME(nStackLimit)); \
588591
} \
@@ -600,8 +603,8 @@ extern "C" {
600603
__perf_counter_printf__( \
601604
"\r\n-------------------------------------\r\n" \
602605
__STR \
603-
" Stack Used Max: %"PRIuPTR" bytes\r\n", \
604-
PERFC_SAFE_NAME(__stack_used__)); \
606+
" Stack Used Max: %" PRIuPTR " bytes\r\n", \
607+
PERFC_SAFE_NAME(__stack_used__)); \
605608
} \
606609
} \
607610
} \

0 commit comments

Comments
 (0)