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

Commit af22aa7c authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/asm: Remove the xyz_cfi macros from dwarf2.h 



They are currently unused, and I don't think that anyone was
ever particularly happy with them.  They had the unfortunate
property that they made it easy to CFI-annotate things without
thinking about them -- when pushing, do you want to just update
the CFA offset, or do you also want to update the saved location
of the register being pushed?

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1447bfbd10bb268b4593b32534ecefa1f4df287e.1444696194.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 893a3ec2

arch/x86/include/asm/dwarf2.h

+0 −93
Original line number Diff line number Diff line
@@ -81,97 +81,4 @@ 


#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 pushq_cfi_reg reg

	pushq %\reg

	CFI_ADJUST_CFA_OFFSET 8

	CFI_REL_OFFSET \reg, 0

	.endm



	.macro popq_cfi reg

	popq \reg

	CFI_ADJUST_CFA_OFFSET -8

	.endm



	.macro popq_cfi_reg reg

	popq %\reg

	CFI_ADJUST_CFA_OFFSET -8

	CFI_RESTORE \reg

	.endm



	.macro pushfq_cfi

	pushfq

	CFI_ADJUST_CFA_OFFSET 8

	.endm



	.macro popfq_cfi

	popfq

	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*/

	.macro pushl_cfi reg

	pushl \reg

	CFI_ADJUST_CFA_OFFSET 4

	.endm



	.macro pushl_cfi_reg reg

	pushl %\reg

	CFI_ADJUST_CFA_OFFSET 4

	CFI_REL_OFFSET \reg, 0

	.endm



	.macro popl_cfi reg

	popl \reg

	CFI_ADJUST_CFA_OFFSET -4

	.endm



	.macro popl_cfi_reg reg

	popl %\reg

	CFI_ADJUST_CFA_OFFSET -4

	CFI_RESTORE \reg

	.endm



	.macro pushfl_cfi

	pushfl

	CFI_ADJUST_CFA_OFFSET 4

	.endm



	.macro popfl_cfi

	popfl

	CFI_ADJUST_CFA_OFFSET -4

	.endm



	.macro movl_cfi reg offset=0

	movl %\reg, \offset(%esp)

	CFI_REL_OFFSET \reg, \offset

	.endm



	.macro movl_cfi_restore offset reg

	movl \offset(%esp), %\reg

	CFI_RESTORE \reg

	.endm

#endif /*!CONFIG_X86_64*/

#endif /*__ASSEMBLY__*/



#endif /* _ASM_X86_DWARF2_H */