diff options
| -rw-r--r-- | darwin-user/main.c | 14 | ||||
| -rw-r--r-- | darwin-user/signal.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/darwin-user/main.c b/darwin-user/main.c index 13c1f057c6..f5cadc797e 100644 --- a/darwin-user/main.c +++ b/darwin-user/main.c @@ -77,38 +77,38 @@ int cpu_get_pic_interrupt(CPUState *env) } #ifdef TARGET_PPC -static inline uint64_t cpu_ppc_get_tb (CPUState *env) +static inline uint64_t cpu_ppc_get_tb(CPUPPCState *env) { /* TO FIX */ return 0; } -uint64_t cpu_ppc_load_tbl (CPUState *env) +uint64_t cpu_ppc_load_tbl(CPUPPCState *env) { return cpu_ppc_get_tb(env); } -uint32_t cpu_ppc_load_tbu (CPUState *env) +uint32_t cpu_ppc_load_tbu(CPUPPCState *env) { return cpu_ppc_get_tb(env) >> 32; } -uint64_t cpu_ppc_load_atbl (CPUState *env) +uint64_t cpu_ppc_load_atbl(CPUPPCState *env) { return cpu_ppc_get_tb(env); } -uint32_t cpu_ppc_load_atbu (CPUState *env) +uint32_t cpu_ppc_load_atbu(CPUPPCState *env) { return cpu_ppc_get_tb(env) >> 32; } -uint32_t cpu_ppc601_load_rtcu (CPUState *env) +uint32_t cpu_ppc601_load_rtcu(CPUPPCState *env) { cpu_ppc_load_tbu(env); } -uint32_t cpu_ppc601_load_rtcl (CPUState *env) +uint32_t cpu_ppc601_load_rtcl(CPUPPCState *env) { return cpu_ppc_load_tbl(env) & 0x3FFFFF80; } diff --git a/darwin-user/signal.c b/darwin-user/signal.c index 317ef92168..8f9705d43c 100644 --- a/darwin-user/signal.c +++ b/darwin-user/signal.c @@ -315,7 +315,7 @@ get_sigframe(struct emulated_sigaction *ka, CPUX86State *env, size_t frame_size) } static void setup_frame(int sig, struct emulated_sigaction *ka, - void *set, CPUState *env) + void *set, CPUX86State *env) { void *frame; @@ -336,7 +336,7 @@ give_sigsegv: force_sig(SIGSEGV /* , current */); } -long do_sigreturn(CPUState *env, int num) +long do_sigreturn(CPUX86State *env, int num) { int i = 0; struct target_sigcontext *scp = get_int_arg(&i, env); |