77 lines
2.4 KiB
Diff
77 lines
2.4 KiB
Diff
From ebb6050a70852a1afdedbe45e6fca7ffd4b15350 Mon Sep 17 00:00:00 2001
|
|
From: Robert Swiecki <robert@swiecki.net>
|
|
Date: Mon, 6 Jun 2022 18:01:41 +0200
|
|
Subject: [PATCH] linux/bfd: use DIAGNOSTIC_ERROR_SWITCH define to figure out
|
|
if init_disassemble_info takes 3 or 4 arguments
|
|
|
|
(cherry picked from commit 90fdf81006614664ef05e5e3c6f94d91610f11b2)
|
|
---
|
|
linux/bfd.c | 29 +++++++++++++++++++++++++++--
|
|
1 file changed, 27 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux/bfd.c b/linux/bfd.c
|
|
index 69f4da59..3494a7e6 100644
|
|
--- a/linux/bfd.c
|
|
+++ b/linux/bfd.c
|
|
@@ -26,6 +26,7 @@
|
|
#include "linux/bfd.h"
|
|
|
|
#include <bfd.h>
|
|
+#include <diagnostics.h>
|
|
#include <dis-asm.h>
|
|
#include <inttypes.h>
|
|
#include <pthread.h>
|
|
@@ -61,7 +62,15 @@ typedef struct {
|
|
*/
|
|
#if defined(FOR_EACH_DISASSEMBLER_OPTION)
|
|
#define _HF_BFD_GE_2_29
|
|
-#endif
|
|
+#endif /* defined(FOR_EACH_DISASSEMBLER_OPTION) */
|
|
+/*
|
|
+ * binutils/libopcode has an unstable public interface. At some point in time the function
|
|
+ * init_disassemble_info() started taking 4 arguments instead of 3. Try to differentiate on the
|
|
+ * basis of some defines which apeared around the same time.
|
|
+ */
|
|
+#if defined(DIAGNOSTIC_ERROR_SWITCH)
|
|
+#define _HF_DISASM_4_ARGS
|
|
+#endif /* defined(DIAGNOSTIC_ERROR_SWITCH) */
|
|
|
|
static pthread_mutex_t arch_bfd_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
@@ -197,6 +206,18 @@ static int arch_bfdFPrintF(void* buf, const char* fmt, ...) {
|
|
return ret;
|
|
}
|
|
|
|
+#if defined(_HF_DISASM_4_ARGS)
|
|
+static int arch_bfdFPrintFStyled(
|
|
+ void* buf, enum disassembler_style style HF_ATTR_UNUSED, const char* fmt, ...) {
|
|
+ va_list args;
|
|
+ va_start(args, fmt);
|
|
+ int ret = util_vssnprintf(buf, _HF_INSTR_SZ, fmt, args);
|
|
+ va_end(args);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+#endif /* defined(_HF_DISASM_4_ARGS) */
|
|
+
|
|
void arch_bfdDisasm(pid_t pid, uint8_t* mem, size_t size, char* instr) {
|
|
MX_SCOPED_LOCK(&arch_bfd_mutex);
|
|
|
|
@@ -227,8 +248,12 @@ void arch_bfdDisasm(pid_t pid, uint8_t* mem, size_t size, char* instr) {
|
|
return;
|
|
}
|
|
|
|
- struct disassemble_info info;
|
|
+ struct disassemble_info info = {};
|
|
+#if defined(_HF_DISASM_4_ARGS)
|
|
+ init_disassemble_info(&info, instr, arch_bfdFPrintF, arch_bfdFPrintFStyled);
|
|
+#else /* defined(_HF_DISASM_4_ARGS) */
|
|
init_disassemble_info(&info, instr, arch_bfdFPrintF);
|
|
+#endif /* defined(_HF_DISASM_4_ARGS) */
|
|
info.arch = bfd_get_arch(bfdh);
|
|
info.mach = bfd_get_mach(bfdh);
|
|
info.buffer = mem;
|
|
--
|
|
2.37.3
|
|
|