patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Replacing _IntLatencyStop with _int_latency_stop

Browse source 
Updating nano kernel functions to follow a consistent naming convention.
Part of that process is the removal of camelCase naming conventions for the
preferred_underscore_method.

Change accomplished with the following script:

#!/bin/bash
echo "Searching for ${1} to replace with ${2}"
find . -type f \( -iname \*.c -o -iname \*.h -o -iname \*.s \) \
       -not \( -path host/src/genIdt -prune \) \   \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

Signed-off-by: Dan Kalowsky <daniel.kalowsky@intel.com>
This commit is contained in:
Dan Kalowsky 2015-04-16 12:25:10 -07:00 committed by Anas Nashif
parent 5b09162bb1
commit df50981dba
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/core/cpuhalt.s
View file

@ -82,7 +82,7 @@ by nano_cpu_atomic_idle().
SECTION_FUNC(TEXT, nano_cpu_idle)
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif
#if defined(CONFIG_BOOT_TIME_MEASUREMENT)
rdtsc /* record idle timestamp */
@ -122,7 +122,7 @@ SECTION_FUNC(TEXT, nano_cpu_idle)
SECTION_FUNC(TEXT, nano_cpu_atomic_idle)
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif
sti /* make sure interrupts are enabled */

12
arch/x86/core/intstub.s
View file

@ -72,7 +72,7 @@ entering and exiting a C interrupt handler.
#ifdef CONFIG_INT_LATENCY_BENCHMARK
GTEXT(_int_latency_start)
GTEXT(_IntLatencyStop)
GTEXT(_int_latency_stop)
#endif
/*******************************************************************************
*
@ -209,7 +209,7 @@ BRANCH_LABEL(alreadyOnIntStack)
#ifdef CONFIG_INT_LATENCY_BENCHMARK
/* preserve eax which contain stub return address */
pushl %eax
call _IntLatencyStop
call _int_latency_stop
popl %eax
#endif
@ -232,7 +232,7 @@ BRANCH_LABEL(_HandleIdle)
call _SysPowerSaveIdleExit
add $0x4, %esp
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif
sti /* re-enable interrupts */
popl %eax
@ -347,7 +347,7 @@ SECTION_FUNC(TEXT, _IntExit)
/* Restore volatile registers and return to the interrupted context */
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif
popl %edx
@ -379,7 +379,7 @@ BRANCH_LABEL(noReschedule)
BRANCH_LABEL(nestedInterrupt)
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif
popl %edx /* pop volatile registers in reverse order */
popl %ecx
@ -516,7 +516,7 @@ SECTION_FUNC(TEXT, irq_unlock)
testl $0x200, SP_ARG1(%esp)
jz skipIntEnable
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif
sti
BRANCH_LABEL(skipIntEnable)

2
arch/x86/core/swap.s
View file

@ -380,7 +380,7 @@ BRANCH_LABEL(CROHandlingDone)
/* save %eax since it used as the return value for _Swap */
pushl %eax
/* interrupts are being reenabled, stop accumulating time */
call _IntLatencyStop
call _int_latency_stop
/* restore _Swap's %eax */
popl %eax

8
include/nanokernel/x86/arch.h
View file

@ -260,7 +260,7 @@ static inline void irq_unlock(unsigned int key) {}
#ifdef CONFIG_INT_LATENCY_BENCHMARK
void _int_latency_start (void);
void _IntLatencyStop (void);
void _int_latency_stop (void);
#endif
/*******************************************************************************
@ -361,7 +361,7 @@ static inline __attribute__((always_inline))
{
/*
* The assembler code is split into two parts and
* _IntLatencyStop (); is invoked as a legitimate C
* _int_latency_stop (); is invoked as a legitimate C
* function to let the compiler preserve registers
* before the function invocation
*
@ -385,7 +385,7 @@ static inline __attribute__((always_inline))
#endif
#ifdef CONFIG_INT_LATENCY_BENCHMARK
_IntLatencyStop ();
_int_latency_stop ();
#endif
__asm__ volatile (
@ -413,7 +413,7 @@ __asm volatile void irq_unlock_inline
testl $0x200, key
jz end
#ifdef CONFIG_INT_LATENCY_BENCHMARK
call _IntLatencyStop
call _int_latency_stop
#endif /* CONFIG_INT_LATENCY_BENCHMARK */
sti
end:

4
kernel/nanokernel/core/int_latency_bench.c
View file

@ -106,7 +106,7 @@ void _int_latency_start(void)
*
*/
void _IntLatencyStop(void)
void _int_latency_stop(void)
{
uint32_t delta;
uint32_t delayOverhead;
@ -189,7 +189,7 @@ void intLatencyInit(void)
nestingDelay = timer_read() - nestingDelay - timeToReadTime;
stopDelay = timer_read();
_IntLatencyStop();
_int_latency_stop();
stopDelay = timer_read() - stopDelay - timeToReadTime;
/* re-initialize globals to default values */