[PATCH v9 05/18] perf print_insn: Use e_machine for fallback IP length check

Ian Rogers
2026-05-03T00:23:03Z

Avoid string comparisons with perf_env arch, switch to using the more
precise ELF machine.

Sort header files and fix missing definitions.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/print_insn.c | 23 ++++++++++++++---------
tools/perf/util/print_insn.h | 3 +++
2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/print_insn.c b/tools/perf/util/print_insn.c
index 02e6fbb8ca04..4068436f26ea 100644
--- a/tools/perf/util/print_insn.c
+++ b/tools/perf/util/print_insn.c
@@ -4,19 +4,24 @@
*
* Author(s): Changbin Du <changbin.du@huawei.com>
*/
+#include "print_insn.h"
+
#include <inttypes.h>
-#include <string.h>
#include <stdbool.h>
+#include <string.h>
+
+#include <dwarf-regs.h>
+
#include "capstone.h"
#include "debug.h"
+#include "dso.h"
+#include "dump-insn.h"
+#include "env.h"
+#include "machine.h"
+#include "map.h"
#include "sample.h"
#include "symbol.h"
-#include "machine.h"
#include "thread.h"
-#include "print_insn.h"
-#include "dump-insn.h"
-#include "map.h"
-#include "dso.h"

size_t sample__fprintf_insn_raw(struct perf_sample *sample, FILE *fp)
{
@@ -33,13 +38,13 @@ size_t sample__fprintf_insn_raw(struct perf_sample *sample, FILE *fp)
static bool is64bitip(struct machine *machine, struct addr_location *al)
{
const struct dso *dso = al->map ? map__dso(al->map) : NULL;
+ uint16_t e_machine;

if (dso)
return dso__is_64_bit(dso);

- return machine__is(machine, "x86_64") ||
- machine__normalized_is(machine, "arm64") ||
- machine__normalized_is(machine, "s390");
+ e_machine = perf_env__e_machine(machine->env, /*e_flags=*/NULL);
+ return e_machine == EM_X86_64 || e_machine == EM_AARCH64 || e_machine == EM_S390;
}

ssize_t fprintf_insn_asm(struct machine *machine, struct thread *thread, u8 cpumode,
diff --git a/tools/perf/util/print_insn.h b/tools/perf/util/print_insn.h
index 07d11af3fc1c..1f2c2f25f973 100644
--- a/tools/perf/util/print_insn.h
+++ b/tools/perf/util/print_insn.h
@@ -5,6 +5,9 @@
#include <stddef.h>
#include <stdio.h>

+#include <linux/types.h>
+
+struct addr_location;
struct perf_sample;
struct thread;
struct machine;
--
2.54.0.545.g6539524ca2-goog