From 2ac4a04b9255f1c9b70449db3146660965fe64b1 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Fri, 8 May 2015 17:12:56 -0500 Subject: [PATCH] Rename __defaultEsf to _default_esf Updating global variable's name to follow a consistent naming convention. Explicitly moved from __ to _ by direction of Ben Walsh Change accomplished with the following script: #!/bin/bash echo "Searching for ${1} to replace with ${2}" find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" -o -name "*.arch" \) \ ! -path "./host/src/genIdt/*" \ ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g'; Change-Id: Idd6f7c3c2fdd818f0a794985f3689705cac3c0a2 Signed-off-by: Yonattan Louise --- arch/arc/core/fatal.c | 4 ++-- arch/arc/core/fault.c | 4 ++-- arch/arm/core/nanofatal.c | 4 ++-- arch/x86/core/nanofatal.c | 4 ++-- include/nanokernel/arc/v2/exc.h | 2 +- include/nanokernel/arm/CortexM/exc.h | 2 +- include/nanokernel/x86/arch.h | 2 +- kernel/nanokernel/compiler_stack_protect.c | 2 +- kernel/nanokernel/nanocontextentry.c | 2 +- kernel/nanokernel/string_s.c | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arc/core/fatal.c b/arch/arc/core/fatal.c index 52121dce0fc..bfe192533f1 100644 --- a/arch/arc/core/fatal.c +++ b/arch/arc/core/fatal.c @@ -48,7 +48,7 @@ ARCv2 CPUs. #define PR_EXC(...) #endif /* CONFIG_PRINTK */ -const NANO_ESF __defaultEsf = { +const NANO_ESF _default_esf = { 0xdeaddead, /* placeholder */ }; @@ -63,7 +63,7 @@ const NANO_ESF __defaultEsf = { * * The caller is expected to always provide a usable ESF. In the event that the * fatal error does not have a hardware generated ESF, the caller should either -* create its own or use a pointer to the global default ESF <__defaultEsf>. +* create its own or use a pointer to the global default ESF <_default_esf>. * * RETURNS: This function does not return. * diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c index 57c3a2610c5..dc5c2898679 100644 --- a/arch/arc/core/fault.c +++ b/arch/arc/core/fault.c @@ -103,7 +103,7 @@ void _Fault(void) { uint32_t ecr = _arc_v2_aux_reg_read(_ARC_V2_ECR); - FAULT_DUMP(&__defaultEsf, ecr); + FAULT_DUMP(&_default_esf, ecr); - _SysFatalErrorHandler(_NANO_ERR_HW_EXCEPTION, &__defaultEsf); + _SysFatalErrorHandler(_NANO_ERR_HW_EXCEPTION, &_default_esf); } diff --git a/arch/arm/core/nanofatal.c b/arch/arm/core/nanofatal.c index 0682b226a1e..072ba630711 100644 --- a/arch/arm/core/nanofatal.c +++ b/arch/arm/core/nanofatal.c @@ -58,7 +58,7 @@ This module provides the _NanoFatalErrorHandler() routine for ARM Cortex-M. * Define a default ESF for use with _NanoFatalErrorHandler() in the event * the caller does not have a NANO_ESF to pass */ -const NANO_ESF __defaultEsf = {0xdeaddead, /* a1 */ +const NANO_ESF _default_esf = {0xdeaddead, /* a1 */ 0xdeaddead, /* a2 */ 0xdeaddead, /* a3 */ 0xdeaddead, /* a4 */ @@ -79,7 +79,7 @@ const NANO_ESF __defaultEsf = {0xdeaddead, /* a1 */ * * The caller is expected to always provide a usable ESF. In the event that the * fatal error does not have a hardware generated ESF, the caller should either -* create its own or use a pointer to the global default ESF <__defaultEsf>. +* create its own or use a pointer to the global default ESF <_default_esf>. * * RETURNS: This function does not return. * diff --git a/arch/x86/core/nanofatal.c b/arch/x86/core/nanofatal.c index 81b181a85b1..bb2d210edd0 100644 --- a/arch/x86/core/nanofatal.c +++ b/arch/x86/core/nanofatal.c @@ -52,7 +52,7 @@ This module provides the _NanoFatalErrorHandler() routine. * Define a default ESF for use with _NanoFatalErrorHandler() in the event * the caller does not have a NANO_ESF to pass */ -const NANO_ESF __defaultEsf = { +const NANO_ESF _default_esf = { #ifdef CONFIG_GDB_INFO 0xdeaddead, /* EBP */ 0xdeaddead, /* EBX */ @@ -79,7 +79,7 @@ const NANO_ESF __defaultEsf = { * * The caller is expected to always provide a usable ESF. In the event that the * fatal error does not have a hardware generated ESF, the caller should either -* create its own or use a pointer to the global default ESF <__defaultEsf>. +* create its own or use a pointer to the global default ESF <_default_esf>. * * RETURNS: This function does not return. * diff --git a/include/nanokernel/arc/v2/exc.h b/include/nanokernel/arc/v2/exc.h index 4034e33f186..2cd04cf5a1a 100644 --- a/include/nanokernel/arc/v2/exc.h +++ b/include/nanokernel/arc/v2/exc.h @@ -46,7 +46,7 @@ struct __esf { }; typedef struct __esf NANO_ESF; -extern const NANO_ESF __defaultEsf; +extern const NANO_ESF _default_esf; #endif #endif /* _ARCH_ARC_V2_EXC_H_ */ diff --git a/include/nanokernel/arm/CortexM/exc.h b/include/nanokernel/arm/CortexM/exc.h index 761fcf4441c..0b1fbb94421 100644 --- a/include/nanokernel/arm/CortexM/exc.h +++ b/include/nanokernel/arm/CortexM/exc.h @@ -54,7 +54,7 @@ struct __esf { typedef struct __esf NANO_ESF; -extern const NANO_ESF __defaultEsf; +extern const NANO_ESF _default_esf; extern void _ExcExit(void); #endif diff --git a/include/nanokernel/x86/arch.h b/include/nanokernel/x86/arch.h index 2ef59ee7ae2..5a6f2a5d8a9 100644 --- a/include/nanokernel/x86/arch.h +++ b/include/nanokernel/x86/arch.h @@ -369,7 +369,7 @@ extern FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason, extern FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason, const NANO_ESF *pEsf); /* Dummy ESF for fatal errors that would otherwise not have an ESF */ -extern const NANO_ESF __defaultEsf; +extern const NANO_ESF _default_esf; /* * BSP provided routine which kernel invokes to configure an interrupt vector diff --git a/kernel/nanokernel/compiler_stack_protect.c b/kernel/nanokernel/compiler_stack_protect.c index 0935c5e2dd1..c747637c484 100644 --- a/kernel/nanokernel/compiler_stack_protect.c +++ b/kernel/nanokernel/compiler_stack_protect.c @@ -63,7 +63,7 @@ void FUNC_NORETURN _StackCheckHandler(void) /* Stack canary error is a software fatal condition; treat it as such. */ - _NanoFatalErrorHandler(_NANO_ERR_STACK_CHK_FAIL, &__defaultEsf); + _NanoFatalErrorHandler(_NANO_ERR_STACK_CHK_FAIL, &_default_esf); } #endif /* CONFIG_STACK_CANARIES */ diff --git a/kernel/nanokernel/nanocontextentry.c b/kernel/nanokernel/nanocontextentry.c index e0b5168ed7c..5452b6f3492 100644 --- a/kernel/nanokernel/nanocontextentry.c +++ b/kernel/nanokernel/nanocontextentry.c @@ -135,7 +135,7 @@ FUNC_NORETURN void _context_entry( /* Loss of essential context is a system fatal error */ _NanoFatalErrorHandler(_NANO_ERR_INVALID_TASK_EXIT, - &__defaultEsf); + &_default_esf); } /* Gracefully terminate the currently executing context */ diff --git a/kernel/nanokernel/string_s.c b/kernel/nanokernel/string_s.c index 4b536edd914..8e567d2e45a 100644 --- a/kernel/nanokernel/string_s.c +++ b/kernel/nanokernel/string_s.c @@ -67,7 +67,7 @@ errno_t __k_memcpy_s(void *dest, size_t nDestElem, const void *src, { if ((dest == NULL) || (src == NULL) || (nDestElem < nElem)) { _NanoFatalErrorHandler(_NANO_ERR_INVALID_STRING_OP, - &__defaultEsf); + &_default_esf); } /* @@ -143,7 +143,7 @@ errno_t __strcpy_s(char *dest, size_t nDestElem, const char *src) dest[0] = '\0'; } - _NanoFatalErrorHandler (_NANO_ERR_INVALID_STRING_OP, &__defaultEsf); + _NanoFatalErrorHandler (_NANO_ERR_INVALID_STRING_OP, &_default_esf); /* * the following statement is included in case the compiler