lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix symbol clash on bunlded static libs

Browse Source
This commit is contained in:
lazymio
2022-04-04 11:24:59 +02:00
parent e188591695
commit 2f113b11d1
7 changed files with 32 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
qemu/exec.c
View File

@@ -1439,6 +1439,25 @@ static void tcg_commit(MemoryListener *listener)
tlb_flush(cpuas->cpu);
}
static uint64_t unassigned_io_read(struct uc_struct *uc, void* opaque, hwaddr addr, unsigned size)
{
#ifdef _MSC_VER
return (uint64_t)0xffffffffffffffffULL;
#else
return (uint64_t)-1ULL;
#endif
}
static void unassigned_io_write(struct uc_struct *uc, void* opaque, hwaddr addr, uint64_t data, unsigned size)
{
}
static const MemoryRegionOps unassigned_io_ops = {
.read = unassigned_io_read,
.write = unassigned_io_write,
.endianness = DEVICE_NATIVE_ENDIAN,
};
static void memory_map_init(struct uc_struct *uc)
{
uc->system_memory = g_malloc(sizeof(*(uc->system_memory)));

2
qemu/include/exec/ioport.h
View File

@@ -40,8 +40,6 @@ typedef struct MemoryRegionPortio {
#define PORTIO_END_OF_LIST() { }
extern const MemoryRegionOps unassigned_io_ops;
void cpu_outb(struct uc_struct *uc, uint32_t addr, uint8_t val);
void cpu_outw(struct uc_struct *uc, uint32_t addr, uint16_t val);
void cpu_outl(struct uc_struct *uc, uint32_t addr, uint32_t val);

3
qemu/s390x.h
View File

@@ -1278,4 +1278,7 @@
#define gen_helper_cpsr_read gen_helper_cpsr_read_s390x
#define gen_helper_cpsr_write gen_helper_cpsr_write_s390x
#define helper_uc_s390x_exit helper_uc_s390x_exit_s390x
#define tcg_s390_tod_updated tcg_s390_tod_updated_s390x
#define tcg_s390_program_interrupt tcg_s390_program_interrupt_s390x
#define tcg_s390_data_exception tcg_s390_data_exception_s390x
#endif

2
qemu/target/s390x/excp_helper.c
View File

@@ -26,7 +26,7 @@
#include "exec/exec-all.h"
#include "exec/cpu_ldst.h"
#include "hw/s390x/ioinst.h"
#//include "exec/address-spaces.h"
//include "exec/address-spaces.h"
#include "tcg_s390x.h"
#include "sysemu/sysemu.h"
//#include "hw/s390x/s390_flic.h"

16
qemu/target/s390x/tcg-stub.c
View File

@@ -13,18 +13,4 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "cpu.h"
#include "tcg_s390x.h"
void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque)
{
}
void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env,
uint32_t code, uintptr_t ra)
{
g_assert_not_reached();
}
void QEMU_NORETURN tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc,
uintptr_t ra)
{
g_assert_not_reached();
}
#include "tcg_s390x.h"