falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get darwin qemu-irix to compile

This commit is contained in:
tehzz 2020-05-09 18:46:44 -04:00
parent e8b66af9c9
commit 25d6223cc9
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -245,6 +245,7 @@ trace-events-subdirs += target/s390x
trace-events-subdirs += target/ppc trace-events-subdirs += target/ppc
trace-events-subdirs += qom trace-events-subdirs += qom
trace-events-subdirs += linux-user trace-events-subdirs += linux-user
trace-events-subdirs += darwin-user
trace-events-subdirs += qapi trace-events-subdirs += qapi
trace-events-subdirs += accel/tcg trace-events-subdirs += accel/tcg
trace-events-subdirs += accel/kvm trace-events-subdirs += accel/kvm

2
darwin-user/signal.c
View File

@ -594,7 +594,6 @@ static void QEMU_NORETURN dump_core_and_abort(CPUArchState *env, int target_sig)
struct sigaction act; struct sigaction act;
host_sig = target_to_host_signal(target_sig); host_sig = target_to_host_signal(target_sig);
// TODO: why isn't this function defined anywhere? macro?
trace_user_force_sig(env, target_sig, host_sig); trace_user_force_sig(env, target_sig, host_sig);
gdb_signalled(env, target_sig); gdb_signalled(env, target_sig);
@ -647,7 +646,6 @@ int queue_signal(CPUArchState *env, int sig, int si_type,
CPUState *cpu = ENV_GET_CPU(env); CPUState *cpu = ENV_GET_CPU(env);
TaskState *ts = cpu->opaque; TaskState *ts = cpu->opaque;
/* is this a real function? */
trace_user_queue_signal(env, sig); trace_user_queue_signal(env, sig);
info->si_code = deposit32(info->si_code, 16, 16, si_type); info->si_code = deposit32(info->si_code, 16, 16, si_type);

2
darwin-user/trace-events
View File

@ -1,6 +1,6 @@
# See docs/devel/tracing.txt for syntax documentation. # See docs/devel/tracing.txt for syntax documentation.
# linux-user/signal.c # darwin-user/signal.c
user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64

4
target/mips/irix_helper.c
View File

@ -25,7 +25,11 @@
#ifdef TARGET_ABI_IRIX #ifdef TARGET_ABI_IRIX
/* argh, ugly! need TaskState here to access PRDA storage */ /* argh, ugly! need TaskState here to access PRDA storage */
#ifdef CONFIG_DARWIN_USER
#include <darwin-user/qemu.h>
#else
#include <linux-user/qemu.h> #include <linux-user/qemu.h>
#endif
#define DEBUG(x) //x #define DEBUG(x) //x