Emulation/mupen64plus-core
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-core.git synced 2024-06-02 19:27:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #526 from bsmiles32/fix_binutils_2_29

Browse source 
Fix undefined reference to print_insn_i386 with libopcode >= 2.29
This commit is contained in:
Richard Goedeken 2018-02-01 23:09:29 -08:00 committed by GitHub
parent 97631d7ae1 0bfe65b550
commit cd69499a8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
projects/unix/Makefile
View file

@ -600,6 +600,15 @@ ifeq ($(DEBUGGER), 1)
$(SRCDIR)/debugger/dbg_memory.c \
$(SRCDIR)/debugger/dbg_breakpoints.c
LDLIBS += -lopcodes -lbfd
# UGLY libopcodes version check (we check for >= 2.29)
LIBOPCODES_VERSION := $(shell $(STRINGS) --version | head -n1 | cut -d ' ' -f5)
LIBOPCODES_VERSION_MAJOR := $(shell echo $(LIBOPCODES_VERSION) | cut -f1 -d.)
LIBOPCODES_VERSION_MINOR := $(shell echo $(LIBOPCODES_VERSION) | cut -f2 -d.)
LIBOPCODES_GE_2_29 := $(shell [ $(LIBOPCODES_VERSION_MAJOR) -gt 2 -o \( $(LIBOPCODES_VERSION_MAJOR) -eq 2 -a $(LIBOPCODES_VERSION_MINOR) -ge 29 \) ] && echo true)
ifeq ($(LIBOPCODES_GE_2_29),true)
CFLAGS += -DUSE_LIBOPCODES_GE_2_29
endif
endif
# generate a list of object files to build, make a temporary directory for them

16
src/debugger/dbg_memory.c
View file

@ -45,6 +45,7 @@ static char args_recompiled[564][MAX_DISASSEMBLY*4];
static void *opaddr_recompiled[564];
static disassemble_info dis_info;
static disassembler_ftype disassemble;
#define CHECK_MEM(r4300, address) \
invalidate_r4300_cached_code(r4300, address, 4);
@ -97,9 +98,22 @@ void init_host_disassembler(void)
dis_info.stream = stderr;
dis_info.bytes_per_line=1;
dis_info.endian = 1;
dis_info.arch = bfd_arch_i386;
dis_info.mach = bfd_mach_i386_i8086;
dis_info.disassembler_options = (char*) "i386,suffix";
dis_info.read_memory_func = read_memory_func;
#if defined(USE_LIBOPCODES_GE_2_29)
/* libopcode >= 2.29 cannot use print_insn_i386 directly,
* but can get it through disassembler function
* whose prototype has been also updated to allow such selection. */
disassemble = disassembler(dis_info.arch,
(dis_info.endian == BFD_ENDIAN_BIG),
dis_info.mach,
NULL);
#else
disassemble = print_insn_i386;
#endif
}
static void decode_recompiled(struct r4300_core* r4300, uint32_t addr)
@ -136,7 +150,7 @@ static void decode_recompiled(struct r4300_core* r4300, uint32_t addr)
opaddr_recompiled[lines_recompiled] = assemb;
num_decoded=0;
assemb += print_insn_i386((bfd_vma)(long) assemb, &dis_info);
assemb += disassemble((bfd_vma)(long) assemb, &dis_info);
lines_recompiled++;
}