mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-04-24 14:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpf: include, bfd, opcodes: add EF_BPF_CPUVER ELF header flags

Browse Source 
This patch adds support for EF_BPF_CPUVER bits in the ELF
machine-dependent header flags.  These bits encode the BPF CPU
version for which the object file has been compiled for.

The BPF assembler is updated so it annotates the object files it
generates with these bits.

The BPF disassembler is updated so it honors EF_BPF_CPUVER to use the
appropriate ISA version if the user didn't specify an explicit ISA
version in the command line.  Note that a value of zero in
EF_BPF_CPUVER is interpreted by the disassembler as "use the later
supported version" (the BPF CPU versions start with v1.)

The readelf utility is updated to pretty print EF_BPF_CPUVER when it
prints out the ELF header:

   $ readelf -h a.out
   ELF Header:
     ...
     Flags:                             0x4, CPU Version: 4

Tested in bpf-unknown-none.

include/ChangeLog:

2023-07-30  Jose E. Marchesi  <jose.marchesi@oracle.com>

	* elf/bpf.h (EF_BPF_CPUVER): Define.
	* opcode/bpf.h (BPF_XBPF): Change from 0xf to 0xff so it fits in
	EF_BPF_CPUVER.

binutils/ChangeLog:

2023-07-30  Jose E. Marchesi  <jose.marchesi@oracle.com>

	* readelf.c (get_machine_flags): Recognize and pretty print BPF
	machine flags.

opcodes/ChangeLog:

2023-07-30  Jose E. Marchesi  <jose.marchesi@oracle.com>

	* bpf-dis.c: Initialize asm_bpf_version to -1.
	(print_insn_bpf): Set BPF ISA version from the cpu version ELF
	header flags if no explicit version set in the command line.
	* disassemble.c (disassemble_init_for_target): Remove unused code.

gas/ChangeLog:

2023-07-30  Jose E. Marchesi  <jose.marchesi@oracle.com>

	* config/tc-bpf.h (elf_tc_final_processing): Define.
	* config/tc-bpf.c (bpf_elf_final_processing): New function.
This commit is contained in:
Jose E. Marchesi 2023-07-30 22:39:30 +02:00
parent 0346042938
commit 1e18ffc991
12 changed files with 77 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2023-07-30 Jose E. Marchesi <jose.marchesi@oracle.com>
* readelf.c (get_machine_flags): Recognize and pretty print BPF
machine flags.
2023-07-24 Johannes Schauer Marin Rodrigues <josch@debian.org>
* doc/binutils.texi (objcopy): Document change in behaviour of

6
binutils/readelf.c
View File

@ -168,6 +168,7 @@
#include "elf/xtensa.h"
#include "elf/z80.h"
#include "elf/loongarch.h"
#include "elf/bpf.h"
#include "getopt.h"
#include "libiberty.h"
@ -4191,6 +4192,11 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
strcat (buf, ", no delay");
break;
case EM_BPF:
sprintf (buf + strlen (buf), ", CPU Version: %u",
e_flags & EF_BPF_CPUVER);
break;
case EM_SPARCV9:
if (e_flags & EF_SPARC_32PLUS)
strcat (buf, ", v8+");

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
2023-07-30 Jose E. Marchesi <jose.marchesi@oracle.com>
* config/tc-bpf.h (elf_tc_final_processing): Define.
* config/tc-bpf.c (bpf_elf_final_processing): New function.
2023-07-30 Jose E. Marchesi <jose.marchesi@oracle.com>
* config/tc-bpf.c (signed_overflow): Copy function from

9
gas/config/tc-bpf.c
View File

@ -1679,3 +1679,12 @@ bpf_tc_equal_in_insn (int c ATTRIBUTE_UNUSED, char *str ATTRIBUTE_UNUSED)
return 0;
}
/* Some special processing for a BPF ELF file. */
void
bpf_elf_final_processing (void)
{
/* Annotate the BPF ISA version in the ELF flag bits. */
elf_elfheader (stdoutput)->e_flags |= (isa_spec & EF_BPF_CPUVER);
}

3
gas/config/tc-bpf.h
View File

@ -53,3 +53,6 @@
#define TC_EQUAL_IN_INSN(c, s) bpf_tc_equal_in_insn ((c), (s))
extern bool bpf_tc_equal_in_insn (int, char *);
#define elf_tc_final_processing bpf_elf_final_processing
extern void bpf_elf_final_processing (void);

1
gas/config/tc-sparc.c
View File

@ -4992,3 +4992,4 @@ sparc_cfi_emit_pcrel_expr (expressionS *exp, unsigned int nbytes)
emit_expr_with_reloc (exp, nbytes, "disp");
sparc_no_align_cons = 0;
}

6
include/ChangeLog
View File

@ -1,3 +1,9 @@
2023-07-30 Jose E. Marchesi <jose.marchesi@oracle.com>
* elf/bpf.h (EF_BPF_CPUVER): Define.
* opcode/bpf.h (BPF_XBPF): Change from 0xf to 0xff so it fits in
EF_BPF_CPUVER.
2023-07-24 Jose E. Marchesi <jose.marchesi@oracle.com>
* opcode/bpf.h (BPF_IMM32_BSWAP16): Define.

5
include/elf/bpf.h
View File

@ -37,4 +37,9 @@ START_RELOC_NUMBERS (elf_bpf_reloc_type)
RELOC_NUMBER (R_BPF_GNU_64_16, 256)
END_RELOC_NUMBERS (R_BPF_max)
/* Processor specific flags for the ELF header e_flags field. */
/* Version of the BPF ISA used in the file. */
#define EF_BPF_CPUVER 0x0000000f
#endif /* _ELF_BPF_H */

2
include/opcode/bpf.h
View File

@ -44,7 +44,7 @@ typedef uint64_t bpf_insn_word;
#define BPF_V2 0x2
#define BPF_V3 0x3
#define BPF_V4 0x4
#define BPF_XBPF 0xff
#define BPF_XBPF 0xf
/* Masks for the several instruction fields in a BPF instruction.
These assume big-endian BPF instructions. */

7
opcodes/ChangeLog
View File

@ -1,3 +1,10 @@
2023-07-30 Jose E. Marchesi <jose.marchesi@oracle.com>
* bpf-dis.c: Initialize asm_bpf_version to -1.
(print_insn_bpf): Set BPF ISA version from the cpu version ELF
header flags if no explicit version set in the command line.
* disassemble.c (disassemble_init_for_target): Remove unused code.
2023-07-26 Jose E. Marchesi <jose.marchesi@oracle.com>
* bpf-opc.c (bpf_opcodes): Fix BPF_INSN_NEGR to not use a src

30
opcodes/bpf-dis.c
View File

@ -24,6 +24,8 @@
#include "libiberty.h"
#include "opintl.h"
#include "opcode/bpf.h"
#include "elf-bfd.h"
#include "elf/bpf.h"
#include <string.h>
#include <inttypes.h>
@ -42,7 +44,7 @@ enum bpf_dialect
/* Global configuration for the disassembler. */
static enum bpf_dialect asm_dialect = BPF_DIALECT_NORMAL;
static int asm_bpf_version = BPF_V4;
static int asm_bpf_version = -1;
static int asm_obase = 10;
/* Print BPF specific command-line options. */
@ -141,6 +143,32 @@ print_insn_bpf (bfd_vma pc, disassemble_info *info)
info->disassembler_options = NULL;
}
/* Determine what version of the BPF ISA to use when disassembling.
If the user didn't explicitly specify an ISA version, then derive
it from the CPU Version flag in the ELF header. A CPU version of
0 in the header means "latest version". */
if (asm_bpf_version == -1)
{
struct bfd *abfd = info->section->owner;
Elf_Internal_Ehdr *header = elf_elfheader (abfd);
int cpu_version = header->e_flags & EF_BPF_CPUVER;
switch (cpu_version)
{
case 0: asm_bpf_version = BPF_V4; break;
case 1: asm_bpf_version = BPF_V1; break;
case 2: asm_bpf_version = BPF_V2; break;
case 3: asm_bpf_version = BPF_V3; break;
case 4: asm_bpf_version = BPF_V4; break;
case 0xf: asm_bpf_version = BPF_XBPF; break;
default:
/* xgettext:c-format */
opcodes_error_handler (_("unknown BPF CPU version %u\n"),
cpu_version);
break;
}
}
/* Print eight bytes per line. */
info->bytes_per_chunk = 1;
info->bytes_per_line = 8;

20
opcodes/disassemble.c
View File

@ -680,27 +680,7 @@ disassemble_init_for_target (struct disassemble_info * info)
#endif
#ifdef ARCH_bpf
case bfd_arch_bpf:
/* XXX option for dialect */
info->created_styled_output = true;
#if 0
info->endian_code = BFD_ENDIAN_LITTLE;
if (!info->private_data)
{
info->private_data = cgen_bitset_create (ISA_MAX);
if (info->endian == BFD_ENDIAN_BIG)
{
cgen_bitset_set (info->private_data, ISA_EBPFBE);
if (info->mach == bfd_mach_xbpf)
cgen_bitset_set (info->private_data, ISA_XBPFBE);
}
else
{
cgen_bitset_set (info->private_data, ISA_EBPFLE);
if (info->mach == bfd_mach_xbpf)
cgen_bitset_set (info->private_data, ISA_XBPFLE);
}
}
#endif
break;
#endif
#ifdef ARCH_pru