Eliminate separate include files for generating absolute symbols
The toolchain-specific macros used to generate absolute symbols are now part of the main include file for that toolchain, since there doesn't seem to be a good reason to have them in a separate file. Change-Id: Ic97800485b20d6c5b23d14f69f67ee845cf076f5 Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
This commit is contained in:
Allan Stephens
Anas Nashif
parent
40a719d584
commit
e54a6c4b68
5 changed files with 43 additions and 124 deletions
|
|
@ -1,42 +0,0 @@
|
|||
/* macros to generate absolute symbols */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010, 2012-2014, Wind River Systems, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1) Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2) Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3) Neither the name of Wind River Systems nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _ABSSYM_H_
|
||||
#define _ABSSYM_H_
|
||||
|
||||
#if defined(__GNUC__)
|
||||
#include <toolchain/abs_sym_gcc.h>
|
||||
#else
|
||||
#include <toolchain/abs_sym_other.h>
|
||||
#endif
|
||||
|
||||
#endif /* _ABSSYM_H_ */
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
/* macros to generate absolute symbols for GCC */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010, 2012-2014, Wind River Systems, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1) Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2) Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3) Neither the name of Wind River Systems nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _ABS_SYM_GCC_H_
|
||||
#define _ABS_SYM_GCC_H_
|
||||
|
||||
/*
|
||||
* The file should not be included directly
|
||||
* Include toolchain.h instead
|
||||
*/
|
||||
|
||||
/* create an extern reference to the absolute symbol */
|
||||
|
||||
#define GEN_OFFSET_EXTERN(name) extern const char name[]
|
||||
|
||||
#define GEN_ABS_SYM_BEGIN(name) \
|
||||
extern void name(void); \
|
||||
void name(void) \
|
||||
{
|
||||
|
||||
#define GEN_ABS_SYM_END }
|
||||
|
||||
#if defined(VXMICRO_ARCH_arm)
|
||||
|
||||
/*
|
||||
* GNU/ARM backend does not have a proper operand modifier which does not
|
||||
* produces prefix # followed by value, such as %0 for PowerPC, Intel, and
|
||||
* MIPS. The workaround performed here is using %B0 which converts
|
||||
* the value to ~(value). Thus "n"(~(value)) is set in operand constraint
|
||||
* to output (value) in the ARM specific GEN_OFFSET macro.
|
||||
*/
|
||||
|
||||
#define GEN_ABSOLUTE_SYM(name, value) \
|
||||
__asm__(".globl\t" #name "\n\t.equ\t" #name \
|
||||
",%B0" \
|
||||
"\n\t.type\t" #name ",%%object" : : "n"(~(value)))
|
||||
|
||||
#elif defined(VXMICRO_ARCH_x86) || defined(VXMICRO_ARCH_arc)
|
||||
|
||||
#define GEN_ABSOLUTE_SYM(name, value) \
|
||||
__asm__(".globl\t" #name "\n\t.equ\t" #name \
|
||||
",%c0" \
|
||||
"\n\t.type\t" #name ",@object" : : "n"(value))
|
||||
|
||||
#else
|
||||
#error processor architecture not supported
|
||||
#endif
|
||||
|
||||
#endif /* _ABS_SYM_GCC_H_ */
|
||||
|
|
@ -253,6 +253,45 @@ A##a:
|
|||
#else
|
||||
#define _ASM_FILE_PROLOGUE .text; .code 32
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* These macros generate absolute symbols for GCC
|
||||
*/
|
||||
|
||||
/* create an extern reference to the absolute symbol */
|
||||
|
||||
#define GEN_OFFSET_EXTERN(name) extern const char name[]
|
||||
|
||||
#define GEN_ABS_SYM_BEGIN(name) \
|
||||
extern void name(void); \
|
||||
void name(void) \
|
||||
{
|
||||
|
||||
#define GEN_ABS_SYM_END }
|
||||
|
||||
#if defined(VXMICRO_ARCH_arm)
|
||||
|
||||
/*
|
||||
* GNU/ARM backend does not have a proper operand modifier which does not
|
||||
* produces prefix # followed by value, such as %0 for PowerPC, Intel, and
|
||||
* MIPS. The workaround performed here is using %B0 which converts
|
||||
* the value to ~(value). Thus "n"(~(value)) is set in operand constraint
|
||||
* to output (value) in the ARM specific GEN_OFFSET macro.
|
||||
*/
|
||||
|
||||
#define GEN_ABSOLUTE_SYM(name, value) \
|
||||
__asm__(".globl\t" #name "\n\t.equ\t" #name \
|
||||
",%B0" \
|
||||
"\n\t.type\t" #name ",%%object" : : "n"(~(value)))
|
||||
|
||||
#elif defined(VXMICRO_ARCH_x86) || defined(VXMICRO_ARCH_arc)
|
||||
|
||||
#define GEN_ABSOLUTE_SYM(name, value) \
|
||||
__asm__(".globl\t" #name "\n\t.equ\t" #name \
|
||||
",%c0" \
|
||||
"\n\t.type\t" #name ",@object" : : "n"(value))
|
||||
|
||||
#else
|
||||
#error processor architecture not supported
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ $ nm offsets.o
|
|||
#ifndef _GEN_OFFSET_H
|
||||
#define _GEN_OFFSET_H
|
||||
|
||||
#include <abs_sym.h>
|
||||
#include <toolchain.h>
|
||||
#include <stddef.h>
|
||||
|
||||
/* definition of the GEN_OFFSET_SYM() macros is toolchain independant */
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ misc/generated/sysgen/kernel_main.c: misc/generated/sysgen/prj.vpf FORCE
|
|||
define filechk_configs.c
|
||||
(echo "/* file is auto-generated, do not modify ! */"; \
|
||||
echo; \
|
||||
echo "#include <abs_sym.h>"; \
|
||||
echo "#include <toolchain.h>"; \
|
||||
echo; \
|
||||
echo "GEN_ABS_SYM_BEGIN (_ConfigAbsSyms)"; \
|
||||
echo; \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue