Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2503fa authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: move dwarf2 related macro to dwarf2.h 



Impact: cleanup

Move recently introduced dwarf2 macros to dwarf2.h file.
It allow us to not duplicate them in assembly files.

Active usage of _cfi macros don't make assembly files
more obvious to understand but we already have a lot of
macros there which requires to search the definitions
of them *anyway*. But at least it make every cfi usage
one line shorter.

Also some code alignment is done.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c8108411

arch/x86/include/asm/dwarf2.h

+66 −31
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
#endif



/*

   Macros for dwarf2 CFI unwind table entries.

   See "as.info" for details on these pseudo ops. Unfortunately

   they are only supported in very new binutils, so define them

   away for older version.

 * Macros for dwarf2 CFI unwind table entries.

 * See "as.info" for details on these pseudo ops. Unfortunately

 * they are only supported in very new binutils, so define them

 * away for older version.

 */



#ifdef CONFIG_AS_CFI
@@ -36,8 +36,10 @@ 


#else



/* Due to the structure of pre-exisiting code, don't use assembler line

   comment character # to ignore the arguments. Instead, use a dummy macro. */

/*

 * Due to the structure of pre-exisiting code, don't use assembler line

 * comment character # to ignore the arguments. Instead, use a dummy macro.

 */

.macro cfi_ignore a=0, b=0, c=0, d=0

.endm
@@ -58,4 +60,37 @@ 


#endif



/*

 * An attempt to make CFI annotations more or less

 * correct and shorter. It is implied that you know

 * what you're doing if you use them.

 */

#ifdef __ASSEMBLY__

#ifdef CONFIG_X86_64

	.macro pushq_cfi reg

	pushq \reg

	CFI_ADJUST_CFA_OFFSET 8

	.endm



	.macro popq_cfi reg

	popq \reg

	CFI_ADJUST_CFA_OFFSET -8

	.endm



	.macro movq_cfi reg offset=0

	movq %\reg, \offset(%rsp)

	CFI_REL_OFFSET \reg, \offset

	.endm



	.macro movq_cfi_restore offset reg

	movq \offset(%rsp), %\reg

	CFI_RESTORE \reg

	.endm

#else /*!CONFIG_X86_64*/



	/* 32bit defenitions are missed yet */



#endif /*!CONFIG_X86_64*/

#endif /*__ASSEMBLY__*/



#endif /* _ASM_X86_DWARF2_H */

arch/x86/kernel/entry_64.S

+0 −23
Original line number Diff line number Diff line
@@ -60,29 +60,6 @@ 
#define __AUDIT_ARCH_LE	   0x40000000



	.code64

/*

 * Some macro's to hide the most frequently occuring CFI annotations.

 */

	.macro pushq_cfi reg

	pushq \reg

	CFI_ADJUST_CFA_OFFSET 8

	.endm



	.macro popq_cfi reg

	popq \reg

	CFI_ADJUST_CFA_OFFSET -8

	.endm



	.macro movq_cfi reg offset=0

	movq %\reg, \offset(%rsp)

	CFI_REL_OFFSET \reg, \offset

	.endm



	.macro movq_cfi_restore offset reg

	movq \offset(%rsp), %\reg

	CFI_RESTORE \reg

	.endm



#ifdef CONFIG_FUNCTION_TRACER

#ifdef CONFIG_DYNAMIC_FTRACE

ENTRY(mcount)