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

Commit 269e5906 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

objtool: header file sync-up 



When building tools/objtool/ it rightly complains about a number of
files being out of sync.  Fix this up by syncing them properly with the
relevant in-kernel versions.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c310c7b2

tools/objtool/arch/x86/include/asm/inat.h

+0 −10
Original line number Diff line number Diff line
@@ -97,16 +97,6 @@ 
#define INAT_MAKE_GROUP(grp)	((grp << INAT_GRP_OFFS) | INAT_MODRM)

#define INAT_MAKE_IMM(imm)	(imm << INAT_IMM_OFFS)



/* Identifiers for segment registers */

#define INAT_SEG_REG_IGNORE	0

#define INAT_SEG_REG_DEFAULT	1

#define INAT_SEG_REG_CS		2

#define INAT_SEG_REG_SS		3

#define INAT_SEG_REG_DS		4

#define INAT_SEG_REG_ES		5

#define INAT_SEG_REG_FS		6

#define INAT_SEG_REG_GS		7



/* Attribute search APIs */

extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode);

extern int inat_get_last_prefix_id(insn_byte_t last_pfx);

tools/objtool/arch/x86/include/asm/orc_types.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct orc_entry { 
	unsigned	sp_reg:4;

	unsigned	bp_reg:4;

	unsigned	type:2;

} __packed;

};



/*

 * This struct is used by asm and inline asm code to manually annotate the

tools/objtool/arch/x86/lib/x86-opcode-map.txt

+3 −12
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ fb: psubq Pq,Qq | vpsubq Vx,Hx,Wx (66),(v1) 
fc: paddb Pq,Qq | vpaddb Vx,Hx,Wx (66),(v1)

fd: paddw Pq,Qq | vpaddw Vx,Hx,Wx (66),(v1)

fe: paddd Pq,Qq | vpaddd Vx,Hx,Wx (66),(v1)

ff: UD0

ff:

EndTable



Table: 3-byte opcode 1 (0x0f 0x38)
@@ -717,7 +717,7 @@ AVXcode: 2 
7e: vpermt2d/q Vx,Hx,Wx (66),(ev)

7f: vpermt2ps/d Vx,Hx,Wx (66),(ev)

80: INVEPT Gy,Mdq (66)

81: INVVPID Gy,Mdq (66)

81: INVPID Gy,Mdq (66)

82: INVPCID Gy,Mdq (66)

83: vpmultishiftqb Vx,Hx,Wx (66),(ev)

88: vexpandps/d Vpd,Wpd (66),(ev)
@@ -970,15 +970,6 @@ GrpTable: Grp9 
EndTable



GrpTable: Grp10

# all are UD1

0: UD1

1: UD1

2: UD1

3: UD1

4: UD1

5: UD1

6: UD1

7: UD1

EndTable



# Grp11A and Grp11B are expressed as Grp11 in Intel SDM
@@ -1018,7 +1009,7 @@ GrpTable: Grp15 
1: fxstor | RDGSBASE Ry (F3),(11B)

2: vldmxcsr Md (v1) | WRFSBASE Ry (F3),(11B)

3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B)

4: XSAVE | ptwrite Ey (F3),(11B)

4: XSAVE

5: XRSTOR | lfence (11B)

6: XSAVEOPT | clwb (66) | mfence (11B)

7: clflush | clflushopt (66) | sfence (11B)

tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk

+0 −1
Original line number Diff line number Diff line 
#!/bin/awk -f

# SPDX-License-Identifier: GPL-2.0

# gen-insn-attr-x86.awk: Instruction attribute table generator

# Written by Masami Hiramatsu <mhiramat@redhat.com>

#