1 files changed, 20 insertions, 1 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 53f78cf3113f..a5080afd361d 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -29,10 +29,12 @@
 #include "util/time-utils.h"
 #include "util/path.h"
 #include "print_binary.h"
+#include "archinsn.h"
 #include <linux/bitmap.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 #include <linux/time64.h>
+#include <sys/utsname.h>
 #include "asm/bug.h"
 #include "util/mem-events.h"
 #include "util/dump-insn.h"
@@ -63,6 +65,7 @@ static const char		*cpu_list;
 static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
 static struct perf_stat_config  stat_config;
 static int                      max_blocks;
+static bool                     native_arch;
 
 unsigned int scripting_max_stack = PERF_MAX_STACK_DEPTH;
 
@@ -1227,6 +1230,12 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample,
         return len + dlen;
 }
 
+__weak void arch_fetch_insn(struct perf_sample *sample __maybe_unused,
+                            struct thread *thread __maybe_unused,
+                            struct machine *machine __maybe_unused)
+{
+}
+
 static int perf_sample__fprintf_insn(struct perf_sample *sample,
                                      struct perf_event_attr *attr,
                                      struct thread *thread,
@@ -1234,9 +1243,12 @@ static int perf_sample__fprintf_insn(struct perf_sample *sample,
 {
         int printed = 0;
 
+        if (sample->insn_len == 0 && native_arch)
+                arch_fetch_insn(sample, thread, machine);
+
         if (PRINT_FIELD(INSNLEN))
                 printed += fprintf(fp, " ilen: %d", sample->insn_len);
-        if (PRINT_FIELD(INSN)) {
+        if (PRINT_FIELD(INSN) && sample->insn_len) {
                 int i;
 
                 printed += fprintf(fp, " insn:");
@@ -3277,6 +3289,7 @@ int cmd_script(int argc, const char **argv)
                 .set = false,
                 .default_no_sample = true,
         };
+        struct utsname uts;
         char *script_path = NULL;
         const char **__argv;
         int i, j, err = 0;
@@ -3615,6 +3628,12 @@ int cmd_script(int argc, const char **argv)
         if (symbol__init(&session->header.env) < 0)
                 goto out_delete;
 
+        uname(&uts);
+        if (!strcmp(uts.machine, session->header.env.arch) ||
+            (!strcmp(uts.machine, "x86_64") &&
+             !strcmp(session->header.env.arch, "i386")))
+                native_arch = true;
+
         script.session = session;
         script__setup_sample_type(&script);