diff options
Diffstat (limited to 'target-sh4/op_helper.c')
| -rw-r--r-- | target-sh4/op_helper.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 292e9b30d..c1bc4e894 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -28,7 +28,11 @@ void do_raise_exception(void) #ifndef CONFIG_USER_ONLY #define MMUSUFFIX _mmu -#define GETPC() (__builtin_return_address(0)) +#ifdef __s390__ +# define GETPC() ((void*)((unsigned long)__builtin_return_address(0) & 0x7fffffffUL)) +#else +# define GETPC() (__builtin_return_address(0)) +#endif #define SHIFT 0 #include "softmmu_template.h" @@ -42,7 +46,7 @@ void do_raise_exception(void) #define SHIFT 3 #include "softmmu_template.h" -void tlb_fill(target_ulong addr, int is_write, int is_user, void *retaddr) +void tlb_fill(target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; @@ -53,7 +57,7 @@ void tlb_fill(target_ulong addr, int is_write, int is_user, void *retaddr) generated code */ saved_env = env; env = cpu_single_env; - ret = cpu_sh4_handle_mmu_fault(env, addr, is_write, is_user, 1); + ret = cpu_sh4_handle_mmu_fault(env, addr, is_write, mmu_idx, 1); if (ret) { if (retaddr) { /* now we have a real cpu fault */ |