Commit c8ea0d67 authored by Julien Thierry's avatar Julien Thierry Committed by Josh Poimboeuf
Browse files

objtool: Move macros describing structures to arch-dependent code 



Some macros are defined to describe the size and layout of structures
exception_table_entry, jump_entry and alt_instr. These values can vary
from one architecture to another.

Have the values be defined by arch specific code.

Suggested-by: default avatarRaphael Gault <raphael.gault@arm.com>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Signed-off-by: default avatarJulien Thierry <jthierry@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
parent bb090fdb

tools/objtool/arch/x86/include/arch_special.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _X86_ARCH_SPECIAL_H

#define _X86_ARCH_SPECIAL_H



#define EX_ENTRY_SIZE		12

#define EX_ORIG_OFFSET		0

#define EX_NEW_OFFSET		4



#define JUMP_ENTRY_SIZE		16

#define JUMP_ORIG_OFFSET	0

#define JUMP_NEW_OFFSET		4



#define ALT_ENTRY_SIZE		13

#define ALT_ORIG_OFFSET		0

#define ALT_NEW_OFFSET		4

#define ALT_FEATURE_OFFSET	8

#define ALT_ORIG_LEN_OFFSET	10

#define ALT_NEW_LEN_OFFSET	11



#endif /* _X86_ARCH_SPECIAL_H */

tools/objtool/special.c

+1 −15
Original line number Diff line number Diff line
@@ -14,21 +14,7 @@ 
#include "builtin.h"

#include "special.h"

#include "warn.h"



#define EX_ENTRY_SIZE		12

#define EX_ORIG_OFFSET		0

#define EX_NEW_OFFSET		4



#define JUMP_ENTRY_SIZE		16

#define JUMP_ORIG_OFFSET	0

#define JUMP_NEW_OFFSET		4



#define ALT_ENTRY_SIZE		13

#define ALT_ORIG_OFFSET		0

#define ALT_NEW_OFFSET		4

#define ALT_FEATURE_OFFSET	8

#define ALT_ORIG_LEN_OFFSET	10

#define ALT_NEW_LEN_OFFSET	11

#include "arch_special.h"



#define X86_FEATURE_POPCNT (4*32+23)

#define X86_FEATURE_SMAP   (9*32+20)