AREG0 patches, final round
cover AREG0 patches, final round
Convert remaining targets to AREG0 free mode.
I decided after s390x to not split the remaining op_helper.c files to for example fpu_helper.c, int_helper.c etc. It may still make sense especially for MIPS with 3442 lines in op_helper.c. This can be done later.
After this series, whole of QEMU can be compiled with Clang.
If there are no problems, this should be applied pretty early in 1.3 cycle.
Blue Swirl (21):
target-s390x: fix style
target-s390x: split FPU ops
target-s390x: split condition code helpers
target-s390x: split integer helpers
target-s390x: split memory access helpers
target-s390x: rename op_helper.c to misc_helper.c
target-s390x: avoid AREG0 for FPU helpers
target-s390x: avoid AREG0 for integer helpers
target-s390x: avoid AREG0 for condition code helpers
target-s390x: avoid AREG0 for misc helpers
target-s390x: switch to AREG0 free mode
target-s390x: split helper.c
target-lm32: switch to AREG0 free mode
target-m68k: switch to AREG0 free mode
target-unicore32: switch to AREG0 free mode
target-arm: switch to AREG0 free mode
target-microblaze: switch to AREG0 free mode
target-cris: switch to AREG0 free mode
target-sh4: switch to AREG0 free mode
target-mips: switch to AREG0 free mode Remove unused CONFIG_TCG_PASS_AREG0 and dead code
Makefile.target | 8 - configure | 11 - cpu-all.h | 11 - cputlb.c | 4 - dyngen-exec.h | 70 - exec-all.h | 4 - hw/spapr_hcall.c | 1 - softmmu_defs.h | 21 - softmmu_header.h | 63 +- softmmu_template.h | 72 +- target-arm/Makefile.objs | 2 - target-arm/cpu.h | 10 +- target-arm/helper.c | 8 +- target-arm/helper.h | 60 +- target-arm/op_helper.c | 92 +- target-arm/translate.c | 148 +- target-cris/Makefile.objs | 2 - target-cris/helper.c | 4 +- target-cris/helper.h | 34 +- target-cris/op_helper.c | 89 +- target-cris/translate.c | 50 +- target-cris/translate_v10.c | 22 +- target-lm32/Makefile.objs | 2 - target-lm32/helper.h | 20 +- target-lm32/op_helper.c | 29 +- target-lm32/translate.c | 22 +- target-m68k/Makefile.objs | 2 - target-m68k/helpers.h | 2 +- target-m68k/op_helper.c | 71 +- target-m68k/translate.c | 76 +- target-microblaze/Makefile.objs | 2 - target-microblaze/helper.h | 48 +- target-microblaze/op_helper.c | 115 +- target-microblaze/translate.c | 56 +- target-mips/Makefile.objs | 2 - target-mips/cpu.h | 16 +- target-mips/helper.h | 410 +++--- target-mips/op_helper.c | 1065 ++++++++------- target-mips/translate.c | 754 +++++----- target-s390x/Makefile.objs | 5 +- target-s390x/cc_helper.c | 550 +++++++ target-s390x/cpu.c | 18 + target-s390x/cpu.h | 9 + target-s390x/fpu_helper.c | 843 +++++++++++ target-s390x/helper.c | 617 -------- target-s390x/helper.h | 250 ++-- target-s390x/int_helper.c | 201 +++ target-s390x/mem_helper.c | 1203 ++++++++++++++++ target-s390x/misc_helper.c | 1000 +++++++++++++ target-s390x/op_helper.c | 3019 --------------------------------------- target-s390x/translate.c | 233 ++-- target-sh4/Makefile.objs | 2 - target-sh4/helper.h | 84 +- target-sh4/op_helper.c | 182 ++-- target-sh4/translate.c | 114 +- target-sparc/Makefile.objs | 2 - target-unicore32/Makefile.objs | 2 - target-unicore32/helper.h | 26 +- target-unicore32/op_helper.c | 65 +- target-unicore32/translate.c | 38 +- tcg/arm/tcg-target.c | 31 +- tcg/arm/tcg-target.h | 1 - tcg/hppa/tcg-target.c | 24 - tcg/hppa/tcg-target.h | 1 - tcg/i386/tcg-target.c | 30 - tcg/i386/tcg-target.h | 1 - tcg/ia64/tcg-target.c | 34 - tcg/ia64/tcg-target.h | 1 - tcg/mips/tcg-target.c | 31 +- tcg/mips/tcg-target.h | 1 - tcg/ppc/tcg-target.c | 38 - tcg/ppc64/tcg-target.c | 28 - tcg/s390/tcg-target.c | 24 - tcg/s390/tcg-target.h | 1 - tcg/sparc/tcg-target.c | 30 - tcg/sparc/tcg-target.h | 1 - tcg/tci/tcg-target.c | 4 - tci.c | 12 - user-exec.c | 14 - 79 files changed, 5994 insertions(+), 6254 deletions(-) delete mode 100644 dyngen-exec.h create mode 100644 target-s390x/cc_helper.c create mode 100644 target-s390x/fpu_helper.c delete mode 100644 target-s390x/helper.c create mode 100644 target-s390x/int_helper.c create mode 100644 target-s390x/mem_helper.c create mode 100644 target-s390x/misc_helper.c delete mode 100644 target-s390x/op_helper.c
Signature · 1 line
1.7.2.5
PATCH 1/21 target-s390x: fix style
Before splitting op_helper.c and helper.c in the next patches, fix style issues. No functional changes.
Replace also GCC specific __FUNCTION__ with
standard __func__.
Don't init static variable (cpu_s390x_init:inited) with 0.
--- target-s390x/helper.c | 96 +++++----- target-s390x/op_helper.c | 438 ++++++++++++++++++++++++++-------------------- 2 files changed, 297 insertions(+), 237 deletions(-)
target-s390x/helper.c +49 -47
@@ -74,7 +74,7 @@ S390CPU *cpu_s390x_init(const char *cpu_model) {S390CPU *cpu;CPUS390XState *env; -static int inited =0 ; +static int inited; cpu =S390_CPU (object_new (TYPE_S390_CPU )); env = &cpu->env;
@@ -91,25 +91,27 @@ S390CPU *cpu_s390x_init(const char *cpu_model)#if defined(CONFIG_USER_ONLY ) -void do_interrupt (CPUS390XState *env) +void do_interrupt (CPUS390XState *env) { env->exception_index =-1 ; } -int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong address,int rw, -int mmu_idx) +int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong address, +int rw,int mmu_idx) { -/* fprintf(stderr,"%s: address 0x%lx rw %d mmu_idx %d\n", -__FUNCTION__, address, rw, mmu_idx); */ +/* fprintf(stderr, "%s: address 0x%lx rw %d mmu_idx %d\n", +__func__, address, rw, mmu_idx); */ env->exception_index =EXCP_ADDR ; - env->__excp_addr = address;/* FIXME: find out how this works on a real machine */ +/* FIXME: find out how this works on a real machine */ + env->__excp_addr = address;return 1 ; }#else /* !CONFIG_USER_ONLY */ /* Ensure to exit the TB after this call! */ -static void trigger_pgm_exception (CPUS390XState *env,uint32_t code,uint32_t ilc) +static void trigger_pgm_exception (CPUS390XState *env,uint32_t code, +uint32_t ilc) { env->exception_index =EXCP_PGM ; env->int_pgm_code = code;
@@ -138,19 +140,20 @@ static int trans_bits(CPUS390XState *env, uint64_t mode)return bits; } -static void trigger_prot_fault (CPUS390XState *env,target_ulong vaddr,uint64_t mode) +static void trigger_prot_fault (CPUS390XState *env,target_ulong vaddr, +uint64_t mode) {int ilc =ILC_LATER_INC_2 ;int bits =trans_bits (env, mode) |4 ; -DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __FUNCTION__, vaddr, bits); +DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __func__, vaddr, bits);stq_phys (env->psa + offsetof(LowCore , trans_exc_code), vaddr | bits);trigger_pgm_exception (env,PGM_PROTECTION , ilc); } -static void trigger_page_fault (CPUS390XState *env,target_ulong vaddr,uint32_t type, -uint64_t asc,int rw) +static void trigger_page_fault (CPUS390XState *env,target_ulong vaddr, +uint32_t type,uint64_t asc,int rw) {int ilc =ILC_LATER ;int bits =trans_bits (env, asc);
@@ -160,26 +163,26 @@ static void trigger_page_fault(CPUS390XState *env, target_ulong vaddr, uint32_t ilc =2 ; } -DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __FUNCTION__, vaddr, bits); +DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __func__, vaddr, bits);stq_phys (env->psa + offsetof(LowCore , trans_exc_code), vaddr | bits);trigger_pgm_exception (env, type, ilc); } -static int mmu_translate_asce (CPUS390XState *env,target_ulong vaddr,uint64_t asc, -uint64_t asce,int level,target_ulong *raddr, -int *flags,int rw) +static int mmu_translate_asce (CPUS390XState *env,target_ulong vaddr, +uint64_t asc,uint64_t asce,int level, +target_ulong *raddr,int *flags,int rw) {uint64_t offs =0 ;uint64_t origin;uint64_t new_asce; -PTE_DPRINTF ("%s: 0x%" PRIx64"\n" , __FUNCTION__, asce); +PTE_DPRINTF ("%s: 0x%" PRIx64"\n" , __func__, asce);if (((level != _ASCE_TYPE_SEGMENT) && (asce & _REGION_ENTRY_INV)) || ((level == _ASCE_TYPE_SEGMENT) && (asce & _SEGMENT_ENTRY_INV))) {/* XXX different regions have different faults */ -DPRINTF ("%s: invalid region\n" , __FUNCTION__); +DPRINTF ("%s: invalid region\n" , __func__);trigger_page_fault (env, vaddr,PGM_SEGMENT_TRANS , asc, rw);return -1 ; }
@@ -222,7 +225,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a new_asce =ldq_phys (origin + offs);PTE_DPRINTF ("%s: 0x%" PRIx64" + 0x%" PRIx64" => 0x%016" PRIx64"\n" , - __FUNCTION__, origin, offs, new_asce); + __func__, origin, offs, new_asce);if (level != _ASCE_TYPE_SEGMENT) {/* yet another region */
@@ -232,7 +235,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a/* PTE */ if (new_asce & _PAGE_INVALID) { -DPRINTF ("%s: PTE=0x%" PRIx64" invalid\n" , __FUNCTION__, new_asce); +DPRINTF ("%s: PTE=0x%" PRIx64" invalid\n" , __func__, new_asce);trigger_page_fault (env, vaddr,PGM_PAGE_TRANS , asc, rw);return -1 ; }
@@ -243,13 +246,14 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a *raddr = new_asce & _ASCE_ORIGIN; -PTE_DPRINTF ("%s: PTE=0x%" PRIx64"\n" , __FUNCTION__, new_asce); +PTE_DPRINTF ("%s: PTE=0x%" PRIx64"\n" , __func__, new_asce);return 0 ; } -static int mmu_translate_asc (CPUS390XState *env,target_ulong vaddr,uint64_t asc, -target_ulong *raddr,int *flags,int rw) +static int mmu_translate_asc (CPUS390XState *env,target_ulong vaddr, +uint64_t asc,target_ulong *raddr,int *flags, +int rw) {uint64_t asce =0 ;int level, new_level;
@@ -257,15 +261,15 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t asswitch (asc) {case PSW_ASC_PRIMARY : -PTE_DPRINTF ("%s: asc=primary\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=primary\n" , __func__); asce = env->cregs[1 ];break ;case PSW_ASC_SECONDARY : -PTE_DPRINTF ("%s: asc=secondary\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=secondary\n" , __func__); asce = env->cregs[7 ];break ;case PSW_ASC_HOME : -PTE_DPRINTF ("%s: asc=home\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=home\n" , __func__); asce = env->cregs[13 ];break ; }
@@ -276,8 +280,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_REGION2:if (vaddr &0xffe0000000000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xffe0000000000000ULL\n" , __FUNCTION__, - vaddr); +" 0xffe0000000000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }
@@ -285,8 +288,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_REGION3:if (vaddr &0xfffffc0000000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xfffffc0000000000ULL\n" , __FUNCTION__, - vaddr); +" 0xfffffc0000000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }
@@ -294,8 +296,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_SEGMENT:if (vaddr &0xffffffff80000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xffffffff80000000ULL\n" , __FUNCTION__, - vaddr); +" 0xffffffff80000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }
@@ -358,7 +359,7 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,break ; } -out: + out:/* Convert real address -> absolute address */ if (*raddr <0x2000 ) { *raddr = *raddr + env->psa;
@@ -378,18 +379,18 @@ out:return r; } -int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong _vaddr,int rw, -int mmu_idx) +int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong orig_vaddr, +int rw,int mmu_idx) {uint64_t asc = env->psw.mask &PSW_MASK_ASC ;target_ulong vaddr, raddr;int prot;DPRINTF ("%s: address 0x%" PRIx64" rw %d mmu_idx %d\n" , - __FUNCTION__, _vaddr, rw, mmu_idx); + __func__, _vaddr, rw, mmu_idx); - _vaddr &=TARGET_PAGE_MASK ; - vaddr = _vaddr; + orig_vaddr &=TARGET_PAGE_MASK ; + vaddr = orig_vaddr;/* 31-Bit mode */ if (!(env->psw.mask &PSW_MASK_64 )) {
@@ -403,22 +404,23 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong _vaddr, int rw,/* check out of RAM access */ if (raddr > (ram_size + virtio_size)) { -DPRINTF ("%s: aaddr %" PRIx64" > ram_size %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: aaddr %" PRIx64" > ram_size %" PRIx64"\n" , __func__, (uint64_t )aaddr, (uint64_t )ram_size);trigger_pgm_exception (env,PGM_ADDRESSING ,ILC_LATER );return 1 ; } -DPRINTF ("%s: set tlb %" PRIx64" -> %" PRIx64" (%x)\n" , __FUNCTION__, +DPRINTF ("%s: set tlb %" PRIx64" -> %" PRIx64" (%x)\n" , __func__, (uint64_t )vaddr, (uint64_t )raddr, prot); -tlb_set_page (env, _vaddr, raddr, prot, +tlb_set_page (env, orig_vaddr, raddr, prot, mmu_idx,TARGET_PAGE_SIZE );return 0 ; } -target_phys_addr_t cpu_get_phys_page_debug (CPUS390XState *env,target_ulong vaddr) +target_phys_addr_t cpu_get_phys_page_debug (CPUS390XState *env, +target_ulong vaddr) {target_ulong raddr;int prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ;
@@ -509,7 +511,7 @@ static void do_program_interrupt(CPUS390XState *env)break ; } -qemu_log ("%s: code=0x%x ilc=%d\n" , __FUNCTION__, env->int_pgm_code, ilc); +qemu_log ("%s: code=0x%x ilc=%d\n" , __func__, env->int_pgm_code, ilc); lowcore =cpu_physical_memory_map (env->psa, &len,1 );
@@ -522,7 +524,7 @@ static void do_program_interrupt(CPUS390XState *env)cpu_physical_memory_unmap (lowcore, len,1 , len); -DPRINTF ("%s: %x %x %" PRIx64" %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: %x %x %" PRIx64" %" PRIx64"\n" , __func__, env->int_pgm_code, ilc, env->psw.mask, env->psw.addr);
@@ -565,15 +567,15 @@ static void do_ext_interrupt(CPUS390XState *env) env->pending_int &= ~INTERRUPT_EXT ; } -DPRINTF ("%s: %" PRIx64" %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: %" PRIx64" %" PRIx64"\n" , __func__, env->psw.mask, env->psw.addr);load_psw (env, mask, addr); } -void do_interrupt (CPUS390XState *env) +void do_interrupt (CPUS390XState *env) { -qemu_log ("%s: %d at pc=%" PRIx64"\n" , __FUNCTION__, env->exception_index, +qemu_log ("%s: %d at pc=%" PRIx64"\n" , __func__, env->exception_index, env->psw.addr);s390_add_running_cpu (env);
target-s390x/op_helper.c +248 -190
1,184 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 2/21 target-s390x: split FPU ops
In reply to Blue SwirlMove floating point instructions to fpu_helper.c.
While exporting some condition code helpers, avoid duplicate identifier conflict with translate.c.
Remove unused set_cc_nz_f64() in translate.c.
--- target-s390x/Makefile.objs | 2 + target-s390x/cpu.h | 6 + target-s390x/fpu_helper.c | 836 ++++++++++++++++++++++++++++++++++++++++++++ target-s390x/op_helper.c | 802 ------------------------------------------ target-s390x/translate.c | 11 +- 5 files changed, 847 insertions(+), 810 deletions(-) create mode 100644 target-s390x/fpu_helper.c
target-s390x/Makefile.objs +2 -0
@@ -1,5 +1,7 @@ obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o +obj-y += fpu_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o $(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) +$(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/cpu.h +6 -0
@@ -999,4 +999,10 @@ static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb) env->psw.addr = tb->pc; } +/* fpu_helper.c */ +uint32_t set_cc_f32 (float32 v1,float32 v2); +uint32_t set_cc_f64 (float64 v1,float64 v2); +uint32_t set_cc_nz_f32 (float32 v); +uint32_t set_cc_nz_f64 (float64 v); +#endif
target-s390x/fpu_helper.c new file +836 -0
836 lines not on this page · raw message
target-s390x/op_helper.c +0 -802
814 lines not on this page · raw message
target-s390x/translate.c +3 -8
@@ -667,16 +667,11 @@ static void set_cc_cmp_f32_i64(DisasContext *s, TCGv_i32 v1, TCGv_i64 v2) s->cc_op =CC_OP_LTGT_F32 ; } -static void set_cc_nz_f32 (DisasContext *s,TCGv_i32 v1) +static void gen_set_cc_nz_f32 (DisasContext *s,TCGv_i32 v1) {gen_op_update1_cc_i32 (s,CC_OP_NZ_F32 , v1); } -static inline void set_cc_nz_f64 (DisasContext *s,TCGv_i64 v1) -{ -gen_op_update1_cc_i64 (s,CC_OP_NZ_F64 , v1); -} -/* CC value is in env->cc_op */ static inline void set_cc_static (DisasContext *s) {
@@ -2235,7 +2230,7 @@ static void disas_ed(DisasContext *s, int op, int r1, int x2, int b2, int d2,tcg_temp_free_i32 (tmp32); tmp32 =load_freg32 (r1); -set_cc_nz_f32 (s, tmp32); +gen_set_cc_nz_f32 (s, tmp32);tcg_temp_free_i32 (tmp32);break ;case 0xb :/* SEB R1,D2(X2,B2) [RXE] */
@@ -2248,7 +2243,7 @@ static void disas_ed(DisasContext *s, int op, int r1, int x2, int b2, int d2,tcg_temp_free_i32 (tmp32); tmp32 =load_freg32 (r1); -set_cc_nz_f32 (s, tmp32); +gen_set_cc_nz_f32 (s, tmp32);tcg_temp_free_i32 (tmp32);break ;case 0xd :/* DEB R1,D2(X2,B2) [RXE] */
Signature · 1 line
1.7.2.5
PATCH 3/21 target-s390x: split condition code helpers
In reply to Blue SwirlMove condition code helpers to cc_helper.c.
--- target-s390x/Makefile.objs | 3 +- target-s390x/cc_helper.c | 551 ++++++++++++++++++++++++++++++++++++++++++++ target-s390x/cpu.h | 3 + target-s390x/op_helper.c | 522 +----------------------------------------- 4 files changed, 557 insertions(+), 522 deletions(-) create mode 100644 target-s390x/cc_helper.c
target-s390x/Makefile.objs +2 -1
@@ -1,7 +1,8 @@ obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o -obj-y += fpu_helper.o +obj-y += fpu_helper.o cc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o $(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) +$(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/cc_helper.c new file +551 -0
551 lines not on this page · raw message
target-s390x/cpu.h +3 -0
@@ -1005,4 +1005,7 @@ uint32_t set_cc_f64(float64 v1, float64 v2);uint32_t set_cc_nz_f32 (float32 v);uint32_t set_cc_nz_f64 (float64 v); +/* op_helper.c */ +void program_interrupt (CPUS390XState *env,uint32_t code,int ilc); +#endif
target-s390x/op_helper.c +1 -521
546 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 4/21 target-s390x: split integer helpers
In reply to Blue SwirlMove integer helpers to int_helper.c.
--- target-s390x/Makefile.objs | 3 +- target-s390x/int_helper.c | 201 ++++++++++++++++++++++++++++++++++++++++++++ target-s390x/op_helper.c | 170 ------------------------------------- 3 files changed, 203 insertions(+), 171 deletions(-) create mode 100644 target-s390x/int_helper.c
target-s390x/Makefile.objs +2 -1
@@ -1,8 +1,9 @@ obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o -obj-y += fpu_helper.o cc_helper.o +obj-y += int_helper.o fpu_helper.o cc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o $(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) +$(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/int_helper.c new file +201 -0
201 lines not on this page · raw message
target-s390x/op_helper.c +0 -170
194 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 6/21 target-s390x: rename op_helper.c to misc_helper.c
In reply to Blue SwirlNow op_helper.c contains miscellaneous helpers, rename it to misc_helper.c.
--- target-s390x/Makefile.objs | 6 +- target-s390x/cpu.h | 2 +- target-s390x/misc_helper.c | 431 ++++++++++++++++++++++++++++++++++++++++++++ target-s390x/op_helper.c | 431 -------------------------------------------- 4 files changed, 435 insertions(+), 435 deletions(-) create mode 100644 target-s390x/misc_helper.c delete mode 100644 target-s390x/op_helper.c
target-s390x/Makefile.objs +3 -3
@@ -1,10 +1,10 @@ -obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o -obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o +obj-y += translate.o helper.o cpu.o interrupt.o +obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) +$(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/cpu.h +1 -1
@@ -1005,7 +1005,7 @@ uint32_t set_cc_f64(float64 v1, float64 v2);uint32_t set_cc_nz_f32 (float32 v);uint32_t set_cc_nz_f64 (float64 v); -/* op_helper.c */ +/* misc_helper.c */ void program_interrupt (CPUS390XState *env,uint32_t code,int ilc);#endif
target-s390x/misc_helper.c new file +431 -0
431 lines not on this page · raw message
target-s390x/op_helper.c deleted +0 -431
431 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 5/21 target-s390x: split memory access helpers
In reply to Blue SwirlMove memory access helpers to mem_helper.c.
--- target-s390x/Makefile.objs | 3 +- target-s390x/mem_helper.c | 1190 ++++++++++++++++++++++++++++++++++++++++++++ target-s390x/op_helper.c | 1158 +------------------------------------------ 3 files changed, 1194 insertions(+), 1157 deletions(-) create mode 100644 target-s390x/mem_helper.c
target-s390x/Makefile.objs +2 -1
@@ -1,5 +1,5 @@ obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o -obj-y += int_helper.o fpu_helper.o cc_helper.o +obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o
@@ -7,3 +7,4 @@ $(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) +$(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/mem_helper.c new file +1190 -0
1,190 lines not on this page · raw message
target-s390x/op_helper.c +2 -1156
1,183 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 8/21 target-s390x: avoid AREG0 for integer helpers
In reply to Blue SwirlMake integer helpers take a parameter for CPUState instead of relying on global env.
--- target-s390x/Makefile.objs | 1 - target-s390x/helper.h | 10 +++++----- target-s390x/int_helper.c | 12 ++++++------ target-s390x/translate.c | 16 ++++++++-------- 4 files changed, 19 insertions(+), 20 deletions(-)
target-s390x/Makefile.objs +0 -1
@@ -3,7 +3,6 @@ obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o -$(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/helper.h +5 -5
@@ -12,8 +12,8 @@ DEF_HELPER_FLAGS_1(set_cc_comp_s64, TCG_CALL_PURE|TCG_CALL_CONST, i32, s64) DEF_HELPER_FLAGS_2(set_cc_icm, TCG_CALL_PURE|TCG_CALL_CONST, i32, i32, i32) DEF_HELPER_3(clm, i32, i32, i32, i64) DEF_HELPER_3(stcm, void, i32, i32, i64) -DEF_HELPER_2(mlg, void, i32, i64) -DEF_HELPER_2(dlg, void, i32, i64) +DEF_HELPER_3(mlg, void, env, i32, i64) +DEF_HELPER_3(dlg, void, env, i32, i64) DEF_HELPER_FLAGS_3(set_cc_add64, TCG_CALL_PURE|TCG_CALL_CONST, i32, s64, s64, s64) DEF_HELPER_FLAGS_3(set_cc_addu64, TCG_CALL_PURE|TCG_CALL_CONST, i32, i64, i64, i64)DEF_HELPER_FLAGS_3 (set_cc_add32,TCG_CALL_PURE |TCG_CALL_CONST , i32, s32, s32, s32)
@@ -43,8 +43,8 @@ DEF_HELPER_3(stam, void, i32, i64, i32) DEF_HELPER_3(lam, void, i32, i64, i32) DEF_HELPER_3(mvcle, i32, i32, i64, i32) DEF_HELPER_3(clcle, i32, i32, i64, i32) -DEF_HELPER_3(slb, i32, i32, i32, i32) -DEF_HELPER_4(slbg, i32, i32, i32, i64, i64) +DEF_HELPER_4(slb, i32, env, i32, i32, i32) +DEF_HELPER_5(slbg, i32, env, i32, i32, i64, i64) DEF_HELPER_3(cefbr, void, env, i32, s32) DEF_HELPER_3(cdfbr, void, env, i32, s32)DEF_HELPER_3 (cxfbr, void, env, i32, s32)
@@ -107,7 +107,7 @@ DEF_HELPER_3(lxdb, void, env, i32, i64) DEF_HELPER_FLAGS_3(tceb, TCG_CALL_PURE, i32, env, i32, i64) DEF_HELPER_FLAGS_3(tcdb, TCG_CALL_PURE, i32, env, i32, i64) DEF_HELPER_FLAGS_3(tcxb, TCG_CALL_PURE, i32, env, i32, i64) -DEF_HELPER_2(flogr, i32, i32, i64) +DEF_HELPER_3(flogr, i32, env, i32, i64) DEF_HELPER_3(sqdbr, void, env, i32, i32) DEF_HELPER_FLAGS_1(cvd, TCG_CALL_PURE|TCG_CALL_CONST, i64, s32)DEF_HELPER_3 (unpk, void, i32, i64, i64)
target-s390x/int_helper.c +6 -6
@@ -19,7 +19,6 @@*/ #include "cpu.h" -#include "dyngen-exec.h" #include "host-utils.h" #include "helper.h"
@@ -31,7 +30,7 @@#endif /* 64/64 -> 128 unsigned multiplication */ -void HELPER (mlg )(uint32_t r1,uint64_t v2) +void HELPER (mlg )(CPUS390XState *env,uint32_t r1,uint64_t v2) {#if HOST_LONG_BITS ==64 && defined(__GNUC__)/* assuming 64-bit hosts have __uint128_t */
@@ -46,7 +45,7 @@ void HELPER(mlg)(uint32_t r1, uint64_t v2) }/* 128 -> 64/64 unsigned division */ -void HELPER (dlg )(uint32_t r1,uint64_t v2) +void HELPER (dlg )(CPUS390XState *env,uint32_t r1,uint64_t v2) {uint64_t divisor = v2;
@@ -129,7 +128,7 @@ uint32_t HELPER(addc_u32)(uint32_t cc, uint32_t v1, uint32_t v2) }/* subtract unsigned v2 from v1 with borrow */ -uint32_t HELPER (slb )(uint32_t cc,uint32_t r1,uint32_t v2) +uint32_t HELPER (slb )(CPUS390XState *env,uint32_t cc,uint32_t r1,uint32_t v2) {uint32_t v1 = env->regs[r1];uint32_t res = v1 + (~v2) + (cc >>1 );
@@ -144,7 +143,8 @@ uint32_t HELPER(slb)(uint32_t cc, uint32_t r1, uint32_t v2) }/* subtract unsigned v2 from v1 with borrow */ -uint32_t HELPER (slbg )(uint32_t cc,uint32_t r1,uint64_t v1,uint64_t v2) +uint32_t HELPER (slbg )(CPUS390XState *env,uint32_t cc,uint32_t r1, +uint64_t v1,uint64_t v2) {uint64_t res = v1 + (~v2) + (cc >>1 );
@@ -158,7 +158,7 @@ uint32_t HELPER(slbg)(uint32_t cc, uint32_t r1, uint64_t v1, uint64_t v2) }/* find leftmost one */ -uint32_t HELPER (flogr )(uint32_t r1,uint64_t v2) +uint32_t HELPER (flogr )(CPUS390XState *env,uint32_t r1,uint64_t v2) {uint64_t res =0 ;uint64_t ov2 = v2;
target-s390x/translate.c +8 -8
@@ -1803,7 +1803,7 @@ static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2) tmp2 =tcg_temp_new_i64 (); tmp32_1 =tcg_const_i32 (r1);tcg_gen_qemu_ld64 (tmp2, addr,get_mem_index (s)); -gen_helper_mlg (tmp32_1, tmp2); +gen_helper_mlg (cpu_env, tmp32_1, tmp2);tcg_temp_free_i64 (tmp2);tcg_temp_free_i32 (tmp32_1);break ;
@@ -1811,7 +1811,7 @@ static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2) tmp2 =tcg_temp_new_i64 (); tmp32_1 =tcg_const_i32 (r1);tcg_gen_qemu_ld64 (tmp2, addr,get_mem_index (s)); -gen_helper_dlg (tmp32_1, tmp2); +gen_helper_dlg (cpu_env, tmp32_1, tmp2);tcg_temp_free_i64 (tmp2);tcg_temp_free_i32 (tmp32_1);break ;
@@ -1837,7 +1837,7 @@ static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2)tcg_gen_qemu_ld64 (tmp2, addr,get_mem_index (s));/* XXX possible optimization point */ gen_op_calc_cc (s); -gen_helper_slbg (cc_op, cc_op, tmp32_1, regs[r1], tmp2); +gen_helper_slbg (cc_op, cpu_env, cc_op, tmp32_1, regs[r1], tmp2);set_cc_static (s);tcg_temp_free_i64 (tmp2);tcg_temp_free_i32 (tmp32_1);
@@ -1917,7 +1917,7 @@ static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2)tcg_gen_trunc_i64_i32 (tmp32_2, tmp2);/* XXX possible optimization point */ gen_op_calc_cc (s); -gen_helper_slb (cc_op, cc_op, tmp32_1, tmp32_2); +gen_helper_slb (cc_op, cpu_env, cc_op, tmp32_1, tmp32_2);set_cc_static (s);tcg_temp_free_i64 (tmp2);tcg_temp_free_i32 (tmp32_1);
@@ -3535,7 +3535,7 @@ static void disas_b9(DisasContext *s, int op, int r1, int r2)case 0x83 :/* FLOGR R1,R2 [RRE] */ tmp =load_reg (r2); tmp32_1 =tcg_const_i32 (r1); -gen_helper_flogr (cc_op, tmp32_1, tmp); +gen_helper_flogr (cc_op, cpu_env, tmp32_1, tmp);set_cc_static (s);tcg_temp_free_i64 (tmp);tcg_temp_free_i32 (tmp32_1);
@@ -3555,7 +3555,7 @@ static void disas_b9(DisasContext *s, int op, int r1, int r2)case 0x87 :/* DLGR R1,R2 [RRE] */ tmp32_1 =tcg_const_i32 (r1); tmp =load_reg (r2); -gen_helper_dlg (tmp32_1, tmp); +gen_helper_dlg (cpu_env, tmp32_1, tmp);tcg_temp_free_i64 (tmp);tcg_temp_free_i32 (tmp32_1);break ;
@@ -3580,7 +3580,7 @@ static void disas_b9(DisasContext *s, int op, int r1, int r2) tmp2 =load_reg (r2); tmp32_1 =tcg_const_i32 (r1);gen_op_calc_cc (s); -gen_helper_slbg (cc_op, cc_op, tmp32_1, tmp, tmp2); +gen_helper_slbg (cc_op, cpu_env, cc_op, tmp32_1, tmp, tmp2);set_cc_static (s);tcg_temp_free_i64 (tmp);tcg_temp_free_i64 (tmp2);
@@ -3647,7 +3647,7 @@ static void disas_b9(DisasContext *s, int op, int r1, int r2) tmp32_1 =load_reg32 (r2); tmp32_2 =tcg_const_i32 (r1);gen_op_calc_cc (s); -gen_helper_slb (cc_op, cc_op, tmp32_2, tmp32_1); +gen_helper_slb (cc_op, cpu_env, cc_op, tmp32_2, tmp32_1);set_cc_static (s);tcg_temp_free_i32 (tmp32_1);tcg_temp_free_i32 (tmp32_2);
Signature · 1 line
1.7.2.5
PATCH 7/21 target-s390x: avoid AREG0 for FPU helpers
In reply to Blue SwirlMake FPU helpers take a parameter for CPUState instead of relying on global env.
Introduce temporary wrappers for FPU load and store ops.
--- target-s390x/Makefile.objs | 1 - target-s390x/cc_helper.c | 4 +- target-s390x/cpu.h | 14 +++- target-s390x/fpu_helper.c | 184 +++++++++++++++++++++++--------------------- target-s390x/helper.h | 126 +++++++++++++++--------------- target-s390x/mem_helper.c | 49 ++++++++++++ target-s390x/translate.c | 70 ++++++++-------- 7 files changed, 257 insertions(+), 191 deletions(-)
target-s390x/Makefile.objs +0 -1
@@ -4,7 +4,6 @@ obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o $(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) -$(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/cc_helper.c +2 -2
@@ -473,10 +473,10 @@ static inline uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op,break ;case CC_OP_LTGT_F32 : - r =set_cc_f32 (src, dst); + r =set_cc_f32 (env, src, dst);break ;case CC_OP_LTGT_F64 : - r =set_cc_f64 (src, dst); + r =set_cc_f64 (env, src, dst);break ;case CC_OP_NZ_F32 : r =set_cc_nz_f32 (dst);
target-s390x/cpu.h +12 -2
@@ -1000,12 +1000,22 @@ static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb) }/* fpu_helper.c */ -uint32_t set_cc_f32 (float32 v1,float32 v2); -uint32_t set_cc_f64 (float64 v1,float64 v2); +uint32_t set_cc_f32 (CPUS390XState *env,float32 v1,float32 v2); +uint32_t set_cc_f64 (CPUS390XState *env,float64 v1,float64 v2);uint32_t set_cc_nz_f32 (float32 v);uint32_t set_cc_nz_f64 (float64 v);/* misc_helper.c */ void program_interrupt (CPUS390XState *env,uint32_t code,int ilc); +/* temporary wrappers */ +uint32_t cpu_ldub_data (CPUS390XState *env,target_ulong ptr); +uint32_t cpu_lduw_data (CPUS390XState *env,target_ulong ptr); +uint32_t cpu_ldl_data (CPUS390XState *env,target_ulong ptr); +uint64_t cpu_ldq_data (CPUS390XState *env,target_ulong ptr); + +void cpu_stb_data (CPUS390XState *env,target_ulong ptr,uint32_t data); +void cpu_stw_data (CPUS390XState *env,target_ulong ptr,uint32_t data); +void cpu_stl_data (CPUS390XState *env,target_ulong ptr,uint32_t data); +void cpu_stq_data (CPUS390XState *env,target_ulong ptr,uint64_t data);#endif
target-s390x/fpu_helper.c +96 -88
642 lines not on this page · raw message
target-s390x/helper.h +63 -63
133 lines not on this page · raw message
target-s390x/mem_helper.c +49 -0
52 lines not on this page · raw message
target-s390x/translate.c +35 -35
229 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 9/21 target-s390x: avoid AREG0 for condition code helpers
In reply to Blue SwirlMake condition code helpers take a parameter for CPUState instead of relying on global env.
--- target-s390x/Makefile.objs | 1 - target-s390x/cc_helper.c | 11 +++++------ target-s390x/helper.h | 10 +++++----- target-s390x/translate.c | 16 ++++++++-------- 4 files changed, 18 insertions(+), 20 deletions(-)
target-s390x/Makefile.objs +0 -1
@@ -3,6 +3,5 @@ obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o -$(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/cc_helper.c +5 -6
@@ -19,7 +19,6 @@*/ #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" /* #define DEBUG_HELPER */
@@ -500,14 +499,14 @@ uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst,return do_calc_cc (env, cc_op, src, dst, vr); } -uint32_t HELPER (calc_cc )(uint32_t cc_op,uint64_t src,uint64_t dst, -uint64_t vr) +uint32_t HELPER (calc_cc )(CPUS390XState *env,uint32_t cc_op,uint64_t src, +uint64_t dst,uint64_t vr) {return do_calc_cc (env, cc_op, src, dst, vr); }/* insert psw mask and condition code into r1 */ -void HELPER (ipm )(uint32_t cc,uint32_t r1) +void HELPER (ipm )(CPUS390XState *env,uint32_t cc,uint32_t r1) {uint64_t r = env->regs[r1];
@@ -519,13 +518,13 @@ void HELPER(ipm)(uint32_t cc, uint32_t r1) }#ifndef CONFIG_USER_ONLY -void HELPER (load_psw )(uint64_t mask,uint64_t addr) +void HELPER (load_psw )(CPUS390XState *env,uint64_t mask,uint64_t addr) {load_psw (env, mask, addr);cpu_loop_exit (env); } -void HELPER (sacf )(uint64_t a1) +void HELPER (sacf )(CPUS390XState *env,uint64_t a1) {HELPER_LOG ("%s: %16" PRIx64"\n" , __func__, a1);
target-s390x/helper.h +5 -5
@@ -36,7 +36,7 @@ DEF_HELPER_FLAGS_1(abs_i64, TCG_CALL_PURE|TCG_CALL_CONST, i64, s64) DEF_HELPER_FLAGS_1(nabs_i64, TCG_CALL_PURE|TCG_CALL_CONST, s64, s64) DEF_HELPER_3(stcmh, void, i32, i64, i32) DEF_HELPER_3(icmh, i32, i32, i64, i32) -DEF_HELPER_2(ipm, void, i32, i32) +DEF_HELPER_3(ipm, void, env, i32, i32) DEF_HELPER_FLAGS_3(addc_u32, TCG_CALL_PURE|TCG_CALL_CONST, i32, i32, i32, i32) DEF_HELPER_FLAGS_3(set_cc_addc_u64, TCG_CALL_PURE|TCG_CALL_CONST, i32, i64, i64, i64)DEF_HELPER_3 (stam, void, i32, i64, i32)
@@ -115,7 +115,7 @@ DEF_HELPER_3(tr, void, i32, i64, i64) DEF_HELPER_2(servc, i32, i32, i64) DEF_HELPER_3(diag, i64, i32, i64, i64) -DEF_HELPER_2(load_psw, void, i64, i64) +DEF_HELPER_3(load_psw, void, env, i64, i64) DEF_HELPER_1(program_interrupt, void, i32) DEF_HELPER_FLAGS_1(stidp, TCG_CALL_CONST, void, i64)DEF_HELPER_FLAGS_1 (spx,TCG_CALL_CONST , void, i64)
@@ -139,14 +139,14 @@ DEF_HELPER_2(csp, i32, i32, i32) DEF_HELPER_3(mvcs, i32, i64, i64, i64) DEF_HELPER_3(mvcp, i32, i64, i64, i64) DEF_HELPER_3(sigp, i32, i64, i32, i64) -DEF_HELPER_1(sacf, void, i64) +DEF_HELPER_2(sacf, void, env, i64) DEF_HELPER_FLAGS_2(ipte, TCG_CALL_CONST, void, i64, i64) DEF_HELPER_FLAGS_0(ptlb, TCG_CALL_CONST, void) DEF_HELPER_2(lra, i32, i64, i32) DEF_HELPER_2(stura, void, i64, i32) DEF_HELPER_2(cksm, void, i32, i32) -DEF_HELPER_FLAGS_4 (calc_cc,TCG_CALL_PURE |TCG_CALL_CONST , - i32, i32, i64, i64, i64) +DEF_HELPER_FLAGS_5 (calc_cc,TCG_CALL_PURE |TCG_CALL_CONST , + i32, env, i32, i64, i64, i64)#include "def-helper.h"
target-s390x/translate.c +8 -8
@@ -722,7 +722,7 @@ static void gen_op_calc_cc(DisasContext *s)case CC_OP_NZ_F32 :case CC_OP_NZ_F64 :/* 1 argument */ -gen_helper_calc_cc (cc_op, local_cc_op, dummy, cc_dst, dummy); +gen_helper_calc_cc (cc_op, cpu_env, local_cc_op, dummy, cc_dst, dummy);break ;case CC_OP_ICM :case CC_OP_LTGT_32 :
@@ -735,7 +735,7 @@ static void gen_op_calc_cc(DisasContext *s)case CC_OP_LTGT_F64 :case CC_OP_SLAG :/* 2 arguments */ -gen_helper_calc_cc (cc_op, local_cc_op, cc_src, cc_dst, dummy); +gen_helper_calc_cc (cc_op, cpu_env, local_cc_op, cc_src, cc_dst, dummy);break ;case CC_OP_ADD_64 :case CC_OP_ADDU_64 :
@@ -746,11 +746,11 @@ static void gen_op_calc_cc(DisasContext *s)case CC_OP_SUB_32 :case CC_OP_SUBU_32 :/* 3 arguments */ -gen_helper_calc_cc (cc_op, local_cc_op, cc_src, cc_dst, cc_vr); +gen_helper_calc_cc (cc_op, cpu_env, local_cc_op, cc_src, cc_dst, cc_vr);break ;case CC_OP_DYNAMIC :/* unknown operation - assume 3 arguments and cc_op in env */ -gen_helper_calc_cc (cc_op, cc_op, cc_src, cc_dst, cc_vr); +gen_helper_calc_cc (cc_op, cpu_env, cc_op, cc_src, cc_dst, cc_vr);break ;default :tcg_abort ();
@@ -2628,7 +2628,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)case 0x22 :/* IPM R1 [RRE] */ tmp32_1 =tcg_const_i32 (r1);gen_op_calc_cc (s); -gen_helper_ipm (cc_op, tmp32_1); +gen_helper_ipm (cpu_env, cc_op, tmp32_1);tcg_temp_free_i32 (tmp32_1);break ;case 0x41 :/* CKSM R1,R2 [RRE] */
@@ -2916,7 +2916,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_sacf (tmp); +gen_helper_sacf (cpu_env, tmp);tcg_temp_free_i64 (tmp);/* addressing mode has changed, so end the block */ s->pc += ilc *2 ;
@@ -2967,7 +2967,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)tcg_gen_qemu_ld64 (tmp2, tmp,get_mem_index (s));tcg_gen_addi_i64 (tmp, tmp,8 );tcg_gen_qemu_ld64 (tmp3, tmp,get_mem_index (s)); -gen_helper_load_psw (tmp2, tmp3); +gen_helper_load_psw (cpu_env, tmp2, tmp3);/* we need to keep cc_op intact */ s->is_jmp =DISAS_JUMP ;tcg_temp_free_i64 (tmp);
@@ -4527,7 +4527,7 @@ static void disas_s390_insn(DisasContext *s)tcg_gen_qemu_ld32u (tmp2, tmp,get_mem_index (s));tcg_gen_addi_i64 (tmp, tmp,4 );tcg_gen_qemu_ld32u (tmp3, tmp,get_mem_index (s)); -gen_helper_load_psw (tmp2, tmp3); +gen_helper_load_psw (cpu_env, tmp2, tmp3);tcg_temp_free_i64 (tmp);tcg_temp_free_i64 (tmp2);tcg_temp_free_i64 (tmp3);
Signature · 1 line
1.7.2.5
PATCH 10/21 target-s390x: avoid AREG0 for misc helpers
In reply to Blue SwirlMake misc helpers take a parameter for CPUState instead of relying on global env.
--- target-s390x/Makefile.objs | 1 - target-s390x/helper.h | 26 ++++++++++---------- target-s390x/mem_helper.c | 2 +- target-s390x/misc_helper.c | 55 +++++++++++++++++++++++-------------------- target-s390x/translate.c | 32 ++++++++++++------------ 5 files changed, 59 insertions(+), 57 deletions(-)
target-s390x/Makefile.objs +0 -1
@@ -4,4 +4,3 @@ obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o $(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) -$(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/helper.h +13 -13
@@ -1,6 +1,6 @@#include "def-helper.h" -DEF_HELPER_1(exception, void, i32) +DEF_HELPER_2(exception, void, env, i32) DEF_HELPER_3(nc, i32, i32, i64, i64) DEF_HELPER_3(oc, i32, i32, i64, i64)DEF_HELPER_3 (xc, i32, i32, i64, i64)
@@ -113,20 +113,20 @@ DEF_HELPER_FLAGS_1(cvd, TCG_CALL_PURE|TCG_CALL_CONST, i64, s32) DEF_HELPER_3(unpk, void, i32, i64, i64) DEF_HELPER_3(tr, void, i32, i64, i64) -DEF_HELPER_2(servc, i32, i32, i64) -DEF_HELPER_3(diag, i64, i32, i64, i64) +DEF_HELPER_3(servc, i32, env, i32, i64) +DEF_HELPER_4(diag, i64, env, i32, i64, i64) DEF_HELPER_3(load_psw, void, env, i64, i64) DEF_HELPER_1(program_interrupt, void, i32) -DEF_HELPER_FLAGS_1(stidp, TCG_CALL_CONST, void, i64) -DEF_HELPER_FLAGS_1(spx, TCG_CALL_CONST, void, i64) +DEF_HELPER_FLAGS_2(stidp, TCG_CALL_CONST, void, env, i64) +DEF_HELPER_FLAGS_2(spx, TCG_CALL_CONST, void, env, i64) DEF_HELPER_FLAGS_1(sck, TCG_CALL_CONST, i32, i64) -DEF_HELPER_1(stck, i32, i64) -DEF_HELPER_1(stcke, i32, i64) -DEF_HELPER_FLAGS_1(sckc, TCG_CALL_CONST, void, i64) -DEF_HELPER_FLAGS_1(stckc, TCG_CALL_CONST, void, i64) -DEF_HELPER_FLAGS_1(spt, TCG_CALL_CONST, void, i64) -DEF_HELPER_FLAGS_1(stpt, TCG_CALL_CONST, void, i64) -DEF_HELPER_3(stsi, i32, i64, i32, i32) +DEF_HELPER_2(stck, i32, env, i64) +DEF_HELPER_2(stcke, i32, env, i64) +DEF_HELPER_FLAGS_2(sckc, TCG_CALL_CONST, void, env, i64) +DEF_HELPER_FLAGS_2(stckc, TCG_CALL_CONST, void, env, i64) +DEF_HELPER_FLAGS_2(spt, TCG_CALL_CONST, void, env, i64) +DEF_HELPER_FLAGS_2(stpt, TCG_CALL_CONST, void, env, i64) +DEF_HELPER_4(stsi, i32, env, i64, i32, i32) DEF_HELPER_3(lctl, void, i32, i64, i32) DEF_HELPER_3(lctlg, void, i32, i64, i32)DEF_HELPER_3 (stctl, void, i32, i64, i32)
@@ -138,7 +138,7 @@ DEF_HELPER_FLAGS_2(rrbe, TCG_CALL_CONST, i32, i32, i64) DEF_HELPER_2(csp, i32, i32, i32) DEF_HELPER_3(mvcs, i32, i64, i64, i64) DEF_HELPER_3(mvcp, i32, i64, i64, i64) -DEF_HELPER_3(sigp, i32, i64, i32, i64) +DEF_HELPER_4(sigp, i32, env, i64, i32, i64) DEF_HELPER_2(sacf, void, env, i64) DEF_HELPER_FLAGS_2(ipte, TCG_CALL_CONST, void, i64, i64)DEF_HELPER_FLAGS_0 (ptlb,TCG_CALL_CONST , void)
target-s390x/mem_helper.c +1 -1
@@ -595,7 +595,7 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret) env->psw.addr = ret -4 ; env->int_svc_code = (insn | v1) &0xff ; env->int_svc_ilc =4 ; -helper_exception (EXCP_SVC ); +helper_exception (env,EXCP_SVC ); }else if ((insn &0xff00 ) ==0xbf00 ) {uint32_t insn2, r1, r3, b2, d2;
target-s390x/misc_helper.c +29 -26
149 lines not on this page · raw message
target-s390x/translate.c +16 -16
@@ -312,7 +312,7 @@ static inline void gen_debug(DisasContext *s)TCGv_i32 tmp =tcg_const_i32 (EXCP_DEBUG );update_psw_addr (s);gen_op_calc_cc (s); -gen_helper_exception (tmp); +gen_helper_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp); s->is_jmp =DISAS_EXCP ; }
@@ -324,7 +324,7 @@ static void gen_illegal_opcode(DisasContext *s, int ilc)TCGv_i32 tmp =tcg_const_i32 (EXCP_SPEC );update_psw_addr (s);gen_op_calc_cc (s); -gen_helper_exception (tmp); +gen_helper_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp); s->is_jmp =DISAS_EXCP ; }
@@ -377,7 +377,7 @@ static void gen_program_exception(DisasContext *s, int ilc, int code)/* trigger exception */ tmp =tcg_const_i32 (EXCP_PGM ); -gen_helper_exception (tmp); +gen_helper_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp);/* end TB here */
@@ -2712,7 +2712,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_stidp (tmp); +gen_helper_stidp (cpu_env, tmp);tcg_temp_free_i64 (tmp);break ;case 0x04 :/* SCK D2(B2) [S] */
@@ -2730,7 +2730,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_stck (cc_op, tmp); +gen_helper_stck (cc_op, cpu_env, tmp);set_cc_static (s);tcg_temp_free_i64 (tmp);break ;
@@ -2740,7 +2740,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_sckc (tmp); +gen_helper_sckc (cpu_env, tmp);tcg_temp_free_i64 (tmp);break ;case 0x07 :/* STCKC D2(B2) [S] */
@@ -2749,7 +2749,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_stckc (tmp); +gen_helper_stckc (cpu_env, tmp);tcg_temp_free_i64 (tmp);break ;case 0x08 :/* SPT D2(B2) [S] */
@@ -2758,7 +2758,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_spt (tmp); +gen_helper_spt (cpu_env, tmp);tcg_temp_free_i64 (tmp);break ;case 0x09 :/* STPT D2(B2) [S] */
@@ -2767,7 +2767,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_stpt (tmp); +gen_helper_stpt (cpu_env, tmp);tcg_temp_free_i64 (tmp);break ;case 0x0a :/* SPKA D2(B2) [S] */
@@ -2793,7 +2793,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_spx (tmp); +gen_helper_spx (cpu_env, tmp);tcg_temp_free_i64 (tmp);break ;case 0x11 :/* STPX D2(B2) [S] */
@@ -2906,7 +2906,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)decode_rs (s, insn, &r1, &r3, &b2, &d2); tmp =get_address (s,0 , b2, d2);potential_page_fault (s); -gen_helper_stcke (cc_op, tmp); +gen_helper_stcke (cc_op, cpu_env, tmp);set_cc_static (s);tcg_temp_free_i64 (tmp);break ;
@@ -2930,7 +2930,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn) tmp32_1 =load_reg32 (0 ); tmp32_2 =load_reg32 (1 );potential_page_fault (s); -gen_helper_stsi (cc_op, tmp, tmp32_1, tmp32_2); +gen_helper_stsi (cc_op, cpu_env, tmp, tmp32_1, tmp32_2);set_cc_static (s);tcg_temp_free_i64 (tmp);tcg_temp_free_i32 (tmp32_1);
@@ -2980,7 +2980,7 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn)potential_page_fault (s); tmp32_1 =load_reg32 (r2); tmp =load_reg (r1); -gen_helper_servc (cc_op, tmp32_1, tmp); +gen_helper_servc (cc_op, cpu_env, tmp32_1, tmp);set_cc_static (s);tcg_temp_free_i32 (tmp32_1);tcg_temp_free_i64 (tmp);
@@ -3926,7 +3926,7 @@ static void disas_s390_insn(DisasContext *s) tmp32_3 =tcg_const_i32 (EXCP_SVC );tcg_gen_st_i32 (tmp32_1, cpu_env, offsetof(CPUS390XState , int_svc_code));tcg_gen_st_i32 (tmp32_2, cpu_env, offsetof(CPUS390XState , int_svc_ilc)); -gen_helper_exception (tmp32_3); +gen_helper_exception (cpu_env, tmp32_3); s->is_jmp =DISAS_EXCP ;tcg_temp_free_i32 (tmp32_1);tcg_temp_free_i32 (tmp32_2);
@@ -4543,7 +4543,7 @@ static void disas_s390_insn(DisasContext *s) tmp32_1 =tcg_const_i32 (insn &0xfff ); tmp2 =load_reg (2 ); tmp3 =load_reg (1 ); -gen_helper_diag (tmp2, tmp32_1, tmp2, tmp3); +gen_helper_diag (tmp2, cpu_env, tmp32_1, tmp2, tmp3);store_reg (2 , tmp2);tcg_temp_free_i32 (tmp32_1);tcg_temp_free_i64 (tmp2);
@@ -4777,7 +4777,7 @@ static void disas_s390_insn(DisasContext *s) tmp2 =load_reg (r3); tmp32_1 =tcg_const_i32 (r1);potential_page_fault (s); -gen_helper_sigp (cc_op, tmp, tmp32_1, tmp2); +gen_helper_sigp (cc_op, cpu_env, tmp, tmp32_1, tmp2);set_cc_static (s);tcg_temp_free_i64 (tmp);tcg_temp_free_i64 (tmp2);
Signature · 1 line
1.7.2.5
PATCH 11/21 target-s390x: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0.
Remove temporary wrappers and switch to AREG0 free mode.
--- configure | 2 +- target-s390x/Makefile.objs | 2 - target-s390x/cpu.h | 10 -- target-s390x/fpu_helper.c | 3 +- target-s390x/helper.c | 6 +- target-s390x/helper.h | 78 +++++----- target-s390x/mem_helper.c | 338 ++++++++++++++++++++------------------------ target-s390x/misc_helper.c | 6 +- target-s390x/translate.c | 88 ++++++------ 9 files changed, 240 insertions(+), 293 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | i386 | or32 | sparc* | x86_64 | xtensa* | ppc*) + alpha | i386 | or32 | s390x | sparc* | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-s390x/Makefile.objs +0 -2
@@ -2,5 +2,3 @@ obj-y += translate.o helper.o cpu.o interrupt.o obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o - -$(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-s390x/cpu.h +0 -10
@@ -1008,14 +1008,4 @@ uint32_t set_cc_nz_f64(float64 v);/* misc_helper.c */ void program_interrupt (CPUS390XState *env,uint32_t code,int ilc); -/* temporary wrappers */ -uint32_t cpu_ldub_data (CPUS390XState *env,target_ulong ptr); -uint32_t cpu_lduw_data (CPUS390XState *env,target_ulong ptr); -uint32_t cpu_ldl_data (CPUS390XState *env,target_ulong ptr); -uint64_t cpu_ldq_data (CPUS390XState *env,target_ulong ptr); - -void cpu_stb_data (CPUS390XState *env,target_ulong ptr,uint32_t data); -void cpu_stw_data (CPUS390XState *env,target_ulong ptr,uint32_t data); -void cpu_stl_data (CPUS390XState *env,target_ulong ptr,uint32_t data); -void cpu_stq_data (CPUS390XState *env,target_ulong ptr,uint64_t data);#endif
target-s390x/fpu_helper.c +1 -2
@@ -21,8 +21,7 @@#include "cpu.h" #include "helper.h" -/* temporarily disabled due to wrapper use */ -#if 0 && !defined(CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )#include "softmmu_exec.h" #endif
target-s390x/helper.c +3 -3
@@ -499,14 +499,14 @@ static void do_program_interrupt(CPUS390XState *env)switch (ilc) {case ILC_LATER : - ilc =get_ilc (ldub_code (env->psw.addr)); + ilc =get_ilc (cpu_ldub_code (env, env->psw.addr));break ;case ILC_LATER_INC : - ilc =get_ilc (ldub_code (env->psw.addr)); + ilc =get_ilc (cpu_ldub_code (env, env->psw.addr)); env->psw.addr += ilc *2 ;break ;case ILC_LATER_INC_2 : - ilc =get_ilc (ldub_code (env->psw.addr)) *2 ; + ilc =get_ilc (cpu_ldub_code (env, env->psw.addr)) *2 ; env->psw.addr += ilc;break ; }
target-s390x/helper.h +39 -39
115 lines not on this page · raw message
target-s390x/mem_helper.c +151 -187
900 lines not on this page · raw message
target-s390x/misc_helper.c +1 -5
@@ -30,12 +30,8 @@#include <linux/kvm.h> #endif -/* temporarily disabled due to wrapper use */ -#if 0 && !defined(CONFIG_USER_ONLY ) -#include "softmmu_exec.h" -#endif -#if !defined(CONFIG_USER_ONLY ) +#include "softmmu_exec.h" #include "sysemu.h" #endif
target-s390x/translate.c +44 -44
332 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 13/21 target-lm32: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-lm32/Makefile.objs | 2 -- target-lm32/helper.h | 20 ++++++++++---------- target-lm32/op_helper.c | 29 +++++++++++------------------ target-lm32/translate.c | 22 +++++++++++----------- 5 files changed, 33 insertions(+), 42 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | i386 | or32 | s390x | sparc* | x86_64 | xtensa* | ppc*) + alpha | i386 | lm32 | or32 | s390x | sparc* | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-lm32/Makefile.objs +0 -2
@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-lm32/helper.h +10 -10
@@ -1,14 +1,14 @@#include "def-helper.h" -DEF_HELPER_1(raise_exception, void, i32) -DEF_HELPER_0(hlt, void) -DEF_HELPER_1(wcsr_im, void, i32) -DEF_HELPER_1(wcsr_ip, void, i32) -DEF_HELPER_1(wcsr_jtx, void, i32) -DEF_HELPER_1(wcsr_jrx, void, i32) -DEF_HELPER_0(rcsr_im, i32) -DEF_HELPER_0(rcsr_ip, i32) -DEF_HELPER_0(rcsr_jtx, i32) -DEF_HELPER_0(rcsr_jrx, i32) +DEF_HELPER_2(raise_exception, void, env, i32) +DEF_HELPER_1(hlt, void, env) +DEF_HELPER_2(wcsr_im, void, env, i32) +DEF_HELPER_2(wcsr_ip, void, env, i32) +DEF_HELPER_2(wcsr_jtx, void, env, i32) +DEF_HELPER_2(wcsr_jrx, void, env, i32) +DEF_HELPER_1(rcsr_im, i32, env) +DEF_HELPER_1(rcsr_ip, i32, env) +DEF_HELPER_1(rcsr_jtx, i32, env) +DEF_HELPER_1(rcsr_jrx, i32, env)#include "def-helper.h"
target-lm32/op_helper.c +11 -18
@@ -1,6 +1,5 @@#include <assert.h> #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" #include "host-utils.h"
@@ -18,55 +17,55 @@#define SHIFT 3#include "softmmu_template.h" -void helper_raise_exception (uint32_t index) +void helper_raise_exception (CPULM32State *env,uint32_t index) { env->exception_index = index;cpu_loop_exit (env); } -void helper_hlt (void ) +void helper_hlt (CPULM32State *env) { env->halted =1 ; env->exception_index =EXCP_HLT ;cpu_loop_exit (env); } -void helper_wcsr_im (uint32_t im) +void helper_wcsr_im (CPULM32State *env,uint32_t im) {lm32_pic_set_im (env->pic_state, im); } -void helper_wcsr_ip (uint32_t im) +void helper_wcsr_ip (CPULM32State *env,uint32_t im) {lm32_pic_set_ip (env->pic_state, im); } -void helper_wcsr_jtx (uint32_t jtx) +void helper_wcsr_jtx (CPULM32State *env,uint32_t jtx) {lm32_juart_set_jtx (env->juart_state, jtx); } -void helper_wcsr_jrx (uint32_t jrx) +void helper_wcsr_jrx (CPULM32State *env,uint32_t jrx) {lm32_juart_set_jrx (env->juart_state, jrx); } -uint32_t helper_rcsr_im (void ) +uint32_t helper_rcsr_im (CPULM32State *env) {return lm32_pic_get_im (env->pic_state); } -uint32_t helper_rcsr_ip (void ) +uint32_t helper_rcsr_ip (CPULM32State *env) {return lm32_pic_get_ip (env->pic_state); } -uint32_t helper_rcsr_jtx (void ) +uint32_t helper_rcsr_jtx (CPULM32State *env) {return lm32_juart_get_jtx (env->juart_state); } -uint32_t helper_rcsr_jrx (void ) +uint32_t helper_rcsr_jrx (CPULM32State *env) {return lm32_juart_get_jrx (env->juart_state); }
@@ -74,17 +73,12 @@ uint32_t helper_rcsr_jrx(void)/* Try to fill the TLB and return an exception if error. If retaddr is NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ -/* XXX: fix it to restore all registers */ -void tlb_fill (CPULM32State *env1,target_ulong addr,int is_write,int mmu_idx, +void tlb_fill (CPULM32State *env,target_ulong addr,int is_write,int mmu_idx,uintptr_t retaddr) {TranslationBlock *tb; -CPULM32State *saved_env;int ret; - saved_env = env; - env = env1; - ret =cpu_lm32_handle_mmu_fault (env, addr, is_write, mmu_idx);if (unlikely (ret)) {if (retaddr) {
@@ -98,7 +92,6 @@ void tlb_fill(CPULM32State *env1, target_ulong addr, int is_write, int mmu_idx, }cpu_loop_exit (env); } - env = saved_env; }#endif
target-lm32/translate.c +11 -11
@@ -116,7 +116,7 @@ static inline void t_gen_raise_exception(DisasContext *dc, uint32_t index) {TCGv_i32 tmp =tcg_const_i32 (index); -gen_helper_raise_exception (tmp); +gen_helper_raise_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp); }
@@ -179,7 +179,7 @@ static void dec_and(DisasContext *dc) }else {if (dc->r0 ==0 && dc->r1 ==0 && dc->r2 ==0 ) {tcg_gen_movi_tl (cpu_pc, dc->pc +4 ); -gen_helper_hlt (); +gen_helper_hlt (cpu_env); }else {tcg_gen_and_tl (cpu_R[dc->r2], cpu_R[dc->r0], cpu_R[dc->r1]); }
@@ -601,10 +601,10 @@ static void dec_rcsr(DisasContext *dc)tcg_gen_mov_tl (cpu_R[dc->r2], cpu_ie);break ;case CSR_IM : -gen_helper_rcsr_im (cpu_R[dc->r2]); +gen_helper_rcsr_im (cpu_R[dc->r2], cpu_env);break ;case CSR_IP : -gen_helper_rcsr_ip (cpu_R[dc->r2]); +gen_helper_rcsr_ip (cpu_R[dc->r2], cpu_env);break ;case CSR_CC :tcg_gen_mov_tl (cpu_R[dc->r2], cpu_cc);
@@ -622,10 +622,10 @@ static void dec_rcsr(DisasContext *dc)tcg_gen_mov_tl (cpu_R[dc->r2], cpu_deba);break ;case CSR_JTX : -gen_helper_rcsr_jtx (cpu_R[dc->r2]); +gen_helper_rcsr_jtx (cpu_R[dc->r2], cpu_env);break ;case CSR_JRX : -gen_helper_rcsr_jrx (cpu_R[dc->r2]); +gen_helper_rcsr_jrx (cpu_R[dc->r2], cpu_env);break ;case CSR_ICC :case CSR_DCC :
@@ -812,7 +812,7 @@ static void dec_wcsr(DisasContext *dc)if (use_icount) {gen_io_start (); } -gen_helper_wcsr_im (cpu_R[dc->r1]); +gen_helper_wcsr_im (cpu_env, cpu_R[dc->r1]);tcg_gen_movi_tl (cpu_pc, dc->pc +4 );if (use_icount) {gen_io_end ();
@@ -824,7 +824,7 @@ static void dec_wcsr(DisasContext *dc)if (use_icount) {gen_io_start (); } -gen_helper_wcsr_ip (cpu_R[dc->r1]); +gen_helper_wcsr_ip (cpu_env, cpu_R[dc->r1]);tcg_gen_movi_tl (cpu_pc, dc->pc +4 );if (use_icount) {gen_io_end ();
@@ -844,10 +844,10 @@ static void dec_wcsr(DisasContext *dc)tcg_gen_mov_tl (cpu_deba, cpu_R[dc->r1]);break ;case CSR_JTX : -gen_helper_wcsr_jtx (cpu_R[dc->r1]); +gen_helper_wcsr_jtx (cpu_env, cpu_R[dc->r1]);break ;case CSR_JRX : -gen_helper_wcsr_jrx (cpu_R[dc->r1]); +gen_helper_wcsr_jrx (cpu_env, cpu_R[dc->r1]);break ;case CSR_DC :tcg_gen_mov_tl (cpu_dc, cpu_R[dc->r1]);
@@ -948,7 +948,7 @@ static inline void decode(DisasContext *dc)tcg_gen_debug_insn_start (dc->pc); } - dc->ir = ir =ldl_code (dc->pc); + dc->ir = ir =cpu_ldl_code (cpu_single_env, dc->pc);LOG_DIS ("%8.8x\t" , dc->ir);/* try guessing 'empty' instruction memory, although it may be a valid
Signature · 1 line
1.7.2.5
PATCH 12/21 target-s390x: split helper.c
In reply to Blue SwirlMove CPU init to cpu.c and the rest of helper.c to misc_helper.c.
--- target-s390x/Makefile.objs | 2 +- target-s390x/cpu.c | 18 ++ target-s390x/helper.c | 619 -------------------------------------------- target-s390x/misc_helper.c | 570 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 589 insertions(+), 620 deletions(-) delete mode 100644 target-s390x/helper.c
target-s390x/Makefile.objs +1 -1
@@ -1,4 +1,4 @@ -obj-y += translate.o helper.o cpu.o interrupt.o +obj-y += translate.o cpu.o interrupt.o obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o
target-s390x/cpu.c +18 -0
@@ -24,6 +24,24 @@#include "qemu-common.h" #include "qemu-timer.h" +S390CPU *cpu_s390x_init (const char *cpu_model) +{ +S390CPU *cpu; +CPUS390XState *env; +static int inited; + + cpu =S390_CPU (object_new (TYPE_S390_CPU )); + env = &cpu->env; + +if (tcg_enabled () && !inited) { + inited =1 ; +s390x_translate_init (); + } + + env->cpu_model_str = cpu_model; +qemu_init_vcpu (env); +return cpu; +}/* CPUClass::reset() */ static void s390_cpu_reset (CPUState *s)
target-s390x/helper.c deleted +0 -619
619 lines not on this page · raw message
target-s390x/misc_helper.c +570 -0
593 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 14/21 target-m68k: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-m68k/Makefile.objs | 2 - target-m68k/helpers.h | 2 +- target-m68k/op_helper.c | 68 ++++++++++++++++------------------------ target-m68k/translate.c | 76 +++++++++++++++++++++++---------------------- 5 files changed, 68 insertions(+), 82 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | i386 | lm32 | or32 | s390x | sparc* | x86_64 | xtensa* | ppc*) + alpha | i386 | lm32 | m68k | or32 | s390x | sparc* | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-m68k/Makefile.objs +0 -2
@@ -1,5 +1,3 @@ obj-y += m68k-semi.o obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-m68k/helpers.h +1 -1
@@ -49,6 +49,6 @@ DEF_HELPER_3(set_mac_exts, void, env, i32, i32) DEF_HELPER_3(set_mac_extu, void, env, i32, i32) DEF_HELPER_2(flush_flags, void, env, i32) -DEF_HELPER_1(raise_exception, void, i32) +DEF_HELPER_2(raise_exception, void, env, i32)#include "def-helper.h"
target-m68k/op_helper.c +27 -41
158 lines not on this page · raw message
target-m68k/translate.c +39 -37
247 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 15/21 target-unicore32: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-unicore32/Makefile.objs | 2 - target-unicore32/helper.h | 26 ++++++++-------- target-unicore32/op_helper.c | 65 +++++++++++++++------------------------ target-unicore32/translate.c | 38 +++++++++++----------- 5 files changed, 58 insertions(+), 75 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | i386 | lm32 | m68k | or32 | s390x | sparc* | x86_64 | xtensa* | ppc*) + alpha | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-unicore32/Makefile.objs +0 -2
@@ -2,5 +2,3 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-y += ucf64_helper.o obj-$(CONFIG_SOFTMMU) += machine.o softmmu.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-unicore32/helper.h +13 -13
@@ -17,26 +17,26 @@ DEF_HELPER_1(cp1_putc, void, i32) DEF_HELPER_1(clz, i32, i32) DEF_HELPER_1(clo, i32, i32) -DEF_HELPER_1(exception, void, i32) +DEF_HELPER_2(exception, void, env, i32) -DEF_HELPER_2(asr_write, void, i32, i32) -DEF_HELPER_0(asr_read, i32) +DEF_HELPER_3(asr_write, void, env, i32, i32) +DEF_HELPER_1(asr_read, i32, env) -DEF_HELPER_1(get_user_reg, i32, i32) -DEF_HELPER_2(set_user_reg, void, i32, i32) +DEF_HELPER_2(get_user_reg, i32, env, i32) +DEF_HELPER_3(set_user_reg, void, env, i32, i32) -DEF_HELPER_2(add_cc, i32, i32, i32) -DEF_HELPER_2(adc_cc, i32, i32, i32) -DEF_HELPER_2(sub_cc, i32, i32, i32) -DEF_HELPER_2(sbc_cc, i32, i32, i32) +DEF_HELPER_3(add_cc, i32, env, i32, i32) +DEF_HELPER_3(adc_cc, i32, env, i32, i32) +DEF_HELPER_3(sub_cc, i32, env, i32, i32) +DEF_HELPER_3(sbc_cc, i32, env, i32, i32) DEF_HELPER_2(shl, i32, i32, i32) DEF_HELPER_2(shr, i32, i32, i32) DEF_HELPER_2(sar, i32, i32, i32) -DEF_HELPER_2(shl_cc, i32, i32, i32) -DEF_HELPER_2(shr_cc, i32, i32, i32) -DEF_HELPER_2(sar_cc, i32, i32, i32) -DEF_HELPER_2(ror_cc, i32, i32, i32) +DEF_HELPER_3(shl_cc, i32, env, i32, i32) +DEF_HELPER_3(shr_cc, i32, env, i32, i32) +DEF_HELPER_3(sar_cc, i32, env, i32, i32) +DEF_HELPER_3(ror_cc, i32, env, i32, i32) DEF_HELPER_1(ucf64_get_fpscr, i32, env)DEF_HELPER_2 (ucf64_set_fpscr, void, env, i32)
target-unicore32/op_helper.c +25 -40
176 lines not on this page · raw message
target-unicore32/translate.c +19 -19
@@ -253,7 +253,7 @@ static void disas_ocd_insn(CPUUniCore32State *env, DisasContext *s,static inline void gen_set_asr (TCGv var,uint32_t mask) {TCGv tmp_mask =tcg_const_i32 (mask); -gen_helper_asr_write (var, tmp_mask); +gen_helper_asr_write (cpu_env, var, tmp_mask);tcg_temp_free_i32 (tmp_mask); }/* Set NZCV flags from the high 4 bits of var. */
@@ -263,7 +263,7 @@ static void gen_exception(int excp) {TCGv tmp =new_tmp ();tcg_gen_movi_i32 (tmp, excp); -gen_helper_exception (tmp); +gen_helper_exception (cpu_env, tmp);dead_tmp (tmp); }
@@ -416,16 +416,16 @@ static inline void gen_uc32_shift_reg(TCGv var, int shiftop,if (flags) {switch (shiftop) {case 0 : -gen_helper_shl_cc (var, var, shift); +gen_helper_shl_cc (var, cpu_env, var, shift);break ;case 1 : -gen_helper_shr_cc (var, var, shift); +gen_helper_shr_cc (var, cpu_env, var, shift);break ;case 2 : -gen_helper_sar_cc (var, var, shift); +gen_helper_sar_cc (var, cpu_env, var, shift);break ;case 3 : -gen_helper_ror_cc (var, var, shift); +gen_helper_ror_cc (var, cpu_env, var, shift);break ; } }else {
@@ -1323,11 +1323,11 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)if (IS_USER (s)) {ILLEGAL ; } -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);gen_exception_return (s, tmp); }else {if (UCOP_SET_S ) { -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }else {tcg_gen_sub_i32 (tmp, tmp, tmp2); }
@@ -1336,7 +1336,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)break ;case 0x03 :if (UCOP_SET_S ) { -gen_helper_sub_cc (tmp, tmp2, tmp); +gen_helper_sub_cc (tmp, cpu_env, tmp2, tmp); }else {tcg_gen_sub_i32 (tmp, tmp2, tmp); }
@@ -1344,7 +1344,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)break ;case 0x04 :if (UCOP_SET_S ) { -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }else {tcg_gen_add_i32 (tmp, tmp, tmp2); }
@@ -1352,7 +1352,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)break ;case 0x05 :if (UCOP_SET_S ) { -gen_helper_adc_cc (tmp, tmp, tmp2); +gen_helper_adc_cc (tmp, cpu_env, tmp, tmp2); }else {gen_add_carry (tmp, tmp, tmp2); }
@@ -1360,7 +1360,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)break ;case 0x06 :if (UCOP_SET_S ) { -gen_helper_sbc_cc (tmp, tmp, tmp2); +gen_helper_sbc_cc (tmp, cpu_env, tmp, tmp2); }else {gen_sub_carry (tmp, tmp, tmp2); }
@@ -1368,7 +1368,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)break ;case 0x07 :if (UCOP_SET_S ) { -gen_helper_sbc_cc (tmp, tmp2, tmp); +gen_helper_sbc_cc (tmp, cpu_env, tmp2, tmp); }else {gen_sub_carry (tmp, tmp2, tmp); }
@@ -1390,13 +1390,13 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn)break ;case 0x0a :if (UCOP_SET_S ) { -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }dead_tmp (tmp);break ;case 0x0b :if (UCOP_SET_S ) { -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }dead_tmp (tmp);break ;
@@ -1536,7 +1536,7 @@ static void do_misc(CPUUniCore32State *env, DisasContext *s, uint32_t insn) tmp =load_cpu_field (bsr); }else { tmp =new_tmp (); -gen_helper_asr_read (tmp); +gen_helper_asr_read (tmp, cpu_env); }store_reg (s,UCOP_REG_D , tmp);return ;
@@ -1760,7 +1760,7 @@ static void do_ldst_m(CPUUniCore32State *env, DisasContext *s, uint32_t insn)gen_bx (s, tmp); }else if (user) { tmp2 =tcg_const_i32 (reg); -gen_helper_set_user_reg (tmp2, tmp); +gen_helper_set_user_reg (cpu_env, tmp2, tmp);tcg_temp_free_i32 (tmp2);dead_tmp (tmp); }else if (reg ==UCOP_REG_N ) {
@@ -1778,7 +1778,7 @@ static void do_ldst_m(CPUUniCore32State *env, DisasContext *s, uint32_t insn) }else if (user) { tmp =new_tmp (); tmp2 =tcg_const_i32 (reg); -gen_helper_get_user_reg (tmp, tmp2); +gen_helper_get_user_reg (tmp, cpu_env, tmp2);tcg_temp_free_i32 (tmp2); }else { tmp =load_reg (s, reg);
@@ -1861,7 +1861,7 @@ static void disas_uc32_insn(CPUUniCore32State *env, DisasContext *s) {unsigned int insn; - insn =ldl_code (s->pc); + insn =cpu_ldl_code (env, s->pc); s->pc +=4 ;/* UniCore instructions class:
Signature · 1 line
1.7.2.5
PATCH 16/21 target-arm: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-arm/Makefile.objs | 2 - target-arm/cpu.h | 10 ++- target-arm/helper.c | 8 +- target-arm/helper.h | 60 +++++++++--------- target-arm/op_helper.c | 92 +++++++++++++--------------- target-arm/translate.c | 148 +++++++++++++++++++++++----------------------- 7 files changed, 158 insertions(+), 164 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-arm/Makefile.objs +0 -2
@@ -2,5 +2,3 @@ obj-y += arm-semi.o obj-$(CONFIG_SOFTMMU) += machine.o obj-y += translate.o op_helper.o helper.o cpu.o obj-y += neon_helper.o iwmmxt_helper.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-arm/cpu.h +6 -4
@@ -734,9 +734,10 @@ static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb) }/* Load an instruction and return it in the standard little-endian order */ -static inline uint32_t arm_ldl_code (uint32_t addr,bool do_swap) +static inline uint32_t arm_ldl_code (CPUARMState *env,uint32_t addr, +bool do_swap) { -uint32_t insn =ldl_code (addr); +uint32_t insn =cpu_ldl_code (env, addr);if (do_swap) {return bswap32 (insn); }
@@ -744,9 +745,10 @@ static inline uint32_t arm_ldl_code(uint32_t addr, bool do_swap) }/* Ditto, for a halfword (Thumb) instruction */ -static inline uint16_t arm_lduw_code (uint32_t addr,bool do_swap) +static inline uint16_t arm_lduw_code (CPUARMState *env,uint32_t addr, +bool do_swap) { -uint16_t insn =lduw_code (addr); +uint16_t insn =cpu_lduw_code (env, addr);if (do_swap) {return bswap16 (insn); }
target-arm/helper.c +4 -4
@@ -1756,7 +1756,7 @@ static void do_interrupt_v7m(CPUARMState *env)case EXCP_BKPT :if (semihosting_enabled) {int nr; - nr =arm_lduw_code (env->regs[15 ], env->bswap_code) &0xff ; + nr =arm_lduw_code (env, env->regs[15 ], env->bswap_code) &0xff ;if (nr ==0xab ) { env->regs[15 ] +=2 ; env->regs[0 ] =do_arm_semihosting (env);
@@ -1828,9 +1828,9 @@ void do_interrupt(CPUARMState *env)if (semihosting_enabled) {/* Check for semihosting interrupt. */ if (env->thumb) { - mask =arm_lduw_code (env->regs[15 ] -2 , env->bswap_code) &0xff ; + mask =arm_lduw_code (env, env->regs[15 ] -2 , env->bswap_code) &0xff ; }else { - mask =arm_ldl_code (env->regs[15 ] -4 , env->bswap_code) + mask =arm_ldl_code (env, env->regs[15 ] -4 , env->bswap_code) &0xffffff ; }/* Only intercept calls from privileged modes, to provide some
@@ -1851,7 +1851,7 @@ void do_interrupt(CPUARMState *env)case EXCP_BKPT :/* See if this is a semihosting syscall. */ if (env->thumb && semihosting_enabled) { - mask =arm_lduw_code (env->regs[15 ], env->bswap_code) &0xff ; + mask =arm_lduw_code (env, env->regs[15 ], env->bswap_code) &0xff ;if (mask ==0xab && (env->uncached_cpsr &CPSR_M ) !=ARM_CPU_MODE_USR ) { env->regs[15 ] +=2 ;
target-arm/helper.h +30 -30
91 lines not on this page · raw message
target-arm/op_helper.c +43 -49
316 lines not on this page · raw message
target-arm/translate.c +74 -74
480 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 17/21 target-microblaze: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-microblaze/Makefile.objs | 2 - target-microblaze/helper.h | 48 ++++++++-------- target-microblaze/op_helper.c | 115 ++++++++++++++++++--------------------- target-microblaze/translate.c | 56 +++++++++++--------- 5 files changed, 108 insertions(+), 115 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-microblaze/Makefile.objs +0 -2
@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += mmu.o machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-microblaze/helper.h +24 -24
63 lines not on this page · raw message
target-microblaze/op_helper.c +52 -63
373 lines not on this page · raw message
target-microblaze/translate.c +31 -25
168 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 18/21 target-cris: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-cris/Makefile.objs | 2 - target-cris/helper.c | 4 +- target-cris/helper.h | 34 ++++++++-------- target-cris/op_helper.c | 89 +++++++++++++++++++++---------------------- target-cris/translate.c | 50 ++++++++++++----------- target-cris/translate_v10.c | 22 +++++----- 7 files changed, 101 insertions(+), 102 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-cris/Makefile.objs +0 -2
@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += mmu.o machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-cris/helper.c +2 -2
@@ -151,7 +151,7 @@ static void do_interruptv10(CPUCRISState *env) }/* Now that we are in kernel mode, load the handlers address. */ - env->pc =ldl_code (env->pregs[PR_EBP ] + ex_vec *4 ); + env->pc =cpu_ldl_code (env, env->pregs[PR_EBP ] + ex_vec *4 ); env->locked_irq =1 ; env->pregs[PR_CCS ] |=F_FLAG_V10 ;/* set F. */
@@ -233,7 +233,7 @@ void do_interrupt(CPUCRISState *env)/* Now that we are in kernel mode, load the handlers address. This load may not fault, real hw leaves that behaviour as undefined. */ - env->pc =ldl_code (env->pregs[PR_EBP ] + ex_vec *4 ); + env->pc =cpu_ldl_code (env, env->pregs[PR_EBP ] + ex_vec *4 );/* Clear the excption_index to avoid spurios hw_aborts for recursive bus faults. */
target-cris/helper.h +17 -17
@@ -1,26 +1,26 @@#include "def-helper.h" -DEF_HELPER_1(raise_exception, void, i32) -DEF_HELPER_1(tlb_flush_pid, void, i32) -DEF_HELPER_1(spc_write, void, i32) +DEF_HELPER_2(raise_exception, void, env, i32) +DEF_HELPER_2(tlb_flush_pid, void, env, i32) +DEF_HELPER_2(spc_write, void, env, i32) DEF_HELPER_3(dump, void, i32, i32, i32) -DEF_HELPER_0 (rfe, void); -DEF_HELPER_0 (rfn, void); +DEF_HELPER_1 (rfe, void, env); +DEF_HELPER_1 (rfn, void, env); -DEF_HELPER_2(movl_sreg_reg, void, i32, i32) -DEF_HELPER_2(movl_reg_sreg, void, i32, i32) +DEF_HELPER_3(movl_sreg_reg, void, env, i32, i32) +DEF_HELPER_3(movl_reg_sreg, void, env, i32, i32)DEF_HELPER_FLAGS_1 (lz,TCG_CALL_PURE , i32, i32); -DEF_HELPER_FLAGS_3 (btst,TCG_CALL_PURE , i32, i32, i32, i32); +DEF_HELPER_FLAGS_4 (btst,TCG_CALL_PURE , i32, env, i32, i32, i32); -DEF_HELPER_FLAGS_3(evaluate_flags_muls, TCG_CALL_PURE, i32, i32, i32, i32) -DEF_HELPER_FLAGS_3(evaluate_flags_mulu, TCG_CALL_PURE, i32, i32, i32, i32) -DEF_HELPER_FLAGS_4(evaluate_flags_mcp, TCG_CALL_PURE, i32, i32, i32, i32, i32) -DEF_HELPER_FLAGS_4(evaluate_flags_alu_4, TCG_CALL_PURE, i32, i32, i32, i32, i32) -DEF_HELPER_FLAGS_4(evaluate_flags_sub_4, TCG_CALL_PURE, i32, i32, i32, i32, i32) -DEF_HELPER_FLAGS_2(evaluate_flags_move_4, TCG_CALL_PURE, i32, i32, i32) -DEF_HELPER_FLAGS_2(evaluate_flags_move_2, TCG_CALL_PURE, i32, i32, i32) -DEF_HELPER_0(evaluate_flags, void) -DEF_HELPER_0(top_evaluate_flags, void) +DEF_HELPER_FLAGS_4(evaluate_flags_muls, TCG_CALL_PURE, i32, env, i32, i32, i32) +DEF_HELPER_FLAGS_4(evaluate_flags_mulu, TCG_CALL_PURE, i32, env, i32, i32, i32) +DEF_HELPER_FLAGS_5(evaluate_flags_mcp, TCG_CALL_PURE, i32, env, i32, i32, i32, i32) +DEF_HELPER_FLAGS_5(evaluate_flags_alu_4, TCG_CALL_PURE, i32, env, i32, i32, i32, i32) +DEF_HELPER_FLAGS_5(evaluate_flags_sub_4, TCG_CALL_PURE, i32, env, i32, i32, i32, i32) +DEF_HELPER_FLAGS_3(evaluate_flags_move_4, TCG_CALL_PURE, i32, env, i32, i32) +DEF_HELPER_FLAGS_3(evaluate_flags_move_2, TCG_CALL_PURE, i32, env, i32, i32) +DEF_HELPER_1(evaluate_flags, void, env) +DEF_HELPER_1(top_evaluate_flags, void, env)#include "def-helper.h"
target-cris/op_helper.c +44 -45
286 lines not on this page · raw message
target-cris/translate.c +26 -24
161 lines not on this page · raw message
target-cris/translate_v10.c +11 -11
@@ -182,17 +182,17 @@ static int dec10_prep_move_m(DisasContext *dc, int s_ext, int memsize,if (memsize !=4 ) {if (s_ext) {if (memsize ==1 ) - imm =ldsb_code (dc->pc +2 ); + imm =cpu_ldsb_code (cpu_single_env, dc->pc +2 );else - imm =ldsw_code (dc->pc +2 ); + imm =cpu_ldsw_code (cpu_single_env, dc->pc +2 ); }else {if (memsize ==1 ) - imm =ldub_code (dc->pc +2 ); + imm =cpu_ldub_code (cpu_single_env, dc->pc +2 );else - imm =lduw_code (dc->pc +2 ); + imm =cpu_lduw_code (cpu_single_env, dc->pc +2 ); } }else - imm =ldl_code (dc->pc +2 ); + imm =cpu_ldl_code (cpu_single_env, dc->pc +2 );tcg_gen_movi_tl (dst, imm);
@@ -289,7 +289,7 @@ static unsigned int dec10_quick_imm(DisasContext *dc) }else {/* BTST */ cris_update_cc_op (dc,CC_OP_FLAGS ,4 ); -gen_helper_btst (cpu_PR[PR_CCS ], cpu_R[dc->dst], +gen_helper_btst (cpu_PR[PR_CCS ], cpu_env, cpu_R[dc->dst],tcg_const_tl (imm), cpu_PR[PR_CCS ]); }break ;
@@ -723,7 +723,7 @@ static unsigned int dec10_reg(DisasContext *dc)LOG_DIS ("btst $r%d, $r%d sz=%d\n" , dc->src, dc->dst, size);cris_cc_mask (dc,CC_MASK_NZVC );cris_update_cc_op (dc,CC_OP_FLAGS ,4 ); -gen_helper_btst (cpu_PR[PR_CCS ], cpu_R[dc->dst], +gen_helper_btst (cpu_PR[PR_CCS ], cpu_env, cpu_R[dc->dst], cpu_R[dc->src], cpu_PR[PR_CCS ]);break ;case CRISV10_REG_DSTEP :
@@ -974,7 +974,7 @@ static int dec10_dip(DisasContext *dc)LOG_DIS ("dip pc=%x opcode=%d r%d r%d\n" , dc->pc, dc->opcode, dc->src, dc->dst);if (dc->src ==15 ) { - imm =ldl_code (dc->pc +2 ); + imm =cpu_ldl_code (cpu_single_env, dc->pc +2 );tcg_gen_movi_tl (cpu_PR[PR_PREFIX ], imm);if (dc->postinc) insn_len +=4 ;
@@ -1119,7 +1119,7 @@ static unsigned int dec10_ind(DisasContext *dc)if (dc->src ==15 ) {LOG_DIS ("jump.%d %d r%d r%d direct\n" , size, dc->opcode, dc->src, dc->dst); - imm =ldl_code (dc->pc +2 ); + imm =cpu_ldl_code (cpu_single_env, dc->pc +2 );if (dc->mode ==CRISV10_MODE_AUTOINC ) insn_len += size;
@@ -1185,7 +1185,7 @@ static unsigned int dec10_ind(DisasContext *dc)case CRISV10_IND_BCC_M :cris_cc_mask (dc,0 ); - imm =ldsw_code (dc->pc +2 ); + imm =cpu_ldsw_code (cpu_single_env, dc->pc +2 ); simm = (int16_t )imm; simm +=4 ;
@@ -1210,7 +1210,7 @@ static unsigned int crisv10_decoder(DisasContext *dc)tcg_gen_debug_insn_start (dc->pc);/* Load a halfword onto the instruction register. */ - dc->ir =lduw_code (dc->pc); + dc->ir =cpu_lduw_code (cpu_single_env, dc->pc);/* Now decode it. */ dc->opcode =EXTRACT_FIELD (dc->ir,6 ,9 );
Signature · 1 line
1.7.2.5
PATCH 19/21 target-sh4: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-sh4/Makefile.objs | 2 - target-sh4/helper.h | 84 +++++++++++----------- target-sh4/op_helper.c | 182 ++++++++++++++++++++++----------------------- target-sh4/translate.c | 114 ++++++++++++++++------------- 5 files changed, 195 insertions(+), 189 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-sh4/Makefile.objs +0 -2
@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-sh4/helper.h +42 -42
96 lines not on this page · raw message
target-sh4/op_helper.c +89 -93
511 lines not on this page · raw message
target-sh4/translate.c +63 -51
343 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 21/21 Remove unused CONFIG_TCG_PASS_AREG0 and dead code
In reply to Blue SwirlNow that CONFIG_TCG_PASS_AREG0 is enabled for all targets, remove dead code and support for !CONFIG_TCG_PASS_AREG0 case.
Remove dyngen-exec.h and all references to it. Although included by hw/spapr_hcall.c, it does not seem to use it.
Remove unused HELPER_CFLAGS.
--- Makefile.target | 8 ----- configure | 11 ------- cpu-all.h | 11 ------- cputlb.c | 4 -- dyngen-exec.h | 70 ------------------------------------------ exec-all.h | 4 -- hw/spapr_hcall.c | 1 - softmmu_defs.h | 21 ------------- softmmu_header.h | 63 ++++++++++++-------------------------- softmmu_template.h | 72 ++++++++++++++++--------------------------- target-m68k/op_helper.c | 3 -- target-sparc/Makefile.objs | 2 - tcg/arm/tcg-target.c | 31 ++----------------- tcg/arm/tcg-target.h | 1 - tcg/hppa/tcg-target.c | 24 -------------- tcg/hppa/tcg-target.h | 1 - tcg/i386/tcg-target.c | 30 ------------------ tcg/i386/tcg-target.h | 1 - tcg/ia64/tcg-target.c | 34 -------------------- tcg/ia64/tcg-target.h | 1 - tcg/mips/tcg-target.c | 31 ++----------------- tcg/mips/tcg-target.h | 1 - tcg/ppc/tcg-target.c | 38 ----------------------- tcg/ppc64/tcg-target.c | 28 ----------------- tcg/s390/tcg-target.c | 24 -------------- tcg/s390/tcg-target.h | 1 - tcg/sparc/tcg-target.c | 30 ------------------ tcg/sparc/tcg-target.h | 1 - tcg/tci/tcg-target.c | 4 -- tci.c | 12 ------- user-exec.c | 14 -------- 31 files changed, 53 insertions(+), 524 deletions(-) delete mode 100644 dyngen-exec.h
Makefile.target +0 -8
@@ -80,14 +80,6 @@ obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci -# HELPER_CFLAGS is used for all the legacy code compiled with static register -# variables -user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS) - -# Note: this is a workaround. The real fix is to avoid compiling -# cpu_signal_handler() in user-exec.c. -%/signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS) - ######################################################### # Linux user emulator target
configure +0 -11
@@ -118,7 +118,6 @@ audio_card_list="ac97 es1370 sb16 hda" audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus hda" block_drv_whitelist="" host_cc="gcc" -helper_cflags="" libs_softmmu="" libs_tools="" audio_pt_int=""
@@ -894,7 +893,6 @@ case "$cpu" in QEMU_CFLAGS="-m32 -ffixed-g2 -ffixed-g3 $QEMU_CFLAGS" if test "$solaris" = "no" ; then QEMU_CFLAGS="-ffixed-g1 -ffixed-g6 $QEMU_CFLAGS" - helper_cflags="-ffixed-i0" fi ;; sparc64)
@@ -919,7 +917,6 @@ case "$cpu" in QEMU_CFLAGS="-m32 $QEMU_CFLAGS" LDFLAGS="-m32 $LDFLAGS" cc_i386='$(CC) -m32' - helper_cflags="-fomit-frame-pointer" host_guest_base="yes" ;; x86_64)
@@ -3572,7 +3569,6 @@ if test "$sparse" = "yes" ; then echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak fi -echo "HELPER_CFLAGS=$helper_cflags" >> $config_host_mak echo "LDFLAGS=$LDFLAGS" >> $config_host_mak echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
@@ -3827,13 +3823,6 @@ fi symlink "$source_path/Makefile.target" "$target_dir/Makefile" - -case "$target_arch2" in - alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | mips* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) - echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak - ;; -esac - upper() { echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]' }
cpu-all.h +0 -11
@@ -260,14 +260,6 @@ extern unsigned long reserved_va;#define stfl (p, v) stfl_raw(p, v)#define stfq (p, v) stfq_raw(p, v) -#ifndef CONFIG_TCG_PASS_AREG0 -#define ldub_code (p) ldub_raw(p) -#define ldsb_code (p) ldsb_raw(p) -#define lduw_code (p) lduw_raw(p) -#define ldsw_code (p) ldsw_raw(p) -#define ldl_code (p) ldl_raw(p) -#define ldq_code (p) ldq_raw(p) -#else #define cpu_ldub_code (env1, p) ldub_raw(p)#define cpu_ldsb_code (env1, p) ldsb_raw(p)#define cpu_lduw_code (env1, p) lduw_raw(p)
@@ -296,7 +288,6 @@ extern unsigned long reserved_va;#define cpu_stw_kernel (env, addr, data) stw_raw(addr, data)#define cpu_stl_kernel (env, addr, data) stl_raw(addr, data)#define cpu_stq_kernel (env, addr, data) stq_raw(addr, data) -#endif #define ldub_kernel (p) ldub_raw(p)#define ldsb_kernel (p) ldsb_raw(p)
@@ -313,7 +304,6 @@ extern unsigned long reserved_va;#define stfl_kernel (p, v) stfl_raw(p, v)#define stfq_kernel (p, vt) stfq_raw(p, v) -#ifdef CONFIG_TCG_PASS_AREG0 #define cpu_ldub_data (env, addr) ldub_raw(addr)#define cpu_lduw_data (env, addr) lduw_raw(addr)#define cpu_ldl_data (env, addr) ldl_raw(addr)
@@ -321,7 +311,6 @@ extern unsigned long reserved_va;#define cpu_stb_data (env, addr, data) stb_raw(addr, data)#define cpu_stw_data (env, addr, data) stw_raw(addr, data)#define cpu_stl_data (env, addr, data) stl_raw(addr, data) -#endif #endif /* defined(CONFIG_USER_ONLY) */ /* page related stuff */
cputlb.c +0 -4
@@ -325,11 +325,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) mmu_idx =cpu_mmu_index (env1);if (unlikely (env1->tlb_table[mmu_idx][page_index].addr_code != (addr &TARGET_PAGE_MASK ))) { -#ifdef CONFIG_TCG_PASS_AREG0 cpu_ldub_code (env1, addr); -#else -ldub_code (addr); -#endif } pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK ; mr =iotlb_to_region (pd);
dyngen-exec.h deleted +0 -70
70 lines not on this page · raw message
exec-all.h +0 -4
@@ -323,9 +323,6 @@ void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,#define ACCESS_TYPE (NB_MMU_MODES + 1)#define MEMSUFFIX _code -#ifndef CONFIG_TCG_PASS_AREG0 -#define env cpu_single_env -#endif #define DATA_SIZE 1#include "softmmu_header.h"
@@ -341,7 +338,6 @@ void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,#undef ACCESS_TYPE#undef MEMSUFFIX -#undef env#endif
hw/spapr_hcall.c +0 -1
@@ -1,6 +1,5 @@#include "sysemu.h" #include "cpu.h" -#include "dyngen-exec.h" #include "qemu-char.h" #include "sysemu.h" #include "qemu-char.h"
softmmu_defs.h +0 -21
@@ -9,25 +9,6 @@#ifndef SOFTMMU_DEFS_H #define SOFTMMU_DEFS_H -#ifndef CONFIG_TCG_PASS_AREG0 -uint8_t __ldb_mmu (target_ulong addr,int mmu_idx); -void __stb_mmu (target_ulong addr,uint8_t val,int mmu_idx); -uint16_t __ldw_mmu (target_ulong addr,int mmu_idx); -void __stw_mmu (target_ulong addr,uint16_t val,int mmu_idx); -uint32_t __ldl_mmu (target_ulong addr,int mmu_idx); -void __stl_mmu (target_ulong addr,uint32_t val,int mmu_idx); -uint64_t __ldq_mmu (target_ulong addr,int mmu_idx); -void __stq_mmu (target_ulong addr,uint64_t val,int mmu_idx); - -uint8_t __ldb_cmmu (target_ulong addr,int mmu_idx); -void __stb_cmmu (target_ulong addr,uint8_t val,int mmu_idx); -uint16_t __ldw_cmmu (target_ulong addr,int mmu_idx); -void __stw_cmmu (target_ulong addr,uint16_t val,int mmu_idx); -uint32_t __ldl_cmmu (target_ulong addr,int mmu_idx); -void __stl_cmmu (target_ulong addr,uint32_t val,int mmu_idx); -uint64_t __ldq_cmmu (target_ulong addr,int mmu_idx); -void __stq_cmmu (target_ulong addr,uint64_t val,int mmu_idx); -#else uint8_t helper_ldb_mmu (CPUArchState *env,target_ulong addr,int mmu_idx);void helper_stb_mmu (CPUArchState *env,target_ulong addr,uint8_t val,int mmu_idx);
@@ -54,5 +35,3 @@ uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);void helper_stq_cmmu (CPUArchState *env,target_ulong addr,uint64_t val,int mmu_idx);#endif - -#endif
softmmu_header.h +20 -43
143 lines not on this page · raw message
softmmu_template.h +27 -45
193 lines not on this page · raw message
target-m68k/op_helper.c +0 -3
@@ -192,9 +192,6 @@ void HELPER(divu)(CPUM68KState *env, uint32_t word) quot = num / den; rem = num % den; flags =0 ; -/* Avoid using a PARAM1 of zero. This breaks dyngen because it uses -the address of a symbol, and gcc knows symbols can't have address -zero. */ if (word && quot >0xffff ) flags |=CCF_V ;if (quot ==0 )
target-sparc/Makefile.objs +0 -2
@@ -4,5 +4,3 @@ obj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o obj-$(TARGET_SPARC) += int32_helper.o obj-$(TARGET_SPARC64) += int64_helper.o obj-$(TARGET_SPARC64) += vis_helper.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
tcg/arm/tcg-target.c +3 -28
@@ -176,7 +176,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)so don't use these. */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R0 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R1 ); -#if defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +#if TARGET_LONG_BITS ==64 /* If we're passing env to the helper as r0 and need a regpair * for the address then r2 will be overwritten as we're setting * up the args to the helper.
@@ -204,8 +204,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)use these. */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R0 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R1 ); -#if defined(CONFIG_SOFTMMU ) && \ - defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +#if defined(CONFIG_SOFTMMU ) && (TARGET_LONG_BITS ==64 )/* Avoid clashes with registers being used for helper args */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R2 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );
@@ -223,7 +222,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)#ifdef CONFIG_SOFTMMU /* r2 is still needed to load data_reg, so don't use it. */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R2 ); -#if defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +#if TARGET_LONG_BITS ==64 /* Avoid clashes with registers being used for helper args */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );#endif
@@ -954,7 +953,6 @@ static inline void tcg_out_goto_label(TCGContext *s, int cond, int label_index)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -972,25 +970,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif /* Helper routines for marshalling helper function arguments into * the correct registers and stack.
@@ -1203,9 +1182,7 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)* trash by moving the earlier arguments into them. */ argreg =TCG_REG_R0 ; -#ifdef CONFIG_TCG_PASS_AREG0 argreg =tcg_out_arg_reg32 (s, argreg,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==64 argreg =tcg_out_arg_reg64 (s, argreg, addr_reg, addr_reg2);#else
@@ -1421,9 +1398,7 @@ static inline void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc)* trash by moving the earlier arguments into them. */ argreg =TCG_REG_R0 ; -#ifdef CONFIG_TCG_PASS_AREG0 argreg =tcg_out_arg_reg32 (s, argreg,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==64 argreg =tcg_out_arg_reg64 (s, argreg, addr_reg, addr_reg2);#else
tcg/arm/tcg-target.h +0 -1
@@ -77,7 +77,6 @@ typedef enum {#define TCG_TARGET_HAS_GUEST_BASE enum { -/* Note: must be synced with dyngen-exec.h */ TCG_AREG0 =TCG_REG_R6 , };
tcg/hppa/tcg-target.c +0 -24
@@ -882,7 +882,6 @@ static void tcg_out_setcond2(TCGContext *s, int cond, TCGArg ret,#if defined(CONFIG_SOFTMMU )#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void * const qemu_ld_helpers[4] = {
@@ -900,25 +899,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif /* Load and compare a TLB entry, and branch if TLB miss. OFFSET is set to the offset of the first ADDR_READ or ADDR_WRITE member of the appropriate
@@ -1085,7 +1065,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) }tcg_out_movi (s,TCG_TYPE_I32 , argreg, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[2 ], tcg_target_call_iarg_regs[1 ]);
@@ -1093,7 +1072,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tcg_out_call (s, qemu_ld_helpers[opc &3 ]);switch (opc) {
@@ -1245,7 +1223,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc)tcg_abort (); } -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);
@@ -1255,7 +1232,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc) tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tcg_out_call (s, qemu_st_helpers[opc]);/* label2: */
tcg/hppa/tcg-target.h +0 -1
@@ -104,7 +104,6 @@ typedef enum {#define TCG_TARGET_HAS_GUEST_BASE -/* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_R17
tcg/i386/tcg-target.c +0 -30
@@ -183,9 +183,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set32 (ct->u.regs,0 ,0xffff );tcg_regset_reset_reg (ct->u.regs, tcg_target_call_iarg_regs[0 ]);tcg_regset_reset_reg (ct->u.regs, tcg_target_call_iarg_regs[1 ]); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs, tcg_target_call_iarg_regs[2 ]); -#endif }else {tcg_regset_set32 (ct->u.regs,0 ,0xff );tcg_regset_reset_reg (ct->u.regs,TCG_REG_EAX );
@@ -965,7 +963,6 @@ static void tcg_out_jmp(TCGContext *s, tcg_target_long dest)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *qemu_ld_helpers[4 ] = {
@@ -983,25 +980,6 @@ static const void *qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif /* Perform the TLB load and compare.
@@ -1220,16 +1198,13 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, }tcg_out_push (s, args[addrlo_idx]); stack_adjust +=4 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_push (s,TCG_AREG0 ); stack_adjust +=4 ; -#endif #else /* The first argument is already loaded with addrlo. */ arg_idx =1 ;tcg_out_movi (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[arg_idx], mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);
@@ -1240,7 +1215,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[0 ],TCG_AREG0 );#endif -#endif tcg_out_calli (s, (tcg_target_long )qemu_ld_helpers[s_bits]);
@@ -1436,16 +1410,13 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, }tcg_out_push (s, args[addrlo_idx]); stack_adjust +=4 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_push (s,TCG_AREG0 ); stack_adjust +=4 ; -#endif #else tcg_out_mov (s, (opc ==3 ?TCG_TYPE_I64 :TCG_TYPE_I32 ), tcg_target_call_iarg_regs[1 ], data_reg);tcg_out_movi (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[2 ], mem_index); stack_adjust =0 ; -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);
@@ -1456,7 +1427,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[0 ],TCG_AREG0 );#endif -#endif tcg_out_calli (s, (tcg_target_long )qemu_st_helpers[s_bits]);
tcg/i386/tcg-target.h +0 -1
@@ -116,7 +116,6 @@ typedef enum {#define TCG_TARGET_HAS_GUEST_BASE -/* Note: must be synced with dyngen-exec.h */ #if TCG_TARGET_REG_BITS ==64 # define TCG_AREG0 TCG_REG_R14#else
tcg/ia64/tcg-target.c +0 -34
@@ -1452,7 +1452,6 @@ static inline void tcg_out_qemu_tlb(TCGContext *s, TCGArg addr_reg, TCG_REG_P7, TCG_REG_R3, TCG_REG_R57)); } -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -1461,16 +1460,6 @@ static const void * const qemu_ld_helpers[4] = { helper_ldl_mmu, helper_ldq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; -#endif static inline void tcg_out_qemu_ld (TCGContext *s,const TCGArg *args,int opc) {
@@ -1530,7 +1519,6 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)tcg_opc_m1 (TCG_REG_P7 ,OPC_LD8_M1 ,TCG_REG_R1 ,TCG_REG_R2 ), tcg_opc_i18(TCG_REG_P0, OPC_NOP_I18, 0)); } -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_bundle(s, mII, tcg_opc_a5 (TCG_REG_P7, OPC_ADDL_A5, TCG_REG_R58,
@@ -1539,7 +1527,6 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) TCG_REG_R57, 0, TCG_REG_R56),tcg_opc_a4 (TCG_REG_P7 ,OPC_ADDS_A4 , TCG_REG_R56, 0, TCG_AREG0)); -#endif if (!bswap || s_bits ==0 ) { tcg_out_bundle(s, miB, tcg_opc_m48(TCG_REG_P0, OPC_NOP_M48, 0),
@@ -1570,7 +1557,6 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) } } -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_st_mmu(CPUState *env, target_ulong addr, uintxx_t val, int mmu_idx) */ static const void *const qemu_st_helpers[4 ] = {
@@ -1579,16 +1565,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif static inline void tcg_out_qemu_st (TCGContext *s,const TCGArg *args,int opc) {
@@ -1658,7 +1634,6 @@ static inline void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc) data_reg =TCG_REG_R2 ; } -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_bundle(s, mII, tcg_opc_a5 (TCG_REG_P7, OPC_ADDL_A5, TCG_REG_R59,
@@ -1674,15 +1649,6 @@ static inline void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc) TCG_REG_R56, 0, TCG_AREG0),tcg_opc_b5 (TCG_REG_P7 ,OPC_BR_CALL_SPTK_MANY_B5 , TCG_REG_B0, TCG_REG_B6)); -#else -tcg_out_bundle (s, miB, -tcg_opc_m4 (TCG_REG_P6 , opc_st_m4[opc], - data_reg,TCG_REG_R3 ), -tcg_opc_a5 (TCG_REG_P7 ,OPC_ADDL_A5 ,TCG_REG_R58 , - mem_index,TCG_REG_R0 ), -tcg_opc_b5 (TCG_REG_P7 ,OPC_BR_CALL_SPTK_MANY_B5 , -TCG_REG_B0 ,TCG_REG_B6 )); -#endif }#else /* !CONFIG_SOFTMMU */
tcg/ia64/tcg-target.h +0 -1
@@ -140,7 +140,6 @@ typedef enum {#define TCG_TARGET_HAS_not_i32 0/* xor r1, -1, r3 */ #define TCG_TARGET_HAS_not_i64 0/* xor r1, -1, r3 */ -/* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_R7/* Guest base is supported */
tcg/mips/tcg-target.c +3 -28
@@ -217,7 +217,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set (ct->u.regs,0xffffffff );#if defined(CONFIG_SOFTMMU )tcg_regset_reset_reg (ct->u.regs,TCG_REG_A0 ); -# if defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +# if (TARGET_LONG_BITS ==64 )tcg_regset_reset_reg (ct->u.regs,TCG_REG_A2 );# endif #endif
@@ -227,12 +227,11 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set (ct->u.regs,0xffffffff );tcg_regset_reset_reg (ct->u.regs,TCG_REG_A0 );#if defined(CONFIG_SOFTMMU ) -# if (defined(CONFIG_TCG_PASS_AREG0 ) &&TARGET_LONG_BITS ==32 ) || \ - (!defined(CONFIG_TCG_PASS_AREG0 ) &&TARGET_LONG_BITS ==64 ) +# if (TARGET_LONG_BITS ==32 )tcg_regset_reset_reg (ct->u.regs,TCG_REG_A1 );# endif tcg_regset_reset_reg (ct->u.regs,TCG_REG_A2 ); -# if defined(CONFIG_TCG_PASS_AREG0 ) &&TARGET_LONG_BITS ==64 +# if TARGET_LONG_BITS ==64 tcg_regset_reset_reg (ct->u.regs,TCG_REG_A3 );# endif #endif
@@ -821,7 +820,6 @@ static void tcg_out_setcond2(TCGContext *s, TCGCond cond, int ret,#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -839,25 +837,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
@@ -942,9 +921,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,/* slow path */ arg_num =0 ; -# ifdef CONFIG_TCG_PASS_AREG0 tcg_out_call_iarg_reg32 (s, &arg_num,TCG_AREG0 ); -# endif # if TARGET_LONG_BITS ==64 tcg_out_call_iarg_reg64 (s, &arg_num, addr_regl, addr_regh);# else
@@ -1127,9 +1104,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,/* slow path */ arg_num =0 ; -# ifdef CONFIG_TCG_PASS_AREG0 tcg_out_call_iarg_reg32 (s, &arg_num,TCG_AREG0 ); -# endif # if TARGET_LONG_BITS ==64 tcg_out_call_iarg_reg64 (s, &arg_num, addr_regl, addr_regh);# else
tcg/mips/tcg-target.h +0 -1
@@ -96,7 +96,6 @@ typedef enum {#define TCG_TARGET_HAS_ext8u_i32 0/* andi rt, rs, 0xff */ #define TCG_TARGET_HAS_ext16u_i32 0/* andi rt, rs, 0xffff */ -/* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_S0/* guest base is supported */
tcg/ppc/tcg-target.c +0 -38
@@ -248,7 +248,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set32 (ct->u.regs,0 ,0xffffffff );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 );#if TARGET_LONG_BITS ==64 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );
@@ -256,11 +255,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R7 );#endif #endif -#else /* !AREG0 */ -#if TARGET_LONG_BITS ==64 -tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 ); -#endif -#endif break ;case 'K' :/* qemu_st[8..32] constraint */ ct->ct |=TCG_CT_REG ;
@@ -268,7 +262,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );#if TARGET_LONG_BITS ==64 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R7 );
@@ -276,11 +269,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R8 );#endif #endif -#else /* !AREG0 */ -#if TARGET_LONG_BITS ==64 -tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 ); -#endif -#endif break ;case 'M' :/* qemu_st64 constraint */ ct->ct |=TCG_CT_REG ;
@@ -290,12 +278,10 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R7 ); -#if defined(CONFIG_TCG_PASS_AREG0 )tcg_regset_reset_reg (ct->u.regs,TCG_REG_R8 );#ifdef TCG_TARGET_CALL_ALIGN_ARGS tcg_regset_reset_reg (ct->u.regs,TCG_REG_R9 );#endif -#endif break ;#else case 'L' :
@@ -541,7 +527,6 @@ static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -559,25 +544,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif static void tcg_out_qemu_ld (TCGContext *s,const TCGArg *args,int opc)
@@ -647,9 +613,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I32 , ir++,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==32 tcg_out_mov (s,TCG_TYPE_I32 , ir++, addr_reg);#else
@@ -849,9 +813,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I32 , ir++,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==32 tcg_out_mov (s,TCG_TYPE_I32 , ir++, addr_reg);#else
tcg/ppc64/tcg-target.c +0 -28
@@ -235,10 +235,8 @@ static int target_parse_constraint (TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );#ifdef CONFIG_SOFTMMU tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 );#endif -#endif break ;case 'S' :/* qemu_st constraint */ ct->ct |=TCG_CT_REG ;
@@ -247,10 +245,8 @@ static int target_parse_constraint (TCGArgConstraint *ct, const char **pct_str)#ifdef CONFIG_SOFTMMU tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );#endif -#endif break ;case 'Z' : ct->ct |=TCG_CT_CONST_U32 ;
@@ -558,7 +554,6 @@ static void tcg_out_ldsta (TCGContext *s, int ret, int addr,#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -576,25 +571,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif static void tcg_out_tlb_read (TCGContext *s,int r0,int r1,int r2,int addr_reg,int s_bits,int offset)
@@ -676,9 +652,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I64 , ir++,TCG_AREG0 ); -#endif tcg_out_mov (s,TCG_TYPE_I64 , ir++, addr_reg);tcg_out_movi (s,TCG_TYPE_I64 , ir++, mem_index);
@@ -827,9 +801,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I64 , ir++,TCG_AREG0 ); -#endif tcg_out_mov (s,TCG_TYPE_I64 , ir++, addr_reg);tcg_out_rld (s,RLDICL , ir++, data_reg,0 ,64 - (1 << (3 + opc)));tcg_out_movi (s,TCG_TYPE_I64 , ir++, mem_index);
tcg/s390/tcg-target.c +0 -24
@@ -301,7 +301,6 @@ static const uint8_t tcg_cond_to_ltr_cond[10] = {#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -319,25 +318,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif static uint8_t *tb_ret_addr;
@@ -1507,7 +1487,6 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg,tcg_abort (); }tcg_out_movi (s,TCG_TYPE_I32 ,TCG_REG_R4 , mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[2 ], tcg_target_call_iarg_regs[1 ]);
@@ -1515,11 +1494,9 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tgen_calli (s, (tcg_target_ulong )qemu_st_helpers[s_bits]); }else {tcg_out_movi (s,TCG_TYPE_I32 , arg1, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);
@@ -1529,7 +1506,6 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tgen_calli (s, (tcg_target_ulong )qemu_ld_helpers[s_bits]);/* sign extension */
tcg/s390/tcg-target.h +0 -1
@@ -96,7 +96,6 @@ typedef enum TCGReg {#define TCG_TARGET_EXTEND_ARGS 1enum { -/* Note: must be synced with dyngen-exec.h */ TCG_AREG0 =TCG_REG_R10 , };
tcg/sparc/tcg-target.c +0 -30
@@ -59,11 +59,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { };#endif -#ifdef CONFIG_TCG_PASS_AREG0 #define ARG_OFFSET 1 -#else -#define ARG_OFFSET 0 -#endif static const int tcg_target_reg_alloc_order[] = {TCG_REG_L0 ,
@@ -161,9 +157,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_O0 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_O1 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_O2 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_O3 ); -#endif break ;case 'I' : ct->ct |=TCG_CT_CONST_S11 ;
@@ -715,7 +709,6 @@ static void tcg_target_qemu_prologue(TCGContext *s)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {
@@ -733,25 +726,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static const void *const qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static const void *const qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif #if TARGET_LONG_BITS ==32
@@ -834,7 +808,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,/* mov */ tcg_out_movi (s,TCG_TYPE_I32 , arg1, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);
@@ -844,7 +817,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif /* XXX: move that code at the end of the TB */ /* qemu_ld_helper[s_bits](arg0, arg1) */
@@ -1061,7 +1033,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,/* mov */ tcg_out_movi (s,TCG_TYPE_I32 , arg2, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);
@@ -1071,7 +1042,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif /* XXX: move that code at the end of the TB */ /* qemu_st_helper[s_bits](arg0, arg1, arg2) */ tcg_out32(s, CALL | ((((tcg_target_ulong)qemu_st_helpers[s_bits]
tcg/sparc/tcg-target.h +0 -1
@@ -125,7 +125,6 @@ typedef enum {#define TCG_TARGET_HAS_deposit_i64 0#endif -/* Note: must be synced with dyngen-exec.h */ #ifdef CONFIG_SOLARIS #define TCG_AREG0 TCG_REG_G2#elif defined(__sparc_v9__)
tcg/tci/tcg-target.c +0 -4
@@ -798,9 +798,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,case INDEX_op_qemu_st8:case INDEX_op_qemu_st16:case INDEX_op_qemu_st32: -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_r (s,TCG_AREG0 ); -#endif tcg_out_r (s, *args++);tcg_out_r (s, *args++);#if TARGET_LONG_BITS >TCG_TARGET_REG_BITS
@@ -811,9 +809,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,#endif break ;case INDEX_op_qemu_st64: -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_r (s,TCG_AREG0 ); -#endif tcg_out_r (s, *args++);#if TCG_TARGET_REG_BITS ==32 tcg_out_r (s, *args++);
tci.c +0 -12
@@ -25,7 +25,6 @@#endif #include "qemu-common.h" -#include "dyngen-exec.h" /* env */ #include "exec-all.h" /* MAX_OPC_PARAM_IARGS */ #include "tcg-op.h"
@@ -63,17 +62,6 @@ uintptr_t tci_tb_ptr;static tcg_target_ulong tci_reg[TCG_TARGET_NB_REGS ]; -#if !defined(CONFIG_TCG_PASS_AREG0 ) -# define helper_ldb_mmu (env, addr, mmu_idx) __ldb_mmu(addr, mmu_idx) -# define helper_ldw_mmu (env, addr, mmu_idx) __ldw_mmu(addr, mmu_idx) -# define helper_ldl_mmu (env, addr, mmu_idx) __ldl_mmu(addr, mmu_idx) -# define helper_ldq_mmu (env, addr, mmu_idx) __ldq_mmu(addr, mmu_idx) -# define helper_stb_mmu (env, addr, val, mmu_idx) __stb_mmu(addr, val, mmu_idx) -# define helper_stw_mmu (env, addr, val, mmu_idx) __stw_mmu(addr, val, mmu_idx) -# define helper_stl_mmu (env, addr, val, mmu_idx) __stl_mmu(addr, val, mmu_idx) -# define helper_stq_mmu (env, addr, val, mmu_idx) __stq_mmu(addr, val, mmu_idx) -#endif /* !CONFIG_TCG_PASS_AREG0 */ -static tcg_target_ulong tci_read_reg (TCGReg index) {assert (index <ARRAY_SIZE (tci_reg));
user-exec.c +0 -14
@@ -18,9 +18,6 @@*/ #include "config.h" #include "cpu.h" -#ifndef CONFIG_TCG_PASS_AREG0 -#include "dyngen-exec.h" -#endif #include "disas.h" #include "tcg.h"
@@ -60,12 +57,6 @@ void cpu_resume_from_signal(CPUArchState *env1, void *puc)struct sigcontext *uc = puc;#endif -#ifndef CONFIG_TCG_PASS_AREG0 - env = env1; - -/* XXX: restore cpu registers saved in host registers */ -#endif -if (puc) {/* XXX: use siglongjmp ? */ #ifdef __linux__
@@ -93,11 +84,6 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,TranslationBlock *tb;int ret; -#ifndef CONFIG_TCG_PASS_AREG0 -if (cpu_single_env) { - env = cpu_single_env;/* XXX: find a correct solution for multithread */ - } -#endif #if defined(DEBUG_SIGNAL )qemu_printf ("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n" , pc, address, is_write, *(unsigned long *)old_set);
Signature · 1 line
1.7.2.5
PATCH 20/21 target-mips: switch to AREG0 free mode
In reply to Blue SwirlAdd an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
--- configure | 2 +- target-mips/Makefile.objs | 2 - target-mips/cpu.h | 16 +- target-mips/helper.h | 410 +++++++++--------- target-mips/op_helper.c | 1065 ++++++++++++++++++++++++--------------------- target-mips/translate.c | 754 ++++++++++++++++---------------- 6 files changed, 1163 insertions(+), 1086 deletions(-)
configure +1 -1
@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | mips* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esac
target-mips/Makefile.objs +0 -2
@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
target-mips/cpu.h +8 -8
@@ -38,10 +38,10 @@ struct CPUMIPSTLBContext {uint32_t nb_tlb;uint32_t tlb_in_use;int (*map_address) (struct CPUMIPSState *env,target_phys_addr_t *physical,int *prot,target_ulong address,int rw,int access_type); -void (*helper_tlbwi) (void ); -void (*helper_tlbwr) (void ); -void (*helper_tlbp) (void ); -void (*helper_tlbr) (void ); +void (*helper_tlbwi)(struct CPUMIPSState *env); +void (*helper_tlbwr)(struct CPUMIPSState *env); +void (*helper_tlbp)(struct CPUMIPSState *env); +void (*helper_tlbr)(struct CPUMIPSState *env); union { struct { r4k_tlb_t tlb[MIPS_TLB_MAX];
@@ -485,10 +485,10 @@ int fixed_mmu_map_address (CPUMIPSState *env, target_phys_addr_t *physical, int target_ulong address, int rw, int access_type);int r4k_map_address (CPUMIPSState *env,target_phys_addr_t *physical,int *prot,target_ulong address,int rw,int access_type); -void r4k_helper_tlbwi (void ); -void r4k_helper_tlbwr (void ); -void r4k_helper_tlbp (void ); -void r4k_helper_tlbr (void ); +void r4k_helper_tlbwi (CPUMIPSState *env); +void r4k_helper_tlbwr (CPUMIPSState *env); +void r4k_helper_tlbp (CPUMIPSState *env); +void r4k_helper_tlbr (CPUMIPSState *env);void cpu_unassigned_access (CPUMIPSState *env,target_phys_addr_t addr,int is_write,int is_exec,int unused,int size);
target-mips/helper.h +208 -202
485 lines not on this page · raw message
target-mips/op_helper.c +560 -505
2,475 lines not on this page · raw message
target-mips/translate.c +386 -368
754 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.2.5
Part of the diff is not shown here. View the raw message.
Re: [Qemu-devel] [PATCH 19/21] target-sh4: switch to AREG0 free mode
In reply to Blue SwirlQuoted 1,033 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>--- configure | 2 +- target-sh4/Makefile.objs | 2 - target-sh4/helper.h | 84 +++++++++++----------- target-sh4/op_helper.c | 182 ++++++++++++++++++++++----------------------- target-sh4/translate.c | 114 ++++++++++++++++------------- 5 files changed, 195 insertions(+), 189 deletions(-)configure +1
-1@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esactarget-sh4/Makefile.objs +0
-2@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)target-sh4/helper.h +42
-42@@ -1,54 +1,54 @@#include "def-helper.h" -DEF_HELPER_0(ldtlb, void) -DEF_HELPER_0(raise_illegal_instruction, void) -DEF_HELPER_0(raise_slot_illegal_instruction, void) -DEF_HELPER_0(raise_fpu_disable, void) -DEF_HELPER_0(raise_slot_fpu_disable, void) -DEF_HELPER_0(debug, void) -DEF_HELPER_1(sleep, void, i32) -DEF_HELPER_1(trapa, void, i32) +DEF_HELPER_1(ldtlb, void, env) +DEF_HELPER_1(raise_illegal_instruction, void, env) +DEF_HELPER_1(raise_slot_illegal_instruction, void, env) +DEF_HELPER_1(raise_fpu_disable, void, env) +DEF_HELPER_1(raise_slot_fpu_disable, void, env) +DEF_HELPER_1(debug, void, env) +DEF_HELPER_2(sleep, void, env, i32) +DEF_HELPER_2(trapa, void, env, i32) -DEF_HELPER_2(movcal, void, i32, i32) -DEF_HELPER_0(discard_movcal_backup, void) -DEF_HELPER_1(ocbi, void, i32) +DEF_HELPER_3(movcal, void, env, i32, i32) +DEF_HELPER_1(discard_movcal_backup, void, env) +DEF_HELPER_2(ocbi, void, env, i32) -DEF_HELPER_2(addv, i32, i32, i32) -DEF_HELPER_2(addc, i32, i32, i32) -DEF_HELPER_2(subv, i32, i32, i32) -DEF_HELPER_2(subc, i32, i32, i32) -DEF_HELPER_2(div1, i32, i32, i32) -DEF_HELPER_2(macl, void, i32, i32) -DEF_HELPER_2(macw, void, i32, i32) +DEF_HELPER_3(addv, i32, env, i32, i32) +DEF_HELPER_3(addc, i32, env, i32, i32) +DEF_HELPER_3(subv, i32, env, i32, i32) +DEF_HELPER_3(subc, i32, env, i32, i32) +DEF_HELPER_3(div1, i32, env, i32, i32) +DEF_HELPER_3(macl, void, env, i32, i32) +DEF_HELPER_3(macw, void, env, i32, i32) -DEF_HELPER_1(ld_fpscr, void, i32) +DEF_HELPER_2(ld_fpscr, void, env, i32) DEF_HELPER_1(fabs_FT, f32, f32) DEF_HELPER_1(fabs_DT, f64, f64) -DEF_HELPER_2(fadd_FT, f32, f32, f32) -DEF_HELPER_2(fadd_DT, f64, f64, f64) -DEF_HELPER_1(fcnvsd_FT_DT, f64, f32) -DEF_HELPER_1(fcnvds_DT_FT, f32, f64) +DEF_HELPER_3(fadd_FT, f32, env, f32, f32) +DEF_HELPER_3(fadd_DT, f64, env, f64, f64) +DEF_HELPER_2(fcnvsd_FT_DT, f64, env, f32) +DEF_HELPER_2(fcnvds_DT_FT, f32, env, f64) -DEF_HELPER_2(fcmp_eq_FT, void, f32, f32) -DEF_HELPER_2(fcmp_eq_DT, void, f64, f64) -DEF_HELPER_2(fcmp_gt_FT, void, f32, f32) -DEF_HELPER_2(fcmp_gt_DT, void, f64, f64) -DEF_HELPER_2(fdiv_FT, f32, f32, f32) -DEF_HELPER_2(fdiv_DT, f64, f64, f64) -DEF_HELPER_1(float_FT, f32, i32) -DEF_HELPER_1(float_DT, f64, i32) -DEF_HELPER_3(fmac_FT, f32, f32, f32, f32) -DEF_HELPER_2(fmul_FT, f32, f32, f32) -DEF_HELPER_2(fmul_DT, f64, f64, f64) +DEF_HELPER_3(fcmp_eq_FT, void, env, f32, f32) +DEF_HELPER_3(fcmp_eq_DT, void, env, f64, f64) +DEF_HELPER_3(fcmp_gt_FT, void, env, f32, f32) +DEF_HELPER_3(fcmp_gt_DT, void, env, f64, f64) +DEF_HELPER_3(fdiv_FT, f32, env, f32, f32) +DEF_HELPER_3(fdiv_DT, f64, env, f64, f64) +DEF_HELPER_2(float_FT, f32, env, i32) +DEF_HELPER_2(float_DT, f64, env, i32) +DEF_HELPER_4(fmac_FT, f32, env, f32, f32, f32) +DEF_HELPER_3(fmul_FT, f32, env, f32, f32) +DEF_HELPER_3(fmul_DT, f64, env, f64, f64) DEF_HELPER_1(fneg_T, f32, f32) -DEF_HELPER_2(fsub_FT, f32, f32, f32) -DEF_HELPER_2(fsub_DT, f64, f64, f64) -DEF_HELPER_1(fsqrt_FT, f32, f32) -DEF_HELPER_1(fsqrt_DT, f64, f64) -DEF_HELPER_1(ftrc_FT, i32, f32) -DEF_HELPER_1(ftrc_DT, i32, f64) -DEF_HELPER_2(fipr, void, i32, i32) -DEF_HELPER_1(ftrv, void, i32) +DEF_HELPER_3(fsub_FT, f32, env, f32, f32) +DEF_HELPER_3(fsub_DT, f64, env, f64, f64) +DEF_HELPER_2(fsqrt_FT, f32, env, f32) +DEF_HELPER_2(fsqrt_DT, f64, env, f64) +DEF_HELPER_2(ftrc_FT, i32, env, f32) +DEF_HELPER_2(ftrc_DT, i32, env, f64) +DEF_HELPER_3(fipr, void, env, i32, i32) +DEF_HELPER_2(ftrv, void, env, i32)#include "def-helper.h" target-sh4/op_helper.c +89
-93@@ -19,10 +19,9 @@#include <assert.h> #include <stdlib.h> #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" -static void cpu_restore_state_from_retaddr (uintptr_t retaddr) +static void cpu_restore_state_from_retaddr (CPUSH4State *env,uintptr_t retaddr) {TranslationBlock *tb;@@ -53,26 +52,22 @@ static void cpu_restore_state_from_retaddr(uintptr_t retaddr)#define SHIFT 3#include "softmmu_template.h" -void tlb_fill (CPUSH4State *env1,target_ulong addr,int is_write,int mmu_idx, +void tlb_fill (CPUSH4State *env,target_ulong addr,int is_write,int mmu_idx,uintptr_t retaddr) { -CPUSH4State *saved_env;int ret; - saved_env = env; - env = env1; ret =cpu_sh4_handle_mmu_fault (env, addr, is_write, mmu_idx);if (ret) {/* now we have a real cpu fault */ -cpu_restore_state_from_retaddr (retaddr); +cpu_restore_state_from_retaddr (env, retaddr);cpu_loop_exit (env); } - env = saved_env; }#endif -void helper_ldtlb (void ) +void helper_ldtlb (CPUSH4State *env) {#ifdef CONFIG_USER_ONLY /* XXXXX */ @@ -82,40 +77,41 @@ void helper_ldtlb(void)#endif } -static inline void raise_exception (int index,uintptr_t retaddr) +static inline void raise_exception (CPUSH4State *env,int index, +uintptr_t retaddr) { env->exception_index = index; -cpu_restore_state_from_retaddr (retaddr); +cpu_restore_state_from_retaddr (env, retaddr);cpu_loop_exit (env); } -void helper_raise_illegal_instruction (void ) +void helper_raise_illegal_instruction (CPUSH4State *env) { -raise_exception (0x180 ,GETPC ()); +raise_exception (env,0x180 ,GETPC ()); } -void helper_raise_slot_illegal_instruction (void ) +void helper_raise_slot_illegal_instruction (CPUSH4State *env) { -raise_exception (0x1a0 ,GETPC ()); +raise_exception (env,0x1a0 ,GETPC ()); } -void helper_raise_fpu_disable (void ) +void helper_raise_fpu_disable (CPUSH4State *env) { -raise_exception (0x800 ,GETPC ()); +raise_exception (env,0x800 ,GETPC ()); } -void helper_raise_slot_fpu_disable (void ) +void helper_raise_slot_fpu_disable (CPUSH4State *env) { -raise_exception (0x820 ,GETPC ()); +raise_exception (env,0x820 ,GETPC ()); } -void helper_debug (void ) +void helper_debug (CPUSH4State *env) { env->exception_index =EXCP_DEBUG ;cpu_loop_exit (env); } -void helper_sleep (uint32_t next_pc) +void helper_sleep (CPUSH4State *env,uint32_t next_pc) { env->halted =1 ; env->in_sleep =1 ;@@ -124,13 +120,13 @@ void helper_sleep(uint32_t next_pc)cpu_loop_exit (env); } -void helper_trapa (uint32_t tra) +void helper_trapa (CPUSH4State *env,uint32_t tra) { env->tra = tra <<2 ; -raise_exception (0x160 ,GETPC ()); +raise_exception (env,0x160 ,GETPC ()); } -void helper_movcal (uint32_t address,uint32_t value) +void helper_movcal (CPUSH4State *env,uint32_t address,uint32_t value) {if (cpu_sh4_is_cached (env, address)) {@@ -144,7 +140,7 @@ void helper_movcal(uint32_t address, uint32_t value) } } -void helper_discard_movcal_backup (void ) +void helper_discard_movcal_backup (CPUSH4State *env) {memory_content *current = env->movcal_backup;@@ -158,7 +154,7 @@ void helper_discard_movcal_backup(void) } } -void helper_ocbi (uint32_t address) +void helper_ocbi (CPUSH4State *env,uint32_t address) {memory_content **current = &(env->movcal_backup);while (*current)@@ -167,7 +163,7 @@ void helper_ocbi(uint32_t address)if ((a & ~0x1F ) == (address & ~0x1F )) {memory_content *next = (*current)->next; -stl (a, (*current)->value); +cpu_stl_data (env, a, (*current)->value);if (next ==NULL ) {@@ -181,7 +177,7 @@ void helper_ocbi(uint32_t address) } } -uint32_t helper_addc (uint32_t arg0,uint32_t arg1) +uint32_t helper_addc (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t tmp0, tmp1;@@ -197,7 +193,7 @@ uint32_t helper_addc(uint32_t arg0, uint32_t arg1)return arg1; } -uint32_t helper_addv (uint32_t arg0,uint32_t arg1) +uint32_t helper_addv (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t dest, src, ans;@@ -236,7 +232,7 @@ uint32_t helper_addv(uint32_t arg0, uint32_t arg1)#define SETM env->sr |= SR_M#define CLRM env->sr &= ~SR_M -uint32_t helper_div1 (uint32_t arg0,uint32_t arg1) +uint32_t helper_div1 (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t tmp0, tmp2;uint8_t old_q, tmp1 =0xff ;@@ -344,7 +340,7 @@ uint32_t helper_div1(uint32_t arg0, uint32_t arg1)return arg1; } -void helper_macl (uint32_t arg0,uint32_t arg1) +void helper_macl (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {int64_t res;@@ -360,7 +356,7 @@ void helper_macl(uint32_t arg0, uint32_t arg1) } } -void helper_macw (uint32_t arg0,uint32_t arg1) +void helper_macw (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {int64_t res;@@ -379,7 +375,7 @@ void helper_macw(uint32_t arg0, uint32_t arg1) } } -uint32_t helper_subc (uint32_t arg0,uint32_t arg1) +uint32_t helper_subc (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t tmp0, tmp1;@@ -395,7 +391,7 @@ uint32_t helper_subc(uint32_t arg0, uint32_t arg1)return arg1; } -uint32_t helper_subv (uint32_t arg0,uint32_t arg1) +uint32_t helper_subv (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {int32_t dest, src, ans;@@ -424,17 +420,17 @@ uint32_t helper_subv(uint32_t arg0, uint32_t arg1)return arg1; } -static inline void set_t (void ) +static inline void set_t (CPUSH4State *env) { env->sr |=SR_T ; } -static inline void clr_t (void ) +static inline void clr_t (CPUSH4State *env) { env->sr &= ~SR_T ; } -void helper_ld_fpscr (uint32_t val) +void helper_ld_fpscr (CPUSH4State *env,uint32_t val) { env->fpscr = val &FPSCR_MASK ;if ((val &FPSCR_RM_MASK ) ==FPSCR_RM_ZERO ) {@@ -445,7 +441,7 @@ void helper_ld_fpscr(uint32_t val)set_flush_to_zero ((val &FPSCR_DN ) !=0 , &env->fp_status); } -static void update_fpscr (uintptr_t retaddr) +static void update_fpscr (CPUSH4State *env,uintptr_t retaddr) {int xcpt, cause, enable;@@ -479,7 +475,7 @@ static void update_fpscr(uintptr_t retaddr) cause = (env->fpscr &FPSCR_CAUSE_MASK ) >>FPSCR_CAUSE_SHIFT ; enable = (env->fpscr &FPSCR_ENABLE_MASK ) >>FPSCR_ENABLE_SHIFT ;if (cause & enable) { -cpu_restore_state_from_retaddr (retaddr); +cpu_restore_state_from_retaddr (env, retaddr); env->exception_index =0x120 ;cpu_loop_exit (env); }@@ -496,156 +492,156 @@ float64 helper_fabs_DT(float64 t0)return float64_abs (t0); } -float32 helper_fadd_FT (float32 t0,float32 t1) +float32 helper_fadd_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_add (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fadd_DT (float64 t0,float64 t1) +float64 helper_fadd_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_add (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -void helper_fcmp_eq_FT (float32 t0,float32 t1) +void helper_fcmp_eq_FT (CPUSH4State *env,float32 t0,float32 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float32_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_equal) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -void helper_fcmp_eq_DT (float64 t0,float64 t1) +void helper_fcmp_eq_DT (CPUSH4State *env,float64 t0,float64 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float64_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_equal) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -void helper_fcmp_gt_FT (float32 t0,float32 t1) +void helper_fcmp_gt_FT (CPUSH4State *env,float32 t0,float32 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float32_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_greater) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -void helper_fcmp_gt_DT (float64 t0,float64 t1) +void helper_fcmp_gt_DT (CPUSH4State *env,float64 t0,float64 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float64_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_greater) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -float64 helper_fcnvsd_FT_DT (float32 t0) +float64 helper_fcnvsd_FT_DT (CPUSH4State *env,float32 t0) {float64 ret;set_float_exception_flags (0 , &env->fp_status); ret =float32_to_float64 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float32 helper_fcnvds_DT_FT (float64 t0) +float32 helper_fcnvds_DT_FT (CPUSH4State *env,float64 t0) {float32 ret;set_float_exception_flags (0 , &env->fp_status); ret =float64_to_float32 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float32 helper_fdiv_FT (float32 t0,float32 t1) +float32 helper_fdiv_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_div (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fdiv_DT (float64 t0,float64 t1) +float64 helper_fdiv_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_div (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float32 helper_float_FT (uint32_t t0) +float32 helper_float_FT (CPUSH4State *env,uint32_t t0) {float32 ret;set_float_exception_flags (0 , &env->fp_status); ret =int32_to_float32 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float64 helper_float_DT (uint32_t t0) +float64 helper_float_DT (CPUSH4State *env,uint32_t t0) {float64 ret;set_float_exception_flags (0 , &env->fp_status); ret =int32_to_float64 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float32 helper_fmac_FT (float32 t0,float32 t1,float32 t2) +float32 helper_fmac_FT (CPUSH4State *env,float32 t0,float32 t1,float32 t2) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_mul (t0, t1, &env->fp_status); t0 =float32_add (t0, t2, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float32 helper_fmul_FT (float32 t0,float32 t1) +float32 helper_fmul_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_mul (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fmul_DT (float64 t0,float64 t1) +float64 helper_fmul_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_mul (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; }@@ -654,57 +650,57 @@ float32 helper_fneg_T(float32 t0)return float32_chs (t0); } -float32 helper_fsqrt_FT (float32 t0) +float32 helper_fsqrt_FT (CPUSH4State *env,float32 t0) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_sqrt (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fsqrt_DT (float64 t0) +float64 helper_fsqrt_DT (CPUSH4State *env,float64 t0) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_sqrt (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float32 helper_fsub_FT (float32 t0,float32 t1) +float32 helper_fsub_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_sub (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fsub_DT (float64 t0,float64 t1) +float64 helper_fsub_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_sub (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -uint32_t helper_ftrc_FT (float32 t0) +uint32_t helper_ftrc_FT (CPUSH4State *env,float32 t0) {uint32_t ret;set_float_exception_flags (0 , &env->fp_status); ret =float32_to_int32_round_to_zero (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -uint32_t helper_ftrc_DT (float64 t0) +uint32_t helper_ftrc_DT (CPUSH4State *env,float64 t0) {uint32_t ret;set_float_exception_flags (0 , &env->fp_status); ret =float64_to_int32_round_to_zero (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -void helper_fipr (uint32_t m,uint32_t n) +void helper_fipr (CPUSH4State *env,uint32_t m,uint32_t n) {int bank, i;float32 r, p;@@ -719,12 +715,12 @@ void helper_fipr(uint32_t m, uint32_t n) &env->fp_status); r =float32_add (r, p, &env->fp_status); } -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); env->fregs[bank + n +3 ] = r; } -void helper_ftrv (uint32_t n) +void helper_ftrv (CPUSH4State *env,uint32_t n) {int bank_matrix, bank_vector;int i, j;@@ -743,7 +739,7 @@ void helper_ftrv(uint32_t n) r[i] =float32_add (r[i], p, &env->fp_status); } } -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());for (i =0 ; i <4 ; i++) { env->fregs[bank_vector + i] = r[i];target-sh4/translate.c +61
-49@@ -276,7 +276,7 @@ static void gen_goto_tb(DisasContext * ctx, int n, target_ulong dest) }else {tcg_gen_movi_i32 (cpu_pc, dest);if (ctx->singlestep_enabled) -gen_helper_debug (); +gen_helper_debug (cpu_env);tcg_gen_exit_tb (0 ); } }@@ -288,7 +288,7 @@ static void gen_jump(DisasContext * ctx)delayed jump as immediate jump are conditinal jumps */ tcg_gen_mov_i32 (cpu_pc, cpu_delayed_pc);if (ctx->singlestep_enabled) -gen_helper_debug (); +gen_helper_debug (cpu_env);tcg_gen_exit_tb (0 ); }else {gen_goto_tb (ctx,0 , ctx->delayed_pc);@@ -437,7 +437,7 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)#define CHECK_NOT_DELAY_SLOT \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) \ { \ - gen_helper_raise_slot_illegal_instruction(); \ + gen_helper_raise_slot_illegal_instruction(cpu_env); \ ctx->bstate = BS_EXCP; \ return; \ }@@ -445,9 +445,9 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)#define CHECK_PRIVILEGED \ if (IS_USER(ctx)) { \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) { \ - gen_helper_raise_slot_illegal_instruction(); \ + gen_helper_raise_slot_illegal_instruction(cpu_env); \ } else { \ - gen_helper_raise_illegal_instruction(); \ + gen_helper_raise_illegal_instruction(cpu_env); \ } \ ctx->bstate = BS_EXCP; \ return; \@@ -456,9 +456,9 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)#define CHECK_FPU_ENABLED \ if (ctx->flags & SR_FD) { \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) { \ - gen_helper_raise_slot_fpu_disable(); \ + gen_helper_raise_slot_fpu_disable(cpu_env); \ } else { \ - gen_helper_raise_fpu_disable(); \ + gen_helper_raise_fpu_disable(cpu_env); \ } \ ctx->bstate = BS_EXCP; \ return; \@@ -492,7 +492,7 @@ static void _decode_opc(DisasContext * ctx)if (opcode !=0x0093 /* ocbi */ && opcode !=0x00c3 /* movca.l */ ) { -gen_helper_discard_movcal_backup (); +gen_helper_discard_movcal_backup (cpu_env); ctx->has_movcal =0 ; } }@@ -523,7 +523,7 @@ static void _decode_opc(DisasContext * ctx)return ;case 0x0038 :/* ldtlb */ CHECK_PRIVILEGED -gen_helper_ldtlb (); +gen_helper_ldtlb (cpu_env );return ;case 0x002b :/* rte */ CHECK_PRIVILEGED @@ -551,7 +551,7 @@ static void _decode_opc(DisasContext * ctx)return ;case 0x001b :/* sleep */ CHECK_PRIVILEGED - gen_helper_sleep(tcg_const_i32(ctx->pc + 2)); + gen_helper_sleep(cpu_env, tcg_const_i32(ctx->pc + 2));return ; }@@ -761,10 +761,10 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_add_i32 (REG (B11_8 ),REG (B11_8 ),REG (B7_4 ));return ;case 0x300e :/* addc Rm,Rn */ -gen_helper_addc (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_addc (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x300f :/* addv Rm,Rn */ -gen_helper_addv (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_addv (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x2009 :/* and Rm,Rn */ tcg_gen_and_i32 (REG (B11_8 ),REG (B11_8 ),REG (B7_4 ));@@ -817,7 +817,7 @@ static void _decode_opc(DisasContext * ctx) }return ;case 0x3004 :/* div1 Rm,Rn */ -gen_helper_div1 (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_div1 (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x300d :/* dmuls.l Rm,Rn */ {@@ -870,7 +870,7 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_qemu_ld32s (arg0,REG (B7_4 ), ctx->memidx); arg1 =tcg_temp_new ();tcg_gen_qemu_ld32s (arg1,REG (B11_8 ), ctx->memidx); -gen_helper_macl (arg0, arg1); +gen_helper_macl (cpu_env, arg0, arg1);tcg_temp_free (arg1);tcg_temp_free (arg0);tcg_gen_addi_i32 (REG (B7_4 ),REG (B7_4 ),4 );@@ -884,7 +884,7 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_qemu_ld32s (arg0,REG (B7_4 ), ctx->memidx); arg1 =tcg_temp_new ();tcg_gen_qemu_ld32s (arg1,REG (B11_8 ), ctx->memidx); -gen_helper_macw (arg0, arg1); +gen_helper_macw (cpu_env, arg0, arg1);tcg_temp_free (arg1);tcg_temp_free (arg0);tcg_gen_addi_i32 (REG (B11_8 ),REG (B11_8 ),2 );@@ -1013,10 +1013,10 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_sub_i32 (REG (B11_8 ),REG (B11_8 ),REG (B7_4 ));return ;case 0x300a :/* subc Rm,Rn */ -gen_helper_subc (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_subc (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x300b :/* subv Rm,Rn */ -gen_helper_subv (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_subv (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x2008 :/* tst Rm,Rn */ {@@ -1152,22 +1152,22 @@ static void _decode_opc(DisasContext * ctx)gen_load_fpr64 (fp1,DREG (B7_4 ));switch (ctx->opcode &0xf00f ) {case 0xf000 :/* fadd Rm,Rn */ -gen_helper_fadd_DT (fp0, fp0, fp1); +gen_helper_fadd_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf001 :/* fsub Rm,Rn */ -gen_helper_fsub_DT (fp0, fp0, fp1); +gen_helper_fsub_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf002 :/* fmul Rm,Rn */ -gen_helper_fmul_DT (fp0, fp0, fp1); +gen_helper_fmul_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf003 :/* fdiv Rm,Rn */ -gen_helper_fdiv_DT (fp0, fp0, fp1); +gen_helper_fdiv_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf004 :/* fcmp/eq Rm,Rn */ -gen_helper_fcmp_eq_DT (fp0, fp1); +gen_helper_fcmp_eq_DT (cpu_env, fp0, fp1);return ;case 0xf005 :/* fcmp/gt Rm,Rn */ -gen_helper_fcmp_gt_DT (fp0, fp1); +gen_helper_fcmp_gt_DT (cpu_env, fp0, fp1);return ; }gen_store_fpr64 (fp0,DREG (B11_8 ));@@ -1176,22 +1176,32 @@ static void _decode_opc(DisasContext * ctx) }else {switch (ctx->opcode &0xf00f ) {case 0xf000 :/* fadd Rm,Rn */ -gen_helper_fadd_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fadd_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf001 :/* fsub Rm,Rn */ -gen_helper_fsub_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fsub_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf002 :/* fmul Rm,Rn */ -gen_helper_fmul_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fmul_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf003 :/* fdiv Rm,Rn */ -gen_helper_fdiv_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fdiv_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf004 :/* fcmp/eq Rm,Rn */ -gen_helper_fcmp_eq_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fcmp_eq_FT (cpu_env, cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);return ;case 0xf005 :/* fcmp/gt Rm,Rn */ -gen_helper_fcmp_gt_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fcmp_gt_FT (cpu_env, cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);return ; } }@@ -1203,8 +1213,9 @@ static void _decode_opc(DisasContext * ctx)if (ctx->fpscr &FPSCR_PR ) {break ;/* illegal instruction */ }else { -gen_helper_fmac_FT (cpu_fregs[FREG (B11_8 )], - cpu_fregs[FREG (0 )], cpu_fregs[FREG (B7_4 )], cpu_fregs[FREG (B11_8 )]); +gen_helper_fmac_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (0 )], cpu_fregs[FREG (B7_4 )], + cpu_fregs[FREG (B11_8 )]);return ; } }@@ -1356,7 +1367,7 @@ static void _decode_opc(DisasContext * ctx)TCGv imm;CHECK_NOT_DELAY_SLOT imm =tcg_const_i32 (B7_0 ); -gen_helper_trapa (imm); +gen_helper_trapa (cpu_env, imm);tcg_temp_free (imm); ctx->bstate =BS_BRANCH ; }@@ -1531,7 +1542,7 @@ static void _decode_opc(DisasContext * ctx) LDST(fpul, 0x405a, 0x4056, 0x005a, 0x4052, {CHECK_FPU_ENABLED})case 0x406a :/* lds Rm,FPSCR */ CHECK_FPU_ENABLED -gen_helper_ld_fpscr (REG (B11_8 )); +gen_helper_ld_fpscr (cpu_env ,REG (B11_8 )); ctx->bstate =BS_STOP ;return ;case 0x4066 :/* lds.l @Rm+,FPSCR */ @@ -1540,7 +1551,7 @@ static void _decode_opc(DisasContext * ctx)TCGv addr =tcg_temp_new ();tcg_gen_qemu_ld32s (addr,REG (B11_8 ), ctx->memidx);tcg_gen_addi_i32 (REG (B11_8 ),REG (B11_8 ),4 ); -gen_helper_ld_fpscr (addr); +gen_helper_ld_fpscr (cpu_env, addr);tcg_temp_free (addr); ctx->bstate =BS_STOP ; }@@ -1567,7 +1578,7 @@ static void _decode_opc(DisasContext * ctx) {TCGv val =tcg_temp_new ();tcg_gen_qemu_ld32u (val,REG (B11_8 ), ctx->memidx); -gen_helper_movcal (REG (B11_8 ), val); +gen_helper_movcal (cpu_env,REG (B11_8 ), val);tcg_gen_qemu_st32 (REG (0 ),REG (B11_8 ), ctx->memidx); } ctx->has_movcal =1 ;@@ -1619,7 +1630,7 @@ static void _decode_opc(DisasContext * ctx)break ;case 0x0093 :/* ocbi @Rn */ { -gen_helper_ocbi (REG (B11_8 )); +gen_helper_ocbi (cpu_env,REG (B11_8 )); }return ;case 0x00a3 :/* ocbp @Rn */ @@ -1733,12 +1744,12 @@ static void _decode_opc(DisasContext * ctx)if (ctx->opcode &0x0100 )break ;/* illegal instruction */ fp =tcg_temp_new_i64 (); -gen_helper_float_DT (fp, cpu_fpul); +gen_helper_float_DT (fp, cpu_env, cpu_fpul);gen_store_fpr64 (fp,DREG (B11_8 ));tcg_temp_free_i64 (fp); }else { -gen_helper_float_FT (cpu_fregs[FREG (B11_8 )], cpu_fpul); +gen_helper_float_FT (cpu_fregs[FREG (B11_8 )], cpu_env, cpu_fpul); }return ;case 0xf03d :/* ftrc FRm/DRm,FPUL - FPSCR: R[PR,Enable.V]/W[Cause,Flag] */ @@ -1749,11 +1760,11 @@ static void _decode_opc(DisasContext * ctx)break ;/* illegal instruction */ fp =tcg_temp_new_i64 ();gen_load_fpr64 (fp,DREG (B11_8 )); -gen_helper_ftrc_DT (cpu_fpul, fp); +gen_helper_ftrc_DT (cpu_fpul, cpu_env, fp);tcg_temp_free_i64 (fp); }else { -gen_helper_ftrc_FT (cpu_fpul, cpu_fregs[FREG (B11_8 )]); +gen_helper_ftrc_FT (cpu_fpul, cpu_env, cpu_fregs[FREG (B11_8 )]); }return ;case 0xf04d :/* fneg FRn/DRn - FPSCR: Nothing */ @@ -1783,11 +1794,12 @@ static void _decode_opc(DisasContext * ctx)break ;/* illegal instruction */ TCGv_i64 fp =tcg_temp_new_i64 ();gen_load_fpr64 (fp,DREG (B11_8 )); -gen_helper_fsqrt_DT (fp, fp); +gen_helper_fsqrt_DT (fp, cpu_env, fp);gen_store_fpr64 (fp,DREG (B11_8 ));tcg_temp_free_i64 (fp); }else { -gen_helper_fsqrt_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )]); +gen_helper_fsqrt_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )]); }return ;case 0xf07d :/* fsrra FRn */ @@ -1809,7 +1821,7 @@ static void _decode_opc(DisasContext * ctx) CHECK_FPU_ENABLED {TCGv_i64 fp =tcg_temp_new_i64 (); -gen_helper_fcnvsd_FT_DT (fp, cpu_fpul); +gen_helper_fcnvsd_FT_DT (fp, cpu_env, cpu_fpul);gen_store_fpr64 (fp,DREG (B11_8 ));tcg_temp_free_i64 (fp); }@@ -1819,7 +1831,7 @@ static void _decode_opc(DisasContext * ctx) {TCGv_i64 fp =tcg_temp_new_i64 ();gen_load_fpr64 (fp,DREG (B11_8 )); -gen_helper_fcnvds_DT_FT (cpu_fpul, fp); +gen_helper_fcnvds_DT_FT (cpu_fpul, cpu_env, fp);tcg_temp_free_i64 (fp); }return ;@@ -1829,7 +1841,7 @@ static void _decode_opc(DisasContext * ctx)TCGv m, n; m =tcg_const_i32 ((ctx->opcode >>8 ) &3 ); n =tcg_const_i32 ((ctx->opcode >>10 ) &3 ); -gen_helper_fipr (m, n); +gen_helper_fipr (cpu_env, m, n);tcg_temp_free (m);tcg_temp_free (n);return ;@@ -1841,7 +1853,7 @@ static void _decode_opc(DisasContext * ctx) (ctx->fpscr & FPSCR_PR) == 0) {TCGv n; n =tcg_const_i32 ((ctx->opcode >>10 ) &3 ); -gen_helper_ftrv (n); +gen_helper_ftrv (cpu_env, n);tcg_temp_free (n);return ; }@@ -1853,9 +1865,9 @@ static void _decode_opc(DisasContext * ctx)fflush (stderr);#endif if (ctx->flags & (DELAY_SLOT |DELAY_SLOT_CONDITIONAL )) { -gen_helper_raise_slot_illegal_instruction (); +gen_helper_raise_slot_illegal_instruction (cpu_env); }else { -gen_helper_raise_illegal_instruction (); +gen_helper_raise_illegal_instruction (cpu_env); } ctx->bstate =BS_EXCP ; }@@ -1934,7 +1946,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,if (ctx.pc == bp->pc) {/* We have hit a breakpoint - make sure PC is up-to-date */ tcg_gen_movi_i32 (cpu_pc, ctx.pc); -gen_helper_debug (); +gen_helper_debug (cpu_env); ctx.bstate =BS_EXCP ;break ; }
target-sh4/translate.c gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb, · line 1973
Quoted 5 lines
target-sh4/translate.c +1
-1@@ -1958,7 +1970,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,fprintf (stderr,"Loading opcode at address 0x%08x\n" , ctx.pc);fflush (stderr);#endif - ctx.opcode =lduw_code (ctx.pc); + ctx.opcode =cpu_lduw_code (cpu_single_env, ctx.pc);
Why using cpu_single_env here, while all the code in this function uses the env argument to gen_intermediate_code()? I thought one of the goal of this patch series was to get rid of the global env variable.
Quoted 17 lines
target-sh4/translate.c +1
-1decode_opc (&ctx); num_insns++; ctx.pc +=2 ;@@ -1975,7 +1987,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,gen_io_end ();if (env->singlestep_enabled) {tcg_gen_movi_i32 (cpu_pc, ctx.pc); -gen_helper_debug (); +gen_helper_debug (cpu_env); }else {switch (ctx.bstate) {case BS_STOP :Signature · 1 line
1.7.2.5
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
In reply to Blue SwirlQuoted 4 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>
Quoted 9 lines
--- configure | 2 +- target-arm/Makefile.objs | 2 - target-arm/cpu.h | 10 ++- target-arm/helper.c | 8 +- target-arm/helper.h | 60 +++++++++--------- target-arm/op_helper.c | 92 +++++++++++++--------------- target-arm/translate.c | 148 +++++++++++++++++++++++----------------------- 7 files changed, 158 insertions(+), 164 deletions(-)
This is too big to easily review -- it's making a change to a lot of helpers, and in each case that change affects three places (callers, declaration, implementation). That'
Quoted 1,062 lines
configure +1
-1@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esactarget-arm/Makefile.objs +0
-2@@ -2,5 +2,3 @@ obj-y += arm-semi.o obj-$(CONFIG_SOFTMMU) += machine.o obj-y += translate.o op_helper.o helper.o cpu.o obj-y += neon_helper.o iwmmxt_helper.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)target-arm/cpu.h +6
-4@@ -734,9 +734,10 @@ static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb) }/* Load an instruction and return it in the standard little-endian order */ -static inline uint32_t arm_ldl_code (uint32_t addr,bool do_swap) +static inline uint32_t arm_ldl_code (CPUARMState *env,uint32_t addr, +bool do_swap) { -uint32_t insn =ldl_code (addr); +uint32_t insn =cpu_ldl_code (env, addr);if (do_swap) {return bswap32 (insn); }@@ -744,9 +745,10 @@ static inline uint32_t arm_ldl_code(uint32_t addr, bool do_swap) }/* Ditto, for a halfword (Thumb) instruction */ -static inline uint16_t arm_lduw_code (uint32_t addr,bool do_swap) +static inline uint16_t arm_lduw_code (CPUARMState *env,uint32_t addr, +bool do_swap) { -uint16_t insn =lduw_code (addr); +uint16_t insn =cpu_lduw_code (env, addr);if (do_swap) {return bswap16 (insn); }target-arm/helper.c +4
-4@@ -1756,7 +1756,7 @@ static void do_interrupt_v7m(CPUARMState *env)case EXCP_BKPT :if (semihosting_enabled) {int nr; - nr =arm_lduw_code (env->regs[15 ], env->bswap_code) &0xff ; + nr =arm_lduw_code (env, env->regs[15 ], env->bswap_code) &0xff ;if (nr ==0xab ) { env->regs[15 ] +=2 ; env->regs[0 ] =do_arm_semihosting (env);@@ -1828,9 +1828,9 @@ void do_interrupt(CPUARMState *env)if (semihosting_enabled) {/* Check for semihosting interrupt. */ if (env->thumb) { - mask =arm_lduw_code (env->regs[15 ] -2 , env->bswap_code) &0xff ; + mask =arm_lduw_code (env, env->regs[15 ] -2 , env->bswap_code) &0xff ; }else { - mask =arm_ldl_code (env->regs[15 ] -4 , env->bswap_code) + mask =arm_ldl_code (env, env->regs[15 ] -4 , env->bswap_code) &0xffffff ; }/* Only intercept calls from privileged modes, to provide some @@ -1851,7 +1851,7 @@ void do_interrupt(CPUARMState *env)case EXCP_BKPT :/* See if this is a semihosting syscall. */ if (env->thumb && semihosting_enabled) { - mask =arm_lduw_code (env->regs[15 ], env->bswap_code) &0xff ; + mask =arm_lduw_code (env, env->regs[15 ], env->bswap_code) &0xff ;if (mask ==0xab && (env->uncached_cpsr &CPSR_M ) !=ARM_CPU_MODE_USR ) { env->regs[15 ] +=2 ;target-arm/helper.h +30
-30@@ -4,12 +4,12 @@ DEF_HELPER_1(clz, i32, i32) DEF_HELPER_1(sxtb16, i32, i32) DEF_HELPER_1(uxtb16, i32, i32) -DEF_HELPER_2(add_setq, i32, i32, i32) -DEF_HELPER_2(add_saturate, i32, i32, i32) -DEF_HELPER_2(sub_saturate, i32, i32, i32) -DEF_HELPER_2(add_usaturate, i32, i32, i32) -DEF_HELPER_2(sub_usaturate, i32, i32, i32) -DEF_HELPER_1(double_saturate, i32, s32) +DEF_HELPER_3(add_setq, i32, env, i32, i32) +DEF_HELPER_3(add_saturate, i32, env, i32, i32) +DEF_HELPER_3(sub_saturate, i32, env, i32, i32) +DEF_HELPER_3(add_usaturate, i32, env, i32, i32) +DEF_HELPER_3(sub_usaturate, i32, env, i32, i32) +DEF_HELPER_2(double_saturate, i32, env, s32) DEF_HELPER_2(sdiv, s32, s32, s32) DEF_HELPER_2(udiv, i32, i32, i32)DEF_HELPER_1 (rbit, i32, i32)@@ -40,21 +40,21 @@ PAS_OP(uq) PAS_OP(uh) #undef PAS_OP -DEF_HELPER_2(ssat, i32, i32, i32) -DEF_HELPER_2(usat, i32, i32, i32) -DEF_HELPER_2(ssat16, i32, i32, i32) -DEF_HELPER_2(usat16, i32, i32, i32) +DEF_HELPER_3(ssat, i32, env, i32, i32) +DEF_HELPER_3(usat, i32, env, i32, i32) +DEF_HELPER_3(ssat16, i32, env, i32, i32) +DEF_HELPER_3(usat16, i32, env, i32, i32) DEF_HELPER_2(usad8, i32, i32, i32) DEF_HELPER_1(logicq_cc, i32, i64) DEF_HELPER_3(sel_flags, i32, i32, i32, i32) -DEF_HELPER_1(exception, void, i32) -DEF_HELPER_0(wfi, void) +DEF_HELPER_2(exception, void, env, i32) +DEF_HELPER_1(wfi, void, env) -DEF_HELPER_2(cpsr_write, void, i32, i32) -DEF_HELPER_0(cpsr_read, i32) +DEF_HELPER_3(cpsr_write, void, env, i32, i32) +DEF_HELPER_1(cpsr_read, i32, env) DEF_HELPER_3(v7m_msr, void, env, i32, i32)DEF_HELPER_2 (v7m_mrs, i32, env, i32)@@ -67,8 +67,8 @@ DEF_HELPER_2(get_cp_reg64, i64, env, ptr) DEF_HELPER_2(get_r13_banked, i32, env, i32) DEF_HELPER_3(set_r13_banked, void, env, i32, i32) -DEF_HELPER_1(get_user_reg, i32, i32) -DEF_HELPER_2(set_user_reg, void, i32, i32) +DEF_HELPER_2(get_user_reg, i32, env, i32) +DEF_HELPER_3(set_user_reg, void, env, i32, i32) DEF_HELPER_1(vfp_get_fpscr, i32, env)DEF_HELPER_2 (vfp_set_fpscr, void, env, i32)@@ -140,20 +140,20 @@ DEF_HELPER_2(recpe_f32, f32, f32, env) DEF_HELPER_2(rsqrte_f32, f32, f32, env) DEF_HELPER_2(recpe_u32, i32, i32, env) DEF_HELPER_2(rsqrte_u32, i32, i32, env) -DEF_HELPER_4(neon_tbl, i32, i32, i32, i32, i32) - -DEF_HELPER_2(add_cc, i32, i32, i32) -DEF_HELPER_2(adc_cc, i32, i32, i32) -DEF_HELPER_2(sub_cc, i32, i32, i32) -DEF_HELPER_2(sbc_cc, i32, i32, i32) - -DEF_HELPER_2(shl, i32, i32, i32) -DEF_HELPER_2(shr, i32, i32, i32) -DEF_HELPER_2(sar, i32, i32, i32) -DEF_HELPER_2(shl_cc, i32, i32, i32) -DEF_HELPER_2(shr_cc, i32, i32, i32) -DEF_HELPER_2(sar_cc, i32, i32, i32) -DEF_HELPER_2 (ror_cc, i32, i32, i32) +DEF_HELPER_5(neon_tbl, i32, env, i32, i32, i32, i32) + +DEF_HELPER_3(add_cc, i32, env, i32, i32) +DEF_HELPER_3(adc_cc, i32, env, i32, i32) +DEF_HELPER_3(sub_cc, i32, env, i32, i32) +DEF_HELPER_3(sbc_cc, i32, env, i32, i32) + +DEF_HELPER_3(shl, i32, env, i32, i32) +DEF_HELPER_3(shr, i32, env, i32, i32) +DEF_HELPER_3(sar, i32, env, i32, i32) +DEF_HELPER_3(shl_cc, i32, env, i32, i32) +DEF_HELPER_3(shr_cc, i32, env, i32, i32) +DEF_HELPER_3(sar_cc, i32, env, i32, i32) +DEF_HELPER_3 (ror_cc, i32, env, i32, i32) /* neon_helper.c */DEF_HELPER_3 (neon_qadd_u8, i32, env, i32, i32)target-arm/op_helper.c +43
-49@@ -17,19 +17,18 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" #define SIGNBIT (uint32_t)0x80000000#define SIGNBIT64 ((uint64_t)1 << 63) -static void raise_exception (int tt) +static void raise_exception (CPUARMState *env,int tt) { env->exception_index = tt;cpu_loop_exit (env); } -uint32_t HELPER (neon_tbl )(uint32_t ireg,uint32_t def, +uint32_t HELPER (neon_tbl )(CPUARMState *env,uint32_t ireg,uint32_t def,uint32_t rn,uint32_t maxindex) {uint32_t val;@@ -72,16 +71,12 @@ uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def,/* try to fill the TLB and return an exception if error. If retaddr is NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ -/* XXX: fix it to restore all registers */ -void tlb_fill (CPUARMState *env1,target_ulong addr,int is_write,int mmu_idx, +void tlb_fill (CPUARMState *env,target_ulong addr,int is_write,int mmu_idx,uintptr_t retaddr) {TranslationBlock *tb; -CPUARMState *saved_env;int ret; - saved_env = env; - env = env1; ret =cpu_arm_handle_mmu_fault (env, addr, is_write, mmu_idx);if (unlikely (ret)) {if (retaddr) {@@ -93,15 +88,14 @@ void tlb_fill(CPUARMState *env1, target_ulong addr, int is_write, int mmu_idx, cpu_restore_state(tb, env, retaddr); } } -raise_exception (env->exception_index); +raise_exception (env, env->exception_index); } - env = saved_env; }#endif /* FIXME: Pass an explicit pointer to QF to CPUARMState, and move saturating instructions into helper.c */ -uint32_t HELPER (add_setq )(uint32_t a,uint32_t b) +uint32_t HELPER (add_setq )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t res = a + b;if (((res ^ a) &SIGNBIT ) && !((a ^ b) &SIGNBIT ))@@ -109,7 +103,7 @@ uint32_t HELPER(add_setq)(uint32_t a, uint32_t b)return res; } -uint32_t HELPER (add_saturate )(uint32_t a,uint32_t b) +uint32_t HELPER (add_saturate )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t res = a + b;if (((res ^ a) &SIGNBIT ) && !((a ^ b) &SIGNBIT )) {@@ -119,7 +113,7 @@ uint32_t HELPER(add_saturate)(uint32_t a, uint32_t b)return res; } -uint32_t HELPER (sub_saturate )(uint32_t a,uint32_t b) +uint32_t HELPER (sub_saturate )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t res = a - b;if (((res ^ a) &SIGNBIT ) && ((a ^ b) &SIGNBIT )) {@@ -129,7 +123,7 @@ uint32_t HELPER(sub_saturate)(uint32_t a, uint32_t b)return res; } -uint32_t HELPER (double_saturate )(int32_t val) +uint32_t HELPER (double_saturate )(CPUARMState *env,int32_t val) {uint32_t res;if (val >=0x40000000 ) {@@ -144,7 +138,7 @@ uint32_t HELPER(double_saturate)(int32_t val)return res; } -uint32_t HELPER (add_usaturate )(uint32_t a,uint32_t b) +uint32_t HELPER (add_usaturate )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t res = a + b;if (res < a) {@@ -154,7 +148,7 @@ uint32_t HELPER(add_usaturate)(uint32_t a, uint32_t b)return res; } -uint32_t HELPER (sub_usaturate )(uint32_t a,uint32_t b) +uint32_t HELPER (sub_usaturate )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t res = a - b;if (res > a) {@@ -165,7 +159,7 @@ uint32_t HELPER(sub_usaturate)(uint32_t a, uint32_t b) }/* Signed saturation. */ -static inline uint32_t do_ssat (int32_t val,int shift) +static inline uint32_t do_ssat (CPUARMState *env,int32_t val,int shift) {int32_t top;uint32_t mask;@@ -183,7 +177,7 @@ static inline uint32_t do_ssat(int32_t val, int shift) }/* Unsigned saturation. */ -static inline uint32_t do_usat (int32_t val,int shift) +static inline uint32_t do_usat (CPUARMState *env,int32_t val,int shift) {uint32_t max;@@ -199,62 +193,62 @@ static inline uint32_t do_usat(int32_t val, int shift) }/* Signed saturate. */ -uint32_t HELPER (ssat )(uint32_t x,uint32_t shift) +uint32_t HELPER (ssat )(CPUARMState *env,uint32_t x,uint32_t shift) { -return do_ssat (x, shift); +return do_ssat (env, x, shift); }/* Dual halfword signed saturate. */ -uint32_t HELPER (ssat16 )(uint32_t x,uint32_t shift) +uint32_t HELPER (ssat16 )(CPUARMState *env,uint32_t x,uint32_t shift) {uint32_t res; - res = (uint16_t )do_ssat ((int16_t )x, shift); - res |=do_ssat (((int32_t )x) >>16 , shift) <<16 ; + res = (uint16_t )do_ssat (env, (int16_t )x, shift); + res |=do_ssat (env, ((int32_t )x) >>16 , shift) <<16 ;return res; }/* Unsigned saturate. */ -uint32_t HELPER (usat )(uint32_t x,uint32_t shift) +uint32_t HELPER (usat )(CPUARMState *env,uint32_t x,uint32_t shift) { -return do_usat (x, shift); +return do_usat (env, x, shift); }/* Dual halfword unsigned saturate. */ -uint32_t HELPER (usat16 )(uint32_t x,uint32_t shift) +uint32_t HELPER (usat16 )(CPUARMState *env,uint32_t x,uint32_t shift) {uint32_t res; - res = (uint16_t )do_usat ((int16_t )x, shift); - res |=do_usat (((int32_t )x) >>16 , shift) <<16 ; + res = (uint16_t )do_usat (env, (int16_t )x, shift); + res |=do_usat (env, ((int32_t )x) >>16 , shift) <<16 ;return res; } -void HELPER (wfi )(void ) +void HELPER (wfi )(CPUARMState *env) { env->exception_index =EXCP_HLT ; env->halted =1 ;cpu_loop_exit (env); } -void HELPER (exception )(uint32_t excp) +void HELPER (exception )(CPUARMState *env,uint32_t excp) { env->exception_index = excp;cpu_loop_exit (env); } -uint32_t HELPER (cpsr_read )(void ) +uint32_t HELPER (cpsr_read )(CPUARMState *env) {return cpsr_read (env) & ~CPSR_EXEC ; } -void HELPER (cpsr_write )(uint32_t val,uint32_t mask) +void HELPER (cpsr_write )(CPUARMState *env,uint32_t val,uint32_t mask) {cpsr_write (env, val, mask); }/* Access to user mode registers from privileged modes. */ -uint32_t HELPER (get_user_reg )(uint32_t regno) +uint32_t HELPER (get_user_reg )(CPUARMState *env,uint32_t regno) {uint32_t val;@@ -271,7 +265,7 @@ uint32_t HELPER(get_user_reg)(uint32_t regno)return val; } -void HELPER (set_user_reg )(uint32_t regno,uint32_t val) +void HELPER (set_user_reg )(CPUARMState *env,uint32_t regno,uint32_t val) {if (regno ==13 ) { env->banked_r13[0 ] = val;@@ -290,7 +284,7 @@ void HELPER(set_cp_reg)(CPUARMState *env, void *rip, uint32_t value)const ARMCPRegInfo *ri = rip;int excp = ri->writefn (env, ri, value);if (excp) { -raise_exception (excp); +raise_exception (env, excp); } }@@ -300,7 +294,7 @@ uint32_t HELPER(get_cp_reg)(CPUARMState *env, void *rip)uint64_t value;int excp = ri->readfn (env, ri, &value);if (excp) { -raise_exception (excp); +raise_exception (env, excp); }return value; }@@ -310,7 +304,7 @@ void HELPER(set_cp_reg64)(CPUARMState *env, void *rip, uint64_t value)const ARMCPRegInfo *ri = rip;int excp = ri->writefn (env, ri, value);if (excp) { -raise_exception (excp); +raise_exception (env, excp); } }@@ -320,7 +314,7 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip)uint64_t value;int excp = ri->readfn (env, ri, &value);if (excp) { -raise_exception (excp); +raise_exception (env, excp); }return value; }@@ -329,7 +323,7 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip)The only way to do that in TCG is a conditional branch, which clobbers all our temporaries. For now implement these as helper functions. */ -uint32_t HELPER (add_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (add_cc )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t result; result = a + b;@@ -339,7 +333,7 @@ uint32_t HELPER (add_cc)(uint32_t a, uint32_t b)return result; } -uint32_t HELPER (adc_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (adc_cc )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t result;if (!env->CF) {@@ -354,7 +348,7 @@ uint32_t HELPER(adc_cc)(uint32_t a, uint32_t b)return result; } -uint32_t HELPER (sub_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (sub_cc )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t result; result = a - b;@@ -364,7 +358,7 @@ uint32_t HELPER(sub_cc)(uint32_t a, uint32_t b)return result; } -uint32_t HELPER (sbc_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (sbc_cc )(CPUARMState *env,uint32_t a,uint32_t b) {uint32_t result;if (!env->CF) {@@ -381,7 +375,7 @@ uint32_t HELPER(sbc_cc)(uint32_t a, uint32_t b)/* Similarly for variable shift instructions. */ -uint32_t HELPER (shl )(uint32_t x,uint32_t i) +uint32_t HELPER (shl )(CPUARMState *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 )@@ -389,7 +383,7 @@ uint32_t HELPER(shl)(uint32_t x, uint32_t i)return x << shift; } -uint32_t HELPER (shr )(uint32_t x,uint32_t i) +uint32_t HELPER (shr )(CPUARMState *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 )@@ -397,7 +391,7 @@ uint32_t HELPER(shr)(uint32_t x, uint32_t i)return (uint32_t )x >> shift; } -uint32_t HELPER (sar )(uint32_t x,uint32_t i) +uint32_t HELPER (sar )(CPUARMState *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 )@@ -405,7 +399,7 @@ uint32_t HELPER(sar)(uint32_t x, uint32_t i)return (int32_t )x >> shift; } -uint32_t HELPER (shl_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (shl_cc )(CPUARMState *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 ) {@@ -421,7 +415,7 @@ uint32_t HELPER(shl_cc)(uint32_t x, uint32_t i)return x; } -uint32_t HELPER (shr_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (shr_cc )(CPUARMState *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 ) {@@ -437,7 +431,7 @@ uint32_t HELPER(shr_cc)(uint32_t x, uint32_t i)return x; } -uint32_t HELPER (sar_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (sar_cc )(CPUARMState *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 ) {@@ -450,7 +444,7 @@ uint32_t HELPER(sar_cc)(uint32_t x, uint32_t i)return x; } -uint32_t HELPER (ror_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (ror_cc )(CPUARMState *env,uint32_t x,uint32_t i) {int shift1, shift; shift1 = i &0xff ;target-arm/translate.c +74
-75@@ -199,7 +199,7 @@ static void store_reg(DisasContext *s, int reg, TCGv var)static inline void gen_set_cpsr (TCGv var,uint32_t mask) {TCGv tmp_mask =tcg_const_i32 (mask); -gen_helper_cpsr_write (var, tmp_mask); +gen_helper_cpsr_write (cpu_env, var, tmp_mask);tcg_temp_free_i32 (tmp_mask); }/* Set NZCV flags from the high 4 bits of var. */ @@ -209,7 +209,7 @@ static void gen_exception(int excp) {TCGv tmp =tcg_temp_new_i32 ();tcg_gen_movi_i32 (tmp, excp); -gen_helper_exception (tmp); +gen_helper_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp); }@@ -490,16 +490,16 @@ static inline void gen_arm_shift_reg(TCGv var, int shiftop, {if (flags) {switch (shiftop) { -case 0 :gen_helper_shl_cc (var, var, shift);break ; -case 1 :gen_helper_shr_cc (var, var, shift);break ; -case 2 :gen_helper_sar_cc (var, var, shift);break ; -case 3 :gen_helper_ror_cc (var, var, shift);break ; +case 0 :gen_helper_shl_cc (var, cpu_env, var, shift);break ; +case 1 :gen_helper_shr_cc (var, cpu_env, var, shift);break ; +case 2 :gen_helper_sar_cc (var, cpu_env, var, shift);break ; +case 3 :gen_helper_ror_cc (var, cpu_env, var, shift);break ; } }else {switch (shiftop) { -case 0 :gen_helper_shl (var, var, shift);break ; -case 1 :gen_helper_shr (var, var, shift);break ; -case 2 :gen_helper_sar (var, var, shift);break ; +case 0 :gen_helper_shl (var, cpu_env, var, shift);break ; +case 1 :gen_helper_shr (var, cpu_env, var, shift);break ; +case 2 :gen_helper_sar (var, cpu_env, var, shift);break ;case 3 :tcg_gen_andi_i32 (shift, shift,0x1f );tcg_gen_rotr_i32 (var, var, shift);break ; }@@ -6121,7 +6121,7 @@ static int disas_neon_data_insn(CPUARMState * env, DisasContext *s, uint32_t ins tmp2 =neon_load_reg (rm,0 ); tmp4 =tcg_const_i32 (rn); tmp5 =tcg_const_i32 (n); -gen_helper_neon_tbl (tmp2, tmp2, tmp, tmp4, tmp5); +gen_helper_neon_tbl (tmp2, cpu_env, tmp2, tmp, tmp4, tmp5);tcg_temp_free_i32 (tmp);if (insn & (1 <<6 )) { tmp =neon_load_reg (rd,1 );@@ -6130,7 +6130,7 @@ static int disas_neon_data_insn(CPUARMState * env, DisasContext *s, uint32_t instcg_gen_movi_i32 (tmp,0 ); } tmp3 =neon_load_reg (rm,1 ); -gen_helper_neon_tbl (tmp3, tmp3, tmp, tmp4, tmp5); +gen_helper_neon_tbl (tmp3, cpu_env, tmp3, tmp, tmp4, tmp5);tcg_temp_free_i32 (tmp5);tcg_temp_free_i32 (tmp4);neon_store_reg (rd,0 , tmp2);@@ -6534,7 +6534,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)TCGv addr;TCGv_i64 tmp64; - insn =arm_ldl_code (s->pc, s->bswap_code); + insn =arm_ldl_code (env, s->pc, s->bswap_code); s->pc +=4 ;/* M variants do not implement ARM mode. */ @@ -6818,7 +6818,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) tmp =load_cpu_field (spsr); }else { tmp =tcg_temp_new_i32 (); -gen_helper_cpsr_read (tmp); +gen_helper_cpsr_read (tmp, cpu_env); }store_reg (s, rd, tmp); }@@ -6869,11 +6869,11 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) tmp =load_reg (s, rm); tmp2 =load_reg (s, rn);if (op1 &2 ) -gen_helper_double_saturate (tmp2, tmp2); +gen_helper_double_saturate (tmp2, cpu_env, tmp2);if (op1 &1 ) -gen_helper_sub_saturate (tmp, tmp, tmp2); +gen_helper_sub_saturate (tmp, cpu_env, tmp, tmp2);else -gen_helper_add_saturate (tmp, tmp, tmp2); +gen_helper_add_saturate (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2);store_reg (s, rd, tmp);break ;@@ -6911,7 +6911,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)tcg_temp_free_i64 (tmp64);if ((sh &2 ) ==0 ) { tmp2 =load_reg (s, rn); -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }store_reg (s, rd, tmp);@@ -6931,7 +6931,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) }else {if (op1 ==0 ) { tmp2 =load_reg (s, rn); -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }store_reg (s, rd, tmp);@@ -7005,11 +7005,11 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)if (IS_USER (s)) { goto illegal_op; } -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);gen_exception_return (s, tmp); }else {if (set_cc) { -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }else {tcg_gen_sub_i32 (tmp, tmp, tmp2); }@@ -7018,7 +7018,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)break ;case 0x03 :if (set_cc) { -gen_helper_sub_cc (tmp, tmp2, tmp); +gen_helper_sub_cc (tmp, cpu_env, tmp2, tmp); }else {tcg_gen_sub_i32 (tmp, tmp2, tmp); }@@ -7026,7 +7026,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)break ;case 0x04 :if (set_cc) { -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }else {tcg_gen_add_i32 (tmp, tmp, tmp2); }@@ -7034,7 +7034,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)break ;case 0x05 :if (set_cc) { -gen_helper_adc_cc (tmp, tmp, tmp2); +gen_helper_adc_cc (tmp, cpu_env, tmp, tmp2); }else {gen_add_carry (tmp, tmp, tmp2); }@@ -7042,7 +7042,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)break ;case 0x06 :if (set_cc) { -gen_helper_sbc_cc (tmp, tmp, tmp2); +gen_helper_sbc_cc (tmp, cpu_env, tmp, tmp2); }else {gen_sub_carry (tmp, tmp, tmp2); }@@ -7050,7 +7050,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)break ;case 0x07 :if (set_cc) { -gen_helper_sbc_cc (tmp, tmp2, tmp); +gen_helper_sbc_cc (tmp, cpu_env, tmp2, tmp); }else {gen_sub_carry (tmp, tmp2, tmp); }@@ -7072,13 +7072,13 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)break ;case 0x0a :if (set_cc) { -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }tcg_temp_free_i32 (tmp);break ;case 0x0b :if (set_cc) { -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }tcg_temp_free_i32 (tmp);break ;@@ -7395,9 +7395,9 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) sh = (insn >>16 ) &0x1f ; tmp2 =tcg_const_i32 (sh);if (insn & (1 <<22 )) -gen_helper_usat (tmp, tmp, tmp2); +gen_helper_usat (tmp, cpu_env, tmp, tmp2);else -gen_helper_ssat (tmp, tmp, tmp2); +gen_helper_ssat (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2);store_reg (s, rd, tmp); }else if ((insn &0x00300fe0 ) ==0x00200f20 ) {@@ -7406,9 +7406,9 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) sh = (insn >>16 ) &0x1f ; tmp2 =tcg_const_i32 (sh);if (insn & (1 <<22 )) -gen_helper_usat16 (tmp, tmp, tmp2); +gen_helper_usat16 (tmp, cpu_env, tmp, tmp2);else -gen_helper_ssat16 (tmp, tmp, tmp2); +gen_helper_ssat16 (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2);store_reg (s, rd, tmp); }else if ((insn &0x00700fe0 ) ==0x00000fa0 ) {@@ -7518,7 +7518,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)* however it may overflow considered as a signed * operation, in which case we must set the Q flag. */ -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2); }tcg_temp_free_i32 (tmp2);if (insn & (1 <<22 )) {@@ -7534,7 +7534,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)if (rd !=15 ) { tmp2 =load_reg (s, rd); -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }store_reg (s, rn, tmp);@@ -7719,7 +7719,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) tmp =gen_ld32 (addr,IS_USER (s));if (user) { tmp2 =tcg_const_i32 (i); -gen_helper_set_user_reg (tmp2, tmp); +gen_helper_set_user_reg (cpu_env, tmp2, tmp);tcg_temp_free_i32 (tmp2);tcg_temp_free_i32 (tmp); }else if (i == rn) {@@ -7738,7 +7738,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) }else if (user) { tmp =tcg_temp_new_i32 (); tmp2 =tcg_const_i32 (i); -gen_helper_get_user_reg (tmp, tmp2); +gen_helper_get_user_reg (tmp, cpu_env, tmp2);tcg_temp_free_i32 (tmp2); }else { tmp =load_reg (s, i);@@ -7865,31 +7865,31 @@ gen_thumb2_data_op(DisasContext *s, int op, int conds, uint32_t shifter_out, TCGbreak ;case 8 :/* add */ if (conds) -gen_helper_add_cc (t0, t0, t1); +gen_helper_add_cc (t0, cpu_env, t0, t1);else tcg_gen_add_i32 (t0, t0, t1);break ;case 10 :/* adc */ if (conds) -gen_helper_adc_cc (t0, t0, t1); +gen_helper_adc_cc (t0, cpu_env, t0, t1);else gen_adc (t0, t1);break ;case 11 :/* sbc */ if (conds) -gen_helper_sbc_cc (t0, t0, t1); +gen_helper_sbc_cc (t0, cpu_env, t0, t1);else gen_sub_carry (t0, t0, t1);break ;case 13 :/* sub */ if (conds) -gen_helper_sub_cc (t0, t0, t1); +gen_helper_sub_cc (t0, cpu_env, t0, t1);else tcg_gen_sub_i32 (t0, t0, t1);break ;case 14 :/* rsb */ if (conds) -gen_helper_sub_cc (t0, t1, t0); +gen_helper_sub_cc (t0, cpu_env, t1, t0);else tcg_gen_sub_i32 (t0, t1, t0);break ;@@ -7962,7 +7962,7 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw/* Fall through to 32-bit decode. */ } - insn =arm_lduw_code (s->pc, s->bswap_code); + insn =arm_lduw_code (env, s->pc, s->bswap_code); s->pc +=2 ; insn |= (uint32_t )insn_hw1 <<16 ;@@ -8111,7 +8111,7 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hwgen_st32 (tmp, addr,0 );tcg_gen_addi_i32 (addr, addr,4 ); tmp =tcg_temp_new_i32 (); -gen_helper_cpsr_read (tmp); +gen_helper_cpsr_read (tmp, cpu_env);gen_st32 (tmp, addr,0 );if (insn & (1 <<21 )) {if ((insn & (1 <<24 )) ==0 ) {@@ -8293,11 +8293,11 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw tmp =load_reg (s, rn); tmp2 =load_reg (s, rm);if (op &1 ) -gen_helper_double_saturate (tmp, tmp); +gen_helper_double_saturate (tmp, cpu_env, tmp);if (op &2 ) -gen_helper_sub_saturate (tmp, tmp2, tmp); +gen_helper_sub_saturate (tmp, cpu_env, tmp2, tmp);else -gen_helper_add_saturate (tmp, tmp, tmp2); +gen_helper_add_saturate (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }else { tmp =load_reg (s, rn);@@ -8353,7 +8353,7 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hwtcg_temp_free_i32 (tmp2);if (rs !=15 ) { tmp2 =load_reg (s, rs); -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }break ;@@ -8370,13 +8370,13 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw* however it may overflow considered as a signed * operation, in which case we must set the Q flag. */ -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2); }tcg_temp_free_i32 (tmp2);if (rs !=15 ) { tmp2 =load_reg (s, rs); -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }break ;@@ -8393,7 +8393,7 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hwif (rs !=15 ) { tmp2 =load_reg (s, rs); -gen_helper_add_setq (tmp, tmp, tmp2); +gen_helper_add_setq (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2); }break ;@@ -8632,7 +8632,7 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hwgen_helper_v7m_mrs (tmp, cpu_env, addr);tcg_temp_free_i32 (addr); }else { -gen_helper_cpsr_read (tmp); +gen_helper_cpsr_read (tmp, cpu_env); }store_reg (s, rd, tmp);break ;@@ -8721,15 +8721,15 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hwif (op &4 ) {/* Unsigned. */ if ((op &1 ) && shift ==0 ) -gen_helper_usat16 (tmp, tmp, tmp2); +gen_helper_usat16 (tmp, cpu_env, tmp, tmp2);else -gen_helper_usat (tmp, tmp, tmp2); +gen_helper_usat (tmp, cpu_env, tmp, tmp2); }else {/* Signed. */ if ((op &1 ) && shift ==0 ) -gen_helper_ssat16 (tmp, tmp, tmp2); +gen_helper_ssat16 (tmp, cpu_env, tmp, tmp2);else -gen_helper_ssat (tmp, tmp, tmp2); +gen_helper_ssat (tmp, cpu_env, tmp, tmp2); }tcg_temp_free_i32 (tmp2);break ;@@ -8992,7 +8992,7 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s) } } - insn =arm_lduw_code (s->pc, s->bswap_code); + insn =arm_lduw_code (env, s->pc, s->bswap_code); s->pc +=2 ;switch (insn >>12 ) {@@ -9017,12 +9017,12 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)if (s->condexec_mask)tcg_gen_sub_i32 (tmp, tmp, tmp2);else -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }else {if (s->condexec_mask)tcg_gen_add_i32 (tmp, tmp, tmp2);else -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }tcg_temp_free_i32 (tmp2);store_reg (s, rd, tmp);@@ -9053,7 +9053,7 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)tcg_gen_movi_i32 (tmp2, insn &0xff );switch (op) {case 1 :/* cmp */ -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp);tcg_temp_free_i32 (tmp2);break ;@@ -9061,7 +9061,7 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)if (s->condexec_mask)tcg_gen_add_i32 (tmp, tmp, tmp2);else -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2);store_reg (s, rd, tmp);break ;@@ -9069,7 +9069,7 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)if (s->condexec_mask)tcg_gen_sub_i32 (tmp, tmp, tmp2);else -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2);store_reg (s, rd, tmp);break ;@@ -9105,7 +9105,7 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)case 1 :/* cmp */ tmp =load_reg (s, rd); tmp2 =load_reg (s, rm); -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);tcg_temp_free_i32 (tmp2);tcg_temp_free_i32 (tmp);break ;@@ -9166,25 +9166,25 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)break ;case 0x2 :/* lsl */ if (s->condexec_mask) { -gen_helper_shl (tmp2, tmp2, tmp); +gen_helper_shl (tmp2, cpu_env, tmp2, tmp); }else { -gen_helper_shl_cc (tmp2, tmp2, tmp); +gen_helper_shl_cc (tmp2, cpu_env, tmp2, tmp);gen_logic_CC (tmp2); }break ;case 0x3 :/* lsr */ if (s->condexec_mask) { -gen_helper_shr (tmp2, tmp2, tmp); +gen_helper_shr (tmp2, cpu_env, tmp2, tmp); }else { -gen_helper_shr_cc (tmp2, tmp2, tmp); +gen_helper_shr_cc (tmp2, cpu_env, tmp2, tmp);gen_logic_CC (tmp2); }break ;case 0x4 :/* asr */ if (s->condexec_mask) { -gen_helper_sar (tmp2, tmp2, tmp); +gen_helper_sar (tmp2, cpu_env, tmp2, tmp); }else { -gen_helper_sar_cc (tmp2, tmp2, tmp); +gen_helper_sar_cc (tmp2, cpu_env, tmp2, tmp);gen_logic_CC (tmp2); }break ;@@ -9192,20 +9192,20 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)if (s->condexec_mask)gen_adc (tmp, tmp2);else -gen_helper_adc_cc (tmp, tmp, tmp2); +gen_helper_adc_cc (tmp, cpu_env, tmp, tmp2);break ;case 0x6 :/* sbc */ if (s->condexec_mask)gen_sub_carry (tmp, tmp, tmp2);else -gen_helper_sbc_cc (tmp, tmp, tmp2); +gen_helper_sbc_cc (tmp, cpu_env, tmp, tmp2);break ;case 0x7 :/* ror */ if (s->condexec_mask) {tcg_gen_andi_i32 (tmp, tmp,0x1f );tcg_gen_rotr_i32 (tmp2, tmp2, tmp); }else { -gen_helper_ror_cc (tmp2, tmp2, tmp); +gen_helper_ror_cc (tmp2, cpu_env, tmp2, tmp);gen_logic_CC (tmp2); }break ;@@ -9218,14 +9218,14 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s)if (s->condexec_mask)tcg_gen_neg_i32 (tmp, tmp2);else -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);break ;case 0xa :/* cmp */ -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); rd =16 ;break ;case 0xb :/* cmn */ -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); rd =16 ;break ;case 0xc :/* orr */ @@ -9913,7 +9913,7 @@ static inline void gen_intermediate_code_internal(CPUARMState *env,/* nothing more to generate */ break ;case DISAS_WFI : -gen_helper_wfi (); +gen_helper_wfi (cpu_env);break ;case DISAS_SWI :gen_exception (EXCP_SWI ); --1.7.2.5
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
Quoted 15 lines · Peter Maydell
Quoted 4 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>Quoted 9 lines
--- configure | 2 +- target-arm/Makefile.objs | 2 - target-arm/cpu.h | 10 ++- target-arm/helper.c | 8 +- target-arm/helper.h | 60 +++++++++--------- target-arm/op_helper.c | 92 +++++++++++++--------------- target-arm/translate.c | 148 +++++++++++++++++++++++----------------------- 7 files changed, 158 insertions(+), 164 deletions(-)
Quoted 3 lines
This is too big to easily review -- it's making a change to a lot of helpers, and in each case that change affects three places (callers, declaration, implementation). That'
Sorry, finger slip meant I sent that half finished. To continue...
That's quite hard to cross-reference when the patch is this big. I think it would be helpful if you could split it up into patches touching smaller groups of helpers at once rather than having a single patch that does them all at once.
thanks
-- PMM
Re: [Qemu-devel] [PATCH 01/21] target-s390x: fix style
In reply to Blue SwirlQuoted 9 lines · Blue Swirl
Before splitting
op_helper.candhelper.cin the next patches, fix style issues. No functional changes.Replace also GCC specific
__FUNCTION__with
standard__func__.Don't init static variable (cpu_s390x_init:inited) with 0.
Signed-off-by Blue Swirl <[email protected]>
Phew. Have you hooked up with Richard about these changes? He had quite a big rewrite of the s390 target in the works, and I don't want you guys to work needlessly on major conflicts :)
Alex
Quoted 1,587 lines
---
target-s390x/helper.c| 96 +++++-----target-s390x/op_helper.c| 438 ++++++++++++++++++++++++++--------------------2 files changed, 297 insertions(+), 237 deletions(-)target-s390x/helper.c +49
-47@@ -74,7 +74,7 @@ S390CPU *cpu_s390x_init(const char *cpu_model) {S390CPU *cpu;CPUS390XState *env; -static int inited =0 ; +static int inited; cpu =S390_CPU (object_new (TYPE_S390_CPU )); env = &cpu->env;@@ -91,25 +91,27 @@ S390CPU *cpu_s390x_init(const char *cpu_model)#if defined(CONFIG_USER_ONLY ) -void do_interrupt (CPUS390XState *env) +void do_interrupt (CPUS390XState *env) { env->exception_index =-1 ; } -int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong address,int rw, -int mmu_idx) +int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong address, +int rw,int mmu_idx) { -/* fprintf(stderr,"%s: address 0x%lx rw %d mmu_idx %d\n", -__FUNCTION__, address, rw, mmu_idx); */ +/* fprintf(stderr, "%s: address 0x%lx rw %d mmu_idx %d\n", +__func__, address, rw, mmu_idx); */ env->exception_index =EXCP_ADDR ; - env->__excp_addr = address;/* FIXME: find out how this works on a real machine */ +/* FIXME: find out how this works on a real machine */ + env->__excp_addr = address;return 1 ; }#else /* !CONFIG_USER_ONLY */ /* Ensure to exit the TB after this call! */ -static void trigger_pgm_exception (CPUS390XState *env,uint32_t code,uint32_t ilc) +static void trigger_pgm_exception (CPUS390XState *env,uint32_t code, +uint32_t ilc) { env->exception_index =EXCP_PGM ; env->int_pgm_code = code;@@ -138,19 +140,20 @@ static int trans_bits(CPUS390XState *env, uint64_t mode)return bits; } -static void trigger_prot_fault (CPUS390XState *env,target_ulong vaddr,uint64_t mode) +static void trigger_prot_fault (CPUS390XState *env,target_ulong vaddr, +uint64_t mode) {int ilc =ILC_LATER_INC_2 ;int bits =trans_bits (env, mode) |4 ; -DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __FUNCTION__, vaddr, bits); +DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __func__, vaddr, bits);stq_phys (env->psa + offsetof(LowCore , trans_exc_code), vaddr | bits);trigger_pgm_exception (env,PGM_PROTECTION , ilc); } -static void trigger_page_fault (CPUS390XState *env,target_ulong vaddr,uint32_t type, -uint64_t asc,int rw) +static void trigger_page_fault (CPUS390XState *env,target_ulong vaddr, +uint32_t type,uint64_t asc,int rw) {int ilc =ILC_LATER ;int bits =trans_bits (env, asc);@@ -160,26 +163,26 @@ static void trigger_page_fault(CPUS390XState *env, target_ulong vaddr, uint32_t ilc =2 ; } -DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __FUNCTION__, vaddr, bits); +DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __func__, vaddr, bits);stq_phys (env->psa + offsetof(LowCore , trans_exc_code), vaddr | bits);trigger_pgm_exception (env, type, ilc); } -static int mmu_translate_asce (CPUS390XState *env,target_ulong vaddr,uint64_t asc, -uint64_t asce,int level,target_ulong *raddr, -int *flags,int rw) +static int mmu_translate_asce (CPUS390XState *env,target_ulong vaddr, +uint64_t asc,uint64_t asce,int level, +target_ulong *raddr,int *flags,int rw) {uint64_t offs =0 ;uint64_t origin;uint64_t new_asce; -PTE_DPRINTF ("%s: 0x%" PRIx64"\n" , __FUNCTION__, asce); +PTE_DPRINTF ("%s: 0x%" PRIx64"\n" , __func__, asce);if (((level != _ASCE_TYPE_SEGMENT) && (asce & _REGION_ENTRY_INV)) || ((level == _ASCE_TYPE_SEGMENT) && (asce & _SEGMENT_ENTRY_INV))) {/* XXX different regions have different faults */ -DPRINTF ("%s: invalid region\n" , __FUNCTION__); +DPRINTF ("%s: invalid region\n" , __func__);trigger_page_fault (env, vaddr,PGM_SEGMENT_TRANS , asc, rw);return -1 ; }@@ -222,7 +225,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a new_asce =ldq_phys (origin + offs);PTE_DPRINTF ("%s: 0x%" PRIx64" + 0x%" PRIx64" => 0x%016" PRIx64"\n" , - __FUNCTION__, origin, offs, new_asce); + __func__, origin, offs, new_asce);if (level != _ASCE_TYPE_SEGMENT) {/* yet another region */ @@ -232,7 +235,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a/* PTE */ if (new_asce & _PAGE_INVALID) { -DPRINTF ("%s: PTE=0x%" PRIx64" invalid\n" , __FUNCTION__, new_asce); +DPRINTF ("%s: PTE=0x%" PRIx64" invalid\n" , __func__, new_asce);trigger_page_fault (env, vaddr,PGM_PAGE_TRANS , asc, rw);return -1 ; }@@ -243,13 +246,14 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a *raddr = new_asce & _ASCE_ORIGIN; -PTE_DPRINTF ("%s: PTE=0x%" PRIx64"\n" , __FUNCTION__, new_asce); +PTE_DPRINTF ("%s: PTE=0x%" PRIx64"\n" , __func__, new_asce);return 0 ; } -static int mmu_translate_asc (CPUS390XState *env,target_ulong vaddr,uint64_t asc, -target_ulong *raddr,int *flags,int rw) +static int mmu_translate_asc (CPUS390XState *env,target_ulong vaddr, +uint64_t asc,target_ulong *raddr,int *flags, +int rw) {uint64_t asce =0 ;int level, new_level;@@ -257,15 +261,15 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t asswitch (asc) {case PSW_ASC_PRIMARY : -PTE_DPRINTF ("%s: asc=primary\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=primary\n" , __func__); asce = env->cregs[1 ];break ;case PSW_ASC_SECONDARY : -PTE_DPRINTF ("%s: asc=secondary\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=secondary\n" , __func__); asce = env->cregs[7 ];break ;case PSW_ASC_HOME : -PTE_DPRINTF ("%s: asc=home\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=home\n" , __func__); asce = env->cregs[13 ];break ; }@@ -276,8 +280,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_REGION2:if (vaddr &0xffe0000000000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xffe0000000000000ULL\n" , __FUNCTION__, - vaddr); +" 0xffe0000000000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }@@ -285,8 +288,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_REGION3:if (vaddr &0xfffffc0000000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xfffffc0000000000ULL\n" , __FUNCTION__, - vaddr); +" 0xfffffc0000000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }@@ -294,8 +296,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_SEGMENT:if (vaddr &0xffffffff80000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xffffffff80000000ULL\n" , __FUNCTION__, - vaddr); +" 0xffffffff80000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }@@ -358,7 +359,7 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,break ; } -out: + out:/* Convert real address -> absolute address */ if (*raddr <0x2000 ) { *raddr = *raddr + env->psa;@@ -378,18 +379,18 @@ out:return r; } -int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong _vaddr,int rw, -int mmu_idx) +int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong orig_vaddr, +int rw,int mmu_idx) {uint64_t asc = env->psw.mask &PSW_MASK_ASC ;target_ulong vaddr, raddr;int prot;DPRINTF ("%s: address 0x%" PRIx64" rw %d mmu_idx %d\n" , - __FUNCTION__, _vaddr, rw, mmu_idx); + __func__, _vaddr, rw, mmu_idx); - _vaddr &=TARGET_PAGE_MASK ; - vaddr = _vaddr; + orig_vaddr &=TARGET_PAGE_MASK ; + vaddr = orig_vaddr;/* 31-Bit mode */ if (!(env->psw.mask &PSW_MASK_64 )) {@@ -403,22 +404,23 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong _vaddr, int rw,/* check out of RAM access */ if (raddr > (ram_size + virtio_size)) { -DPRINTF ("%s: aaddr %" PRIx64" > ram_size %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: aaddr %" PRIx64" > ram_size %" PRIx64"\n" , __func__, (uint64_t )aaddr, (uint64_t )ram_size);trigger_pgm_exception (env,PGM_ADDRESSING ,ILC_LATER );return 1 ; } -DPRINTF ("%s: set tlb %" PRIx64" -> %" PRIx64" (%x)\n" , __FUNCTION__, +DPRINTF ("%s: set tlb %" PRIx64" -> %" PRIx64" (%x)\n" , __func__, (uint64_t )vaddr, (uint64_t )raddr, prot); -tlb_set_page (env, _vaddr, raddr, prot, +tlb_set_page (env, orig_vaddr, raddr, prot, mmu_idx,TARGET_PAGE_SIZE );return 0 ; } -target_phys_addr_t cpu_get_phys_page_debug (CPUS390XState *env,target_ulong vaddr) +target_phys_addr_t cpu_get_phys_page_debug (CPUS390XState *env, +target_ulong vaddr) {target_ulong raddr;int prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ;@@ -509,7 +511,7 @@ static void do_program_interrupt(CPUS390XState *env)break ; } -qemu_log ("%s: code=0x%x ilc=%d\n" , __FUNCTION__, env->int_pgm_code, ilc); +qemu_log ("%s: code=0x%x ilc=%d\n" , __func__, env->int_pgm_code, ilc); lowcore =cpu_physical_memory_map (env->psa, &len,1 );@@ -522,7 +524,7 @@ static void do_program_interrupt(CPUS390XState *env)cpu_physical_memory_unmap (lowcore, len,1 , len); -DPRINTF ("%s: %x %x %" PRIx64" %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: %x %x %" PRIx64" %" PRIx64"\n" , __func__, env->int_pgm_code, ilc, env->psw.mask, env->psw.addr);@@ -565,15 +567,15 @@ static void do_ext_interrupt(CPUS390XState *env) env->pending_int &= ~INTERRUPT_EXT ; } -DPRINTF ("%s: %" PRIx64" %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: %" PRIx64" %" PRIx64"\n" , __func__, env->psw.mask, env->psw.addr);load_psw (env, mask, addr); } -void do_interrupt (CPUS390XState *env) +void do_interrupt (CPUS390XState *env) { -qemu_log ("%s: %d at pc=%" PRIx64"\n" , __FUNCTION__, env->exception_index, +qemu_log ("%s: %d at pc=%" PRIx64"\n" , __func__, env->exception_index, env->psw.addr);s390_add_running_cpu (env);target-s390x/op_helper.c +248
-190@@ -31,13 +31,13 @@#include <linux/kvm.h> #endif -#if !defined (CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )#include "sysemu.h" #endif /*****************************************************************************/ /* Softmmu support */ -#if !defined (CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )#include "softmmu_exec.h" #define MMUSUFFIX _mmu@@ -95,7 +95,7 @@ void tlb_fill(CPUS390XState *env1, target_ulong addr, int is_write, int mmu_idx,/* raise an exception */ void HELPER (exception )(uint32_t excp) { -HELPER_LOG ("%s: exception %d\n" , __FUNCTION__, excp); +HELPER_LOG ("%s: exception %d\n" , __func__, excp); env->exception_index = excp;cpu_loop_exit (env); }@@ -164,7 +164,7 @@ uint32_t HELPER(nc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t cc =0 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);for (i =0 ; i <= l; i++) { x =ldub (dest + i) &ldub (src + i);if (x) {@@ -183,7 +183,7 @@ uint32_t HELPER(xc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t cc =0 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);#ifndef CONFIG_USER_ONLY /* xor with itself is the same as memset(0) */ @@ -217,7 +217,7 @@ uint32_t HELPER(oc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t cc =0 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);for (i =0 ; i <= l; i++) { x =ldub (dest + i) |ldub (src + i);if (x) {@@ -236,7 +236,7 @@ void HELPER(mvc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t l_64 = (l +1 ) /8 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);#ifndef CONFIG_USER_ONLY if ((l > 32) &&@@ -278,10 +278,11 @@ void HELPER(mvc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t HELPER (clc )(uint32_t l,uint64_t s1,uint64_t s2) {int i; -unsigned char x,y; +unsigned char x, y;uint32_t cc; +HELPER_LOG ("%s l %d s1 %" PRIx64" s2 %" PRIx64"\n" , - __FUNCTION__, l, s1, s2); + __func__, l, s1, s2);for (i =0 ; i <= l; i++) { x =ldub (s1 + i); y =ldub (s2 + i);@@ -295,7 +296,7 @@ uint32_t HELPER(clc)(uint32_t l, uint64_t s1, uint64_t s2) } } cc =0 ; -done: + done:HELPER_LOG ("\n" );return cc; }@@ -303,9 +304,10 @@ done:/* compare logical under mask */ uint32_t HELPER (clm )(uint32_t r1,uint32_t mask,uint64_t addr) { -uint8_t r,d; +uint8_t r, d;uint32_t cc; -HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64"\n" , __FUNCTION__, r1, + +HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64"\n" , __func__, r1, mask, addr); cc =0 ;while (mask) {@@ -313,7 +315,7 @@ uint32_t HELPER(clm)(uint32_t r1, uint32_t mask, uint64_t addr) d =ldub (addr); r = (r1 &0xff000000UL ) >>24 ;HELPER_LOG ("mask 0x%x %02x/%02x (0x%" PRIx64") " , mask, r, d, - addr); + addr);if (r < d) { cc =1 ;break ;@@ -334,7 +336,8 @@ uint32_t HELPER(clm)(uint32_t r1, uint32_t mask, uint64_t addr)void HELPER (stcm )(uint32_t r1,uint32_t mask,uint64_t addr) {uint8_t r; -HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%lx\n" , __FUNCTION__, r1, mask, + +HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%lx\n" , __func__, r1, mask, addr);while (mask) {if (mask &8 ) {@@ -355,6 +358,7 @@ void HELPER(mlg)(uint32_t r1, uint64_t v2)#if HOST_LONG_BITS ==64 && defined(__GNUC__)/* assuming 64-bit hosts have __uint128_t */ __uint128_t res = (__uint128_t )env->regs[r1 +1 ]; + res *= (__uint128_t )v2; env->regs[r1] = (uint64_t )(res >>64 ); env->regs[r1 +1 ] = (uint64_t )res;@@ -370,18 +374,18 @@ void HELPER(dlg)(uint32_t r1, uint64_t v2)if (!env->regs[r1]) {/* 64 -> 64/64 case */ - env->regs[r1] = env->regs[r1+1 ] % divisor; - env->regs[r1+1 ] = env->regs[r1+1 ] / divisor; + env->regs[r1] = env->regs[r1 +1 ] % divisor; + env->regs[r1 +1 ] = env->regs[r1 +1 ] / divisor;return ; }else { -#if HOST_LONG_BITS ==64 && defined(__GNUC__)/* assuming 64-bit hosts have __uint128_t */ __uint128_t dividend = (((__uint128_t )env->regs[r1]) <<64 ) | - (env->regs[r1+1 ]); + (env->regs[r1 +1 ]);__uint128_t quotient = dividend / divisor; - env->regs[r1+1 ] = quotient;__uint128_t remainder = dividend % divisor; + + env->regs[r1 +1 ] = quotient; env->regs[r1] = remainder;#else /* 32-bit hosts would need special wrapper functionality - just abort if @@ -431,7 +435,7 @@ uint32_t HELPER(srst)(uint32_t c, uint32_t r1, uint32_t r2)uint64_t str =get_address_31fix (r2);uint64_t end =get_address_31fix (r1); -HELPER_LOG ("%s: c %d *r1 0x%" PRIx64" *r2 0x%" PRIx64"\n" , __FUNCTION__, +HELPER_LOG ("%s: c %d *r1 0x%" PRIx64" *r2 0x%" PRIx64"\n" , __func__, c, env->regs[r1], env->regs[r2]);for (i = str; i != end; i++) {@@ -452,11 +456,12 @@ uint32_t HELPER(clst)(uint32_t c, uint32_t r1, uint32_t r2)uint64_t s2 =get_address_31fix (r2);uint8_t v1, v2;uint32_t cc; + c = c &0xff ;#ifdef CONFIG_USER_ONLY if (!c) {HELPER_LOG ("%s: comparing '%s' and '%s'\n" , - __FUNCTION__, (char *)g2h (s1), (char *)g2h (s2)); + __func__, (char *)g2h (s1), (char *)g2h (s2)); }#endif for (;;) {@@ -501,10 +506,11 @@ void HELPER(mvst)(uint32_t c, uint32_t r1, uint32_t r2)uint64_t dest =get_address_31fix (r1);uint64_t src =get_address_31fix (r2);uint8_t v; + c = c &0xff ;#ifdef CONFIG_USER_ONLY if (!c) { -HELPER_LOG ("%s: copy '%s' to 0x%lx\n" , __FUNCTION__, (char *)g2h (src), +HELPER_LOG ("%s: copy '%s' to 0x%lx\n" , __func__, (char *)g2h (src), dest); }#endif @@ -526,6 +532,7 @@ uint32_t HELPER(csg)(uint32_t r1, uint64_t a2, uint32_t r3)/* FIXME: locking? */ uint32_t cc;uint64_t v2 =ldq (a2); +if (env->regs[r1] == v2) { cc =0 ;stq (a2, env->regs[r3]);@@ -564,8 +571,9 @@ uint32_t HELPER(cs)(uint32_t r1, uint64_t a2, uint32_t r3) {/* FIXME: locking? */ uint32_t cc; -HELPER_LOG ("%s: r1 %d a2 0x%lx r3 %d\n" , __FUNCTION__, r1, a2, r3);uint32_t v2 =ldl (a2); + +HELPER_LOG ("%s: r1 %d a2 0x%lx r3 %d\n" , __func__, r1, a2, r3);if (((uint32_t )env->regs[r1]) == v2) { cc =0 ;stl (a2, (uint32_t )env->regs[r3]);@@ -612,14 +620,16 @@ static uint32_t helper_icm(uint32_t r1, uint64_t address, uint32_t mask)it does not change the program counter in other words: tricky... currently implemented by interpreting the cases it is most commonly used in -*/ +*/ uint32_t HELPER (ex )(uint32_t cc,uint64_t v1,uint64_t addr,uint64_t ret) {uint16_t insn =lduw_code (addr); -HELPER_LOG ("%s: v1 0x%lx addr 0x%lx insn 0x%x\n" , __FUNCTION__, v1, addr, - insn); + +HELPER_LOG ("%s: v1 0x%lx addr 0x%lx insn 0x%x\n" , __func__, v1, addr, + insn);if ((insn &0xf0ff ) ==0xd000 ) {uint32_t l, insn2, b1, b2, d1, d2; + l = v1 &0xff ; insn2 =ldl_code (addr +2 ); b1 = (insn2 >>28 ) &0xf ;@@ -645,13 +655,14 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret) } }else if ((insn &0xff00 ) ==0x0a00 ) {/* supervisor call */ -HELPER_LOG ("%s: svc %ld via execute\n" , __FUNCTION__, (insn|v1) &0xff ); +HELPER_LOG ("%s: svc %ld via execute\n" , __func__, (insn | v1) &0xff ); env->psw.addr = ret -4 ; - env->int_svc_code = (insn|v1) &0xff ; + env->int_svc_code = (insn | v1) &0xff ; env->int_svc_ilc =4 ;helper_exception (EXCP_SVC ); }else if ((insn &0xff00 ) ==0xbf00 ) {uint32_t insn2, r1, r3, b2, d2; + insn2 =ldl_code (addr +2 ); r1 = (insn2 >>20 ) &0xf ; r3 = (insn2 >>16 ) &0xf ;@@ -659,7 +670,7 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret) d2 = insn2 &0xfff ; cc =helper_icm (r1,get_address (0 , b2, d2), r3); }else { -abort: + abort:cpu_abort (env,"EXECUTE on instruction prefix 0x%x not implemented\n" , insn); }@@ -689,7 +700,7 @@ int32_t HELPER(nabs_i32)(int32_t val)/* absolute value 64-bit */ uint64_t HELPER (abs_i64 )(int64_t val) { -HELPER_LOG ("%s: val 0x%" PRIx64"\n" , __FUNCTION__, val); +HELPER_LOG ("%s: val 0x%" PRIx64"\n" , __func__, val);if (val <0 ) {return -val;@@ -774,9 +785,9 @@ void HELPER(ipm)(uint32_t cc, uint32_t r1)uint64_t r = env->regs[r1]; r &=0xffffffff00ffffffULL ; - r |= (cc <<28 ) | ( (env->psw.mask >>40 ) &0xf ); + r |= (cc <<28 ) | ((env->psw.mask >>40 ) &0xf ); env->regs[r1] = r; -HELPER_LOG ("%s: cc %d psw.mask 0x%lx r1 0x%lx\n" , __FUNCTION__, +HELPER_LOG ("%s: cc %d psw.mask 0x%lx r1 0x%lx\n" , __func__, cc, env->psw.mask, r); }@@ -908,7 +919,7 @@ uint32_t HELPER(clcle)(uint32_t r1, uint64_t a2, uint32_t r3)uint64_t srclen = env->regs[r3 +1 ];uint64_t src =get_address_31fix (r3);uint8_t pad = a2 &0xff ; -uint8_t v1 =0 ,v2 =0 ; +uint8_t v1 =0 , v2 =0 ;uint32_t cc =0 ;if (!(destlen || srclen)) {@@ -1036,7 +1047,7 @@ static uint32_t set_cc_nz_f128(float128 v)/* convert 32-bit int to 64-bit float */ void HELPER (cdfbr )(uint32_t f1,int32_t v2) { -HELPER_LOG ("%s: converting %d to f%d\n" , __FUNCTION__, v2, f1); +HELPER_LOG ("%s: converting %d to f%d\n" , __func__, v2, f1); env->fregs[f1].d =int32_to_float64 (v2, &env->fpu_status); }@@ -1044,6 +1055,7 @@ void HELPER(cdfbr)(uint32_t f1, int32_t v2)void HELPER (cxfbr )(uint32_t f1,int32_t v2) {CPU_QuadU v1; + v1.q =int32_to_float128 (v2, &env->fpu_status); env->fregs[f1].ll = v1.ll.upper; env->fregs[f1 +2 ].ll = v1.ll.lower;@@ -1052,14 +1064,14 @@ void HELPER(cxfbr)(uint32_t f1, int32_t v2)/* convert 64-bit int to 32-bit float */ void HELPER (cegbr )(uint32_t f1,int64_t v2) { -HELPER_LOG ("%s: converting %ld to f%d\n" , __FUNCTION__, v2, f1); +HELPER_LOG ("%s: converting %ld to f%d\n" , __func__, v2, f1); env->fregs[f1].l.upper =int64_to_float32 (v2, &env->fpu_status); }/* convert 64-bit int to 64-bit float */ void HELPER (cdgbr )(uint32_t f1,int64_t v2) { -HELPER_LOG ("%s: converting %ld to f%d\n" , __FUNCTION__, v2, f1); +HELPER_LOG ("%s: converting %ld to f%d\n" , __func__, v2, f1); env->fregs[f1].d =int64_to_float64 (v2, &env->fpu_status); }@@ -1067,8 +1079,9 @@ void HELPER(cdgbr)(uint32_t f1, int64_t v2)void HELPER (cxgbr )(uint32_t f1,int64_t v2) {CPU_QuadU x1; + x1.q =int64_to_float128 (v2, &env->fpu_status); -HELPER_LOG ("%s: converted %ld to 0x%lx and 0x%lx\n" , __FUNCTION__, v2, +HELPER_LOG ("%s: converted %ld to 0x%lx and 0x%lx\n" , __func__, v2, x1.ll.upper, x1.ll.lower); env->fregs[f1].ll = x1.ll.upper; env->fregs[f1 +2 ].ll = x1.ll.lower;@@ -1078,7 +1091,7 @@ void HELPER(cxgbr)(uint32_t f1, int64_t v2)void HELPER (cefbr )(uint32_t f1,int32_t v2) { env->fregs[f1].l.upper =int32_to_float32 (v2, &env->fpu_status); -HELPER_LOG ("%s: converting %d to 0x%d in f%d\n" , __FUNCTION__, v2, +HELPER_LOG ("%s: converting %d to 0x%d in f%d\n" , __func__, v2, env->fregs[f1].l.upper, f1); }@@ -1088,7 +1101,7 @@ uint32_t HELPER(aebr)(uint32_t f1, uint32_t f2) env->fregs[f1].l.upper =float32_add (env->fregs[f1].l.upper, env->fregs[f2].l.upper, &env->fpu_status); -HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __func__, env->fregs[f2].l.upper, env->fregs[f1].l.upper, f1);return set_cc_nz_f32 (env->fregs[f1].l.upper);@@ -1099,7 +1112,7 @@ uint32_t HELPER(adbr)(uint32_t f1, uint32_t f2) { env->fregs[f1].d =float64_add (env->fregs[f1].d, env->fregs[f2].d, &env->fpu_status); -HELPER_LOG ("%s: adding 0x%ld resulting in 0x%ld in f%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%ld resulting in 0x%ld in f%d\n" , __func__, env->fregs[f2].d, env->fregs[f1].d, f1);return set_cc_nz_f64 (env->fregs[f1].d);@@ -1111,7 +1124,7 @@ uint32_t HELPER(sebr)(uint32_t f1, uint32_t f2) env->fregs[f1].l.upper =float32_sub (env->fregs[f1].l.upper, env->fregs[f2].l.upper, &env->fpu_status); -HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __func__, env->fregs[f2].l.upper, env->fregs[f1].l.upper, f1);return set_cc_nz_f32 (env->fregs[f1].l.upper);@@ -1123,7 +1136,7 @@ uint32_t HELPER(sdbr)(uint32_t f1, uint32_t f2) env->fregs[f1].d =float64_sub (env->fregs[f1].d, env->fregs[f2].d, &env->fpu_status);HELPER_LOG ("%s: subtracting 0x%ld resulting in 0x%ld in f%d\n" , - __FUNCTION__, env->fregs[f2].d, env->fregs[f1].d, f1); + __func__, env->fregs[f2].d, env->fregs[f1].d, f1);return set_cc_nz_f64 (env->fregs[f1].d); }@@ -1140,12 +1153,13 @@ void HELPER(debr)(uint32_t f1, uint32_t f2)void HELPER (dxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_div (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1162,12 +1176,13 @@ void HELPER(mdbr)(uint32_t f1, uint32_t f2)void HELPER (mxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_mul (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1184,16 +1199,18 @@ void HELPER(ldebr)(uint32_t r1, uint32_t r2)void HELPER (ldxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x2; + x2.ll.upper = env->fregs[f2].ll; x2.ll.lower = env->fregs[f2 +2 ].ll; env->fregs[f1].d =float128_to_float64 (x2.q, &env->fpu_status); -HELPER_LOG ("%s: to 0x%ld\n" , __FUNCTION__, env->fregs[f1].d); +HELPER_LOG ("%s: to 0x%ld\n" , __func__, env->fregs[f1].d); }/* convert 64-bit float to 128-bit float */ void HELPER (lxdbr )(uint32_t f1,uint32_t f2) {CPU_QuadU res; + res.q =float64_to_float128 (env->fregs[f2].d, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1203,6 +1220,7 @@ void HELPER(lxdbr)(uint32_t f1, uint32_t f2)void HELPER (ledbr )(uint32_t f1,uint32_t f2) {float64 d2 = env->fregs[f2].d; + env->fregs[f1].l.upper =float64_to_float32 (d2, &env->fpu_status); }@@ -1210,10 +1228,11 @@ void HELPER(ledbr)(uint32_t f1, uint32_t f2)void HELPER (lexbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x2; + x2.ll.upper = env->fregs[f2].ll; x2.ll.lower = env->fregs[f2 +2 ].ll; env->fregs[f1].l.upper =float128_to_float32 (x2.q, &env->fpu_status); -HELPER_LOG ("%s: to 0x%d\n" , __FUNCTION__, env->fregs[f1].l.upper); +HELPER_LOG ("%s: to 0x%d\n" , __func__, env->fregs[f1].l.upper); }/* absolute value of 32-bit float */ @@ -1221,6 +1240,7 @@ uint32_t HELPER(lpebr)(uint32_t f1, uint32_t f2) {float32 v1;float32 v2 = env->fregs[f2].d; + v1 =float32_abs (v2); env->fregs[f1].d = v1;return set_cc_nz_f32 (v1);@@ -1231,6 +1251,7 @@ uint32_t HELPER(lpdbr)(uint32_t f1, uint32_t f2) {float64 v1;float64 v2 = env->fregs[f2].d; + v1 =float64_abs (v2); env->fregs[f1].d = v1;return set_cc_nz_f64 (v1);@@ -1241,6 +1262,7 @@ uint32_t HELPER(lpxbr)(uint32_t f1, uint32_t f2) {CPU_QuadU v1;CPU_QuadU v2; + v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; v1.q =float128_abs (v2.q);@@ -1267,6 +1289,7 @@ uint32_t HELPER(ltebr)(uint32_t f1, uint32_t f2)uint32_t HELPER (ltxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x; + x.ll.upper = env->fregs[f2].ll; x.ll.lower = env->fregs[f2 +2 ].ll; env->fregs[f1].ll = x.ll.upper;@@ -1294,6 +1317,7 @@ uint32_t HELPER(lcdbr)(uint32_t f1, uint32_t f2)uint32_t HELPER (lcxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x1, x2; + x2.ll.upper = env->fregs[f2].ll; x2.ll.lower = env->fregs[f2 +2 ].ll; x1.q =float128_chs (x2.q);@@ -1307,8 +1331,9 @@ void HELPER(aeb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; -HELPER_LOG ("%s: adding 0x%d from f%d and 0x%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%d from f%d and 0x%d\n" , __func__, v1, f1, v2.f); env->fregs[f1].l.upper =float32_add (v1, v2.f, &env->fpu_status); }@@ -1318,8 +1343,9 @@ void HELPER(deb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; -HELPER_LOG ("%s: dividing 0x%d from f%d by 0x%d\n" , __FUNCTION__, +HELPER_LOG ("%s: dividing 0x%d from f%d by 0x%d\n" , __func__, v1, f1, v2.f); env->fregs[f1].l.upper =float32_div (v1, v2.f, &env->fpu_status); }@@ -1329,8 +1355,9 @@ void HELPER(meeb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; -HELPER_LOG ("%s: multiplying 0x%d from f%d and 0x%d\n" , __FUNCTION__, +HELPER_LOG ("%s: multiplying 0x%d from f%d and 0x%d\n" , __func__, v1, f1, v2.f); env->fregs[f1].l.upper =float32_mul (v1, v2.f, &env->fpu_status); }@@ -1340,7 +1367,8 @@ uint32_t HELPER(cebr)(uint32_t f1, uint32_t f2) {float32 v1 = env->fregs[f1].l.upper;float32 v2 = env->fregs[f2].l.upper; -HELPER_LOG ("%s: comparing 0x%d from f%d and 0x%d\n" , __FUNCTION__, + +HELPER_LOG ("%s: comparing 0x%d from f%d and 0x%d\n" , __func__, v1, f1, v2);return set_cc_f32 (v1, v2); }@@ -1350,7 +1378,8 @@ uint32_t HELPER(cdbr)(uint32_t f1, uint32_t f2) {float64 v1 = env->fregs[f1].d;float64 v2 = env->fregs[f2].d; -HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%ld\n" , __FUNCTION__, + +HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%ld\n" , __func__, v1, f1, v2);return set_cc_f64 (v1, v2); }@@ -1359,14 +1388,15 @@ uint32_t HELPER(cdbr)(uint32_t f1, uint32_t f2)uint32_t HELPER (cxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll;return float_comp_to_cc (float128_compare_quiet (v1.q, v2.q, - &env->fpu_status)); + &env->fpu_status)); }/* 64-bit FP compare RM */ @@ -1374,8 +1404,9 @@ uint32_t HELPER(cdb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%lx\n" , __FUNCTION__, v1, +HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%lx\n" , __func__, v1, f1, v2.d);return set_cc_f64 (v1, v2.d); }@@ -1385,8 +1416,9 @@ uint32_t HELPER(adb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: adding 0x%lx from f%d and 0x%lx\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%lx from f%d and 0x%lx\n" , __func__, v1, f1, v2.d); env->fregs[f1].d = v1 =float64_add (v1, v2.d, &env->fpu_status);return set_cc_nz_f64 (v1);@@ -1397,6 +1429,7 @@ void HELPER(seb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; env->fregs[f1].l.upper =float32_sub (v1, v2.f, &env->fpu_status); }@@ -1406,6 +1439,7 @@ uint32_t HELPER(sdb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); env->fregs[f1].d = v1 =float64_sub (v1, v2.d, &env->fpu_status);return set_cc_nz_f64 (v1);@@ -1416,8 +1450,9 @@ void HELPER(mdb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: multiplying 0x%lx from f%d and 0x%ld\n" , __FUNCTION__, +HELPER_LOG ("%s: multiplying 0x%lx from f%d and 0x%ld\n" , __func__, v1, f1, v2.d); env->fregs[f1].d =float64_mul (v1, v2.d, &env->fpu_status); }@@ -1427,8 +1462,9 @@ void HELPER(ddb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: dividing 0x%lx from f%d by 0x%ld\n" , __FUNCTION__, +HELPER_LOG ("%s: dividing 0x%lx from f%d by 0x%ld\n" , __func__, v1, f1, v2.d); env->fregs[f1].d =float64_div (v1, v2.d, &env->fpu_status); }@@ -1464,6 +1500,7 @@ static void set_round_mode(int m3)uint32_t HELPER (cgebr )(uint32_t r1,uint32_t f2,uint32_t m3) {float32 v2 = env->fregs[f2].l.upper; +set_round_mode (m3); env->regs[r1] =float32_to_int64 (v2, &env->fpu_status);return set_cc_nz_f32 (v2);@@ -1473,6 +1510,7 @@ uint32_t HELPER(cgebr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cgdbr )(uint32_t r1,uint32_t f2,uint32_t m3) {float64 v2 = env->fregs[f2].d; +set_round_mode (m3); env->regs[r1] =float64_to_int64 (v2, &env->fpu_status);return set_cc_nz_f64 (v2);@@ -1482,6 +1520,7 @@ uint32_t HELPER(cgdbr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cgxbr )(uint32_t r1,uint32_t f2,uint32_t m3) {CPU_QuadU v2; + v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll;set_round_mode (m3);@@ -1501,9 +1540,10 @@ uint32_t HELPER(cgxbr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cfebr )(uint32_t r1,uint32_t f2,uint32_t m3) {float32 v2 = env->fregs[f2].l.upper; +set_round_mode (m3); env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | -float32_to_int32 (v2, &env->fpu_status); +float32_to_int32 (v2, &env->fpu_status);return set_cc_nz_f32 (v2); }@@ -1511,9 +1551,10 @@ uint32_t HELPER(cfebr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cfdbr )(uint32_t r1,uint32_t f2,uint32_t m3) {float64 v2 = env->fregs[f2].d; +set_round_mode (m3); env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | -float64_to_int32 (v2, &env->fpu_status); +float64_to_int32 (v2, &env->fpu_status);return set_cc_nz_f64 (v2); }@@ -1521,10 +1562,11 @@ uint32_t HELPER(cfdbr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cfxbr )(uint32_t r1,uint32_t f2,uint32_t m3) {CPU_QuadU v2; + v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | -float128_to_int32 (v2.q, &env->fpu_status); +float128_to_int32 (v2.q, &env->fpu_status);return set_cc_nz_f128 (v2.q); }@@ -1544,6 +1586,7 @@ void HELPER(lzdr)(uint32_t f1)void HELPER (lzxr )(uint32_t f1) {CPU_QuadU x; + x.q =float64_to_float128 (float64_zero, &env->fpu_status); env->fregs[f1].ll = x.ll.upper; env->fregs[f1 +1 ].ll = x.ll.lower;@@ -1553,12 +1596,13 @@ void HELPER(lzxr)(uint32_t f1)uint32_t HELPER (sxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_sub (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1569,12 +1613,13 @@ uint32_t HELPER(sxbr)(uint32_t f1, uint32_t f2)uint32_t HELPER (axbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_add (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1599,8 +1644,9 @@ void HELPER(ddbr)(uint32_t f1, uint32_t f2)/* 64-bit FP multiply and add RM */ void HELPER (madb )(uint32_t f1,uint64_t a2,uint32_t f3) { -HELPER_LOG ("%s: f1 %d a2 0x%lx f3 %d\n" , __FUNCTION__, f1, a2, f3);CPU_DoubleU v2; + +HELPER_LOG ("%s: f1 %d a2 0x%lx f3 %d\n" , __func__, f1, a2, f3); v2.ll =ldq (a2); env->fregs[f1].d = float64_add(env->fregs[f1].d, float64_mul(v2.d, env->fregs[f3].d,@@ -1611,7 +1657,7 @@ void HELPER(madb)(uint32_t f1, uint64_t a2, uint32_t f3)/* 64-bit FP multiply and add RR */ void HELPER (madbr )(uint32_t f1,uint32_t f3,uint32_t f2) { -HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __FUNCTION__, f1, f2, f3); +HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __func__, f1, f2, f3); env->fregs[f1].d = float64_add(float64_mul(env->fregs[f2].d, env->fregs[f3].d, &env->fpu_status),@@ -1621,7 +1667,7 @@ void HELPER(madbr)(uint32_t f1, uint32_t f3, uint32_t f2)/* 64-bit FP multiply and subtract RR */ void HELPER (msdbr )(uint32_t f1,uint32_t f3,uint32_t f2) { -HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __FUNCTION__, f1, f2, f3); +HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __func__, f1, f2, f3); env->fregs[f1].d = float64_sub(float64_mul(env->fregs[f2].d, env->fregs[f3].d, &env->fpu_status),@@ -1642,6 +1688,7 @@ void HELPER(maebr)(uint32_t f1, uint32_t f3, uint32_t f2)void HELPER (ldeb )(uint32_t f1,uint64_t a2) {uint32_t v2; + v2 =ldl (a2); env->fregs[f1].d =float32_to_float64 (v2, &env->fpu_status);@@ -1651,8 +1698,9 @@ void HELPER(ldeb)(uint32_t f1, uint64_t a2)void HELPER (lxdb )(uint32_t f1,uint64_t a2) {CPU_DoubleU v2; - v2.ll =ldq (a2);CPU_QuadU v1; + + v2.ll =ldq (a2); v1.q =float64_to_float128 (v2.d, &env->fpu_status); env->fregs[f1].ll = v1.ll.upper; env->fregs[f1 +2 ].ll = v1.ll.lower;@@ -1665,7 +1713,7 @@ uint32_t HELPER(tceb)(uint32_t f1, uint64_t m2)int neg =float32_is_neg (v1);uint32_t cc =0 ; -HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __FUNCTION__, (long )v1, m2, neg); +HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __func__, (long )v1, m2, neg); if ((float32_is_zero(v1) && (m2 & (1 << (11-neg)))) || (float32_is_infinity(v1) && (m2 & (1 << (5-neg)))) || (float32_is_any_nan(v1) && (m2 & (1 << (3-neg)))) ||@@ -1687,7 +1735,7 @@ uint32_t HELPER(tcdb)(uint32_t f1, uint64_t m2)int neg =float64_is_neg (v1);uint32_t cc =0 ; -HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __FUNCTION__, v1, m2, neg); +HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __func__, v1, m2, neg); if ((float64_is_zero(v1) && (m2 & (1 << (11-neg)))) || (float64_is_infinity(v1) && (m2 & (1 << (5-neg)))) || (float64_is_any_nan(v1) && (m2 & (1 << (3-neg)))) ||@@ -1706,10 +1754,12 @@ uint32_t HELPER(tcxb)(uint32_t f1, uint64_t m2) {CPU_QuadU v1;uint32_t cc =0 ; +int neg; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -int neg =float128_is_neg (v1.q); + neg =float128_is_neg (v1.q); if ((float128_is_zero(v1.q) && (m2 & (1 << (11-neg)))) || (float128_is_infinity(v1.q) && (m2 & (1 << (5-neg)))) || (float128_is_any_nan(v1.q) && (m2 & (1 << (3-neg)))) ||@@ -1787,7 +1837,7 @@ void HELPER(cksm)(uint32_t r1, uint32_t r2)/* store result */ env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | - ((uint32_t )cksm + (cksm >>32 )); + ((uint32_t )cksm + (cksm >>32 )); } static inline uint32_t cc_calc_ltgt_32(CPUS390XState *env, int32_t src,@@ -1848,10 +1898,12 @@ static inline uint32_t cc_calc_ltugtu_64(CPUS390XState *env, uint64_t src, } } -static inline uint32_t cc_calc_tm_32 (CPUS390XState *env,uint32_t val,uint32_t mask) +static inline uint32_t cc_calc_tm_32 (CPUS390XState *env,uint32_t val, +uint32_t mask) { -HELPER_LOG ("%s: val 0x%x mask 0x%x\n" , __FUNCTION__, val, mask);uint16_t r = val & mask; + +HELPER_LOG ("%s: val 0x%x mask 0x%x\n" , __func__, val, mask);if (r ==0 || mask ==0 ) {return 0 ; }else if (r == mask) {@@ -1862,10 +1914,12 @@ static inline uint32_t cc_calc_tm_32(CPUS390XState *env, uint32_t val, uint32_t }/* set condition code for test under mask */ -static inline uint32_t cc_calc_tm_64 (CPUS390XState *env,uint64_t val,uint32_t mask) +static inline uint32_t cc_calc_tm_64 (CPUS390XState *env,uint64_t val, +uint32_t mask) {uint16_t r = val & mask; -HELPER_LOG ("%s: val 0x%lx mask 0x%x r 0x%x\n" , __FUNCTION__, val, mask, r); + +HELPER_LOG ("%s: val 0x%lx mask 0x%x r 0x%x\n" , __func__, val, mask, r);if (r ==0 || mask ==0 ) {return 0 ; }else if (r == mask) {@@ -1888,8 +1942,8 @@ static inline uint32_t cc_calc_nz(CPUS390XState *env, uint64_t dst)return !!dst; } -static inline uint32_t cc_calc_add_64 (CPUS390XState *env,int64_t a1,int64_t a2, -int64_t ar) +static inline uint32_t cc_calc_add_64 (CPUS390XState *env,int64_t a1, +int64_t a2,int64_t ar) {if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) {return 3 ;/* overflow */ @@ -1904,8 +1958,8 @@ static inline uint32_t cc_calc_add_64(CPUS390XState *env, int64_t a1, int64_t a2 } } -static inline uint32_t cc_calc_addu_64 (CPUS390XState *env,uint64_t a1,uint64_t a2, -uint64_t ar) +static inline uint32_t cc_calc_addu_64 (CPUS390XState *env,uint64_t a1, +uint64_t a2,uint64_t ar) {if (ar ==0 ) {if (a1) {@@ -1915,15 +1969,15 @@ static inline uint32_t cc_calc_addu_64(CPUS390XState *env, uint64_t a1, uint64_t } }else {if (ar < a1 || ar < a2) { -return 3 ; +return 3 ; }else { -return 1 ; +return 1 ; } } } -static inline uint32_t cc_calc_sub_64 (CPUS390XState *env,int64_t a1,int64_t a2, -int64_t ar) +static inline uint32_t cc_calc_sub_64 (CPUS390XState *env,int64_t a1, +int64_t a2,int64_t ar) {if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ @@ -1938,8 +1992,8 @@ static inline uint32_t cc_calc_sub_64(CPUS390XState *env, int64_t a1, int64_t a2 } } -static inline uint32_t cc_calc_subu_64 (CPUS390XState *env,uint64_t a1,uint64_t a2, -uint64_t ar) +static inline uint32_t cc_calc_subu_64 (CPUS390XState *env,uint64_t a1, +uint64_t a2,uint64_t ar) {if (ar ==0 ) {return 2 ;@@ -1982,8 +2036,8 @@ static inline uint32_t cc_calc_comp_64(CPUS390XState *env, int64_t dst) } -static inline uint32_t cc_calc_add_32 (CPUS390XState *env,int32_t a1,int32_t a2, -int32_t ar) +static inline uint32_t cc_calc_add_32 (CPUS390XState *env,int32_t a1, +int32_t a2,int32_t ar) {if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) {return 3 ;/* overflow */ @@ -1998,26 +2052,26 @@ static inline uint32_t cc_calc_add_32(CPUS390XState *env, int32_t a1, int32_t a2 } } -static inline uint32_t cc_calc_addu_32 (CPUS390XState *env,uint32_t a1,uint32_t a2, -uint32_t ar) +static inline uint32_t cc_calc_addu_32 (CPUS390XState *env,uint32_t a1, +uint32_t a2,uint32_t ar) {if (ar ==0 ) {if (a1) { -return 2 ; +return 2 ; }else { -return 0 ; +return 0 ; } }else {if (ar < a1 || ar < a2) { -return 3 ; +return 3 ; }else { -return 1 ; +return 1 ; } } } -static inline uint32_t cc_calc_sub_32 (CPUS390XState *env,int32_t a1,int32_t a2, -int32_t ar) +static inline uint32_t cc_calc_sub_32 (CPUS390XState *env,int32_t a1, +int32_t a2,int32_t ar) {if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ @@ -2032,8 +2086,8 @@ static inline uint32_t cc_calc_sub_32(CPUS390XState *env, int32_t a1, int32_t a2 } } -static inline uint32_t cc_calc_subu_32 (CPUS390XState *env,uint32_t a1,uint32_t a2, -uint32_t ar) +static inline uint32_t cc_calc_subu_32 (CPUS390XState *env,uint32_t a1, +uint32_t a2,uint32_t ar) {if (ar ==0 ) {return 2 ;@@ -2076,11 +2130,12 @@ static inline uint32_t cc_calc_comp_32(CPUS390XState *env, int32_t dst) }/* calculate condition code for insert character under mask insn */ -static inline uint32_t cc_calc_icm_32 (CPUS390XState *env,uint32_t mask,uint32_t val) +static inline uint32_t cc_calc_icm_32 (CPUS390XState *env,uint32_t mask, +uint32_t val) { -HELPER_LOG ("%s: mask 0x%x val %d\n" , __FUNCTION__, mask, val);uint32_t cc; +HELPER_LOG ("%s: mask 0x%x val %d\n" , __func__, mask, val);if (mask ==0xf ) {if (!val) {return 0 ;@@ -2107,7 +2162,8 @@ static inline uint32_t cc_calc_icm_32(CPUS390XState *env, uint32_t mask, uint32_return cc; } -static inline uint32_t cc_calc_slag (CPUS390XState *env,uint64_t src,uint64_t shift) +static inline uint32_t cc_calc_slag (CPUS390XState *env,uint64_t src, +uint64_t shift) {uint64_t mask = ((1ULL << shift) -1ULL ) << (64 - shift);uint64_t match, r;@@ -2136,8 +2192,8 @@ static inline uint32_t cc_calc_slag(CPUS390XState *env, uint64_t src, uint64_t s } -static inline uint32_t do_calc_cc (CPUS390XState *env,uint32_t cc_op,uint64_t src, -uint64_t dst,uint64_t vr) +static inline uint32_t do_calc_cc (CPUS390XState *env,uint32_t cc_op, +uint64_t src,uint64_t dst,uint64_t vr) {uint32_t r =0 ;@@ -2244,7 +2300,7 @@ static inline uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t scpu_abort (env,"Unknown CC operation: %s\n" ,cc_name (cc_op)); } -HELPER_LOG ("%s: %15s 0x%016lx 0x%016lx 0x%016lx = %d\n" , __FUNCTION__, +HELPER_LOG ("%s: %15s 0x%016lx 0x%016lx 0x%016lx = %d\n" , __func__,cc_name (cc_op), src, dst, vr, r);return r; }@@ -2334,6 +2390,7 @@ void HELPER(tr)(uint32_t len, uint64_t array, uint64_t trans)for (i =0 ; i <= len; i++) {uint8_t byte =ldub (array + i);uint8_t new_byte =ldub (trans + byte); +stb (array + i, new_byte); } }@@ -2363,7 +2420,7 @@ static void program_interrupt(CPUS390XState *env, uint32_t code, int ilc) }/* -* ret < 0 indicates program check, ret = 0,1,2,3 -> cc +* ret < 0 indicates program check, ret = 0, 1, 2, 3 -> cc */ int sclp_service_call (CPUS390XState *env,uint32_t sccb,uint64_t code) {@@ -2382,24 +2439,24 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code)return -PGM_SPECIFICATION ; } -switch (code) { -case SCLP_CMDW_READ_SCP_INFO : -case SCLP_CMDW_READ_SCP_INFO_FORCED : -while ((ram_size >> (20 + shift)) >65535 ) { - shift++; - } -stw_phys (sccb +SCP_MEM_CODE , ram_size >> (20 + shift)); -stb_phys (sccb +SCP_INCREMENT ,1 << shift); -stw_phys (sccb +SCP_RESPONSE_CODE ,0x10 ); +switch (code) { +case SCLP_CMDW_READ_SCP_INFO : +case SCLP_CMDW_READ_SCP_INFO_FORCED : +while ((ram_size >> (20 + shift)) >65535 ) { + shift++; + } +stw_phys (sccb +SCP_MEM_CODE , ram_size >> (20 + shift)); +stb_phys (sccb +SCP_INCREMENT ,1 << shift); +stw_phys (sccb +SCP_RESPONSE_CODE ,0x10 ); -s390_sclp_extint (sccb & ~3 ); -break ; -default : +s390_sclp_extint (sccb & ~3 ); +break ; +default :#ifdef DEBUG_HELPER -printf ("KVM: invalid sclp call 0x%x / 0x%" PRIx64"x\n" , sccb, code); +printf ("KVM: invalid sclp call 0x%x / 0x%" PRIx64"x\n" , sccb, code);#endif - r =3 ; -break ; + r =3 ; +break ; }return r;@@ -2479,7 +2536,7 @@ static inline uint64_t clock_value(CPUS390XState *env)uint64_t time; time = env->tod_offset + -time2tod (qemu_get_clock_ns (vm_clock) - env->tod_basetime); +time2tod (qemu_get_clock_ns (vm_clock) - env->tod_basetime);return time; }@@ -2503,7 +2560,6 @@ uint32_t HELPER(stcke)(uint64_t a1)/* XXX programmable fields */ stw (a1 +17 ,0 ); -return 0 ; }@@ -2584,7 +2640,7 @@ uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)ebcdic_put (sysib.model,"QEMU " ,16 );ebcdic_put (sysib.sequence,"QEMU " ,16 );ebcdic_put (sysib.plant,"QEMU" ,4 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); }else if ((sel1 ==2 ) && (sel2 ==1 )) {/* Basic Machine CPU */ struct sysib_121 sysib;@@ -2594,7 +2650,7 @@ uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)ebcdic_put (sysib.sequence,"QEMUQEMUQEMUQEMU" ,16 );ebcdic_put (sysib.plant,"QEMU" ,4 );stw_p (&sysib.cpu_addr, env->cpu_num); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); }else if ((sel1 ==2 ) && (sel2 ==2 )) {/* Basic Machine CPUs */ struct sysib_122 sysib;@@ -2606,68 +2662,68 @@ uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)stw_p (&sysib.active_cpus,1 );stw_p (&sysib.standby_cpus,0 );stw_p (&sysib.reserved_cpus,0 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); }else { cc =3 ; }break ;case STSI_LEVEL_2 : - { -if ((sel1 ==2 ) && (sel2 ==1 )) { -/* LPAR CPU */ -struct sysib_221 sysib; - -memset (&sysib,0 ,sizeof (sysib)); -/* XXX make different for different CPUs? */ -ebcdic_put (sysib.sequence,"QEMUQEMUQEMUQEMU" ,16 ); -ebcdic_put (sysib.plant,"QEMU" ,4 ); -stw_p (&sysib.cpu_addr, env->cpu_num); -stw_p (&sysib.cpu_id,0 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); - }else if ((sel1 ==2 ) && (sel2 ==2 )) { -/* LPAR CPUs */ -struct sysib_222 sysib; - -memset (&sysib,0 ,sizeof (sysib)); -stw_p (&sysib.lpar_num,0 ); - sysib.lcpuc =0 ; -/* XXX change when SMP comes */ -stw_p (&sysib.total_cpus,1 ); -stw_p (&sysib.conf_cpus,1 ); -stw_p (&sysib.standby_cpus,0 ); -stw_p (&sysib.reserved_cpus,0 ); -ebcdic_put (sysib.name,"QEMU " ,8 ); -stl_p (&sysib.caf,1000 ); -stw_p (&sysib.dedicated_cpus,0 ); -stw_p (&sysib.shared_cpus,0 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); - }else { - cc =3 ; + { +if ((sel1 ==2 ) && (sel2 ==1 )) { +/* LPAR CPU */ +struct sysib_221 sysib; + +memset (&sysib,0 ,sizeof (sysib)); +/* XXX make different for different CPUs? */ +ebcdic_put (sysib.sequence,"QEMUQEMUQEMUQEMU" ,16 ); +ebcdic_put (sysib.plant,"QEMU" ,4 ); +stw_p (&sysib.cpu_addr, env->cpu_num); +stw_p (&sysib.cpu_id,0 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); + }else if ((sel1 ==2 ) && (sel2 ==2 )) { +/* LPAR CPUs */ +struct sysib_222 sysib; + +memset (&sysib,0 ,sizeof (sysib)); +stw_p (&sysib.lpar_num,0 ); + sysib.lcpuc =0 ; +/* XXX change when SMP comes */ +stw_p (&sysib.total_cpus,1 ); +stw_p (&sysib.conf_cpus,1 ); +stw_p (&sysib.standby_cpus,0 ); +stw_p (&sysib.reserved_cpus,0 ); +ebcdic_put (sysib.name,"QEMU " ,8 ); +stl_p (&sysib.caf,1000 ); +stw_p (&sysib.dedicated_cpus,0 ); +stw_p (&sysib.shared_cpus,0 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); + }else { + cc =3 ; + } +break ; } -break ; - }case STSI_LEVEL_3 : - { -if ((sel1 ==2 ) && (sel2 ==2 )) { -/* VM CPUs */ -struct sysib_322 sysib; - -memset (&sysib,0 ,sizeof (sysib)); - sysib.count =1 ; -/* XXX change when SMP comes */ -stw_p (&sysib.vm[0 ].total_cpus,1 ); -stw_p (&sysib.vm[0 ].conf_cpus,1 ); -stw_p (&sysib.vm[0 ].standby_cpus,0 ); -stw_p (&sysib.vm[0 ].reserved_cpus,0 ); -ebcdic_put (sysib.vm[0 ].name,"KVMguest" ,8 ); -stl_p (&sysib.vm[0 ].caf,1000 ); -ebcdic_put (sysib.vm[0 ].cpi,"KVM/Linux " ,16 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); - }else { - cc =3 ; + { +if ((sel1 ==2 ) && (sel2 ==2 )) { +/* VM CPUs */ +struct sysib_322 sysib; + +memset (&sysib,0 ,sizeof (sysib)); + sysib.count =1 ; +/* XXX change when SMP comes */ +stw_p (&sysib.vm[0 ].total_cpus,1 ); +stw_p (&sysib.vm[0 ].conf_cpus,1 ); +stw_p (&sysib.vm[0 ].standby_cpus,0 ); +stw_p (&sysib.vm[0 ].reserved_cpus,0 ); +ebcdic_put (sysib.vm[0 ].name,"KVMguest" ,8 ); +stl_p (&sysib.vm[0 ].caf,1000 ); +ebcdic_put (sysib.vm[0 ].cpi,"KVM/Linux " ,16 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); + }else { + cc =3 ; + } +break ; } -break ; - }case STSI_LEVEL_CURRENT : env->regs[0 ] =STSI_LEVEL_3 ;break ;@@ -2781,6 +2837,7 @@ uint32_t HELPER(rrbe)(uint32_t r1, uint64_t r2) {uint8_t re;uint8_t key; +if (r2 > ram_size) {return 0 ; }@@ -2865,7 +2922,7 @@ static uint32_t mvc_asc(int64_t l, uint64_t a1, uint64_t mode1, uint64_t a2,uint32_t HELPER (mvcs )(uint64_t l,uint64_t a1,uint64_t a2) {HELPER_LOG ("%s: %16" PRIx64" %16" PRIx64" %16" PRIx64"\n" , - __FUNCTION__, l, a1, a2); + __func__, l, a1, a2);return mvc_asc (l, a1,PSW_ASC_SECONDARY , a2,PSW_ASC_PRIMARY ); }@@ -2873,7 +2930,7 @@ uint32_t HELPER(mvcs)(uint64_t l, uint64_t a1, uint64_t a2)uint32_t HELPER (mvcp )(uint64_t l,uint64_t a1,uint64_t a2) {HELPER_LOG ("%s: %16" PRIx64" %16" PRIx64" %16" PRIx64"\n" , - __FUNCTION__, l, a1, a2); + __func__, l, a1, a2);return mvc_asc (l, a1,PSW_ASC_PRIMARY , a2,PSW_ASC_SECONDARY ); }@@ -2883,9 +2940,9 @@ uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr)int cc =0 ;HELPER_LOG ("%s: %016" PRIx64" %08x %016" PRIx64"\n" , - __FUNCTION__, order_code, r1, cpu_addr); + __func__, order_code, r1, cpu_addr); -/* Remember: Use "R1 or R1+1, whichever is the odd-numbered register" +/* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register" as parameter (input). Status (output) is always R1. */ switch (order_code) {@@ -2901,7 +2958,7 @@ uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr) env->regs[r1] &=0xffffffff00000000ULL ; cc =1 ;break ; -#if !defined (CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )case SIGP_RESTART :qemu_system_reset_request ();cpu_loop_exit (env);@@ -2922,7 +2979,7 @@ uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr)void HELPER (sacf )(uint64_t a1) { -HELPER_LOG ("%s: %16" PRIx64"\n" , __FUNCTION__, a1); +HELPER_LOG ("%s: %16" PRIx64"\n" , __func__, a1);switch (a1 &0xf00 ) {case 0x000 :@@ -2953,13 +3010,13 @@ void HELPER(ipte)(uint64_t pte_addr, uint64_t vaddr)/* XXX broadcast to other CPUs */ /* XXX Linux is nice enough to give us the exact pte address. -According to spec we'd have to find it out ourselves */ +According to spec we'd have to find it out ourselves */ /* XXX Linux is fine with overwriting the pte, the spec requires -us to only set the invalid bit */ +us to only set the invalid bit */ stq_phys (pte_addr, pte | _PAGE_INVALID);/* XXX we exploit the fact that Linux passes the exact virtual -address here - it's not obliged to! */ +address here - it's not obliged to! */ tlb_flush_page (env, page);/* XXX 31-bit hack */ @@ -3008,7 +3065,8 @@ uint32_t HELPER(lra)(uint64_t addr, uint32_t r1) env->exception_index = old_exc;if (!(env->psw.mask &PSW_MASK_64 )) { - env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | (ret &0xffffffffULL ); + env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | + (ret &0xffffffffULL ); }else { env->regs[r1] = ret; }Signature · 1 line
1.7.2.5
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
In reply to Blue SwirlQuoted 2 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
My cheesy test harness for running a popular embedded benchmark in system mode (x86-64 host, ARM guest) shows mostly slowdowns of between 2 and 3% with this patch applied. I think that falls into "not fantastic but acceptable for the cleanup".
-- PMM
Re: [Qemu-devel] [PATCH 20/21] target-mips: switch to AREG0 free mode
In reply to Blue SwirlQuoted 4 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>
Quoted 8 lines
--- configure | 2 +- target-mips/Makefile.objs | 2 - target-mips/cpu.h | 16 +- target-mips/helper.h | 410 +++++++++--------- target-mips/op_helper.c | 1065 ++++++++++++++++++++++++--------------------- target-mips/translate.c | 754 ++++++++++++++++---------------- 6 files changed, 1163 insertions(+), 1086 deletions(-)
Please commit this patch asap after the 1.2 release, even if the patches for the other targets are not ready, so that it doesn't hold the development.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 19/21] target-sh4: switch to AREG0 free mode
In reply to Aurelien JarnoQuoted 1,034 lines · Aurelien Jarno
Quoted 1,033 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>--- configure | 2 +- target-sh4/Makefile.objs | 2 - target-sh4/helper.h | 84 +++++++++++----------- target-sh4/op_helper.c | 182 ++++++++++++++++++++++----------------------- target-sh4/translate.c | 114 ++++++++++++++++------------- 5 files changed, 195 insertions(+), 189 deletions(-)configure +1
-1@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esactarget-sh4/Makefile.objs +0
-2@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)target-sh4/helper.h +42
-42@@ -1,54 +1,54 @@#include "def-helper.h" -DEF_HELPER_0(ldtlb, void) -DEF_HELPER_0(raise_illegal_instruction, void) -DEF_HELPER_0(raise_slot_illegal_instruction, void) -DEF_HELPER_0(raise_fpu_disable, void) -DEF_HELPER_0(raise_slot_fpu_disable, void) -DEF_HELPER_0(debug, void) -DEF_HELPER_1(sleep, void, i32) -DEF_HELPER_1(trapa, void, i32) +DEF_HELPER_1(ldtlb, void, env) +DEF_HELPER_1(raise_illegal_instruction, void, env) +DEF_HELPER_1(raise_slot_illegal_instruction, void, env) +DEF_HELPER_1(raise_fpu_disable, void, env) +DEF_HELPER_1(raise_slot_fpu_disable, void, env) +DEF_HELPER_1(debug, void, env) +DEF_HELPER_2(sleep, void, env, i32) +DEF_HELPER_2(trapa, void, env, i32) -DEF_HELPER_2(movcal, void, i32, i32) -DEF_HELPER_0(discard_movcal_backup, void) -DEF_HELPER_1(ocbi, void, i32) +DEF_HELPER_3(movcal, void, env, i32, i32) +DEF_HELPER_1(discard_movcal_backup, void, env) +DEF_HELPER_2(ocbi, void, env, i32) -DEF_HELPER_2(addv, i32, i32, i32) -DEF_HELPER_2(addc, i32, i32, i32) -DEF_HELPER_2(subv, i32, i32, i32) -DEF_HELPER_2(subc, i32, i32, i32) -DEF_HELPER_2(div1, i32, i32, i32) -DEF_HELPER_2(macl, void, i32, i32) -DEF_HELPER_2(macw, void, i32, i32) +DEF_HELPER_3(addv, i32, env, i32, i32) +DEF_HELPER_3(addc, i32, env, i32, i32) +DEF_HELPER_3(subv, i32, env, i32, i32) +DEF_HELPER_3(subc, i32, env, i32, i32) +DEF_HELPER_3(div1, i32, env, i32, i32) +DEF_HELPER_3(macl, void, env, i32, i32) +DEF_HELPER_3(macw, void, env, i32, i32) -DEF_HELPER_1(ld_fpscr, void, i32) +DEF_HELPER_2(ld_fpscr, void, env, i32) DEF_HELPER_1(fabs_FT, f32, f32) DEF_HELPER_1(fabs_DT, f64, f64) -DEF_HELPER_2(fadd_FT, f32, f32, f32) -DEF_HELPER_2(fadd_DT, f64, f64, f64) -DEF_HELPER_1(fcnvsd_FT_DT, f64, f32) -DEF_HELPER_1(fcnvds_DT_FT, f32, f64) +DEF_HELPER_3(fadd_FT, f32, env, f32, f32) +DEF_HELPER_3(fadd_DT, f64, env, f64, f64) +DEF_HELPER_2(fcnvsd_FT_DT, f64, env, f32) +DEF_HELPER_2(fcnvds_DT_FT, f32, env, f64) -DEF_HELPER_2(fcmp_eq_FT, void, f32, f32) -DEF_HELPER_2(fcmp_eq_DT, void, f64, f64) -DEF_HELPER_2(fcmp_gt_FT, void, f32, f32) -DEF_HELPER_2(fcmp_gt_DT, void, f64, f64) -DEF_HELPER_2(fdiv_FT, f32, f32, f32) -DEF_HELPER_2(fdiv_DT, f64, f64, f64) -DEF_HELPER_1(float_FT, f32, i32) -DEF_HELPER_1(float_DT, f64, i32) -DEF_HELPER_3(fmac_FT, f32, f32, f32, f32) -DEF_HELPER_2(fmul_FT, f32, f32, f32) -DEF_HELPER_2(fmul_DT, f64, f64, f64) +DEF_HELPER_3(fcmp_eq_FT, void, env, f32, f32) +DEF_HELPER_3(fcmp_eq_DT, void, env, f64, f64) +DEF_HELPER_3(fcmp_gt_FT, void, env, f32, f32) +DEF_HELPER_3(fcmp_gt_DT, void, env, f64, f64) +DEF_HELPER_3(fdiv_FT, f32, env, f32, f32) +DEF_HELPER_3(fdiv_DT, f64, env, f64, f64) +DEF_HELPER_2(float_FT, f32, env, i32) +DEF_HELPER_2(float_DT, f64, env, i32) +DEF_HELPER_4(fmac_FT, f32, env, f32, f32, f32) +DEF_HELPER_3(fmul_FT, f32, env, f32, f32) +DEF_HELPER_3(fmul_DT, f64, env, f64, f64) DEF_HELPER_1(fneg_T, f32, f32) -DEF_HELPER_2(fsub_FT, f32, f32, f32) -DEF_HELPER_2(fsub_DT, f64, f64, f64) -DEF_HELPER_1(fsqrt_FT, f32, f32) -DEF_HELPER_1(fsqrt_DT, f64, f64) -DEF_HELPER_1(ftrc_FT, i32, f32) -DEF_HELPER_1(ftrc_DT, i32, f64) -DEF_HELPER_2(fipr, void, i32, i32) -DEF_HELPER_1(ftrv, void, i32) +DEF_HELPER_3(fsub_FT, f32, env, f32, f32) +DEF_HELPER_3(fsub_DT, f64, env, f64, f64) +DEF_HELPER_2(fsqrt_FT, f32, env, f32) +DEF_HELPER_2(fsqrt_DT, f64, env, f64) +DEF_HELPER_2(ftrc_FT, i32, env, f32) +DEF_HELPER_2(ftrc_DT, i32, env, f64) +DEF_HELPER_3(fipr, void, env, i32, i32) +DEF_HELPER_2(ftrv, void, env, i32)#include "def-helper.h" target-sh4/op_helper.c +89
-93@@ -19,10 +19,9 @@#include <assert.h> #include <stdlib.h> #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" -static void cpu_restore_state_from_retaddr (uintptr_t retaddr) +static void cpu_restore_state_from_retaddr (CPUSH4State *env,uintptr_t retaddr) {TranslationBlock *tb;@@ -53,26 +52,22 @@ static void cpu_restore_state_from_retaddr(uintptr_t retaddr)#define SHIFT 3#include "softmmu_template.h" -void tlb_fill (CPUSH4State *env1,target_ulong addr,int is_write,int mmu_idx, +void tlb_fill (CPUSH4State *env,target_ulong addr,int is_write,int mmu_idx,uintptr_t retaddr) { -CPUSH4State *saved_env;int ret; - saved_env = env; - env = env1; ret =cpu_sh4_handle_mmu_fault (env, addr, is_write, mmu_idx);if (ret) {/* now we have a real cpu fault */ -cpu_restore_state_from_retaddr (retaddr); +cpu_restore_state_from_retaddr (env, retaddr);cpu_loop_exit (env); } - env = saved_env; }#endif -void helper_ldtlb (void ) +void helper_ldtlb (CPUSH4State *env) {#ifdef CONFIG_USER_ONLY /* XXXXX */ @@ -82,40 +77,41 @@ void helper_ldtlb(void)#endif } -static inline void raise_exception (int index,uintptr_t retaddr) +static inline void raise_exception (CPUSH4State *env,int index, +uintptr_t retaddr) { env->exception_index = index; -cpu_restore_state_from_retaddr (retaddr); +cpu_restore_state_from_retaddr (env, retaddr);cpu_loop_exit (env); } -void helper_raise_illegal_instruction (void ) +void helper_raise_illegal_instruction (CPUSH4State *env) { -raise_exception (0x180 ,GETPC ()); +raise_exception (env,0x180 ,GETPC ()); } -void helper_raise_slot_illegal_instruction (void ) +void helper_raise_slot_illegal_instruction (CPUSH4State *env) { -raise_exception (0x1a0 ,GETPC ()); +raise_exception (env,0x1a0 ,GETPC ()); } -void helper_raise_fpu_disable (void ) +void helper_raise_fpu_disable (CPUSH4State *env) { -raise_exception (0x800 ,GETPC ()); +raise_exception (env,0x800 ,GETPC ()); } -void helper_raise_slot_fpu_disable (void ) +void helper_raise_slot_fpu_disable (CPUSH4State *env) { -raise_exception (0x820 ,GETPC ()); +raise_exception (env,0x820 ,GETPC ()); } -void helper_debug (void ) +void helper_debug (CPUSH4State *env) { env->exception_index =EXCP_DEBUG ;cpu_loop_exit (env); } -void helper_sleep (uint32_t next_pc) +void helper_sleep (CPUSH4State *env,uint32_t next_pc) { env->halted =1 ; env->in_sleep =1 ;@@ -124,13 +120,13 @@ void helper_sleep(uint32_t next_pc)cpu_loop_exit (env); } -void helper_trapa (uint32_t tra) +void helper_trapa (CPUSH4State *env,uint32_t tra) { env->tra = tra <<2 ; -raise_exception (0x160 ,GETPC ()); +raise_exception (env,0x160 ,GETPC ()); } -void helper_movcal (uint32_t address,uint32_t value) +void helper_movcal (CPUSH4State *env,uint32_t address,uint32_t value) {if (cpu_sh4_is_cached (env, address)) {@@ -144,7 +140,7 @@ void helper_movcal(uint32_t address, uint32_t value) } } -void helper_discard_movcal_backup (void ) +void helper_discard_movcal_backup (CPUSH4State *env) {memory_content *current = env->movcal_backup;@@ -158,7 +154,7 @@ void helper_discard_movcal_backup(void) } } -void helper_ocbi (uint32_t address) +void helper_ocbi (CPUSH4State *env,uint32_t address) {memory_content **current = &(env->movcal_backup);while (*current)@@ -167,7 +163,7 @@ void helper_ocbi(uint32_t address)if ((a & ~0x1F ) == (address & ~0x1F )) {memory_content *next = (*current)->next; -stl (a, (*current)->value); +cpu_stl_data (env, a, (*current)->value);if (next ==NULL ) {@@ -181,7 +177,7 @@ void helper_ocbi(uint32_t address) } } -uint32_t helper_addc (uint32_t arg0,uint32_t arg1) +uint32_t helper_addc (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t tmp0, tmp1;@@ -197,7 +193,7 @@ uint32_t helper_addc(uint32_t arg0, uint32_t arg1)return arg1; } -uint32_t helper_addv (uint32_t arg0,uint32_t arg1) +uint32_t helper_addv (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t dest, src, ans;@@ -236,7 +232,7 @@ uint32_t helper_addv(uint32_t arg0, uint32_t arg1)#define SETM env->sr |= SR_M#define CLRM env->sr &= ~SR_M -uint32_t helper_div1 (uint32_t arg0,uint32_t arg1) +uint32_t helper_div1 (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t tmp0, tmp2;uint8_t old_q, tmp1 =0xff ;@@ -344,7 +340,7 @@ uint32_t helper_div1(uint32_t arg0, uint32_t arg1)return arg1; } -void helper_macl (uint32_t arg0,uint32_t arg1) +void helper_macl (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {int64_t res;@@ -360,7 +356,7 @@ void helper_macl(uint32_t arg0, uint32_t arg1) } } -void helper_macw (uint32_t arg0,uint32_t arg1) +void helper_macw (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {int64_t res;@@ -379,7 +375,7 @@ void helper_macw(uint32_t arg0, uint32_t arg1) } } -uint32_t helper_subc (uint32_t arg0,uint32_t arg1) +uint32_t helper_subc (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {uint32_t tmp0, tmp1;@@ -395,7 +391,7 @@ uint32_t helper_subc(uint32_t arg0, uint32_t arg1)return arg1; } -uint32_t helper_subv (uint32_t arg0,uint32_t arg1) +uint32_t helper_subv (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {int32_t dest, src, ans;@@ -424,17 +420,17 @@ uint32_t helper_subv(uint32_t arg0, uint32_t arg1)return arg1; } -static inline void set_t (void ) +static inline void set_t (CPUSH4State *env) { env->sr |=SR_T ; } -static inline void clr_t (void ) +static inline void clr_t (CPUSH4State *env) { env->sr &= ~SR_T ; } -void helper_ld_fpscr (uint32_t val) +void helper_ld_fpscr (CPUSH4State *env,uint32_t val) { env->fpscr = val &FPSCR_MASK ;if ((val &FPSCR_RM_MASK ) ==FPSCR_RM_ZERO ) {@@ -445,7 +441,7 @@ void helper_ld_fpscr(uint32_t val)set_flush_to_zero ((val &FPSCR_DN ) !=0 , &env->fp_status); } -static void update_fpscr (uintptr_t retaddr) +static void update_fpscr (CPUSH4State *env,uintptr_t retaddr) {int xcpt, cause, enable;@@ -479,7 +475,7 @@ static void update_fpscr(uintptr_t retaddr) cause = (env->fpscr &FPSCR_CAUSE_MASK ) >>FPSCR_CAUSE_SHIFT ; enable = (env->fpscr &FPSCR_ENABLE_MASK ) >>FPSCR_ENABLE_SHIFT ;if (cause & enable) { -cpu_restore_state_from_retaddr (retaddr); +cpu_restore_state_from_retaddr (env, retaddr); env->exception_index =0x120 ;cpu_loop_exit (env); }@@ -496,156 +492,156 @@ float64 helper_fabs_DT(float64 t0)return float64_abs (t0); } -float32 helper_fadd_FT (float32 t0,float32 t1) +float32 helper_fadd_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_add (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fadd_DT (float64 t0,float64 t1) +float64 helper_fadd_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_add (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -void helper_fcmp_eq_FT (float32 t0,float32 t1) +void helper_fcmp_eq_FT (CPUSH4State *env,float32 t0,float32 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float32_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_equal) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -void helper_fcmp_eq_DT (float64 t0,float64 t1) +void helper_fcmp_eq_DT (CPUSH4State *env,float64 t0,float64 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float64_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_equal) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -void helper_fcmp_gt_FT (float32 t0,float32 t1) +void helper_fcmp_gt_FT (CPUSH4State *env,float32 t0,float32 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float32_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_greater) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -void helper_fcmp_gt_DT (float64 t0,float64 t1) +void helper_fcmp_gt_DT (CPUSH4State *env,float64 t0,float64 t1) {int relation;set_float_exception_flags (0 , &env->fp_status); relation =float64_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) { -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); }else if (relation == float_relation_greater) { -set_t (); +set_t (env); }else { -clr_t (); +clr_t (env); } } -float64 helper_fcnvsd_FT_DT (float32 t0) +float64 helper_fcnvsd_FT_DT (CPUSH4State *env,float32 t0) {float64 ret;set_float_exception_flags (0 , &env->fp_status); ret =float32_to_float64 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float32 helper_fcnvds_DT_FT (float64 t0) +float32 helper_fcnvds_DT_FT (CPUSH4State *env,float64 t0) {float32 ret;set_float_exception_flags (0 , &env->fp_status); ret =float64_to_float32 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float32 helper_fdiv_FT (float32 t0,float32 t1) +float32 helper_fdiv_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_div (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fdiv_DT (float64 t0,float64 t1) +float64 helper_fdiv_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_div (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float32 helper_float_FT (uint32_t t0) +float32 helper_float_FT (CPUSH4State *env,uint32_t t0) {float32 ret;set_float_exception_flags (0 , &env->fp_status); ret =int32_to_float32 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float64 helper_float_DT (uint32_t t0) +float64 helper_float_DT (CPUSH4State *env,uint32_t t0) {float64 ret;set_float_exception_flags (0 , &env->fp_status); ret =int32_to_float64 (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -float32 helper_fmac_FT (float32 t0,float32 t1,float32 t2) +float32 helper_fmac_FT (CPUSH4State *env,float32 t0,float32 t1,float32 t2) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_mul (t0, t1, &env->fp_status); t0 =float32_add (t0, t2, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float32 helper_fmul_FT (float32 t0,float32 t1) +float32 helper_fmul_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_mul (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fmul_DT (float64 t0,float64 t1) +float64 helper_fmul_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_mul (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; }@@ -654,57 +650,57 @@ float32 helper_fneg_T(float32 t0)return float32_chs (t0); } -float32 helper_fsqrt_FT (float32 t0) +float32 helper_fsqrt_FT (CPUSH4State *env,float32 t0) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_sqrt (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fsqrt_DT (float64 t0) +float64 helper_fsqrt_DT (CPUSH4State *env,float64 t0) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_sqrt (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float32 helper_fsub_FT (float32 t0,float32 t1) +float32 helper_fsub_FT (CPUSH4State *env,float32 t0,float32 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float32_sub (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -float64 helper_fsub_DT (float64 t0,float64 t1) +float64 helper_fsub_DT (CPUSH4State *env,float64 t0,float64 t1) {set_float_exception_flags (0 , &env->fp_status); t0 =float64_sub (t0, t1, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return t0; } -uint32_t helper_ftrc_FT (float32 t0) +uint32_t helper_ftrc_FT (CPUSH4State *env,float32 t0) {uint32_t ret;set_float_exception_flags (0 , &env->fp_status); ret =float32_to_int32_round_to_zero (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -uint32_t helper_ftrc_DT (float64 t0) +uint32_t helper_ftrc_DT (CPUSH4State *env,float64 t0) {uint32_t ret;set_float_exception_flags (0 , &env->fp_status); ret =float64_to_int32_round_to_zero (t0, &env->fp_status); -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());return ret; } -void helper_fipr (uint32_t m,uint32_t n) +void helper_fipr (CPUSH4State *env,uint32_t m,uint32_t n) {int bank, i;float32 r, p;@@ -719,12 +715,12 @@ void helper_fipr(uint32_t m, uint32_t n) &env->fp_status); r =float32_add (r, p, &env->fp_status); } -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ()); env->fregs[bank + n +3 ] = r; } -void helper_ftrv (uint32_t n) +void helper_ftrv (CPUSH4State *env,uint32_t n) {int bank_matrix, bank_vector;int i, j;@@ -743,7 +739,7 @@ void helper_ftrv(uint32_t n) r[i] =float32_add (r[i], p, &env->fp_status); } } -update_fpscr (GETPC ()); +update_fpscr (env,GETPC ());for (i =0 ; i <4 ; i++) { env->fregs[bank_vector + i] = r[i];target-sh4/translate.c +61
-49@@ -276,7 +276,7 @@ static void gen_goto_tb(DisasContext * ctx, int n, target_ulong dest) }else {tcg_gen_movi_i32 (cpu_pc, dest);if (ctx->singlestep_enabled) -gen_helper_debug (); +gen_helper_debug (cpu_env);tcg_gen_exit_tb (0 ); } }@@ -288,7 +288,7 @@ static void gen_jump(DisasContext * ctx)delayed jump as immediate jump are conditinal jumps */ tcg_gen_mov_i32 (cpu_pc, cpu_delayed_pc);if (ctx->singlestep_enabled) -gen_helper_debug (); +gen_helper_debug (cpu_env);tcg_gen_exit_tb (0 ); }else {gen_goto_tb (ctx,0 , ctx->delayed_pc);@@ -437,7 +437,7 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)#define CHECK_NOT_DELAY_SLOT \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) \ { \ - gen_helper_raise_slot_illegal_instruction(); \ + gen_helper_raise_slot_illegal_instruction(cpu_env); \ ctx->bstate = BS_EXCP; \ return; \ }@@ -445,9 +445,9 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)#define CHECK_PRIVILEGED \ if (IS_USER(ctx)) { \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) { \ - gen_helper_raise_slot_illegal_instruction(); \ + gen_helper_raise_slot_illegal_instruction(cpu_env); \ } else { \ - gen_helper_raise_illegal_instruction(); \ + gen_helper_raise_illegal_instruction(cpu_env); \ } \ ctx->bstate = BS_EXCP; \ return; \@@ -456,9 +456,9 @@ static inline void gen_store_fpr64 (TCGv_i64 t, int reg)#define CHECK_FPU_ENABLED \ if (ctx->flags & SR_FD) { \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) { \ - gen_helper_raise_slot_fpu_disable(); \ + gen_helper_raise_slot_fpu_disable(cpu_env); \ } else { \ - gen_helper_raise_fpu_disable(); \ + gen_helper_raise_fpu_disable(cpu_env); \ } \ ctx->bstate = BS_EXCP; \ return; \@@ -492,7 +492,7 @@ static void _decode_opc(DisasContext * ctx)if (opcode !=0x0093 /* ocbi */ && opcode !=0x00c3 /* movca.l */ ) { -gen_helper_discard_movcal_backup (); +gen_helper_discard_movcal_backup (cpu_env); ctx->has_movcal =0 ; } }@@ -523,7 +523,7 @@ static void _decode_opc(DisasContext * ctx)return ;case 0x0038 :/* ldtlb */ CHECK_PRIVILEGED -gen_helper_ldtlb (); +gen_helper_ldtlb (cpu_env );return ;case 0x002b :/* rte */ CHECK_PRIVILEGED @@ -551,7 +551,7 @@ static void _decode_opc(DisasContext * ctx)return ;case 0x001b :/* sleep */ CHECK_PRIVILEGED - gen_helper_sleep(tcg_const_i32(ctx->pc + 2)); + gen_helper_sleep(cpu_env, tcg_const_i32(ctx->pc + 2));return ; }@@ -761,10 +761,10 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_add_i32 (REG (B11_8 ),REG (B11_8 ),REG (B7_4 ));return ;case 0x300e :/* addc Rm,Rn */ -gen_helper_addc (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_addc (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x300f :/* addv Rm,Rn */ -gen_helper_addv (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_addv (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x2009 :/* and Rm,Rn */ tcg_gen_and_i32 (REG (B11_8 ),REG (B11_8 ),REG (B7_4 ));@@ -817,7 +817,7 @@ static void _decode_opc(DisasContext * ctx) }return ;case 0x3004 :/* div1 Rm,Rn */ -gen_helper_div1 (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_div1 (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x300d :/* dmuls.l Rm,Rn */ {@@ -870,7 +870,7 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_qemu_ld32s (arg0,REG (B7_4 ), ctx->memidx); arg1 =tcg_temp_new ();tcg_gen_qemu_ld32s (arg1,REG (B11_8 ), ctx->memidx); -gen_helper_macl (arg0, arg1); +gen_helper_macl (cpu_env, arg0, arg1);tcg_temp_free (arg1);tcg_temp_free (arg0);tcg_gen_addi_i32 (REG (B7_4 ),REG (B7_4 ),4 );@@ -884,7 +884,7 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_qemu_ld32s (arg0,REG (B7_4 ), ctx->memidx); arg1 =tcg_temp_new ();tcg_gen_qemu_ld32s (arg1,REG (B11_8 ), ctx->memidx); -gen_helper_macw (arg0, arg1); +gen_helper_macw (cpu_env, arg0, arg1);tcg_temp_free (arg1);tcg_temp_free (arg0);tcg_gen_addi_i32 (REG (B11_8 ),REG (B11_8 ),2 );@@ -1013,10 +1013,10 @@ static void _decode_opc(DisasContext * ctx)tcg_gen_sub_i32 (REG (B11_8 ),REG (B11_8 ),REG (B7_4 ));return ;case 0x300a :/* subc Rm,Rn */ -gen_helper_subc (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_subc (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x300b :/* subv Rm,Rn */ -gen_helper_subv (REG (B11_8 ),REG (B7_4 ),REG (B11_8 )); +gen_helper_subv (REG (B11_8 ), cpu_env,REG (B7_4 ),REG (B11_8 ));return ;case 0x2008 :/* tst Rm,Rn */ {@@ -1152,22 +1152,22 @@ static void _decode_opc(DisasContext * ctx)gen_load_fpr64 (fp1,DREG (B7_4 ));switch (ctx->opcode &0xf00f ) {case 0xf000 :/* fadd Rm,Rn */ -gen_helper_fadd_DT (fp0, fp0, fp1); +gen_helper_fadd_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf001 :/* fsub Rm,Rn */ -gen_helper_fsub_DT (fp0, fp0, fp1); +gen_helper_fsub_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf002 :/* fmul Rm,Rn */ -gen_helper_fmul_DT (fp0, fp0, fp1); +gen_helper_fmul_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf003 :/* fdiv Rm,Rn */ -gen_helper_fdiv_DT (fp0, fp0, fp1); +gen_helper_fdiv_DT (fp0, cpu_env, fp0, fp1);break ;case 0xf004 :/* fcmp/eq Rm,Rn */ -gen_helper_fcmp_eq_DT (fp0, fp1); +gen_helper_fcmp_eq_DT (cpu_env, fp0, fp1);return ;case 0xf005 :/* fcmp/gt Rm,Rn */ -gen_helper_fcmp_gt_DT (fp0, fp1); +gen_helper_fcmp_gt_DT (cpu_env, fp0, fp1);return ; }gen_store_fpr64 (fp0,DREG (B11_8 ));@@ -1176,22 +1176,32 @@ static void _decode_opc(DisasContext * ctx) }else {switch (ctx->opcode &0xf00f ) {case 0xf000 :/* fadd Rm,Rn */ -gen_helper_fadd_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fadd_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf001 :/* fsub Rm,Rn */ -gen_helper_fsub_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fsub_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf002 :/* fmul Rm,Rn */ -gen_helper_fmul_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fmul_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf003 :/* fdiv Rm,Rn */ -gen_helper_fdiv_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fdiv_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);break ;case 0xf004 :/* fcmp/eq Rm,Rn */ -gen_helper_fcmp_eq_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fcmp_eq_FT (cpu_env, cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);return ;case 0xf005 :/* fcmp/gt Rm,Rn */ -gen_helper_fcmp_gt_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B7_4 )]); +gen_helper_fcmp_gt_FT (cpu_env, cpu_fregs[FREG (B11_8 )], + cpu_fregs[FREG (B7_4 )]);return ; } }@@ -1203,8 +1213,9 @@ static void _decode_opc(DisasContext * ctx)if (ctx->fpscr &FPSCR_PR ) {break ;/* illegal instruction */ }else { -gen_helper_fmac_FT (cpu_fregs[FREG (B11_8 )], - cpu_fregs[FREG (0 )], cpu_fregs[FREG (B7_4 )], cpu_fregs[FREG (B11_8 )]); +gen_helper_fmac_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (0 )], cpu_fregs[FREG (B7_4 )], + cpu_fregs[FREG (B11_8 )]);return ; } }@@ -1356,7 +1367,7 @@ static void _decode_opc(DisasContext * ctx)TCGv imm;CHECK_NOT_DELAY_SLOT imm =tcg_const_i32 (B7_0 ); -gen_helper_trapa (imm); +gen_helper_trapa (cpu_env, imm);tcg_temp_free (imm); ctx->bstate =BS_BRANCH ; }@@ -1531,7 +1542,7 @@ static void _decode_opc(DisasContext * ctx) LDST(fpul, 0x405a, 0x4056, 0x005a, 0x4052, {CHECK_FPU_ENABLED})case 0x406a :/* lds Rm,FPSCR */ CHECK_FPU_ENABLED -gen_helper_ld_fpscr (REG (B11_8 )); +gen_helper_ld_fpscr (cpu_env ,REG (B11_8 )); ctx->bstate =BS_STOP ;return ;case 0x4066 :/* lds.l @Rm+,FPSCR */ @@ -1540,7 +1551,7 @@ static void _decode_opc(DisasContext * ctx)TCGv addr =tcg_temp_new ();tcg_gen_qemu_ld32s (addr,REG (B11_8 ), ctx->memidx);tcg_gen_addi_i32 (REG (B11_8 ),REG (B11_8 ),4 ); -gen_helper_ld_fpscr (addr); +gen_helper_ld_fpscr (cpu_env, addr);tcg_temp_free (addr); ctx->bstate =BS_STOP ; }@@ -1567,7 +1578,7 @@ static void _decode_opc(DisasContext * ctx) {TCGv val =tcg_temp_new ();tcg_gen_qemu_ld32u (val,REG (B11_8 ), ctx->memidx); -gen_helper_movcal (REG (B11_8 ), val); +gen_helper_movcal (cpu_env,REG (B11_8 ), val);tcg_gen_qemu_st32 (REG (0 ),REG (B11_8 ), ctx->memidx); } ctx->has_movcal =1 ;@@ -1619,7 +1630,7 @@ static void _decode_opc(DisasContext * ctx)break ;case 0x0093 :/* ocbi @Rn */ { -gen_helper_ocbi (REG (B11_8 )); +gen_helper_ocbi (cpu_env,REG (B11_8 )); }return ;case 0x00a3 :/* ocbp @Rn */ @@ -1733,12 +1744,12 @@ static void _decode_opc(DisasContext * ctx)if (ctx->opcode &0x0100 )break ;/* illegal instruction */ fp =tcg_temp_new_i64 (); -gen_helper_float_DT (fp, cpu_fpul); +gen_helper_float_DT (fp, cpu_env, cpu_fpul);gen_store_fpr64 (fp,DREG (B11_8 ));tcg_temp_free_i64 (fp); }else { -gen_helper_float_FT (cpu_fregs[FREG (B11_8 )], cpu_fpul); +gen_helper_float_FT (cpu_fregs[FREG (B11_8 )], cpu_env, cpu_fpul); }return ;case 0xf03d :/* ftrc FRm/DRm,FPUL - FPSCR: R[PR,Enable.V]/W[Cause,Flag] */ @@ -1749,11 +1760,11 @@ static void _decode_opc(DisasContext * ctx)break ;/* illegal instruction */ fp =tcg_temp_new_i64 ();gen_load_fpr64 (fp,DREG (B11_8 )); -gen_helper_ftrc_DT (cpu_fpul, fp); +gen_helper_ftrc_DT (cpu_fpul, cpu_env, fp);tcg_temp_free_i64 (fp); }else { -gen_helper_ftrc_FT (cpu_fpul, cpu_fregs[FREG (B11_8 )]); +gen_helper_ftrc_FT (cpu_fpul, cpu_env, cpu_fregs[FREG (B11_8 )]); }return ;case 0xf04d :/* fneg FRn/DRn - FPSCR: Nothing */ @@ -1783,11 +1794,12 @@ static void _decode_opc(DisasContext * ctx)break ;/* illegal instruction */ TCGv_i64 fp =tcg_temp_new_i64 ();gen_load_fpr64 (fp,DREG (B11_8 )); -gen_helper_fsqrt_DT (fp, fp); +gen_helper_fsqrt_DT (fp, cpu_env, fp);gen_store_fpr64 (fp,DREG (B11_8 ));tcg_temp_free_i64 (fp); }else { -gen_helper_fsqrt_FT (cpu_fregs[FREG (B11_8 )], cpu_fregs[FREG (B11_8 )]); +gen_helper_fsqrt_FT (cpu_fregs[FREG (B11_8 )], cpu_env, + cpu_fregs[FREG (B11_8 )]); }return ;case 0xf07d :/* fsrra FRn */ @@ -1809,7 +1821,7 @@ static void _decode_opc(DisasContext * ctx) CHECK_FPU_ENABLED {TCGv_i64 fp =tcg_temp_new_i64 (); -gen_helper_fcnvsd_FT_DT (fp, cpu_fpul); +gen_helper_fcnvsd_FT_DT (fp, cpu_env, cpu_fpul);gen_store_fpr64 (fp,DREG (B11_8 ));tcg_temp_free_i64 (fp); }@@ -1819,7 +1831,7 @@ static void _decode_opc(DisasContext * ctx) {TCGv_i64 fp =tcg_temp_new_i64 ();gen_load_fpr64 (fp,DREG (B11_8 )); -gen_helper_fcnvds_DT_FT (cpu_fpul, fp); +gen_helper_fcnvds_DT_FT (cpu_fpul, cpu_env, fp);tcg_temp_free_i64 (fp); }return ;@@ -1829,7 +1841,7 @@ static void _decode_opc(DisasContext * ctx)TCGv m, n; m =tcg_const_i32 ((ctx->opcode >>8 ) &3 ); n =tcg_const_i32 ((ctx->opcode >>10 ) &3 ); -gen_helper_fipr (m, n); +gen_helper_fipr (cpu_env, m, n);tcg_temp_free (m);tcg_temp_free (n);return ;@@ -1841,7 +1853,7 @@ static void _decode_opc(DisasContext * ctx) (ctx->fpscr & FPSCR_PR) == 0) {TCGv n; n =tcg_const_i32 ((ctx->opcode >>10 ) &3 ); -gen_helper_ftrv (n); +gen_helper_ftrv (cpu_env, n);tcg_temp_free (n);return ; }@@ -1853,9 +1865,9 @@ static void _decode_opc(DisasContext * ctx)fflush (stderr);#endif if (ctx->flags & (DELAY_SLOT |DELAY_SLOT_CONDITIONAL )) { -gen_helper_raise_slot_illegal_instruction (); +gen_helper_raise_slot_illegal_instruction (cpu_env); }else { -gen_helper_raise_illegal_instruction (); +gen_helper_raise_illegal_instruction (cpu_env); } ctx->bstate =BS_EXCP ; }@@ -1934,7 +1946,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,if (ctx.pc == bp->pc) {/* We have hit a breakpoint - make sure PC is up-to-date */ tcg_gen_movi_i32 (cpu_pc, ctx.pc); -gen_helper_debug (); +gen_helper_debug (cpu_env); ctx.bstate =BS_EXCP ;break ; }@@ -1958,7 +1970,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,
Quoted 8 lines
target-sh4/translate.c gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb, · line 1973
Quoted 5 lines
target-sh4/translate.c +1
-1fprintf (stderr,"Loading opcode at address 0x%08x\n" , ctx.pc);fflush (stderr);#endif - ctx.opcode =lduw_code (ctx.pc); + ctx.opcode =cpu_lduw_code (cpu_single_env, ctx.pc);Why using
cpu_single_envhere, while all the code in this function uses the env argument togen_intermediate_code()?
Good catch, I don't know why I did that. I'll fix it to use the env argument.
Quoted 2 lines
I thought one of the goal
of this patch series was to get rid of the global env variable.
Not that variable, only AREG0. But removing cpu_single_env could have nice cleanup effects on their own too.
Quoted 22 lines
Quoted 14 lines
target-sh4/translate.c +1
-2decode_opc (&ctx); num_insns++; ctx.pc +=2 ;@@ -1975,7 +1987,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,gen_io_end ();if (env->singlestep_enabled) {tcg_gen_movi_i32 (cpu_pc, ctx.pc); -gen_helper_debug (); +gen_helper_debug (cpu_env); }else {switch (ctx.bstate) {case BS_STOP : --Quoted 4 lines
1.7.2.5
--
Aurelien Jarno GPG: 1024D/F1BCDB73
[email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
In reply to Peter MaydellQuoted 20 lines · Peter Maydell
Quoted 15 lines · Peter Maydell
Quoted 4 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>Quoted 9 lines
--- configure | 2 +- target-arm/Makefile.objs | 2 - target-arm/cpu.h | 10 ++- target-arm/helper.c | 8 +- target-arm/helper.h | 60 +++++++++--------- target-arm/op_helper.c | 92 +++++++++++++--------------- target-arm/translate.c | 148 +++++++++++++++++++++++----------------------- 7 files changed, 158 insertions(+), 164 deletions(-)Quoted 3 lines
This is too big to easily review -- it's making a change to a lot of helpers, and in each case that change affects three places (callers, declaration, implementation). That'
Quoted 6 lines
Sorry, finger slip meant I sent that half finished. To continue...
That's quite hard to cross-reference when the patch is this big. I think it would be helpful if you could split it up into patches touching smaller groups of helpers at once rather than having a single patch that does them all at once.
For x86, Sparc and s390x I used the approach of splitting op_helper.c to smaller files first. I didn't do it for ARM since target-arm/op_helper.c is alread pretty small (<500 lines). It could be split to saturating ops, condition code setting arithmetic ops and misc ops, between 100 and 200 lines each. Would that be OK?
It looks like helper.c should be split too (maybe VFP, MMU, CPU init, CPR), but that's starting to get beyond the scope of the series.
Quoted 3 lines
thanks
-- PMM
Re: [Qemu-devel] [PATCH 01/21] target-s390x: fix style
In reply to Alexander GrafQuoted 9 lines · Alexander Graf
Quoted 6 lines · Blue Swirl
Before splitting
op_helper.candhelper.cin the next patches, fix style issues. No functional changes.Replace also GCC specific
__FUNCTION__with
standard__func__.
Quoted 6 lines
Quoted 3 lines
Don't init static variable (cpu_s390x_init:inited) with 0.
Signed-off-by Blue Swirl <[email protected]>Phew. Have you hooked up with Richard about these changes? He had quite a big rewrite of the s390 target in the works, and I don't want you guys to work needlessly on major conflicts :)
I missed that one. He's rewriting translate.c, while I'm mostly touching op_helper.c. I'd expect it would be simpler for Richard to rebase on my series, because they only change helper calls but don't otherwise touch code. His series rearranges the code heavily and if I rebased on that, it would probably make the patch conflicts harder to resolve. What do you think?
Quoted 1,592 lines
Alex
Quoted 1,587 lines
---
target-s390x/helper.c| 96 +++++-----target-s390x/op_helper.c| 438 ++++++++++++++++++++++++++--------------------2 files changed, 297 insertions(+), 237 deletions(-)target-s390x/helper.c +49
-47@@ -74,7 +74,7 @@ S390CPU *cpu_s390x_init(const char *cpu_model) {S390CPU *cpu;CPUS390XState *env; -static int inited =0 ; +static int inited; cpu =S390_CPU (object_new (TYPE_S390_CPU )); env = &cpu->env;@@ -91,25 +91,27 @@ S390CPU *cpu_s390x_init(const char *cpu_model)#if defined(CONFIG_USER_ONLY ) -void do_interrupt (CPUS390XState *env) +void do_interrupt (CPUS390XState *env) { env->exception_index =-1 ; } -int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong address,int rw, -int mmu_idx) +int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong address, +int rw,int mmu_idx) { -/* fprintf(stderr,"%s: address 0x%lx rw %d mmu_idx %d\n", -__FUNCTION__, address, rw, mmu_idx); */ +/* fprintf(stderr, "%s: address 0x%lx rw %d mmu_idx %d\n", +__func__, address, rw, mmu_idx); */ env->exception_index =EXCP_ADDR ; - env->__excp_addr = address;/* FIXME: find out how this works on a real machine */ +/* FIXME: find out how this works on a real machine */ + env->__excp_addr = address;return 1 ; }#else /* !CONFIG_USER_ONLY */ /* Ensure to exit the TB after this call! */ -static void trigger_pgm_exception (CPUS390XState *env,uint32_t code,uint32_t ilc) +static void trigger_pgm_exception (CPUS390XState *env,uint32_t code, +uint32_t ilc) { env->exception_index =EXCP_PGM ; env->int_pgm_code = code;@@ -138,19 +140,20 @@ static int trans_bits(CPUS390XState *env, uint64_t mode)return bits; } -static void trigger_prot_fault (CPUS390XState *env,target_ulong vaddr,uint64_t mode) +static void trigger_prot_fault (CPUS390XState *env,target_ulong vaddr, +uint64_t mode) {int ilc =ILC_LATER_INC_2 ;int bits =trans_bits (env, mode) |4 ; -DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __FUNCTION__, vaddr, bits); +DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __func__, vaddr, bits);stq_phys (env->psa + offsetof(LowCore , trans_exc_code), vaddr | bits);trigger_pgm_exception (env,PGM_PROTECTION , ilc); } -static void trigger_page_fault (CPUS390XState *env,target_ulong vaddr,uint32_t type, -uint64_t asc,int rw) +static void trigger_page_fault (CPUS390XState *env,target_ulong vaddr, +uint32_t type,uint64_t asc,int rw) {int ilc =ILC_LATER ;int bits =trans_bits (env, asc);@@ -160,26 +163,26 @@ static void trigger_page_fault(CPUS390XState *env, target_ulong vaddr, uint32_t ilc =2 ; } -DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __FUNCTION__, vaddr, bits); +DPRINTF ("%s: vaddr=%016" PRIx64" bits=%d\n" , __func__, vaddr, bits);stq_phys (env->psa + offsetof(LowCore , trans_exc_code), vaddr | bits);trigger_pgm_exception (env, type, ilc); } -static int mmu_translate_asce (CPUS390XState *env,target_ulong vaddr,uint64_t asc, -uint64_t asce,int level,target_ulong *raddr, -int *flags,int rw) +static int mmu_translate_asce (CPUS390XState *env,target_ulong vaddr, +uint64_t asc,uint64_t asce,int level, +target_ulong *raddr,int *flags,int rw) {uint64_t offs =0 ;uint64_t origin;uint64_t new_asce; -PTE_DPRINTF ("%s: 0x%" PRIx64"\n" , __FUNCTION__, asce); +PTE_DPRINTF ("%s: 0x%" PRIx64"\n" , __func__, asce);if (((level != _ASCE_TYPE_SEGMENT) && (asce & _REGION_ENTRY_INV)) || ((level == _ASCE_TYPE_SEGMENT) && (asce & _SEGMENT_ENTRY_INV))) {/* XXX different regions have different faults */ -DPRINTF ("%s: invalid region\n" , __FUNCTION__); +DPRINTF ("%s: invalid region\n" , __func__);trigger_page_fault (env, vaddr,PGM_SEGMENT_TRANS , asc, rw);return -1 ; }@@ -222,7 +225,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a new_asce =ldq_phys (origin + offs);PTE_DPRINTF ("%s: 0x%" PRIx64" + 0x%" PRIx64" => 0x%016" PRIx64"\n" , - __FUNCTION__, origin, offs, new_asce); + __func__, origin, offs, new_asce);if (level != _ASCE_TYPE_SEGMENT) {/* yet another region */ @@ -232,7 +235,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a/* PTE */ if (new_asce & _PAGE_INVALID) { -DPRINTF ("%s: PTE=0x%" PRIx64" invalid\n" , __FUNCTION__, new_asce); +DPRINTF ("%s: PTE=0x%" PRIx64" invalid\n" , __func__, new_asce);trigger_page_fault (env, vaddr,PGM_PAGE_TRANS , asc, rw);return -1 ; }@@ -243,13 +246,14 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t a *raddr = new_asce & _ASCE_ORIGIN; -PTE_DPRINTF ("%s: PTE=0x%" PRIx64"\n" , __FUNCTION__, new_asce); +PTE_DPRINTF ("%s: PTE=0x%" PRIx64"\n" , __func__, new_asce);return 0 ; } -static int mmu_translate_asc (CPUS390XState *env,target_ulong vaddr,uint64_t asc, -target_ulong *raddr,int *flags,int rw) +static int mmu_translate_asc (CPUS390XState *env,target_ulong vaddr, +uint64_t asc,target_ulong *raddr,int *flags, +int rw) {uint64_t asce =0 ;int level, new_level;@@ -257,15 +261,15 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t asswitch (asc) {case PSW_ASC_PRIMARY : -PTE_DPRINTF ("%s: asc=primary\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=primary\n" , __func__); asce = env->cregs[1 ];break ;case PSW_ASC_SECONDARY : -PTE_DPRINTF ("%s: asc=secondary\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=secondary\n" , __func__); asce = env->cregs[7 ];break ;case PSW_ASC_HOME : -PTE_DPRINTF ("%s: asc=home\n" , __FUNCTION__); +PTE_DPRINTF ("%s: asc=home\n" , __func__); asce = env->cregs[13 ];break ; }@@ -276,8 +280,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_REGION2:if (vaddr &0xffe0000000000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xffe0000000000000ULL\n" , __FUNCTION__, - vaddr); +" 0xffe0000000000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }@@ -285,8 +288,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_REGION3:if (vaddr &0xfffffc0000000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xfffffc0000000000ULL\n" , __FUNCTION__, - vaddr); +" 0xfffffc0000000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }@@ -294,8 +296,7 @@ static int mmu_translate_asc(CPUS390XState *env, target_ulong vaddr, uint64_t ascase _ASCE_TYPE_SEGMENT:if (vaddr &0xffffffff80000000ULL ) {DPRINTF ("%s: vaddr doesn't fit 0x%16" PRIx64 -" 0xffffffff80000000ULL\n" , __FUNCTION__, - vaddr); +" 0xffffffff80000000ULL\n" , __func__, vaddr);trigger_page_fault (env, vaddr,PGM_TRANS_SPEC , asc, rw);return -1 ; }@@ -358,7 +359,7 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,break ; } -out: + out:/* Convert real address -> absolute address */ if (*raddr <0x2000 ) { *raddr = *raddr + env->psa;@@ -378,18 +379,18 @@ out:return r; } -int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong _vaddr,int rw, -int mmu_idx) +int cpu_s390x_handle_mmu_fault (CPUS390XState *env,target_ulong orig_vaddr, +int rw,int mmu_idx) {uint64_t asc = env->psw.mask &PSW_MASK_ASC ;target_ulong vaddr, raddr;int prot;DPRINTF ("%s: address 0x%" PRIx64" rw %d mmu_idx %d\n" , - __FUNCTION__, _vaddr, rw, mmu_idx); + __func__, _vaddr, rw, mmu_idx); - _vaddr &=TARGET_PAGE_MASK ; - vaddr = _vaddr; + orig_vaddr &=TARGET_PAGE_MASK ; + vaddr = orig_vaddr;/* 31-Bit mode */ if (!(env->psw.mask &PSW_MASK_64 )) {@@ -403,22 +404,23 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong _vaddr, int rw,/* check out of RAM access */ if (raddr > (ram_size + virtio_size)) { -DPRINTF ("%s: aaddr %" PRIx64" > ram_size %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: aaddr %" PRIx64" > ram_size %" PRIx64"\n" , __func__, (uint64_t )aaddr, (uint64_t )ram_size);trigger_pgm_exception (env,PGM_ADDRESSING ,ILC_LATER );return 1 ; } -DPRINTF ("%s: set tlb %" PRIx64" -> %" PRIx64" (%x)\n" , __FUNCTION__, +DPRINTF ("%s: set tlb %" PRIx64" -> %" PRIx64" (%x)\n" , __func__, (uint64_t )vaddr, (uint64_t )raddr, prot); -tlb_set_page (env, _vaddr, raddr, prot, +tlb_set_page (env, orig_vaddr, raddr, prot, mmu_idx,TARGET_PAGE_SIZE );return 0 ; } -target_phys_addr_t cpu_get_phys_page_debug (CPUS390XState *env,target_ulong vaddr) +target_phys_addr_t cpu_get_phys_page_debug (CPUS390XState *env, +target_ulong vaddr) {target_ulong raddr;int prot =PAGE_READ |PAGE_WRITE |PAGE_EXEC ;@@ -509,7 +511,7 @@ static void do_program_interrupt(CPUS390XState *env)break ; } -qemu_log ("%s: code=0x%x ilc=%d\n" , __FUNCTION__, env->int_pgm_code, ilc); +qemu_log ("%s: code=0x%x ilc=%d\n" , __func__, env->int_pgm_code, ilc); lowcore =cpu_physical_memory_map (env->psa, &len,1 );@@ -522,7 +524,7 @@ static void do_program_interrupt(CPUS390XState *env)cpu_physical_memory_unmap (lowcore, len,1 , len); -DPRINTF ("%s: %x %x %" PRIx64" %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: %x %x %" PRIx64" %" PRIx64"\n" , __func__, env->int_pgm_code, ilc, env->psw.mask, env->psw.addr);@@ -565,15 +567,15 @@ static void do_ext_interrupt(CPUS390XState *env) env->pending_int &= ~INTERRUPT_EXT ; } -DPRINTF ("%s: %" PRIx64" %" PRIx64"\n" , __FUNCTION__, +DPRINTF ("%s: %" PRIx64" %" PRIx64"\n" , __func__, env->psw.mask, env->psw.addr);load_psw (env, mask, addr); } -void do_interrupt (CPUS390XState *env) +void do_interrupt (CPUS390XState *env) { -qemu_log ("%s: %d at pc=%" PRIx64"\n" , __FUNCTION__, env->exception_index, +qemu_log ("%s: %d at pc=%" PRIx64"\n" , __func__, env->exception_index, env->psw.addr);s390_add_running_cpu (env);target-s390x/op_helper.c +248
-191@@ -31,13 +31,13 @@#include <linux/kvm.h> #endif -#if !defined (CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )#include "sysemu.h" #endif /*****************************************************************************/ /* Softmmu support */ -#if !defined (CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )#include "softmmu_exec.h" #define MMUSUFFIX _mmu@@ -95,7 +95,7 @@ void tlb_fill(CPUS390XState *env1, target_ulong addr, int is_write, int mmu_idx,/* raise an exception */ void HELPER (exception )(uint32_t excp) { -HELPER_LOG ("%s: exception %d\n" , __FUNCTION__, excp); +HELPER_LOG ("%s: exception %d\n" , __func__, excp); env->exception_index = excp;cpu_loop_exit (env); }@@ -164,7 +164,7 @@ uint32_t HELPER(nc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t cc =0 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);for (i =0 ; i <= l; i++) { x =ldub (dest + i) &ldub (src + i);if (x) {@@ -183,7 +183,7 @@ uint32_t HELPER(xc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t cc =0 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);#ifndef CONFIG_USER_ONLY /* xor with itself is the same as memset(0) */ @@ -217,7 +217,7 @@ uint32_t HELPER(oc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t cc =0 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);for (i =0 ; i <= l; i++) { x =ldub (dest + i) |ldub (src + i);if (x) {@@ -236,7 +236,7 @@ void HELPER(mvc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t l_64 = (l +1 ) /8 ;HELPER_LOG ("%s l %d dest %" PRIx64" src %" PRIx64"\n" , - __FUNCTION__, l, dest, src); + __func__, l, dest, src);#ifndef CONFIG_USER_ONLY if ((l > 32) &&@@ -278,10 +278,11 @@ void HELPER(mvc)(uint32_t l, uint64_t dest, uint64_t src)uint32_t HELPER (clc )(uint32_t l,uint64_t s1,uint64_t s2) {int i; -unsigned char x,y; +unsigned char x, y;uint32_t cc; +HELPER_LOG ("%s l %d s1 %" PRIx64" s2 %" PRIx64"\n" , - __FUNCTION__, l, s1, s2); + __func__, l, s1, s2);for (i =0 ; i <= l; i++) { x =ldub (s1 + i); y =ldub (s2 + i);@@ -295,7 +296,7 @@ uint32_t HELPER(clc)(uint32_t l, uint64_t s1, uint64_t s2) } } cc =0 ; -done: + done:HELPER_LOG ("\n" );return cc; }@@ -303,9 +304,10 @@ done:/* compare logical under mask */ uint32_t HELPER (clm )(uint32_t r1,uint32_t mask,uint64_t addr) { -uint8_t r,d; +uint8_t r, d;uint32_t cc; -HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64"\n" , __FUNCTION__, r1, + +HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64"\n" , __func__, r1, mask, addr); cc =0 ;while (mask) {@@ -313,7 +315,7 @@ uint32_t HELPER(clm)(uint32_t r1, uint32_t mask, uint64_t addr) d =ldub (addr); r = (r1 &0xff000000UL ) >>24 ;HELPER_LOG ("mask 0x%x %02x/%02x (0x%" PRIx64") " , mask, r, d, - addr); + addr);if (r < d) { cc =1 ;break ;@@ -334,7 +336,8 @@ uint32_t HELPER(clm)(uint32_t r1, uint32_t mask, uint64_t addr)void HELPER (stcm )(uint32_t r1,uint32_t mask,uint64_t addr) {uint8_t r; -HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%lx\n" , __FUNCTION__, r1, mask, + +HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%lx\n" , __func__, r1, mask, addr);while (mask) {if (mask &8 ) {@@ -355,6 +358,7 @@ void HELPER(mlg)(uint32_t r1, uint64_t v2)#if HOST_LONG_BITS ==64 && defined(__GNUC__)/* assuming 64-bit hosts have __uint128_t */ __uint128_t res = (__uint128_t )env->regs[r1 +1 ]; + res *= (__uint128_t )v2; env->regs[r1] = (uint64_t )(res >>64 ); env->regs[r1 +1 ] = (uint64_t )res;@@ -370,18 +374,18 @@ void HELPER(dlg)(uint32_t r1, uint64_t v2)if (!env->regs[r1]) {/* 64 -> 64/64 case */ - env->regs[r1] = env->regs[r1+1 ] % divisor; - env->regs[r1+1 ] = env->regs[r1+1 ] / divisor; + env->regs[r1] = env->regs[r1 +1 ] % divisor; + env->regs[r1 +1 ] = env->regs[r1 +1 ] / divisor;return ; }else { -#if HOST_LONG_BITS ==64 && defined(__GNUC__)/* assuming 64-bit hosts have __uint128_t */ __uint128_t dividend = (((__uint128_t )env->regs[r1]) <<64 ) | - (env->regs[r1+1 ]); + (env->regs[r1 +1 ]);__uint128_t quotient = dividend / divisor; - env->regs[r1+1 ] = quotient;__uint128_t remainder = dividend % divisor; + + env->regs[r1 +1 ] = quotient; env->regs[r1] = remainder;#else /* 32-bit hosts would need special wrapper functionality - just abort if @@ -431,7 +435,7 @@ uint32_t HELPER(srst)(uint32_t c, uint32_t r1, uint32_t r2)uint64_t str =get_address_31fix (r2);uint64_t end =get_address_31fix (r1); -HELPER_LOG ("%s: c %d *r1 0x%" PRIx64" *r2 0x%" PRIx64"\n" , __FUNCTION__, +HELPER_LOG ("%s: c %d *r1 0x%" PRIx64" *r2 0x%" PRIx64"\n" , __func__, c, env->regs[r1], env->regs[r2]);for (i = str; i != end; i++) {@@ -452,11 +456,12 @@ uint32_t HELPER(clst)(uint32_t c, uint32_t r1, uint32_t r2)uint64_t s2 =get_address_31fix (r2);uint8_t v1, v2;uint32_t cc; + c = c &0xff ;#ifdef CONFIG_USER_ONLY if (!c) {HELPER_LOG ("%s: comparing '%s' and '%s'\n" , - __FUNCTION__, (char *)g2h (s1), (char *)g2h (s2)); + __func__, (char *)g2h (s1), (char *)g2h (s2)); }#endif for (;;) {@@ -501,10 +506,11 @@ void HELPER(mvst)(uint32_t c, uint32_t r1, uint32_t r2)uint64_t dest =get_address_31fix (r1);uint64_t src =get_address_31fix (r2);uint8_t v; + c = c &0xff ;#ifdef CONFIG_USER_ONLY if (!c) { -HELPER_LOG ("%s: copy '%s' to 0x%lx\n" , __FUNCTION__, (char *)g2h (src), +HELPER_LOG ("%s: copy '%s' to 0x%lx\n" , __func__, (char *)g2h (src), dest); }#endif @@ -526,6 +532,7 @@ uint32_t HELPER(csg)(uint32_t r1, uint64_t a2, uint32_t r3)/* FIXME: locking? */ uint32_t cc;uint64_t v2 =ldq (a2); +if (env->regs[r1] == v2) { cc =0 ;stq (a2, env->regs[r3]);@@ -564,8 +571,9 @@ uint32_t HELPER(cs)(uint32_t r1, uint64_t a2, uint32_t r3) {/* FIXME: locking? */ uint32_t cc; -HELPER_LOG ("%s: r1 %d a2 0x%lx r3 %d\n" , __FUNCTION__, r1, a2, r3);uint32_t v2 =ldl (a2); + +HELPER_LOG ("%s: r1 %d a2 0x%lx r3 %d\n" , __func__, r1, a2, r3);if (((uint32_t )env->regs[r1]) == v2) { cc =0 ;stl (a2, (uint32_t )env->regs[r3]);@@ -612,14 +620,16 @@ static uint32_t helper_icm(uint32_t r1, uint64_t address, uint32_t mask)it does not change the program counter in other words: tricky... currently implemented by interpreting the cases it is most commonly used in -*/ +*/ uint32_t HELPER (ex )(uint32_t cc,uint64_t v1,uint64_t addr,uint64_t ret) {uint16_t insn =lduw_code (addr); -HELPER_LOG ("%s: v1 0x%lx addr 0x%lx insn 0x%x\n" , __FUNCTION__, v1, addr, - insn); + +HELPER_LOG ("%s: v1 0x%lx addr 0x%lx insn 0x%x\n" , __func__, v1, addr, + insn);if ((insn &0xf0ff ) ==0xd000 ) {uint32_t l, insn2, b1, b2, d1, d2; + l = v1 &0xff ; insn2 =ldl_code (addr +2 ); b1 = (insn2 >>28 ) &0xf ;@@ -645,13 +655,14 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret) } }else if ((insn &0xff00 ) ==0x0a00 ) {/* supervisor call */ -HELPER_LOG ("%s: svc %ld via execute\n" , __FUNCTION__, (insn|v1) &0xff ); +HELPER_LOG ("%s: svc %ld via execute\n" , __func__, (insn | v1) &0xff ); env->psw.addr = ret -4 ; - env->int_svc_code = (insn|v1) &0xff ; + env->int_svc_code = (insn | v1) &0xff ; env->int_svc_ilc =4 ;helper_exception (EXCP_SVC ); }else if ((insn &0xff00 ) ==0xbf00 ) {uint32_t insn2, r1, r3, b2, d2; + insn2 =ldl_code (addr +2 ); r1 = (insn2 >>20 ) &0xf ; r3 = (insn2 >>16 ) &0xf ;@@ -659,7 +670,7 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret) d2 = insn2 &0xfff ; cc =helper_icm (r1,get_address (0 , b2, d2), r3); }else { -abort: + abort:cpu_abort (env,"EXECUTE on instruction prefix 0x%x not implemented\n" , insn); }@@ -689,7 +700,7 @@ int32_t HELPER(nabs_i32)(int32_t val)/* absolute value 64-bit */ uint64_t HELPER (abs_i64 )(int64_t val) { -HELPER_LOG ("%s: val 0x%" PRIx64"\n" , __FUNCTION__, val); +HELPER_LOG ("%s: val 0x%" PRIx64"\n" , __func__, val);if (val <0 ) {return -val;@@ -774,9 +785,9 @@ void HELPER(ipm)(uint32_t cc, uint32_t r1)uint64_t r = env->regs[r1]; r &=0xffffffff00ffffffULL ; - r |= (cc <<28 ) | ( (env->psw.mask >>40 ) &0xf ); + r |= (cc <<28 ) | ((env->psw.mask >>40 ) &0xf ); env->regs[r1] = r; -HELPER_LOG ("%s: cc %d psw.mask 0x%lx r1 0x%lx\n" , __FUNCTION__, +HELPER_LOG ("%s: cc %d psw.mask 0x%lx r1 0x%lx\n" , __func__, cc, env->psw.mask, r); }@@ -908,7 +919,7 @@ uint32_t HELPER(clcle)(uint32_t r1, uint64_t a2, uint32_t r3)uint64_t srclen = env->regs[r3 +1 ];uint64_t src =get_address_31fix (r3);uint8_t pad = a2 &0xff ; -uint8_t v1 =0 ,v2 =0 ; +uint8_t v1 =0 , v2 =0 ;uint32_t cc =0 ;if (!(destlen || srclen)) {@@ -1036,7 +1047,7 @@ static uint32_t set_cc_nz_f128(float128 v)/* convert 32-bit int to 64-bit float */ void HELPER (cdfbr )(uint32_t f1,int32_t v2) { -HELPER_LOG ("%s: converting %d to f%d\n" , __FUNCTION__, v2, f1); +HELPER_LOG ("%s: converting %d to f%d\n" , __func__, v2, f1); env->fregs[f1].d =int32_to_float64 (v2, &env->fpu_status); }@@ -1044,6 +1055,7 @@ void HELPER(cdfbr)(uint32_t f1, int32_t v2)void HELPER (cxfbr )(uint32_t f1,int32_t v2) {CPU_QuadU v1; + v1.q =int32_to_float128 (v2, &env->fpu_status); env->fregs[f1].ll = v1.ll.upper; env->fregs[f1 +2 ].ll = v1.ll.lower;@@ -1052,14 +1064,14 @@ void HELPER(cxfbr)(uint32_t f1, int32_t v2)/* convert 64-bit int to 32-bit float */ void HELPER (cegbr )(uint32_t f1,int64_t v2) { -HELPER_LOG ("%s: converting %ld to f%d\n" , __FUNCTION__, v2, f1); +HELPER_LOG ("%s: converting %ld to f%d\n" , __func__, v2, f1); env->fregs[f1].l.upper =int64_to_float32 (v2, &env->fpu_status); }/* convert 64-bit int to 64-bit float */ void HELPER (cdgbr )(uint32_t f1,int64_t v2) { -HELPER_LOG ("%s: converting %ld to f%d\n" , __FUNCTION__, v2, f1); +HELPER_LOG ("%s: converting %ld to f%d\n" , __func__, v2, f1); env->fregs[f1].d =int64_to_float64 (v2, &env->fpu_status); }@@ -1067,8 +1079,9 @@ void HELPER(cdgbr)(uint32_t f1, int64_t v2)void HELPER (cxgbr )(uint32_t f1,int64_t v2) {CPU_QuadU x1; + x1.q =int64_to_float128 (v2, &env->fpu_status); -HELPER_LOG ("%s: converted %ld to 0x%lx and 0x%lx\n" , __FUNCTION__, v2, +HELPER_LOG ("%s: converted %ld to 0x%lx and 0x%lx\n" , __func__, v2, x1.ll.upper, x1.ll.lower); env->fregs[f1].ll = x1.ll.upper; env->fregs[f1 +2 ].ll = x1.ll.lower;@@ -1078,7 +1091,7 @@ void HELPER(cxgbr)(uint32_t f1, int64_t v2)void HELPER (cefbr )(uint32_t f1,int32_t v2) { env->fregs[f1].l.upper =int32_to_float32 (v2, &env->fpu_status); -HELPER_LOG ("%s: converting %d to 0x%d in f%d\n" , __FUNCTION__, v2, +HELPER_LOG ("%s: converting %d to 0x%d in f%d\n" , __func__, v2, env->fregs[f1].l.upper, f1); }@@ -1088,7 +1101,7 @@ uint32_t HELPER(aebr)(uint32_t f1, uint32_t f2) env->fregs[f1].l.upper =float32_add (env->fregs[f1].l.upper, env->fregs[f2].l.upper, &env->fpu_status); -HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __func__, env->fregs[f2].l.upper, env->fregs[f1].l.upper, f1);return set_cc_nz_f32 (env->fregs[f1].l.upper);@@ -1099,7 +1112,7 @@ uint32_t HELPER(adbr)(uint32_t f1, uint32_t f2) { env->fregs[f1].d =float64_add (env->fregs[f1].d, env->fregs[f2].d, &env->fpu_status); -HELPER_LOG ("%s: adding 0x%ld resulting in 0x%ld in f%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%ld resulting in 0x%ld in f%d\n" , __func__, env->fregs[f2].d, env->fregs[f1].d, f1);return set_cc_nz_f64 (env->fregs[f1].d);@@ -1111,7 +1124,7 @@ uint32_t HELPER(sebr)(uint32_t f1, uint32_t f2) env->fregs[f1].l.upper =float32_sub (env->fregs[f1].l.upper, env->fregs[f2].l.upper, &env->fpu_status); -HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%d resulting in 0x%d in f%d\n" , __func__, env->fregs[f2].l.upper, env->fregs[f1].l.upper, f1);return set_cc_nz_f32 (env->fregs[f1].l.upper);@@ -1123,7 +1136,7 @@ uint32_t HELPER(sdbr)(uint32_t f1, uint32_t f2) env->fregs[f1].d =float64_sub (env->fregs[f1].d, env->fregs[f2].d, &env->fpu_status);HELPER_LOG ("%s: subtracting 0x%ld resulting in 0x%ld in f%d\n" , - __FUNCTION__, env->fregs[f2].d, env->fregs[f1].d, f1); + __func__, env->fregs[f2].d, env->fregs[f1].d, f1);return set_cc_nz_f64 (env->fregs[f1].d); }@@ -1140,12 +1153,13 @@ void HELPER(debr)(uint32_t f1, uint32_t f2)void HELPER (dxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_div (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1162,12 +1176,13 @@ void HELPER(mdbr)(uint32_t f1, uint32_t f2)void HELPER (mxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_mul (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1184,16 +1199,18 @@ void HELPER(ldebr)(uint32_t r1, uint32_t r2)void HELPER (ldxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x2; + x2.ll.upper = env->fregs[f2].ll; x2.ll.lower = env->fregs[f2 +2 ].ll; env->fregs[f1].d =float128_to_float64 (x2.q, &env->fpu_status); -HELPER_LOG ("%s: to 0x%ld\n" , __FUNCTION__, env->fregs[f1].d); +HELPER_LOG ("%s: to 0x%ld\n" , __func__, env->fregs[f1].d); }/* convert 64-bit float to 128-bit float */ void HELPER (lxdbr )(uint32_t f1,uint32_t f2) {CPU_QuadU res; + res.q =float64_to_float128 (env->fregs[f2].d, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1203,6 +1220,7 @@ void HELPER(lxdbr)(uint32_t f1, uint32_t f2)void HELPER (ledbr )(uint32_t f1,uint32_t f2) {float64 d2 = env->fregs[f2].d; + env->fregs[f1].l.upper =float64_to_float32 (d2, &env->fpu_status); }@@ -1210,10 +1228,11 @@ void HELPER(ledbr)(uint32_t f1, uint32_t f2)void HELPER (lexbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x2; + x2.ll.upper = env->fregs[f2].ll; x2.ll.lower = env->fregs[f2 +2 ].ll; env->fregs[f1].l.upper =float128_to_float32 (x2.q, &env->fpu_status); -HELPER_LOG ("%s: to 0x%d\n" , __FUNCTION__, env->fregs[f1].l.upper); +HELPER_LOG ("%s: to 0x%d\n" , __func__, env->fregs[f1].l.upper); }/* absolute value of 32-bit float */ @@ -1221,6 +1240,7 @@ uint32_t HELPER(lpebr)(uint32_t f1, uint32_t f2) {float32 v1;float32 v2 = env->fregs[f2].d; + v1 =float32_abs (v2); env->fregs[f1].d = v1;return set_cc_nz_f32 (v1);@@ -1231,6 +1251,7 @@ uint32_t HELPER(lpdbr)(uint32_t f1, uint32_t f2) {float64 v1;float64 v2 = env->fregs[f2].d; + v1 =float64_abs (v2); env->fregs[f1].d = v1;return set_cc_nz_f64 (v1);@@ -1241,6 +1262,7 @@ uint32_t HELPER(lpxbr)(uint32_t f1, uint32_t f2) {CPU_QuadU v1;CPU_QuadU v2; + v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; v1.q =float128_abs (v2.q);@@ -1267,6 +1289,7 @@ uint32_t HELPER(ltebr)(uint32_t f1, uint32_t f2)uint32_t HELPER (ltxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x; + x.ll.upper = env->fregs[f2].ll; x.ll.lower = env->fregs[f2 +2 ].ll; env->fregs[f1].ll = x.ll.upper;@@ -1294,6 +1317,7 @@ uint32_t HELPER(lcdbr)(uint32_t f1, uint32_t f2)uint32_t HELPER (lcxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU x1, x2; + x2.ll.upper = env->fregs[f2].ll; x2.ll.lower = env->fregs[f2 +2 ].ll; x1.q =float128_chs (x2.q);@@ -1307,8 +1331,9 @@ void HELPER(aeb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; -HELPER_LOG ("%s: adding 0x%d from f%d and 0x%d\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%d from f%d and 0x%d\n" , __func__, v1, f1, v2.f); env->fregs[f1].l.upper =float32_add (v1, v2.f, &env->fpu_status); }@@ -1318,8 +1343,9 @@ void HELPER(deb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; -HELPER_LOG ("%s: dividing 0x%d from f%d by 0x%d\n" , __FUNCTION__, +HELPER_LOG ("%s: dividing 0x%d from f%d by 0x%d\n" , __func__, v1, f1, v2.f); env->fregs[f1].l.upper =float32_div (v1, v2.f, &env->fpu_status); }@@ -1329,8 +1355,9 @@ void HELPER(meeb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; -HELPER_LOG ("%s: multiplying 0x%d from f%d and 0x%d\n" , __FUNCTION__, +HELPER_LOG ("%s: multiplying 0x%d from f%d and 0x%d\n" , __func__, v1, f1, v2.f); env->fregs[f1].l.upper =float32_mul (v1, v2.f, &env->fpu_status); }@@ -1340,7 +1367,8 @@ uint32_t HELPER(cebr)(uint32_t f1, uint32_t f2) {float32 v1 = env->fregs[f1].l.upper;float32 v2 = env->fregs[f2].l.upper; -HELPER_LOG ("%s: comparing 0x%d from f%d and 0x%d\n" , __FUNCTION__, + +HELPER_LOG ("%s: comparing 0x%d from f%d and 0x%d\n" , __func__, v1, f1, v2);return set_cc_f32 (v1, v2); }@@ -1350,7 +1378,8 @@ uint32_t HELPER(cdbr)(uint32_t f1, uint32_t f2) {float64 v1 = env->fregs[f1].d;float64 v2 = env->fregs[f2].d; -HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%ld\n" , __FUNCTION__, + +HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%ld\n" , __func__, v1, f1, v2);return set_cc_f64 (v1, v2); }@@ -1359,14 +1388,15 @@ uint32_t HELPER(cdbr)(uint32_t f1, uint32_t f2)uint32_t HELPER (cxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll;return float_comp_to_cc (float128_compare_quiet (v1.q, v2.q, - &env->fpu_status)); + &env->fpu_status)); }/* 64-bit FP compare RM */ @@ -1374,8 +1404,9 @@ uint32_t HELPER(cdb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%lx\n" , __FUNCTION__, v1, +HELPER_LOG ("%s: comparing 0x%ld from f%d and 0x%lx\n" , __func__, v1, f1, v2.d);return set_cc_f64 (v1, v2.d); }@@ -1385,8 +1416,9 @@ uint32_t HELPER(adb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: adding 0x%lx from f%d and 0x%lx\n" , __FUNCTION__, +HELPER_LOG ("%s: adding 0x%lx from f%d and 0x%lx\n" , __func__, v1, f1, v2.d); env->fregs[f1].d = v1 =float64_add (v1, v2.d, &env->fpu_status);return set_cc_nz_f64 (v1);@@ -1397,6 +1429,7 @@ void HELPER(seb)(uint32_t f1, uint32_t val) {float32 v1 = env->fregs[f1].l.upper;CPU_FloatU v2; + v2.l = val; env->fregs[f1].l.upper =float32_sub (v1, v2.f, &env->fpu_status); }@@ -1406,6 +1439,7 @@ uint32_t HELPER(sdb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); env->fregs[f1].d = v1 =float64_sub (v1, v2.d, &env->fpu_status);return set_cc_nz_f64 (v1);@@ -1416,8 +1450,9 @@ void HELPER(mdb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: multiplying 0x%lx from f%d and 0x%ld\n" , __FUNCTION__, +HELPER_LOG ("%s: multiplying 0x%lx from f%d and 0x%ld\n" , __func__, v1, f1, v2.d); env->fregs[f1].d =float64_mul (v1, v2.d, &env->fpu_status); }@@ -1427,8 +1462,9 @@ void HELPER(ddb)(uint32_t f1, uint64_t a2) {float64 v1 = env->fregs[f1].d;CPU_DoubleU v2; + v2.ll =ldq (a2); -HELPER_LOG ("%s: dividing 0x%lx from f%d by 0x%ld\n" , __FUNCTION__, +HELPER_LOG ("%s: dividing 0x%lx from f%d by 0x%ld\n" , __func__, v1, f1, v2.d); env->fregs[f1].d =float64_div (v1, v2.d, &env->fpu_status); }@@ -1464,6 +1500,7 @@ static void set_round_mode(int m3)uint32_t HELPER (cgebr )(uint32_t r1,uint32_t f2,uint32_t m3) {float32 v2 = env->fregs[f2].l.upper; +set_round_mode (m3); env->regs[r1] =float32_to_int64 (v2, &env->fpu_status);return set_cc_nz_f32 (v2);@@ -1473,6 +1510,7 @@ uint32_t HELPER(cgebr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cgdbr )(uint32_t r1,uint32_t f2,uint32_t m3) {float64 v2 = env->fregs[f2].d; +set_round_mode (m3); env->regs[r1] =float64_to_int64 (v2, &env->fpu_status);return set_cc_nz_f64 (v2);@@ -1482,6 +1520,7 @@ uint32_t HELPER(cgdbr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cgxbr )(uint32_t r1,uint32_t f2,uint32_t m3) {CPU_QuadU v2; + v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll;set_round_mode (m3);@@ -1501,9 +1540,10 @@ uint32_t HELPER(cgxbr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cfebr )(uint32_t r1,uint32_t f2,uint32_t m3) {float32 v2 = env->fregs[f2].l.upper; +set_round_mode (m3); env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | -float32_to_int32 (v2, &env->fpu_status); +float32_to_int32 (v2, &env->fpu_status);return set_cc_nz_f32 (v2); }@@ -1511,9 +1551,10 @@ uint32_t HELPER(cfebr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cfdbr )(uint32_t r1,uint32_t f2,uint32_t m3) {float64 v2 = env->fregs[f2].d; +set_round_mode (m3); env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | -float64_to_int32 (v2, &env->fpu_status); +float64_to_int32 (v2, &env->fpu_status);return set_cc_nz_f64 (v2); }@@ -1521,10 +1562,11 @@ uint32_t HELPER(cfdbr)(uint32_t r1, uint32_t f2, uint32_t m3)uint32_t HELPER (cfxbr )(uint32_t r1,uint32_t f2,uint32_t m3) {CPU_QuadU v2; + v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | -float128_to_int32 (v2.q, &env->fpu_status); +float128_to_int32 (v2.q, &env->fpu_status);return set_cc_nz_f128 (v2.q); }@@ -1544,6 +1586,7 @@ void HELPER(lzdr)(uint32_t f1)void HELPER (lzxr )(uint32_t f1) {CPU_QuadU x; + x.q =float64_to_float128 (float64_zero, &env->fpu_status); env->fregs[f1].ll = x.ll.upper; env->fregs[f1 +1 ].ll = x.ll.lower;@@ -1553,12 +1596,13 @@ void HELPER(lzxr)(uint32_t f1)uint32_t HELPER (sxbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_sub (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1569,12 +1613,13 @@ uint32_t HELPER(sxbr)(uint32_t f1, uint32_t f2)uint32_t HELPER (axbr )(uint32_t f1,uint32_t f2) {CPU_QuadU v1; +CPU_QuadU v2; +CPU_QuadU res; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -CPU_QuadU v2; v2.ll.upper = env->fregs[f2].ll; v2.ll.lower = env->fregs[f2 +2 ].ll; -CPU_QuadU res; res.q =float128_add (v1.q, v2.q, &env->fpu_status); env->fregs[f1].ll = res.ll.upper; env->fregs[f1 +2 ].ll = res.ll.lower;@@ -1599,8 +1644,9 @@ void HELPER(ddbr)(uint32_t f1, uint32_t f2)/* 64-bit FP multiply and add RM */ void HELPER (madb )(uint32_t f1,uint64_t a2,uint32_t f3) { -HELPER_LOG ("%s: f1 %d a2 0x%lx f3 %d\n" , __FUNCTION__, f1, a2, f3);CPU_DoubleU v2; + +HELPER_LOG ("%s: f1 %d a2 0x%lx f3 %d\n" , __func__, f1, a2, f3); v2.ll =ldq (a2); env->fregs[f1].d = float64_add(env->fregs[f1].d, float64_mul(v2.d, env->fregs[f3].d,@@ -1611,7 +1657,7 @@ void HELPER(madb)(uint32_t f1, uint64_t a2, uint32_t f3)/* 64-bit FP multiply and add RR */ void HELPER (madbr )(uint32_t f1,uint32_t f3,uint32_t f2) { -HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __FUNCTION__, f1, f2, f3); +HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __func__, f1, f2, f3); env->fregs[f1].d = float64_add(float64_mul(env->fregs[f2].d, env->fregs[f3].d, &env->fpu_status),@@ -1621,7 +1667,7 @@ void HELPER(madbr)(uint32_t f1, uint32_t f3, uint32_t f2)/* 64-bit FP multiply and subtract RR */ void HELPER (msdbr )(uint32_t f1,uint32_t f3,uint32_t f2) { -HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __FUNCTION__, f1, f2, f3); +HELPER_LOG ("%s: f1 %d f2 %d f3 %d\n" , __func__, f1, f2, f3); env->fregs[f1].d = float64_sub(float64_mul(env->fregs[f2].d, env->fregs[f3].d, &env->fpu_status),@@ -1642,6 +1688,7 @@ void HELPER(maebr)(uint32_t f1, uint32_t f3, uint32_t f2)void HELPER (ldeb )(uint32_t f1,uint64_t a2) {uint32_t v2; + v2 =ldl (a2); env->fregs[f1].d =float32_to_float64 (v2, &env->fpu_status);@@ -1651,8 +1698,9 @@ void HELPER(ldeb)(uint32_t f1, uint64_t a2)void HELPER (lxdb )(uint32_t f1,uint64_t a2) {CPU_DoubleU v2; - v2.ll =ldq (a2);CPU_QuadU v1; + + v2.ll =ldq (a2); v1.q =float64_to_float128 (v2.d, &env->fpu_status); env->fregs[f1].ll = v1.ll.upper; env->fregs[f1 +2 ].ll = v1.ll.lower;@@ -1665,7 +1713,7 @@ uint32_t HELPER(tceb)(uint32_t f1, uint64_t m2)int neg =float32_is_neg (v1);uint32_t cc =0 ; -HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __FUNCTION__, (long )v1, m2, neg); +HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __func__, (long )v1, m2, neg); if ((float32_is_zero(v1) && (m2 & (1 << (11-neg)))) || (float32_is_infinity(v1) && (m2 & (1 << (5-neg)))) || (float32_is_any_nan(v1) && (m2 & (1 << (3-neg)))) ||@@ -1687,7 +1735,7 @@ uint32_t HELPER(tcdb)(uint32_t f1, uint64_t m2)int neg =float64_is_neg (v1);uint32_t cc =0 ; -HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __FUNCTION__, v1, m2, neg); +HELPER_LOG ("%s: v1 0x%lx m2 0x%lx neg %d\n" , __func__, v1, m2, neg); if ((float64_is_zero(v1) && (m2 & (1 << (11-neg)))) || (float64_is_infinity(v1) && (m2 & (1 << (5-neg)))) || (float64_is_any_nan(v1) && (m2 & (1 << (3-neg)))) ||@@ -1706,10 +1754,12 @@ uint32_t HELPER(tcxb)(uint32_t f1, uint64_t m2) {CPU_QuadU v1;uint32_t cc =0 ; +int neg; + v1.ll.upper = env->fregs[f1].ll; v1.ll.lower = env->fregs[f1 +2 ].ll; -int neg =float128_is_neg (v1.q); + neg =float128_is_neg (v1.q); if ((float128_is_zero(v1.q) && (m2 & (1 << (11-neg)))) || (float128_is_infinity(v1.q) && (m2 & (1 << (5-neg)))) || (float128_is_any_nan(v1.q) && (m2 & (1 << (3-neg)))) ||@@ -1787,7 +1837,7 @@ void HELPER(cksm)(uint32_t r1, uint32_t r2)/* store result */ env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | - ((uint32_t )cksm + (cksm >>32 )); + ((uint32_t )cksm + (cksm >>32 )); } static inline uint32_t cc_calc_ltgt_32(CPUS390XState *env, int32_t src,@@ -1848,10 +1898,12 @@ static inline uint32_t cc_calc_ltugtu_64(CPUS390XState *env, uint64_t src, } } -static inline uint32_t cc_calc_tm_32 (CPUS390XState *env,uint32_t val,uint32_t mask) +static inline uint32_t cc_calc_tm_32 (CPUS390XState *env,uint32_t val, +uint32_t mask) { -HELPER_LOG ("%s: val 0x%x mask 0x%x\n" , __FUNCTION__, val, mask);uint16_t r = val & mask; + +HELPER_LOG ("%s: val 0x%x mask 0x%x\n" , __func__, val, mask);if (r ==0 || mask ==0 ) {return 0 ; }else if (r == mask) {@@ -1862,10 +1914,12 @@ static inline uint32_t cc_calc_tm_32(CPUS390XState *env, uint32_t val, uint32_t }/* set condition code for test under mask */ -static inline uint32_t cc_calc_tm_64 (CPUS390XState *env,uint64_t val,uint32_t mask) +static inline uint32_t cc_calc_tm_64 (CPUS390XState *env,uint64_t val, +uint32_t mask) {uint16_t r = val & mask; -HELPER_LOG ("%s: val 0x%lx mask 0x%x r 0x%x\n" , __FUNCTION__, val, mask, r); + +HELPER_LOG ("%s: val 0x%lx mask 0x%x r 0x%x\n" , __func__, val, mask, r);if (r ==0 || mask ==0 ) {return 0 ; }else if (r == mask) {@@ -1888,8 +1942,8 @@ static inline uint32_t cc_calc_nz(CPUS390XState *env, uint64_t dst)return !!dst; } -static inline uint32_t cc_calc_add_64 (CPUS390XState *env,int64_t a1,int64_t a2, -int64_t ar) +static inline uint32_t cc_calc_add_64 (CPUS390XState *env,int64_t a1, +int64_t a2,int64_t ar) {if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) {return 3 ;/* overflow */ @@ -1904,8 +1958,8 @@ static inline uint32_t cc_calc_add_64(CPUS390XState *env, int64_t a1, int64_t a2 } } -static inline uint32_t cc_calc_addu_64 (CPUS390XState *env,uint64_t a1,uint64_t a2, -uint64_t ar) +static inline uint32_t cc_calc_addu_64 (CPUS390XState *env,uint64_t a1, +uint64_t a2,uint64_t ar) {if (ar ==0 ) {if (a1) {@@ -1915,15 +1969,15 @@ static inline uint32_t cc_calc_addu_64(CPUS390XState *env, uint64_t a1, uint64_t } }else {if (ar < a1 || ar < a2) { -return 3 ; +return 3 ; }else { -return 1 ; +return 1 ; } } } -static inline uint32_t cc_calc_sub_64 (CPUS390XState *env,int64_t a1,int64_t a2, -int64_t ar) +static inline uint32_t cc_calc_sub_64 (CPUS390XState *env,int64_t a1, +int64_t a2,int64_t ar) {if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ @@ -1938,8 +1992,8 @@ static inline uint32_t cc_calc_sub_64(CPUS390XState *env, int64_t a1, int64_t a2 } } -static inline uint32_t cc_calc_subu_64 (CPUS390XState *env,uint64_t a1,uint64_t a2, -uint64_t ar) +static inline uint32_t cc_calc_subu_64 (CPUS390XState *env,uint64_t a1, +uint64_t a2,uint64_t ar) {if (ar ==0 ) {return 2 ;@@ -1982,8 +2036,8 @@ static inline uint32_t cc_calc_comp_64(CPUS390XState *env, int64_t dst) } -static inline uint32_t cc_calc_add_32 (CPUS390XState *env,int32_t a1,int32_t a2, -int32_t ar) +static inline uint32_t cc_calc_add_32 (CPUS390XState *env,int32_t a1, +int32_t a2,int32_t ar) {if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) {return 3 ;/* overflow */ @@ -1998,26 +2052,26 @@ static inline uint32_t cc_calc_add_32(CPUS390XState *env, int32_t a1, int32_t a2 } } -static inline uint32_t cc_calc_addu_32 (CPUS390XState *env,uint32_t a1,uint32_t a2, -uint32_t ar) +static inline uint32_t cc_calc_addu_32 (CPUS390XState *env,uint32_t a1, +uint32_t a2,uint32_t ar) {if (ar ==0 ) {if (a1) { -return 2 ; +return 2 ; }else { -return 0 ; +return 0 ; } }else {if (ar < a1 || ar < a2) { -return 3 ; +return 3 ; }else { -return 1 ; +return 1 ; } } } -static inline uint32_t cc_calc_sub_32 (CPUS390XState *env,int32_t a1,int32_t a2, -int32_t ar) +static inline uint32_t cc_calc_sub_32 (CPUS390XState *env,int32_t a1, +int32_t a2,int32_t ar) {if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ @@ -2032,8 +2086,8 @@ static inline uint32_t cc_calc_sub_32(CPUS390XState *env, int32_t a1, int32_t a2 } } -static inline uint32_t cc_calc_subu_32 (CPUS390XState *env,uint32_t a1,uint32_t a2, -uint32_t ar) +static inline uint32_t cc_calc_subu_32 (CPUS390XState *env,uint32_t a1, +uint32_t a2,uint32_t ar) {if (ar ==0 ) {return 2 ;@@ -2076,11 +2130,12 @@ static inline uint32_t cc_calc_comp_32(CPUS390XState *env, int32_t dst) }/* calculate condition code for insert character under mask insn */ -static inline uint32_t cc_calc_icm_32 (CPUS390XState *env,uint32_t mask,uint32_t val) +static inline uint32_t cc_calc_icm_32 (CPUS390XState *env,uint32_t mask, +uint32_t val) { -HELPER_LOG ("%s: mask 0x%x val %d\n" , __FUNCTION__, mask, val);uint32_t cc; +HELPER_LOG ("%s: mask 0x%x val %d\n" , __func__, mask, val);if (mask ==0xf ) {if (!val) {return 0 ;@@ -2107,7 +2162,8 @@ static inline uint32_t cc_calc_icm_32(CPUS390XState *env, uint32_t mask, uint32_return cc; } -static inline uint32_t cc_calc_slag (CPUS390XState *env,uint64_t src,uint64_t shift) +static inline uint32_t cc_calc_slag (CPUS390XState *env,uint64_t src, +uint64_t shift) {uint64_t mask = ((1ULL << shift) -1ULL ) << (64 - shift);uint64_t match, r;@@ -2136,8 +2192,8 @@ static inline uint32_t cc_calc_slag(CPUS390XState *env, uint64_t src, uint64_t s } -static inline uint32_t do_calc_cc (CPUS390XState *env,uint32_t cc_op,uint64_t src, -uint64_t dst,uint64_t vr) +static inline uint32_t do_calc_cc (CPUS390XState *env,uint32_t cc_op, +uint64_t src,uint64_t dst,uint64_t vr) {uint32_t r =0 ;@@ -2244,7 +2300,7 @@ static inline uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t scpu_abort (env,"Unknown CC operation: %s\n" ,cc_name (cc_op)); } -HELPER_LOG ("%s: %15s 0x%016lx 0x%016lx 0x%016lx = %d\n" , __FUNCTION__, +HELPER_LOG ("%s: %15s 0x%016lx 0x%016lx 0x%016lx = %d\n" , __func__,cc_name (cc_op), src, dst, vr, r);return r; }@@ -2334,6 +2390,7 @@ void HELPER(tr)(uint32_t len, uint64_t array, uint64_t trans)for (i =0 ; i <= len; i++) {uint8_t byte =ldub (array + i);uint8_t new_byte =ldub (trans + byte); +stb (array + i, new_byte); } }@@ -2363,7 +2420,7 @@ static void program_interrupt(CPUS390XState *env, uint32_t code, int ilc) }/* -* ret < 0 indicates program check, ret = 0,1,2,3 -> cc +* ret < 0 indicates program check, ret = 0, 1, 2, 3 -> cc */ int sclp_service_call (CPUS390XState *env,uint32_t sccb,uint64_t code) {@@ -2382,24 +2439,24 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code)return -PGM_SPECIFICATION ; } -switch (code) { -case SCLP_CMDW_READ_SCP_INFO : -case SCLP_CMDW_READ_SCP_INFO_FORCED : -while ((ram_size >> (20 + shift)) >65535 ) { - shift++; - } -stw_phys (sccb +SCP_MEM_CODE , ram_size >> (20 + shift)); -stb_phys (sccb +SCP_INCREMENT ,1 << shift); -stw_phys (sccb +SCP_RESPONSE_CODE ,0x10 ); +switch (code) { +case SCLP_CMDW_READ_SCP_INFO : +case SCLP_CMDW_READ_SCP_INFO_FORCED : +while ((ram_size >> (20 + shift)) >65535 ) { + shift++; + } +stw_phys (sccb +SCP_MEM_CODE , ram_size >> (20 + shift)); +stb_phys (sccb +SCP_INCREMENT ,1 << shift); +stw_phys (sccb +SCP_RESPONSE_CODE ,0x10 ); -s390_sclp_extint (sccb & ~3 ); -break ; -default : +s390_sclp_extint (sccb & ~3 ); +break ; +default :#ifdef DEBUG_HELPER -printf ("KVM: invalid sclp call 0x%x / 0x%" PRIx64"x\n" , sccb, code); +printf ("KVM: invalid sclp call 0x%x / 0x%" PRIx64"x\n" , sccb, code);#endif - r =3 ; -break ; + r =3 ; +break ; }return r;@@ -2479,7 +2536,7 @@ static inline uint64_t clock_value(CPUS390XState *env)uint64_t time; time = env->tod_offset + -time2tod (qemu_get_clock_ns (vm_clock) - env->tod_basetime); +time2tod (qemu_get_clock_ns (vm_clock) - env->tod_basetime);return time; }@@ -2503,7 +2560,6 @@ uint32_t HELPER(stcke)(uint64_t a1)/* XXX programmable fields */ stw (a1 +17 ,0 ); -return 0 ; }@@ -2584,7 +2640,7 @@ uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)ebcdic_put (sysib.model,"QEMU " ,16 );ebcdic_put (sysib.sequence,"QEMU " ,16 );ebcdic_put (sysib.plant,"QEMU" ,4 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); }else if ((sel1 ==2 ) && (sel2 ==1 )) {/* Basic Machine CPU */ struct sysib_121 sysib;@@ -2594,7 +2650,7 @@ uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)ebcdic_put (sysib.sequence,"QEMUQEMUQEMUQEMU" ,16 );ebcdic_put (sysib.plant,"QEMU" ,4 );stw_p (&sysib.cpu_addr, env->cpu_num); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); }else if ((sel1 ==2 ) && (sel2 ==2 )) {/* Basic Machine CPUs */ struct sysib_122 sysib;@@ -2606,68 +2662,68 @@ uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)stw_p (&sysib.active_cpus,1 );stw_p (&sysib.standby_cpus,0 );stw_p (&sysib.reserved_cpus,0 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); }else { cc =3 ; }break ;case STSI_LEVEL_2 : - { -if ((sel1 ==2 ) && (sel2 ==1 )) { -/* LPAR CPU */ -struct sysib_221 sysib; - -memset (&sysib,0 ,sizeof (sysib)); -/* XXX make different for different CPUs? */ -ebcdic_put (sysib.sequence,"QEMUQEMUQEMUQEMU" ,16 ); -ebcdic_put (sysib.plant,"QEMU" ,4 ); -stw_p (&sysib.cpu_addr, env->cpu_num); -stw_p (&sysib.cpu_id,0 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); - }else if ((sel1 ==2 ) && (sel2 ==2 )) { -/* LPAR CPUs */ -struct sysib_222 sysib; - -memset (&sysib,0 ,sizeof (sysib)); -stw_p (&sysib.lpar_num,0 ); - sysib.lcpuc =0 ; -/* XXX change when SMP comes */ -stw_p (&sysib.total_cpus,1 ); -stw_p (&sysib.conf_cpus,1 ); -stw_p (&sysib.standby_cpus,0 ); -stw_p (&sysib.reserved_cpus,0 ); -ebcdic_put (sysib.name,"QEMU " ,8 ); -stl_p (&sysib.caf,1000 ); -stw_p (&sysib.dedicated_cpus,0 ); -stw_p (&sysib.shared_cpus,0 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); - }else { - cc =3 ; + { +if ((sel1 ==2 ) && (sel2 ==1 )) { +/* LPAR CPU */ +struct sysib_221 sysib; + +memset (&sysib,0 ,sizeof (sysib)); +/* XXX make different for different CPUs? */ +ebcdic_put (sysib.sequence,"QEMUQEMUQEMUQEMU" ,16 ); +ebcdic_put (sysib.plant,"QEMU" ,4 ); +stw_p (&sysib.cpu_addr, env->cpu_num); +stw_p (&sysib.cpu_id,0 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); + }else if ((sel1 ==2 ) && (sel2 ==2 )) { +/* LPAR CPUs */ +struct sysib_222 sysib; + +memset (&sysib,0 ,sizeof (sysib)); +stw_p (&sysib.lpar_num,0 ); + sysib.lcpuc =0 ; +/* XXX change when SMP comes */ +stw_p (&sysib.total_cpus,1 ); +stw_p (&sysib.conf_cpus,1 ); +stw_p (&sysib.standby_cpus,0 ); +stw_p (&sysib.reserved_cpus,0 ); +ebcdic_put (sysib.name,"QEMU " ,8 ); +stl_p (&sysib.caf,1000 ); +stw_p (&sysib.dedicated_cpus,0 ); +stw_p (&sysib.shared_cpus,0 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); + }else { + cc =3 ; + } +break ; } -break ; - }case STSI_LEVEL_3 : - { -if ((sel1 ==2 ) && (sel2 ==2 )) { -/* VM CPUs */ -struct sysib_322 sysib; - -memset (&sysib,0 ,sizeof (sysib)); - sysib.count =1 ; -/* XXX change when SMP comes */ -stw_p (&sysib.vm[0 ].total_cpus,1 ); -stw_p (&sysib.vm[0 ].conf_cpus,1 ); -stw_p (&sysib.vm[0 ].standby_cpus,0 ); -stw_p (&sysib.vm[0 ].reserved_cpus,0 ); -ebcdic_put (sysib.vm[0 ].name,"KVMguest" ,8 ); -stl_p (&sysib.vm[0 ].caf,1000 ); -ebcdic_put (sysib.vm[0 ].cpi,"KVM/Linux " ,16 ); -cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); - }else { - cc =3 ; + { +if ((sel1 ==2 ) && (sel2 ==2 )) { +/* VM CPUs */ +struct sysib_322 sysib; + +memset (&sysib,0 ,sizeof (sysib)); + sysib.count =1 ; +/* XXX change when SMP comes */ +stw_p (&sysib.vm[0 ].total_cpus,1 ); +stw_p (&sysib.vm[0 ].conf_cpus,1 ); +stw_p (&sysib.vm[0 ].standby_cpus,0 ); +stw_p (&sysib.vm[0 ].reserved_cpus,0 ); +ebcdic_put (sysib.vm[0 ].name,"KVMguest" ,8 ); +stl_p (&sysib.vm[0 ].caf,1000 ); +ebcdic_put (sysib.vm[0 ].cpi,"KVM/Linux " ,16 ); +cpu_physical_memory_rw (a0, (uint8_t *)&sysib,sizeof (sysib),1 ); + }else { + cc =3 ; + } +break ; } -break ; - }case STSI_LEVEL_CURRENT : env->regs[0 ] =STSI_LEVEL_3 ;break ;@@ -2781,6 +2837,7 @@ uint32_t HELPER(rrbe)(uint32_t r1, uint64_t r2) {uint8_t re;uint8_t key; +if (r2 > ram_size) {return 0 ; }@@ -2865,7 +2922,7 @@ static uint32_t mvc_asc(int64_t l, uint64_t a1, uint64_t mode1, uint64_t a2,uint32_t HELPER (mvcs )(uint64_t l,uint64_t a1,uint64_t a2) {HELPER_LOG ("%s: %16" PRIx64" %16" PRIx64" %16" PRIx64"\n" , - __FUNCTION__, l, a1, a2); + __func__, l, a1, a2);return mvc_asc (l, a1,PSW_ASC_SECONDARY , a2,PSW_ASC_PRIMARY ); }@@ -2873,7 +2930,7 @@ uint32_t HELPER(mvcs)(uint64_t l, uint64_t a1, uint64_t a2)uint32_t HELPER (mvcp )(uint64_t l,uint64_t a1,uint64_t a2) {HELPER_LOG ("%s: %16" PRIx64" %16" PRIx64" %16" PRIx64"\n" , - __FUNCTION__, l, a1, a2); + __func__, l, a1, a2);return mvc_asc (l, a1,PSW_ASC_PRIMARY , a2,PSW_ASC_SECONDARY ); }@@ -2883,9 +2940,9 @@ uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr)int cc =0 ;HELPER_LOG ("%s: %016" PRIx64" %08x %016" PRIx64"\n" , - __FUNCTION__, order_code, r1, cpu_addr); + __func__, order_code, r1, cpu_addr); -/* Remember: Use "R1 or R1+1, whichever is the odd-numbered register" +/* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register" as parameter (input). Status (output) is always R1. */ switch (order_code) {@@ -2901,7 +2958,7 @@ uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr) env->regs[r1] &=0xffffffff00000000ULL ; cc =1 ;break ; -#if !defined (CONFIG_USER_ONLY ) +#if !defined(CONFIG_USER_ONLY )case SIGP_RESTART :qemu_system_reset_request ();cpu_loop_exit (env);@@ -2922,7 +2979,7 @@ uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr)void HELPER (sacf )(uint64_t a1) { -HELPER_LOG ("%s: %16" PRIx64"\n" , __FUNCTION__, a1); +HELPER_LOG ("%s: %16" PRIx64"\n" , __func__, a1);switch (a1 &0xf00 ) {case 0x000 :@@ -2953,13 +3010,13 @@ void HELPER(ipte)(uint64_t pte_addr, uint64_t vaddr)/* XXX broadcast to other CPUs */ /* XXX Linux is nice enough to give us the exact pte address. -According to spec we'd have to find it out ourselves */ +According to spec we'd have to find it out ourselves */ /* XXX Linux is fine with overwriting the pte, the spec requires -us to only set the invalid bit */ +us to only set the invalid bit */ stq_phys (pte_addr, pte | _PAGE_INVALID);/* XXX we exploit the fact that Linux passes the exact virtual -address here - it's not obliged to! */ +address here - it's not obliged to! */ tlb_flush_page (env, page);/* XXX 31-bit hack */ @@ -3008,7 +3065,8 @@ uint32_t HELPER(lra)(uint64_t addr, uint32_t r1) env->exception_index = old_exc;if (!(env->psw.mask &PSW_MASK_64 )) { - env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | (ret &0xffffffffULL ); + env->regs[r1] = (env->regs[r1] &0xffffffff00000000ULL ) | + (ret &0xffffffffULL ); }else { env->regs[r1] = ret; } --1.7.2.5
Re: [Qemu-devel] [PATCH 20/21] target-mips: switch to AREG0 free mode
In reply to Aurelien JarnoQuoted 14 lines · Aurelien Jarno
Quoted 4 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>Quoted 8 lines
--- configure | 2 +- target-mips/Makefile.objs | 2 - target-mips/cpu.h | 16 +- target-mips/helper.h | 410 +++++++++--------- target-mips/op_helper.c | 1065 ++++++++++++++++++++++++--------------------- target-mips/translate.c | 754 ++++++++++++++++---------------- 6 files changed, 1163 insertions(+), 1086 deletions(-)
Quoted 5 lines
Acked-by Aurelien Jarno <[email protected]>Please commit this patch asap after the 1.2 release, even if the patches for the other targets are not ready, so that it doesn't hold the development.
Thanks. There's at least Jia Liu's MIPS DSP series, it probably does not conflict so much but it hasn't been converted to new AREG0-free order either.
Quoted 4 lines
--
Aurelien Jarno GPG: 1024D/F1BCDB73
[email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 20/21] target-mips: switch to AREG0 free mode
Quoted 17 lines · Blue Swirl
Quoted 16 lines · Aurelien Jarno
Quoted 4 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>Quoted 8 lines
--- configure | 2 +- target-mips/Makefile.objs | 2 - target-mips/cpu.h | 16 +- target-mips/helper.h | 410 +++++++++--------- target-mips/op_helper.c | 1065 ++++++++++++++++++++++++--------------------- target-mips/translate.c | 754 ++++++++++++++++---------------- 6 files changed, 1163 insertions(+), 1086 deletions(-)Acked-by Aurelien Jarno <[email protected]>
Quoted 8 lines
Quoted 3 lines
Please commit this patch asap after the 1.2 release, even if the patches for the other targets are not ready, so that it doesn't hold the development.
Thanks. There's at least Jia Liu's MIPS DSP series, it probably does not conflict so much but it hasn't been converted to new AREG0-free order either.
I am still reviewing it, but I don't think it is ready yet, so it's better to get the AREG0 patches first.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
In reply to Blue SwirlQuoted 7 lines · Blue Swirl
Quoted 5 lines · Peter Maydell
On 3 September 2012 01:01, Peter Maydell <[email protected]> wrote:
That's quite hard to cross-reference when the patch is this big. I think it would be helpful if you could split it up into patches touching smaller groups of helpers at once rather than having a single patch that does them all at once.
Quoted 5 lines
For x86, Sparc and s390x I used the approach of splitting
op_helper.cto smaller files first. I didn't do it for ARM sincetarget-arm/op_helper.cis alread pretty small (<500 lines). It could be split to saturating ops, condition code setting arithmetic ops and misc ops, between 100 and 200 lines each. Would that be OK?
I don't want the *file* split, I'd just like to see this *patch* as 4 or 5 separate patches, not one big one.
(Patch-splitting is a personal preference thing; I generally favour lots of little patches over big ones.)
thanks
-- PMM
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
Quoted 8 lines · Peter Maydell
Quoted 7 lines · Blue Swirl
Quoted 5 lines · Peter Maydell
On 3 September 2012 01:01, Peter Maydell <[email protected]> wrote:
That's quite hard to cross-reference when the patch is this big. I think it would be helpful if you could split it up into patches touching smaller groups of helpers at once rather than having a single patch that does them all at once.
Quoted 8 lines
Quoted 5 lines
For x86, Sparc and s390x I used the approach of splitting
op_helper.cto smaller files first. I didn't do it for ARM sincetarget-arm/op_helper.cis alread pretty small (<500 lines). It could be split to saturating ops, condition code setting arithmetic ops and misc ops, between 100 and 200 lines each. Would that be OK?I don't want the *file* split, I'd just like to see this *patch* as 4 or 5 separate patches, not one big one.
While converting, it's easier to work on whole files but maybe the resulting patch can be still split.
Quoted 3 lines
(Patch-splitting is a personal preference thing; I generally favour lots of little patches over big ones.)
That's just common sense. The conversion logic is just not very helpful here.
Quoted 3 lines
thanks
-- PMM
Re: [Qemu-devel] [PATCH 16/21] target-arm: switch to AREG0 free mode
Quoted 6 lines · Blue Swirl
Quoted 2 lines · Peter Maydell
I don't want the *file* split, I'd just like to see this *patch* as 4 or 5 separate patches, not one big one.
While converting, it's easier to work on whole files but maybe the resulting patch can be still split.
If it really doesn't seem splittable let me know and I'll wade through this big patch.
-- PMM
Re: [Qemu-devel] [PATCH 01/21] target-s390x: fix style
In reply to Blue SwirlQuoted 15 lines · Blue Swirl
Quoted 14 lines · Alexander Graf
Quoted 9 lines · Blue Swirl
Before splitting
op_helper.candhelper.cin the next patches, fix style issues. No functional changes.Replace also GCC specific
__FUNCTION__with
standard__func__.Don't init static variable (cpu_s390x_init:inited) with 0.
Signed-off-by Blue Swirl <[email protected]>
Quoted 8 lines
Quoted 1 line
Phew. Have you hooked up with Richard about these changes? He had quite a big rewrite of the s390 target in the works, and I don't want you guys to work needlessly on major conflicts :)
I missed that one. He's rewriting
translate.c, while I'm mostly touchingop_helper.c. I'd expect it would be simpler for Richard to rebase on my series, because they only change helper calls but don't otherwise touch code. His series rearranges the code heavily and if I rebased on that, it would probably make the patch conflicts harder to resolve. What do you think?
I also think that way around makes more sense, but mainly because you posted patches while he posted an RFC :).
Either way, will hopefully get around to review and/or apply your patches next week :)
Alex
Re: [Qemu-devel] [PATCH 01/21] target-s390x: fix style
In reply to Blue SwirlQuoted 6 lines · Blue Swirl
I missed that one. He's rewriting
translate.c, while I'm mostly touchingop_helper.c. I'd expect it would be simpler for Richard to rebase on my series, because they only change helper calls but don't otherwise touch code. His series rearranges the code heavily and if I rebased on that, it would probably make the patch conflicts harder to resolve. What do you think?
Do go ahead with the areg0 patches first.
r~
Re: [Qemu-devel] [PATCH 02/21] target-s390x: split FPU ops
In reply to Blue Swirltarget-s390x/cpu.h static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb) · line 1007
Quoted 6 lines · Blue Swirl
target-s390x/cpu.h +6
-0+/* fpu_helper.c */ +uint32_t set_cc_f32 (float32 v1,float32 v2); +uint32_t set_cc_f64 (float64 v1,float64 v2); +uint32_t set_cc_nz_f32 (float32 v); +uint32_t set_cc_nz_f64 (float64 v); +
I think that the CC handling should stay together, regardless of FPU-ness. These functions are quite small and can be usefully inlined by the compiler.
OTOH, this is much easier to do with my translate.c rewrite, so maybe I'll just take responsibility for moving them back...
r~
Quoted 4 lines · Blue Swirl
target-s390x: fix style
target-s390x: split FPU ops
target-s390x: split condition code helpers
target-s390x: split integer helpers
Quoted 8 lines
target-s390x: split memory access helpers
target-s390x: renameop_helper.ctomisc_helper.c
target-s390x: avoid AREG0 for FPU helpers
target-s390x: avoid AREG0 for integer helpers
target-s390x: avoid AREG0 for condition code helpers
target-s390x: avoid AREG0 for misc helpers
target-s390x: switch to AREG0 free mode
target-s390x: splithelper.c
Quoted 1 line
Remove unused
CONFIG_TCG_PASS_AREG0and dead code
r~
Re: [Qemu-devel] [PATCH 02/21] target-s390x: split FPU ops
In reply to Richard HendersonQuoted 11 lines · Richard Henderson
target-s390x/cpu.h static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb) · line 1007
Quoted 6 lines · Blue Swirl
target-s390x/cpu.h +6
-0+/* fpu_helper.c */ +uint32_t set_cc_f32 (float32 v1,float32 v2); +uint32_t set_cc_f64 (float64 v1,float64 v2); +uint32_t set_cc_nz_f32 (float32 v); +uint32_t set_cc_nz_f64 (float64 v); +I think that the CC handling should stay together, regardless of FPU-ness. These functions are quite small and can be usefully inlined by the compiler.
Quoted 2 lines
OTOH, this is much easier to do with my
translate.crewrite, so maybe I'll just take responsibility for moving them back...
The problem is that these are used by some FPU ops as well as condition code ops. Maybe it's better to move them to cpu.h as inline functions?
It could be also possible to upgrade condition code functions to full helpers, that could help implementing lazy condition code evaluation. I noticed that the helpers don't use TCGv registers for register access but instead the helpers access env->regs[] and env->fregs[] directly, this probably would need to be changed too.
Quoted 3 lines
r~
Re: [Qemu-devel] [PATCH 02/21] target-s390x: split FPU ops
Quoted 12 lines · Blue Swirl
Quoted 11 lines · Richard Henderson
target-s390x/cpu.h static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb) · line 1007
Quoted 6 lines · Blue Swirl
target-s390x/cpu.h +6
-0+/* fpu_helper.c */ +uint32_t set_cc_f32 (float32 v1,float32 v2); +uint32_t set_cc_f64 (float64 v1,float64 v2); +uint32_t set_cc_nz_f32 (float32 v); +uint32_t set_cc_nz_f64 (float64 v); +I think that the CC handling should stay together, regardless of FPU-ness. These functions are quite small and can be usefully inlined by the compiler.
Quoted 6 lines
Quoted 2 lines
OTOH, this is much easier to do with my
translate.crewrite, so maybe I'll just take responsibility for moving them back...The problem is that these are used by some FPU ops as well as condition code ops. Maybe it's better to move them to
cpu.has inline functions?
Maybe...
Quoted 2 lines
It could be also possible to upgrade condition code functions to full helpers, that could help implementing lazy condition code evaluation.
Done and ...
Quoted 3 lines
I noticed that the helpers don't use TCGv registers for register access but instead the helpers access env->regs[] and env->fregs[] directly, this probably would need to be changed too.
done, in my rewrite.
Except for float128, where we can't return such by value inside TCG. And, annoyingly, s390 float128 values are held in %fN/%fN+2, so the values are not contiguous in memory. I momentarily considered passing a pointer to %fN, letting the helper access f[0]/f[2], but in the end I didn't consider that any better than just passing the integer N.
So after the rewrite, set_cc_nz_f32/64 are not referenced from the fp helpers directly. We still reference set_cc_nz_f128 from ADXBR and SDXBR.
r~
Re: [Qemu-devel] [PATCH 02/21] target-s390x: split FPU ops
Quoted 25 lines · Richard Henderson
Quoted 12 lines · Blue Swirl
Quoted 11 lines · Richard Henderson
target-s390x/cpu.h static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb) · line 1007
Quoted 6 lines · Blue Swirl
target-s390x/cpu.h +6
-0+/* fpu_helper.c */ +uint32_t set_cc_f32 (float32 v1,float32 v2); +uint32_t set_cc_f64 (float64 v1,float64 v2); +uint32_t set_cc_nz_f32 (float32 v); +uint32_t set_cc_nz_f64 (float64 v); +I think that the CC handling should stay together, regardless of FPU-ness. These functions are quite small and can be usefully inlined by the compiler.
Quoted 6 lines
Quoted 2 lines
OTOH, this is much easier to do with my
translate.crewrite, so maybe I'll just take responsibility for moving them back...The problem is that these are used by some FPU ops as well as condition code ops. Maybe it's better to move them to
cpu.has inline functions?Maybe...
Quoted 2 lines
It could be also possible to upgrade condition code functions to full helpers, that could help implementing lazy condition code evaluation.
Quoted 7 lines
Done and ...
Quoted 3 lines
I noticed that the helpers don't use TCGv registers for register access but instead the helpers access env->regs[] and env->fregs[] directly, this probably would need to be changed too.
done, in my rewrite.
So that means your rewrite is based on this series and just fixes it up? Does that mean if I apply this patch, you will be all happy?
Alex
Re: [Qemu-devel] [PATCH 02/21] target-s390x: split FPU ops
Quoted 1 line · Alexander Graf
So that means your rewrite is based on this series and just fixes it up? Does that mean if I apply this patch, you will be all happy?
It is not (yet) based on this series. But I will be happy if you apply it, since it's easier for me to rebase off master than find an external tree.
r~
[email protected]
Tested-by Guan XuetaoRe: [Qemu-devel] [PATCH 15/21] target-unicore32: switch to AREG0 free mode
In reply to a message not in the archiveQuoted 4 lines
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>
Thanks,
Quoted 449 lines
--- configure | 2 +- target-unicore32/Makefile.objs | 2 - target-unicore32/helper.h | 26 ++++++++-------- target-unicore32/op_helper.c | 65 +++++++++++++++------------------------ target-unicore32/translate.c | 38 +++++++++++----------- 5 files changed, 58 insertions(+), 75 deletions(-)configure +0
-0@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target""$target_dir/Makefile"
case "$target_arch2" in
- alpha | i386 | lm32 | m68k | or32 | s390x | sparc* |x86_64| xtensa* | ppc*)
+ alpha | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 |x86_64| xtensa* | ppc*)
echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak
;;
esactarget-unicore32/Makefile.objs +0
-2@@ -2,5 +2,3 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-y += ucf64_helper.o obj-$(CONFIG_SOFTMMU) += machine.o softmmu.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)target-unicore32/helper.h +13
-13@@ -17,26 +17,26 @@ DEF_HELPER_1(cp1_putc, void, i32) DEF_HELPER_1(clz, i32, i32) DEF_HELPER_1(clo, i32, i32) -DEF_HELPER_1(exception, void, i32) +DEF_HELPER_2(exception, void, env, i32) -DEF_HELPER_2(asr_write, void, i32, i32) -DEF_HELPER_0(asr_read, i32) +DEF_HELPER_3(asr_write, void, env, i32, i32) +DEF_HELPER_1(asr_read, i32, env) -DEF_HELPER_1(get_user_reg, i32, i32) -DEF_HELPER_2(set_user_reg, void, i32, i32) +DEF_HELPER_2(get_user_reg, i32, env, i32) +DEF_HELPER_3(set_user_reg, void, env, i32, i32) -DEF_HELPER_2(add_cc, i32, i32, i32) -DEF_HELPER_2(adc_cc, i32, i32, i32) -DEF_HELPER_2(sub_cc, i32, i32, i32) -DEF_HELPER_2(sbc_cc, i32, i32, i32) +DEF_HELPER_3(add_cc, i32, env, i32, i32) +DEF_HELPER_3(adc_cc, i32, env, i32, i32) +DEF_HELPER_3(sub_cc, i32, env, i32, i32) +DEF_HELPER_3(sbc_cc, i32, env, i32, i32) DEF_HELPER_2(shl, i32, i32, i32) DEF_HELPER_2(shr, i32, i32, i32) DEF_HELPER_2(sar, i32, i32, i32) -DEF_HELPER_2(shl_cc, i32, i32, i32) -DEF_HELPER_2(shr_cc, i32, i32, i32) -DEF_HELPER_2(sar_cc, i32, i32, i32) -DEF_HELPER_2(ror_cc, i32, i32, i32) +DEF_HELPER_3(shl_cc, i32, env, i32, i32) +DEF_HELPER_3(shr_cc, i32, env, i32, i32) +DEF_HELPER_3(sar_cc, i32, env, i32, i32) +DEF_HELPER_3(ror_cc, i32, env, i32, i32) DEF_HELPER_1(ucf64_get_fpscr, i32, env)DEF_HELPER_2 (ucf64_set_fpscr, void, env, i32)target-unicore32/op_helper.c +14
-25@@ -9,19 +9,18 @@* later version. See the COPYING file in the top-level directory. */ #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" #define SIGNBIT (uint32_t)0x80000000#define SIGNBIT64 ((uint64_t)1 << 63) -void HELPER (exception )(uint32_t excp) +void HELPER (exception )(CPUUniCore32State *env,uint32_t excp) { env->exception_index = excp;cpu_loop_exit (env); } -static target_ulong asr_read (void ) +static target_ulong asr_read (CPUUniCore32State *env) {int ZF ;ZF = (env->ZF ==0 );@@ -29,24 +28,18 @@ static target_ulong asr_read(void) (env->CF <<29 ) | ((env->VF &0x80000000 ) >>3 ); } -target_ulong cpu_asr_read (CPUUniCore32State *env1) +target_ulong cpu_asr_read (CPUUniCore32State *env) { -CPUUniCore32State *saved_env; -target_ulong ret; - - saved_env = env; - env = env1; - ret =asr_read (); - env = saved_env; -return ret; +return asr_read (env); } -target_ulong HELPER (asr_read )(void ) +target_ulong HELPER (asr_read )(CPUUniCore32State *env) { -return asr_read (); +return asr_read (env); } -static void asr_write (target_ulong val,target_ulong mask) +static void asr_write (CPUUniCore32State *env,target_ulong val, +target_ulong mask) {if (mask &ASR_NZCV ) { env->ZF = (~val) &ASR_Z ;@@ -62,23 +55,19 @@ static void asr_write(target_ulong val, target_ulong mask) env->uncached_asr = (env->uncached_asr & ~mask) | (val & mask); } -void cpu_asr_write (CPUUniCore32State *env1,target_ulong val, target_ulong mask) +void cpu_asr_write (CPUUniCore32State *env,target_ulong val,target_ulong mask) { -CPUUniCore32State *saved_env; - - saved_env = env; - env = env1; -asr_write (val, mask); - env = saved_env; +asr_write (env, val, mask); } -void HELPER (asr_write )(target_ulong val,target_ulong mask) +void HELPER (asr_write )(CPUUniCore32State *env,target_ulong val, +target_ulong mask) { -asr_write (val, mask); +asr_write (env, val, mask); }/* Access to user mode registers from privileged modes. */ -uint32_t HELPER (get_user_reg )(uint32_t regno) +uint32_t HELPER (get_user_reg )(CPUUniCore32State *env,uint32_t regno){ uint32_t val;target-unicore32/op_helper.c +1
-1@@ -92,7 +81,7 @@ uint32_t HELPER(get_user_reg)(uint32_t regno)return val; } -void HELPER (set_user_reg )(uint32_t regno,uint32_t val) +void HELPER (set_user_reg )(CPUUniCore32State *env,uint32_t regno,uint32_t val) {if (regno ==29 ) {env->banked_r29[0] = val;target-unicore32/op_helper.c +10
-14@@ -107,7 +96,7 @@ void HELPER(set_user_reg)(uint32_t regno, uint32_t val)The only way to do that in TCG is a conditional branch, which clobbers all our temporaries. For now implement these as helper functions. */ -uint32_t HELPER (add_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (add_cc )(CPUUniCore32State *env,uint32_t a,uint32_t b) {uint32_t result; result = a + b;@@ -117,7 +106,7 @@ uint32_t HELPER(add_cc)(uint32_t a, uint32_t b)return result; } -uint32_t HELPER (adc_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (adc_cc )(CPUUniCore32State *env,uint32_t a,uint32_t b) {uint32_t result;if (!env->CF) {@@ -132,7 +121,7 @@ uint32_t HELPER(adc_cc)(uint32_t a, uint32_t b)return result; } -uint32_t HELPER (sub_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (sub_cc )(CPUUniCore32State *env,uint32_t a,uint32_t b) {uint32_t result; result = a - b;@@ -142,7 +131,7 @@ uint32_t HELPER(sub_cc)(uint32_t a, uint32_t b)return result; } -uint32_t HELPER (sbc_cc )(uint32_t a,uint32_t b) +uint32_t HELPER (sbc_cc )(CPUUniCore32State *env,uint32_t a,uint32_t b) {uint32_t result;if (!env->CF) {@@ -186,7 +175,7 @@ uint32_t HELPER(sar)(uint32_t x, uint32_t i)return (int32_t )x >> shift; } -uint32_t HELPER (shl_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (shl_cc )(CPUUniCore32State *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 ) {@@ -203,7 +192,7 @@ uint32_t HELPER(shl_cc)(uint32_t x, uint32_t i)return x; } -uint32_t HELPER (shr_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (shr_cc )(CPUUniCore32State *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 ) {@@ -220,7 +209,7 @@ uint32_t HELPER(shr_cc)(uint32_t x, uint32_t i)return x; } -uint32_t HELPER (sar_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (sar_cc )(CPUUniCore32State *env,uint32_t x,uint32_t i) {int shift = i &0xff ;if (shift >=32 ) {@@ -233,7 +222,7 @@ uint32_t HELPER(sar_cc)(uint32_t x, uint32_t i)return x; } -uint32_t HELPER (ror_cc )(uint32_t x,uint32_t i) +uint32_t HELPER (ror_cc )(CPUUniCore32State *env,uint32_t x,uint32_t i) {int shift1, shift; shift1 = i &0xff ;@@ -264,16 +253,13 @@ uint32_t HELPER(ror_cc)(uint32_t x, uint32_t i)#define SHIFT 3#include "softmmu_template.h" -void tlb_fill (CPUUniCore32State *env1,target_ulong addr,int is_write, -int mmu_idx,uintptr_t retaddr) +void tlb_fill (CPUUniCore32State *env,target_ulong addr,int is_write, +int mmu_idx,uintptr_t retaddr) {TranslationBlock *tb; -CPUUniCore32State *saved_env;unsigned long pc;int ret; - saved_env = env; - env = env1; ret =uc32_cpu_handle_mmu_fault (env, addr, is_write, mmu_idx);if (unlikely (ret)) {if (retaddr) {@@ -287,6 +273,5 @@ void tlb_fill(CPUUniCore32State *env1, target_ulong addr, int is_write, }cpu_loop_exit (env); } - env = saved_env; }#endif
target-unicore32/translate.c +1
-1@@ -253,7 +253,7 @@ static void disas_ocd_insn(CPUUniCore32State *env,DisasContext *s, static inline void gen_set_asr(TCGv var, uint32_t mask) { TCGv tmp_mask = tcg_const_i32(mask); -gen_helper_asr_write (var, tmp_mask); +gen_helper_asr_write (cpu_env, var, tmp_mask);tcg_temp_free_i32 (tmp_mask); }/* Set NZCV flags from the high 4 bits of var. */
target-unicore32/translate.c +5
-5@@ -263,7 +263,7 @@ static void gen_exception(int excp) {TCGv tmp =new_tmp ();tcg_gen_movi_i32 (tmp, excp); -gen_helper_exception (tmp); +gen_helper_exception (cpu_env, tmp);dead_tmp (tmp); }@@ -416,16 +416,16 @@ static inline void gen_uc32_shift_reg(TCGv var, int shiftop, if (flags) {switch (shiftop) {case 0 : -gen_helper_shl_cc (var, var, shift); +gen_helper_shl_cc (var, cpu_env, var, shift);break ;case 1 : -gen_helper_shr_cc (var, var, shift); +gen_helper_shr_cc (var, cpu_env, var, shift);break ;case 2 : -gen_helper_sar_cc (var, var, shift); +gen_helper_sar_cc (var, cpu_env, var, shift);break ;case 3 : -gen_helper_ror_cc (var, var, shift); +gen_helper_ror_cc (var, cpu_env, var, shift);break ; }} else {target-unicore32/translate.c +2
-2@@ -1323,11 +1323,11 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) if (IS_USER(s)) {ILLEGAL ; } -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2);gen_exception_return (s, tmp); } else {if (UCOP_SET_S ) { -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }else {tcg_gen_sub_i32 (tmp, tmp, tmp2);}target-unicore32/translate.c +1
-1@@ -1336,7 +1336,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) break;case 0x03 :if (UCOP_SET_S ) { -gen_helper_sub_cc (tmp, tmp2, tmp); +gen_helper_sub_cc (tmp, cpu_env, tmp2, tmp); }else {tcg_gen_sub_i32 (tmp, tmp2, tmp);}target-unicore32/translate.c +1
-1@@ -1344,7 +1344,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) break;case 0x04 :if (UCOP_SET_S ) { -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }else {tcg_gen_add_i32 (tmp, tmp, tmp2);}target-unicore32/translate.c +1
-1@@ -1352,7 +1352,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) break;case 0x05 :if (UCOP_SET_S ) { -gen_helper_adc_cc (tmp, tmp, tmp2); +gen_helper_adc_cc (tmp, cpu_env, tmp, tmp2); }else {gen_add_carry (tmp, tmp, tmp2);}target-unicore32/translate.c +1
-1@@ -1360,7 +1360,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) break;case 0x06 :if (UCOP_SET_S ) { -gen_helper_sbc_cc (tmp, tmp, tmp2); +gen_helper_sbc_cc (tmp, cpu_env, tmp, tmp2); }else {gen_sub_carry (tmp, tmp, tmp2);}target-unicore32/translate.c +1
-1@@ -1368,7 +1368,7 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) break;case 0x07 :if (UCOP_SET_S ) { -gen_helper_sbc_cc (tmp, tmp2, tmp); +gen_helper_sbc_cc (tmp, cpu_env, tmp2, tmp); }else {gen_sub_carry (tmp, tmp2, tmp);}target-unicore32/translate.c +2
-2@@ -1390,13 +1390,13 @@ static void do_datap(CPUUniCore32State *env, DisasContext *s, uint32_t insn) break;case 0x0a :if (UCOP_SET_S ) { -gen_helper_sub_cc (tmp, tmp, tmp2); +gen_helper_sub_cc (tmp, cpu_env, tmp, tmp2); }dead_tmp (tmp);break ;case 0x0b :if (UCOP_SET_S ) { -gen_helper_add_cc (tmp, tmp, tmp2); +gen_helper_add_cc (tmp, cpu_env, tmp, tmp2); }dead_tmp (tmp);break;target-unicore32/translate.c +1
-1@@ -1536,7 +1536,7 @@ static void do_misc(CPUUniCore32State *env, DisasContext *s, uint32_t insn) tmp =load_cpu_field (bsr); }else { tmp =new_tmp (); -gen_helper_asr_read (tmp); +gen_helper_asr_read (tmp, cpu_env); }store_reg (s,UCOP_REG_D , tmp);return;target-unicore32/translate.c +1
-1@@ -1760,7 +1760,7 @@ static void do_ldst_m(CPUUniCore32State *env, DisasContext *s, uint32_t insn)gen_bx (s ,tmp ); }else if (user) { tmp2 =tcg_const_i32 (reg); -gen_helper_set_user_reg (tmp2, tmp); +gen_helper_set_user_reg (cpu_env, tmp2, tmp);tcg_temp_free_i32 (tmp2);dead_tmp (tmp);} else if (reg == UCOP_REG_N) {target-unicore32/translate.c +1
-1@@ -1778,7 +1778,7 @@ static void do_ldst_m(CPUUniCore32State *env, DisasContext *s, uint32_t insn) }else if (user) { tmp =new_tmp (); tmp2 =tcg_const_i32 (reg); -gen_helper_get_user_reg (tmp, tmp2); +gen_helper_get_user_reg (tmp, cpu_env, tmp2);tcg_temp_free_i32 (tmp2); }else {tmp = load_reg(s, reg);target-unicore32/translate.c +1
-1@@ -1861,7 +1861,7 @@ static void disas_uc32_insn(CPUUniCore32State *env, DisasContext *s) {unsigned int insn; - insn =ldl_code (s->pc); + insn =cpu_ldl_code (env, s->pc); s->pc +=4 ;/* UniCore instructions class:--
1.7.2.5
Re: [Qemu-devel] [PATCH 02/21] target-s390x: split FPU ops
In reply to Richard HendersonQuoted 4 lines · Richard Henderson
Quoted 1 line · Alexander Graf
So that means your rewrite is based on this series and just fixes it up? Does that mean if I apply this patch, you will be all happy?
It is not (yet) based on this series. But I will be happy if you apply it, since it's easier for me to rebase off master than find an external tree.
Ok, I need a bit more concentration that I can get now for that though and will hop on a reasonably long plane flight in a few hours. Will apply / review it afterwards, though I don't expect too many problems.
Thus you might be easier off to rebase your series early on on top of Blue's patch set.
Alex
Re: [Qemu-devel] [PATCH 21/21] Remove unused CONFIG_TCG_PASS_AREG0 and dead code
In reply to Blue SwirlQuoted 690 lines · Blue Swirl
Now that
CONFIG_TCG_PASS_AREG0is enabled for all targets, remove dead code and support for !CONFIG_TCG_PASS_AREG0 case.Remove
dyngen-exec.hand all references to it. Although included byhw/spapr_hcall.c, it does not seem to use it.Remove unused
HELPER_CFLAGS.Signed-off-by Blue Swirl <[email protected]>--- Makefile.target | 8 ----- configure | 11 ------- cpu-all.h | 11 ------- cputlb.c | 4 -- dyngen-exec.h | 70 ------------------------------------------ exec-all.h | 4 -- hw/spapr_hcall.c | 1 - softmmu_defs.h | 21 ------------- softmmu_header.h | 63 ++++++++++++-------------------------- softmmu_template.h | 72 ++++++++++++++++--------------------------- target-m68k/op_helper.c | 3 -- target-sparc/Makefile.objs | 2 - tcg/arm/tcg-target.c | 31 ++----------------- tcg/arm/tcg-target.h | 1 - tcg/hppa/tcg-target.c | 24 -------------- tcg/hppa/tcg-target.h | 1 - tcg/i386/tcg-target.c | 30 ------------------ tcg/i386/tcg-target.h | 1 - tcg/ia64/tcg-target.c | 34 -------------------- tcg/ia64/tcg-target.h | 1 - tcg/mips/tcg-target.c | 31 ++----------------- tcg/mips/tcg-target.h | 1 - tcg/ppc/tcg-target.c | 38 ----------------------- tcg/ppc64/tcg-target.c | 28 ----------------- tcg/s390/tcg-target.c | 24 -------------- tcg/s390/tcg-target.h | 1 - tcg/sparc/tcg-target.c | 30 ------------------ tcg/sparc/tcg-target.h | 1 - tcg/tci/tcg-target.c | 4 -- tci.c | 12 ------- user-exec.c | 14 -------- 31 files changed, 53 insertions(+), 524 deletions(-) delete mode 100644 dyngen-exec.hMakefile.target +0
-8@@ -80,14 +80,6 @@ obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci -# HELPER_CFLAGS is used for all the legacy code compiled with static register -# variables -user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS) - -# Note: this is a workaround. The real fix is to avoid compiling -# cpu_signal_handler() in user-exec.c. -%/signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS) - ######################################################### # Linux user emulator targetconfigure +0
-11@@ -118,7 +118,6 @@ audio_card_list="ac97 es1370 sb16 hda" audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus hda" block_drv_whitelist="" host_cc="gcc" -helper_cflags="" libs_softmmu="" libs_tools="" audio_pt_int=""@@ -894,7 +893,6 @@ case "$cpu" in QEMU_CFLAGS="-m32 -ffixed-g2 -ffixed-g3 $QEMU_CFLAGS" if test "$solaris" = "no" ; then QEMU_CFLAGS="-ffixed-g1 -ffixed-g6 $QEMU_CFLAGS" - helper_cflags="-ffixed-i0" fi ;; sparc64)@@ -919,7 +917,6 @@ case "$cpu" in QEMU_CFLAGS="-m32 $QEMU_CFLAGS" LDFLAGS="-m32 $LDFLAGS" cc_i386='$(CC) -m32' - helper_cflags="-fomit-frame-pointer" host_guest_base="yes" ;; x86_64)@@ -3572,7 +3569,6 @@ if test "$sparse" = "yes" ; then echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak fi -echo "HELPER_CFLAGS=$helper_cflags" >> $config_host_mak echo "LDFLAGS=$LDFLAGS" >> $config_host_mak echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak echo "ARLIBS_END=$arlibs_end" >> $config_host_mak@@ -3827,13 +3823,6 @@ fi symlink "$source_path/Makefile.target" "$target_dir/Makefile" - -case "$target_arch2" in - alpha | arm* | cris | i386 | lm32 | m68k | microblaze* | mips* | or32 | s390x | sh4* | sparc* | unicore32 | x86_64 | xtensa* | ppc*) - echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak - ;; -esac - upper() { echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]' }cpu-all.h +0
-11@@ -260,14 +260,6 @@ extern unsigned long reserved_va;#define stfl (p, v) stfl_raw(p, v)#define stfq (p, v) stfq_raw(p, v) -#ifndef CONFIG_TCG_PASS_AREG0 -#define ldub_code (p) ldub_raw(p) -#define ldsb_code (p) ldsb_raw(p) -#define lduw_code (p) lduw_raw(p) -#define ldsw_code (p) ldsw_raw(p) -#define ldl_code (p) ldl_raw(p) -#define ldq_code (p) ldq_raw(p) -#else #define cpu_ldub_code (env1, p) ldub_raw(p)#define cpu_ldsb_code (env1, p) ldsb_raw(p)#define cpu_lduw_code (env1, p) lduw_raw(p)@@ -296,7 +288,6 @@ extern unsigned long reserved_va;#define cpu_stw_kernel (env, addr, data) stw_raw(addr, data)#define cpu_stl_kernel (env, addr, data) stl_raw(addr, data)#define cpu_stq_kernel (env, addr, data) stq_raw(addr, data) -#endif #define ldub_kernel (p) ldub_raw(p)#define ldsb_kernel (p) ldsb_raw(p)@@ -313,7 +304,6 @@ extern unsigned long reserved_va;#define stfl_kernel (p, v) stfl_raw(p, v)#define stfq_kernel (p, vt) stfq_raw(p, v) -#ifdef CONFIG_TCG_PASS_AREG0 #define cpu_ldub_data (env, addr) ldub_raw(addr)#define cpu_lduw_data (env, addr) lduw_raw(addr)#define cpu_ldl_data (env, addr) ldl_raw(addr)@@ -321,7 +311,6 @@ extern unsigned long reserved_va;#define cpu_stb_data (env, addr, data) stb_raw(addr, data)#define cpu_stw_data (env, addr, data) stw_raw(addr, data)#define cpu_stl_data (env, addr, data) stl_raw(addr, data) -#endif #endif /* defined(CONFIG_USER_ONLY) */ /* page related stuff */ cputlb.c +0
-4@@ -325,11 +325,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) mmu_idx =cpu_mmu_index (env1);if (unlikely (env1->tlb_table[mmu_idx][page_index].addr_code != (addr &TARGET_PAGE_MASK ))) { -#ifdef CONFIG_TCG_PASS_AREG0 cpu_ldub_code (env1, addr); -#else -ldub_code (addr); -#endif } pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK ; mr =iotlb_to_region (pd);dyngen-exec.h deleted +0
-70@@ -1,70 +0,0 @@ -/* -* dyngen defines for micro operation code -* -* Copyright (c) 2003 Fabrice Bellard -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, see <http://www.gnu.org/licenses/>. -*/ -#if !defined(__DYNGEN_EXEC_H__) -#define __DYNGEN_EXEC_H__ - -#if defined(CONFIG_TCG_INTERPRETER ) -/* The TCG interpreter does not need a special register AREG0, -* but it is possible to use one by defining AREG0. -* On i386, register edi seems to work. */ -/* Run without special register AREG0 or use a value defined elsewhere. */ -#elif defined(__i386__) -#define AREG0 "ebp" -#elif defined(__x86_64__) -#define AREG0 "r14" -#elif defined(_ARCH_PPC) -#define AREG0 "r27" -#elif defined(__arm__) -#define AREG0 "r6" -#elif defined(__hppa__) -#define AREG0 "r17" -#elif defined(__mips__) -#define AREG0 "s0" -#elif defined(__sparc__) -#ifdef CONFIG_SOLARIS -#define AREG0 "g2" -#else -#ifdef __sparc_v9__ -#define AREG0 "g5" -#else -#define AREG0 "g6" -#endif -#endif -#elif defined(__s390__) -#define AREG0 "r10" -#elif defined(__alpha__) -/* Note $15 is the frame pointer, so anything in op-i386.c that would -require a frame pointer, like alloca, would probably loose. */ -#define AREG0 "$15" -#elif defined(__mc68000) -#define AREG0 "%a5" -#elif defined(__ia64__) -#define AREG0 "r7" -#else -#error unsupported CPU -#endif - -#if defined(AREG0 ) -register CPUArchState *env asm(AREG0); -#else -/* TODO: Try env = cpu_single_env. */ -extern CPUArchState *env; -#endif - -#endif /* !defined(__DYNGEN_EXEC_H__) */ exec-all.h +0
-4@@ -323,9 +323,6 @@ void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,#define ACCESS_TYPE (NB_MMU_MODES + 1)#define MEMSUFFIX _code -#ifndef CONFIG_TCG_PASS_AREG0 -#define env cpu_single_env -#endif #define DATA_SIZE 1#include "softmmu_header.h" @@ -341,7 +338,6 @@ void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,#undef ACCESS_TYPE#undef MEMSUFFIX -#undef env#endif hw/spapr_hcall.c +0
-1@@ -1,6 +1,5 @@#include "sysemu.h" #include "cpu.h" -#include "dyngen-exec.h" #include "qemu-char.h" #include "sysemu.h" #include "qemu-char.h" softmmu_defs.h +0
-21@@ -9,25 +9,6 @@#ifndef SOFTMMU_DEFS_H #define SOFTMMU_DEFS_H -#ifndef CONFIG_TCG_PASS_AREG0 -uint8_t __ldb_mmu (target_ulong addr,int mmu_idx); -void __stb_mmu (target_ulong addr,uint8_t val,int mmu_idx); -uint16_t __ldw_mmu (target_ulong addr,int mmu_idx); -void __stw_mmu (target_ulong addr,uint16_t val,int mmu_idx); -uint32_t __ldl_mmu (target_ulong addr,int mmu_idx); -void __stl_mmu (target_ulong addr,uint32_t val,int mmu_idx); -uint64_t __ldq_mmu (target_ulong addr,int mmu_idx); -void __stq_mmu (target_ulong addr,uint64_t val,int mmu_idx); - -uint8_t __ldb_cmmu (target_ulong addr,int mmu_idx); -void __stb_cmmu (target_ulong addr,uint8_t val,int mmu_idx); -uint16_t __ldw_cmmu (target_ulong addr,int mmu_idx); -void __stw_cmmu (target_ulong addr,uint16_t val,int mmu_idx); -uint32_t __ldl_cmmu (target_ulong addr,int mmu_idx); -void __stl_cmmu (target_ulong addr,uint32_t val,int mmu_idx); -uint64_t __ldq_cmmu (target_ulong addr,int mmu_idx); -void __stq_cmmu (target_ulong addr,uint64_t val,int mmu_idx); -#else uint8_t helper_ldb_mmu (CPUArchState *env,target_ulong addr,int mmu_idx);void helper_stb_mmu (CPUArchState *env,target_ulong addr,uint8_t val,int mmu_idx);@@ -54,5 +35,3 @@ uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);void helper_stq_cmmu (CPUArchState *env,target_ulong addr,uint64_t val,int mmu_idx);#endif - -#endif softmmu_header.h +20
-43@@ -78,23 +78,10 @@#define ADDR_READ addr_read#endif -#ifndef CONFIG_TCG_PASS_AREG0 -#define ENV_PARAM -#define ENV_VAR -#define CPU_PREFIX -#define HELPER_PREFIX __ -#else -#define ENV_PARAM CPUArchState *env, -#define ENV_VAR env, -#define CPU_PREFIX cpu_ -#define HELPER_PREFIX helper_ -#endif -/* generic load/store macros */ static inline RES_TYPE -glue (glue (glue (CPU_PREFIX ,ld ),USUFFIX ),MEMSUFFIX )(ENV_PARAM - target_ulong ptr) +glue (glue (cpu_ld ,USUFFIX ),MEMSUFFIX )(CPUArchState *env,target_ulong ptr) {int page_index;RES_TYPE res;@@ -106,9 +93,7 @@ glue(glue(glue(CPU_PREFIX, ld), USUFFIX), MEMSUFFIX)(ENV_PARAM mmu_idx =CPU_MMU_INDEX ;if (unlikely (env->tlb_table[mmu_idx][page_index].ADDR_READ != (addr & (TARGET_PAGE_MASK | (DATA_SIZE -1 ))))) { - res =glue (glue (glue (HELPER_PREFIX , ld),SUFFIX ),MMUSUFFIX )(ENV_VAR - addr, - mmu_idx); + res =glue (glue (helper_ld,SUFFIX ),MMUSUFFIX )(env, addr, mmu_idx); }else {uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend; res =glue (glue (ld,USUFFIX ), _raw)(hostaddr);@@ -118,8 +103,7 @@ glue(glue(glue(CPU_PREFIX, ld), USUFFIX), MEMSUFFIX)(ENV_PARAM#if DATA_SIZE <=2 static inline int -glue (glue (glue (CPU_PREFIX ,lds ),SUFFIX ),MEMSUFFIX )(ENV_PARAM - target_ulong ptr) +glue (glue (cpu_lds ,SUFFIX ),MEMSUFFIX )(CPUArchState *env,target_ulong ptr) {int res, page_index;target_ulong addr;@@ -130,8 +114,8 @@ glue(glue(glue(CPU_PREFIX, lds), SUFFIX), MEMSUFFIX)(ENV_PARAM mmu_idx =CPU_MMU_INDEX ;if (unlikely (env->tlb_table[mmu_idx][page_index].ADDR_READ != (addr & (TARGET_PAGE_MASK | (DATA_SIZE -1 ))))) { - res = (DATA_STYPE )glue (glue (glue (HELPER_PREFIX , ld),SUFFIX ), - MMUSUFFIX)(ENV_VAR addr, mmu_idx); + res = (DATA_STYPE )glue (glue (helper_ld,SUFFIX ), +MMUSUFFIX )(env, addr, mmu_idx); }else {uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend; res =glue (glue (lds,SUFFIX ), _raw)(hostaddr);@@ -145,8 +129,8 @@ glue(glue(glue(CPU_PREFIX, lds), SUFFIX), MEMSUFFIX)(ENV_PARAM/* generic store macro */ static inline void -glue(glue(glue(CPU_PREFIX, st), SUFFIX), MEMSUFFIX)(ENV_PARAM target_ulong ptr, -RES_TYPE v) +glue (glue (cpu_st ,SUFFIX ),MEMSUFFIX )(CPUArchState *env,target_ulong ptr, +RES_TYPE v) {int page_index;target_ulong addr;@@ -157,8 +141,7 @@ glue(glue(glue(CPU_PREFIX, st), SUFFIX), MEMSUFFIX)(ENV_PARAM target_ulong ptr, mmu_idx =CPU_MMU_INDEX ;if (unlikely (env->tlb_table[mmu_idx][page_index].addr_write != (addr & (TARGET_PAGE_MASK | (DATA_SIZE -1 ))))) { - glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_VAR addr, v, - mmu_idx); +glue (glue (helper_st,SUFFIX ),MMUSUFFIX )(env, addr, v, mmu_idx); }else {uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend;glue (glue (st,SUFFIX ), _raw)(hostaddr, v);@@ -170,52 +153,50 @@ glue(glue(glue(CPU_PREFIX, st), SUFFIX), MEMSUFFIX)(ENV_PARAM target_ulong ptr,#if ACCESS_TYPE != (NB_MMU_MODES +1 )#if DATA_SIZE ==8 -static inline float64 glue (glue (CPU_PREFIX ,ldfq ),MEMSUFFIX )(ENV_PARAM - target_ulong ptr) +static inline float64 glue (cpu_ldfq ,MEMSUFFIX )(CPUArchState *env, +target_ulong ptr) {union {float64 d;uint64_t i; } u; - u.i = glue(glue(CPU_PREFIX, ldq), MEMSUFFIX)(ENV_VAR ptr); + u.i =glue (cpu_ldq,MEMSUFFIX )(env, ptr);return u.d; } -static inline void glue (glue (CPU_PREFIX ,stfq ),MEMSUFFIX )(ENV_PARAM - target_ulong ptr, -float64 v) +static inline void glue (cpu_stfq ,MEMSUFFIX )(CPUArchState *env, +target_ulong ptr,float64 v) {union {float64 d;uint64_t i; } u; u.d = v; - glue(glue(CPU_PREFIX, stq), MEMSUFFIX)(ENV_VAR ptr, u.i); +glue (cpu_stq,MEMSUFFIX )(env, ptr, u.i); }#endif /* DATA_SIZE == 8 */ #if DATA_SIZE ==4 -static inline float32 glue (glue (CPU_PREFIX ,ldfl ),MEMSUFFIX )(ENV_PARAM - target_ulong ptr) +static inline float32 glue (cpu_ldfl ,MEMSUFFIX )(CPUArchState *env, +target_ulong ptr) {union {float32 f;uint32_t i; } u; - u.i = glue(glue(CPU_PREFIX, ldl), MEMSUFFIX)(ENV_VAR ptr); + u.i =glue (cpu_ldl,MEMSUFFIX )(env, ptr);return u.f; } -static inline void glue (glue (CPU_PREFIX ,stfl ),MEMSUFFIX )(ENV_PARAM - target_ulong ptr, -float32 v) +static inline void glue (cpu_stfl ,MEMSUFFIX )(CPUArchState *env, +target_ulong ptr,float32 v) {union {float32 f;uint32_t i; } u; u.f = v; - glue(glue(CPU_PREFIX, stl), MEMSUFFIX)(ENV_VAR ptr, u.i); +glue (cpu_stl,MEMSUFFIX )(env, ptr, u.i); }#endif /* DATA_SIZE == 4 */ @@ -230,7 +211,3 @@ static inline void glue(glue(CPU_PREFIX, stfl), MEMSUFFIX)(ENV_PARAM#undef CPU_MMU_INDEX#undef MMUSUFFIX#undef ADDR_READ -#undef ENV_PARAM -#undef ENV_VAR -#undef CPU_PREFIX -#undef HELPER_PREFIXsoftmmu_template.h +27
-45@@ -54,23 +54,11 @@#define ADDR_READ addr_read#endif -#ifndef CONFIG_TCG_PASS_AREG0 -#define ENV_PARAM -#define ENV_VAR -#define CPU_PREFIX -#define HELPER_PREFIX __ -#else -#define ENV_PARAM CPUArchState *env, -#define ENV_VAR env, -#define CPU_PREFIX cpu_ -#define HELPER_PREFIX helper_ -#endif - -static DATA_TYPE glue (glue (slow_ld ,SUFFIX ),MMUSUFFIX )(ENV_PARAM +static DATA_TYPE glue (glue (slow_ld ,SUFFIX ),MMUSUFFIX )(CPUArchState *env,target_ulong addr,int mmu_idx,uintptr_t retaddr); -static inline DATA_TYPE glue (io_read ,SUFFIX )(ENV_PARAM +static inline DATA_TYPE glue (io_read ,SUFFIX )(CPUArchState *env,target_phys_addr_t physaddr,target_ulong addr,uintptr_t retaddr)@@ -104,9 +92,8 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(ENV_PARAM/* handle all cases except unaligned access which span two pages */ DATA_TYPE -glue (glue (glue (HELPER_PREFIX ,ld ),SUFFIX ),MMUSUFFIX )(ENV_PARAM - target_ulong addr, -int mmu_idx) +glue (glue (helper_ld ,SUFFIX ),MMUSUFFIX )(CPUArchState *env,target_ulong addr, +int mmu_idx) {DATA_TYPE res;int index;@@ -126,15 +113,15 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM goto do_unaligned_access; retaddr =GETPC (); ioaddr = env->iotlb[mmu_idx][index]; - res = glue(io_read, SUFFIX)(ENV_VAR ioaddr, addr, retaddr); + res =glue (io_read,SUFFIX )(env, ioaddr, addr, retaddr); }else if (((addr & ~TARGET_PAGE_MASK ) +DATA_SIZE -1 ) >=TARGET_PAGE_SIZE ) {/* slow unaligned access (it spans two pages or IO) */ do_unaligned_access: retaddr =GETPC ();#ifdef ALIGNED_ONLY - do_unaligned_access(ENV_VAR addr, READ_ACCESS_TYPE, mmu_idx, retaddr); +do_unaligned_access (env, addr,READ_ACCESS_TYPE , mmu_idx, retaddr);#endif - res = glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_VAR addr, + res =glue (glue (slow_ld,SUFFIX ),MMUSUFFIX )(env, addr, mmu_idx, retaddr); }else {/* unaligned/aligned access in the same page */ @@ -142,7 +129,7 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM#ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE -1 )) !=0 ) { retaddr =GETPC (); - do_unaligned_access(ENV_VAR addr, READ_ACCESS_TYPE, mmu_idx, retaddr); +do_unaligned_access (env, addr,READ_ACCESS_TYPE , mmu_idx, retaddr); }#endif addend = env->tlb_table[mmu_idx][index].addend;@@ -154,7 +141,7 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM retaddr =GETPC ();#ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE -1 )) !=0 ) - do_unaligned_access(ENV_VAR addr, READ_ACCESS_TYPE, mmu_idx, retaddr); +do_unaligned_access (env, addr,READ_ACCESS_TYPE , mmu_idx, retaddr);#endif tlb_fill (env, addr,READ_ACCESS_TYPE , mmu_idx, retaddr); goto redo;@@ -164,7 +151,7 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM/* handle all unaligned cases */ static DATA_TYPE -glue (glue (slow_ld ,SUFFIX ),MMUSUFFIX )(ENV_PARAM +glue (glue (slow_ld ,SUFFIX ),MMUSUFFIX )(CPUArchState *env,target_ulong addr,int mmu_idx,uintptr_t retaddr)@@ -183,15 +170,15 @@ glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_PARAMif ((addr & (DATA_SIZE -1 )) !=0 ) goto do_unaligned_access; ioaddr = env->iotlb[mmu_idx][index]; - res = glue(io_read, SUFFIX)(ENV_VAR ioaddr, addr, retaddr); + res =glue (io_read,SUFFIX )(env, ioaddr, addr, retaddr); }else if (((addr & ~TARGET_PAGE_MASK ) +DATA_SIZE -1 ) >=TARGET_PAGE_SIZE ) { do_unaligned_access:/* slow unaligned access (it spans two pages) */ addr1 = addr & ~(DATA_SIZE -1 ); addr2 = addr1 +DATA_SIZE ; - res1 = glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_VAR addr1, + res1 =glue (glue (slow_ld,SUFFIX ),MMUSUFFIX )(env, addr1, mmu_idx, retaddr); - res2 = glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_VAR addr2, + res2 =glue (glue (slow_ld,SUFFIX ),MMUSUFFIX )(env, addr2, mmu_idx, retaddr); shift = (addr & (DATA_SIZE -1 )) *8 ;#ifdef TARGET_WORDS_BIGENDIAN @@ -216,13 +203,13 @@ glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_PARAM#ifndef SOFTMMU_CODE_ACCESS -static void glue (glue (slow_st ,SUFFIX ),MMUSUFFIX )(ENV_PARAM +static void glue (glue (slow_st ,SUFFIX ),MMUSUFFIX )(CPUArchState *env,target_ulong addr,DATA_TYPE val,int mmu_idx,uintptr_t retaddr); -static inline void glue(io_write, SUFFIX)(ENV_PARAM +static inline void glue(io_write, SUFFIX)(CPUArchState *env, target_phys_addr_t physaddr, DATA_TYPE val, target_ulong addr,@@ -253,10 +240,9 @@ static inline void glue(io_write, SUFFIX)(ENV_PARAM#endif /* SHIFT > 2 */ } -void glue (glue (glue (HELPER_PREFIX ,st ),SUFFIX ),MMUSUFFIX )(ENV_PARAM - target_ulong addr, -DATA_TYPE val, -int mmu_idx) +void glue (glue (helper_st ,SUFFIX ),MMUSUFFIX )(CPUArchState *env, +target_ulong addr,DATA_TYPE val, +int mmu_idx) {target_phys_addr_t ioaddr;target_ulong tlb_addr;@@ -273,14 +259,14 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM goto do_unaligned_access; retaddr =GETPC (); ioaddr = env->iotlb[mmu_idx][index]; - glue(io_write, SUFFIX)(ENV_VAR ioaddr, val, addr, retaddr); +glue (io_write,SUFFIX )(env, ioaddr, val, addr, retaddr); }else if (((addr & ~TARGET_PAGE_MASK ) +DATA_SIZE -1 ) >=TARGET_PAGE_SIZE ) { do_unaligned_access: retaddr =GETPC ();#ifdef ALIGNED_ONLY - do_unaligned_access(ENV_VAR addr, 1, mmu_idx, retaddr); +do_unaligned_access (env, addr,1 , mmu_idx, retaddr);#endif - glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_VAR addr, val, +glue (glue (slow_st,SUFFIX ),MMUSUFFIX )(env, addr, val, mmu_idx, retaddr); }else {/* aligned/unaligned access in the same page */ @@ -288,7 +274,7 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM#ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE -1 )) !=0 ) { retaddr =GETPC (); - do_unaligned_access(ENV_VAR addr, 1, mmu_idx, retaddr); +do_unaligned_access (env, addr,1 , mmu_idx, retaddr); }#endif addend = env->tlb_table[mmu_idx][index].addend;@@ -300,7 +286,7 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM retaddr =GETPC ();#ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE -1 )) !=0 ) - do_unaligned_access(ENV_VAR addr, 1, mmu_idx, retaddr); +do_unaligned_access (env, addr,1 , mmu_idx, retaddr);#endif tlb_fill (env, addr,1 , mmu_idx, retaddr); goto redo;@@ -308,7 +294,7 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM }/* handles all unaligned cases */ -static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM +static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, DATA_TYPE val, int mmu_idx,@@ -327,7 +313,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAMif ((addr & (DATA_SIZE -1 )) !=0 ) goto do_unaligned_access; ioaddr = env->iotlb[mmu_idx][index]; - glue(io_write, SUFFIX)(ENV_VAR ioaddr, val, addr, retaddr); +glue (io_write,SUFFIX )(env, ioaddr, val, addr, retaddr); }else if (((addr & ~TARGET_PAGE_MASK ) +DATA_SIZE -1 ) >=TARGET_PAGE_SIZE ) { do_unaligned_access:/* XXX: not efficient, but simple */ @@ -335,11 +321,11 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM* previous page from the TLB cache. */ for (i =DATA_SIZE -1 ; i >=0 ; i--) {#ifdef TARGET_WORDS_BIGENDIAN - glue(slow_stb, MMUSUFFIX)(ENV_VAR addr + i, +glue (slow_stb,MMUSUFFIX )(env, addr + i, val >> (((DATA_SIZE -1 ) *8 ) - (i *8 )), mmu_idx, retaddr);#else - glue(slow_stb, MMUSUFFIX)(ENV_VAR addr + i, +glue (slow_stb,MMUSUFFIX )(env, addr + i, val >> (i *8 ), mmu_idx, retaddr);#endif @@ -366,7 +352,3 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM#undef USUFFIX#undef DATA_SIZE#undef ADDR_READ -#undef ENV_PARAM -#undef ENV_VAR -#undef CPU_PREFIX -#undef HELPER_PREFIXtarget-m68k/op_helper.c +0
-0
target-m68k/op_helper.c void HELPER(divu)(CPUM68KState *env, uint32_t word) · line 197
Quoted 9 lines
target-m68k/op_helper.c +0
-3@@ -192,9 +192,6 @@ void HELPER(divu)(CPUM68KState *env, uint32_t word) quot = num / den; rem = num % den; flags =0 ; -/* Avoid using a PARAM1 of zero. This breaks dyngen because it uses -the address of a symbol, and gcc knows symbols can't have address -zero. */ if (word && quot >0xffff ) flags |=CCF_V ;if (quot ==0 )
I am not sure this hunk really belong to this patch, it should more likely be moved to the "target-m68k: switch to AREG0 free mode" patch.
Quoted 971 lines
target-sparc/Makefile.objs +0
-2@@ -4,5 +4,3 @@ obj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o obj-$(TARGET_SPARC) += int32_helper.o obj-$(TARGET_SPARC64) += int64_helper.o obj-$(TARGET_SPARC64) += vis_helper.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)tcg/arm/tcg-target.c +3
-28@@ -176,7 +176,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)so don't use these. */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R0 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R1 ); -#if defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +#if TARGET_LONG_BITS ==64 /* If we're passing env to the helper as r0 and need a regpair * for the address then r2 will be overwritten as we're setting * up the args to the helper. @@ -204,8 +204,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)use these. */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R0 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R1 ); -#if defined(CONFIG_SOFTMMU ) && \ - defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +#if defined(CONFIG_SOFTMMU ) && (TARGET_LONG_BITS ==64 )/* Avoid clashes with registers being used for helper args */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R2 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );@@ -223,7 +222,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)#ifdef CONFIG_SOFTMMU /* r2 is still needed to load data_reg, so don't use it. */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R2 ); -#if defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +#if TARGET_LONG_BITS ==64 /* Avoid clashes with registers being used for helper args */ tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );#endif @@ -954,7 +953,6 @@ static inline void tcg_out_goto_label(TCGContext *s, int cond, int label_index)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -972,25 +970,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif /* Helper routines for marshalling helper function arguments into * the correct registers and stack. @@ -1203,9 +1182,7 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)* trash by moving the earlier arguments into them. */ argreg =TCG_REG_R0 ; -#ifdef CONFIG_TCG_PASS_AREG0 argreg =tcg_out_arg_reg32 (s, argreg,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==64 argreg =tcg_out_arg_reg64 (s, argreg, addr_reg, addr_reg2);#else @@ -1421,9 +1398,7 @@ static inline void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc)* trash by moving the earlier arguments into them. */ argreg =TCG_REG_R0 ; -#ifdef CONFIG_TCG_PASS_AREG0 argreg =tcg_out_arg_reg32 (s, argreg,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==64 argreg =tcg_out_arg_reg64 (s, argreg, addr_reg, addr_reg2);#else tcg/arm/tcg-target.h +0
-1@@ -77,7 +77,6 @@ typedef enum {#define TCG_TARGET_HAS_GUEST_BASE enum { -/* Note: must be synced with dyngen-exec.h */ TCG_AREG0 =TCG_REG_R6 , };tcg/hppa/tcg-target.c +0
-24@@ -882,7 +882,6 @@ static void tcg_out_setcond2(TCGContext *s, int cond, TCGArg ret,#if defined(CONFIG_SOFTMMU )#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void * const qemu_ld_helpers[4] = {@@ -900,25 +899,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif /* Load and compare a TLB entry, and branch if TLB miss. OFFSET is set to the offset of the first ADDR_READ or ADDR_WRITE member of the appropriate @@ -1085,7 +1065,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) }tcg_out_movi (s,TCG_TYPE_I32 , argreg, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[2 ], tcg_target_call_iarg_regs[1 ]);@@ -1093,7 +1072,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tcg_out_call (s, qemu_ld_helpers[opc &3 ]);switch (opc) {@@ -1245,7 +1223,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc)tcg_abort (); } -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);@@ -1255,7 +1232,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc) tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tcg_out_call (s, qemu_st_helpers[opc]);/* label2: */ tcg/hppa/tcg-target.h +0
-1@@ -104,7 +104,6 @@ typedef enum {#define TCG_TARGET_HAS_GUEST_BASE -/* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_R17tcg/i386/tcg-target.c +0
-30@@ -183,9 +183,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set32 (ct->u.regs,0 ,0xffff );tcg_regset_reset_reg (ct->u.regs, tcg_target_call_iarg_regs[0 ]);tcg_regset_reset_reg (ct->u.regs, tcg_target_call_iarg_regs[1 ]); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs, tcg_target_call_iarg_regs[2 ]); -#endif }else {tcg_regset_set32 (ct->u.regs,0 ,0xff );tcg_regset_reset_reg (ct->u.regs,TCG_REG_EAX );@@ -965,7 +963,6 @@ static void tcg_out_jmp(TCGContext *s, tcg_target_long dest)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *qemu_ld_helpers[4 ] = {@@ -983,25 +980,6 @@ static const void *qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif /* Perform the TLB load and compare. @@ -1220,16 +1198,13 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, }tcg_out_push (s, args[addrlo_idx]); stack_adjust +=4 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_push (s,TCG_AREG0 ); stack_adjust +=4 ; -#endif #else /* The first argument is already loaded with addrlo. */ arg_idx =1 ;tcg_out_movi (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[arg_idx], mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);@@ -1240,7 +1215,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[0 ],TCG_AREG0 );#endif -#endif tcg_out_calli (s, (tcg_target_long )qemu_ld_helpers[s_bits]);@@ -1436,16 +1410,13 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, }tcg_out_push (s, args[addrlo_idx]); stack_adjust +=4 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_push (s,TCG_AREG0 ); stack_adjust +=4 ; -#endif #else tcg_out_mov (s, (opc ==3 ?TCG_TYPE_I64 :TCG_TYPE_I32 ), tcg_target_call_iarg_regs[1 ], data_reg);tcg_out_movi (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[2 ], mem_index); stack_adjust =0 ; -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);@@ -1456,7 +1427,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,tcg_out_mov (s,TCG_TYPE_I64 , tcg_target_call_iarg_regs[0 ],TCG_AREG0 );#endif -#endif tcg_out_calli (s, (tcg_target_long )qemu_st_helpers[s_bits]);tcg/i386/tcg-target.h +0
-1@@ -116,7 +116,6 @@ typedef enum {#define TCG_TARGET_HAS_GUEST_BASE -/* Note: must be synced with dyngen-exec.h */ #if TCG_TARGET_REG_BITS ==64 # define TCG_AREG0 TCG_REG_R14#else tcg/ia64/tcg-target.c +0
-34@@ -1452,7 +1452,6 @@ static inline void tcg_out_qemu_tlb(TCGContext *s, TCGArg addr_reg, TCG_REG_P7, TCG_REG_R3, TCG_REG_R57)); } -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -1461,16 +1460,6 @@ static const void * const qemu_ld_helpers[4] = { helper_ldl_mmu, helper_ldq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; -#endif static inline void tcg_out_qemu_ld (TCGContext *s,const TCGArg *args,int opc) {@@ -1530,7 +1519,6 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)tcg_opc_m1 (TCG_REG_P7 ,OPC_LD8_M1 ,TCG_REG_R1 ,TCG_REG_R2 ), tcg_opc_i18(TCG_REG_P0, OPC_NOP_I18, 0)); } -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_bundle(s, mII, tcg_opc_a5 (TCG_REG_P7, OPC_ADDL_A5, TCG_REG_R58,@@ -1539,7 +1527,6 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) TCG_REG_R57, 0, TCG_REG_R56),tcg_opc_a4 (TCG_REG_P7 ,OPC_ADDS_A4 , TCG_REG_R56, 0, TCG_AREG0)); -#endif if (!bswap || s_bits ==0 ) { tcg_out_bundle(s, miB, tcg_opc_m48(TCG_REG_P0, OPC_NOP_M48, 0),@@ -1570,7 +1557,6 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc) } } -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_st_mmu(CPUState *env, target_ulong addr, uintxx_t val, int mmu_idx) */ static const void *const qemu_st_helpers[4 ] = {@@ -1579,16 +1565,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif static inline void tcg_out_qemu_st (TCGContext *s,const TCGArg *args,int opc) {@@ -1658,7 +1634,6 @@ static inline void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc) data_reg =TCG_REG_R2 ; } -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_bundle(s, mII, tcg_opc_a5 (TCG_REG_P7, OPC_ADDL_A5, TCG_REG_R59,@@ -1674,15 +1649,6 @@ static inline void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc) TCG_REG_R56, 0, TCG_AREG0),tcg_opc_b5 (TCG_REG_P7 ,OPC_BR_CALL_SPTK_MANY_B5 , TCG_REG_B0, TCG_REG_B6)); -#else -tcg_out_bundle (s, miB, -tcg_opc_m4 (TCG_REG_P6 , opc_st_m4[opc], - data_reg,TCG_REG_R3 ), -tcg_opc_a5 (TCG_REG_P7 ,OPC_ADDL_A5 ,TCG_REG_R58 , - mem_index,TCG_REG_R0 ), -tcg_opc_b5 (TCG_REG_P7 ,OPC_BR_CALL_SPTK_MANY_B5 , -TCG_REG_B0 ,TCG_REG_B6 )); -#endif }#else /* !CONFIG_SOFTMMU */ tcg/ia64/tcg-target.h +0
-1@@ -140,7 +140,6 @@ typedef enum {#define TCG_TARGET_HAS_not_i32 0/* xor r1, -1, r3 */ #define TCG_TARGET_HAS_not_i64 0/* xor r1, -1, r3 */ -/* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_R7/* Guest base is supported */ tcg/mips/tcg-target.c +3
-28@@ -217,7 +217,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set (ct->u.regs,0xffffffff );#if defined(CONFIG_SOFTMMU )tcg_regset_reset_reg (ct->u.regs,TCG_REG_A0 ); -# if defined(CONFIG_TCG_PASS_AREG0 ) && (TARGET_LONG_BITS ==64 ) +# if (TARGET_LONG_BITS ==64 )tcg_regset_reset_reg (ct->u.regs,TCG_REG_A2 );# endif #endif @@ -227,12 +227,11 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set (ct->u.regs,0xffffffff );tcg_regset_reset_reg (ct->u.regs,TCG_REG_A0 );#if defined(CONFIG_SOFTMMU ) -# if (defined(CONFIG_TCG_PASS_AREG0 ) &&TARGET_LONG_BITS ==32 ) || \ - (!defined(CONFIG_TCG_PASS_AREG0 ) &&TARGET_LONG_BITS ==64 ) +# if (TARGET_LONG_BITS ==32 )tcg_regset_reset_reg (ct->u.regs,TCG_REG_A1 );# endif tcg_regset_reset_reg (ct->u.regs,TCG_REG_A2 ); -# if defined(CONFIG_TCG_PASS_AREG0 ) &&TARGET_LONG_BITS ==64 +# if TARGET_LONG_BITS ==64 tcg_regset_reset_reg (ct->u.regs,TCG_REG_A3 );# endif #endif @@ -821,7 +820,6 @@ static void tcg_out_setcond2(TCGContext *s, TCGCond cond, int ret,#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -839,25 +837,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,@@ -942,9 +921,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,/* slow path */ arg_num =0 ; -# ifdef CONFIG_TCG_PASS_AREG0 tcg_out_call_iarg_reg32 (s, &arg_num,TCG_AREG0 ); -# endif # if TARGET_LONG_BITS ==64 tcg_out_call_iarg_reg64 (s, &arg_num, addr_regl, addr_regh);# else @@ -1127,9 +1104,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,/* slow path */ arg_num =0 ; -# ifdef CONFIG_TCG_PASS_AREG0 tcg_out_call_iarg_reg32 (s, &arg_num,TCG_AREG0 ); -# endif # if TARGET_LONG_BITS ==64 tcg_out_call_iarg_reg64 (s, &arg_num, addr_regl, addr_regh);# else tcg/mips/tcg-target.h +0
-1@@ -96,7 +96,6 @@ typedef enum {#define TCG_TARGET_HAS_ext8u_i32 0/* andi rt, rs, 0xff */ #define TCG_TARGET_HAS_ext16u_i32 0/* andi rt, rs, 0xffff */ -/* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_S0/* guest base is supported */ tcg/ppc/tcg-target.c +0
-38@@ -248,7 +248,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_set32 (ct->u.regs,0 ,0xffffffff );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 );#if TARGET_LONG_BITS ==64 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );@@ -256,11 +255,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R7 );#endif #endif -#else /* !AREG0 */ -#if TARGET_LONG_BITS ==64 -tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 ); -#endif -#endif break ;case 'K' :/* qemu_st[8..32] constraint */ ct->ct |=TCG_CT_REG ;@@ -268,7 +262,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );#if TARGET_LONG_BITS ==64 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R7 );@@ -276,11 +269,6 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R8 );#endif #endif -#else /* !AREG0 */ -#if TARGET_LONG_BITS ==64 -tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 ); -#endif -#endif break ;case 'M' :/* qemu_st64 constraint */ ct->ct |=TCG_CT_REG ;@@ -290,12 +278,10 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R7 ); -#if defined(CONFIG_TCG_PASS_AREG0 )tcg_regset_reset_reg (ct->u.regs,TCG_REG_R8 );#ifdef TCG_TARGET_CALL_ALIGN_ARGS tcg_regset_reset_reg (ct->u.regs,TCG_REG_R9 );#endif -#endif break ;#else case 'L' :@@ -541,7 +527,6 @@ static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -559,25 +544,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif static void tcg_out_qemu_ld (TCGContext *s,const TCGArg *args,int opc)@@ -647,9 +613,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I32 , ir++,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==32 tcg_out_mov (s,TCG_TYPE_I32 , ir++, addr_reg);#else @@ -849,9 +813,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I32 , ir++,TCG_AREG0 ); -#endif #if TARGET_LONG_BITS ==32 tcg_out_mov (s,TCG_TYPE_I32 , ir++, addr_reg);#else tcg/ppc64/tcg-target.c +0
-28@@ -235,10 +235,8 @@ static int target_parse_constraint (TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_R3 );#ifdef CONFIG_SOFTMMU tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 );#endif -#endif break ;case 'S' :/* qemu_st constraint */ ct->ct |=TCG_CT_REG ;@@ -247,10 +245,8 @@ static int target_parse_constraint (TCGArgConstraint *ct, const char **pct_str)#ifdef CONFIG_SOFTMMU tcg_regset_reset_reg (ct->u.regs,TCG_REG_R4 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_R5 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_R6 );#endif -#endif break ;case 'Z' : ct->ct |=TCG_CT_CONST_U32 ;@@ -558,7 +554,6 @@ static void tcg_out_ldsta (TCGContext *s, int ret, int addr,#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -576,25 +571,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif static void tcg_out_tlb_read (TCGContext *s,int r0,int r1,int r2,int addr_reg,int s_bits,int offset)@@ -676,9 +652,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I64 , ir++,TCG_AREG0 ); -#endif tcg_out_mov (s,TCG_TYPE_I64 , ir++, addr_reg);tcg_out_movi (s,TCG_TYPE_I64 , ir++, mem_index);@@ -827,9 +801,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)/* slow path */ ir =3 ; -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_mov (s,TCG_TYPE_I64 , ir++,TCG_AREG0 ); -#endif tcg_out_mov (s,TCG_TYPE_I64 , ir++, addr_reg);tcg_out_rld (s,RLDICL , ir++, data_reg,0 ,64 - (1 << (3 + opc)));tcg_out_movi (s,TCG_TYPE_I64 , ir++, mem_index);tcg/s390/tcg-target.c +0
-24@@ -301,7 +301,6 @@ static const uint8_t tcg_cond_to_ltr_cond[10] = {#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -319,25 +318,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static void *qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static void *qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif static uint8_t *tb_ret_addr;@@ -1507,7 +1487,6 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg,tcg_abort (); }tcg_out_movi (s,TCG_TYPE_I32 ,TCG_REG_R4 , mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[2 ], tcg_target_call_iarg_regs[1 ]);@@ -1515,11 +1494,9 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tgen_calli (s, (tcg_target_ulong )qemu_st_helpers[s_bits]); }else {tcg_out_movi (s,TCG_TYPE_I32 , arg1, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);@@ -1529,7 +1506,6 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif tgen_calli (s, (tcg_target_ulong )qemu_ld_helpers[s_bits]);/* sign extension */ tcg/s390/tcg-target.h +0
-1@@ -96,7 +96,6 @@ typedef enum TCGReg {#define TCG_TARGET_EXTEND_ARGS 1enum { -/* Note: must be synced with dyngen-exec.h */ TCG_AREG0 =TCG_REG_R10 , };tcg/sparc/tcg-target.c +0
-30@@ -59,11 +59,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { };#endif -#ifdef CONFIG_TCG_PASS_AREG0 #define ARG_OFFSET 1 -#else -#define ARG_OFFSET 0 -#endif static const int tcg_target_reg_alloc_order[] = {TCG_REG_L0 ,@@ -161,9 +157,7 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)tcg_regset_reset_reg (ct->u.regs,TCG_REG_O0 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_O1 );tcg_regset_reset_reg (ct->u.regs,TCG_REG_O2 ); -#ifdef CONFIG_TCG_PASS_AREG0 tcg_regset_reset_reg (ct->u.regs,TCG_REG_O3 ); -#endif break ;case 'I' : ct->ct |=TCG_CT_CONST_S11 ;@@ -715,7 +709,6 @@ static void tcg_target_qemu_prologue(TCGContext *s)#include "../../softmmu_defs.h" -#ifdef CONFIG_TCG_PASS_AREG0 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, int mmu_idx) */ static const void *const qemu_ld_helpers[4 ] = {@@ -733,25 +726,6 @@ static const void * const qemu_st_helpers[4] = { helper_stl_mmu, helper_stq_mmu, }; -#else -/* legacy helper signature: __ld_mmu(target_ulong addr, int -mmu_idx) */ -static const void *const qemu_ld_helpers[4 ] = { - __ldb_mmu, - __ldw_mmu, - __ldl_mmu, - __ldq_mmu, -}; - -/* legacy helper signature: __st_mmu(target_ulong addr, uintxx_t val, -int mmu_idx) */ -static const void *const qemu_st_helpers[4 ] = { - __stb_mmu, - __stw_mmu, - __stl_mmu, - __stq_mmu, -}; -#endif #endif #if TARGET_LONG_BITS ==32 @@ -834,7 +808,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,/* mov */ tcg_out_movi (s,TCG_TYPE_I32 , arg1, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);@@ -844,7 +817,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif /* XXX: move that code at the end of the TB */ /* qemu_ld_helper[s_bits](arg0, arg1) */ @@ -1061,7 +1033,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,/* mov */ tcg_out_movi (s,TCG_TYPE_I32 , arg2, mem_index); -#ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ tcg_out_mov (s,TCG_TYPE_I32 , tcg_target_call_iarg_regs[3 ], tcg_target_call_iarg_regs[2 ]);@@ -1071,7 +1042,6 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, tcg_target_call_iarg_regs[0]);tcg_out_mov (s,TCG_TYPE_PTR , tcg_target_call_iarg_regs[0 ],TCG_AREG0 ); -#endif /* XXX: move that code at the end of the TB */ /* qemu_st_helper[s_bits](arg0, arg1, arg2) */ tcg_out32(s, CALL | ((((tcg_target_ulong)qemu_st_helpers[s_bits]tcg/sparc/tcg-target.h +0
-1@@ -125,7 +125,6 @@ typedef enum {#define TCG_TARGET_HAS_deposit_i64 0#endif -/* Note: must be synced with dyngen-exec.h */ #ifdef CONFIG_SOLARIS #define TCG_AREG0 TCG_REG_G2#elif defined(__sparc_v9__)tcg/tci/tcg-target.c +0
-4@@ -798,9 +798,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,case INDEX_op_qemu_st8:case INDEX_op_qemu_st16:case INDEX_op_qemu_st32: -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_r (s,TCG_AREG0 ); -#endif tcg_out_r (s, *args++);tcg_out_r (s, *args++);#if TARGET_LONG_BITS >TCG_TARGET_REG_BITS @@ -811,9 +809,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,#endif break ;case INDEX_op_qemu_st64: -#ifdef CONFIG_TCG_PASS_AREG0 tcg_out_r (s,TCG_AREG0 ); -#endif tcg_out_r (s, *args++);#if TCG_TARGET_REG_BITS ==32 tcg_out_r (s, *args++);tci.c +0
-12@@ -25,7 +25,6 @@#endif #include "qemu-common.h" -#include "dyngen-exec.h" /* env */ #include "exec-all.h" /* MAX_OPC_PARAM_IARGS */ #include "tcg-op.h" @@ -63,17 +62,6 @@ uintptr_t tci_tb_ptr;static tcg_target_ulong tci_reg[TCG_TARGET_NB_REGS ]; -#if !defined(CONFIG_TCG_PASS_AREG0 ) -# define helper_ldb_mmu (env, addr, mmu_idx) __ldb_mmu(addr, mmu_idx) -# define helper_ldw_mmu (env, addr, mmu_idx) __ldw_mmu(addr, mmu_idx) -# define helper_ldl_mmu (env, addr, mmu_idx) __ldl_mmu(addr, mmu_idx) -# define helper_ldq_mmu (env, addr, mmu_idx) __ldq_mmu(addr, mmu_idx) -# define helper_stb_mmu (env, addr, val, mmu_idx) __stb_mmu(addr, val, mmu_idx) -# define helper_stw_mmu (env, addr, val, mmu_idx) __stw_mmu(addr, val, mmu_idx) -# define helper_stl_mmu (env, addr, val, mmu_idx) __stl_mmu(addr, val, mmu_idx) -# define helper_stq_mmu (env, addr, val, mmu_idx) __stq_mmu(addr, val, mmu_idx) -#endif /* !CONFIG_TCG_PASS_AREG0 */ -static tcg_target_ulong tci_read_reg (TCGReg index) {assert (index <ARRAY_SIZE (tci_reg));user-exec.c +0
-14@@ -18,9 +18,6 @@*/ #include "config.h" #include "cpu.h" -#ifndef CONFIG_TCG_PASS_AREG0 -#include "dyngen-exec.h" -#endif #include "disas.h" #include "tcg.h" @@ -60,12 +57,6 @@ void cpu_resume_from_signal(CPUArchState *env1, void *puc)struct sigcontext *uc = puc;#endif -#ifndef CONFIG_TCG_PASS_AREG0 - env = env1; - -/* XXX: restore cpu registers saved in host registers */ -#endif -if (puc) {/* XXX: use siglongjmp ? */ #ifdef __linux__@@ -93,11 +84,6 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,TranslationBlock *tb;int ret; -#ifndef CONFIG_TCG_PASS_AREG0 -if (cpu_single_env) { - env = cpu_single_env;/* XXX: find a correct solution for multithread */ - } -#endif #if defined(DEBUG_SIGNAL )qemu_printf ("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n" , pc, address, is_write, *(unsigned long *)old_set);Signature · 1 line
1.7.2.5
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 17/21] target-microblaze: switch to AREG0 free mode
In reply to Blue SwirlQuoted 671 lines · Blue Swirl
Add an explicit CPUState parameter instead of relying on AREG0 and switch to AREG0 free mode.
Signed-off-by Blue Swirl <[email protected]>--- configure | 2 +- target-microblaze/Makefile.objs | 2 - target-microblaze/helper.h | 48 ++++++++-------- target-microblaze/op_helper.c | 115 ++++++++++++++++++--------------------- target-microblaze/translate.c | 56 +++++++++++--------- 5 files changed, 108 insertions(+), 115 deletions(-)configure +1
-1@@ -3829,7 +3829,7 @@ symlink "$source_path/Makefile.target" "$target_dir/Makefile" case "$target_arch2" in - alpha | arm* | i386 | lm32 | m68k | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) + alpha | arm* | i386 | lm32 | m68k | microblaze* | or32 | s390x | sparc* | unicore32 | x86_64 | xtensa* | ppc*) echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak ;; esactarget-microblaze/Makefile.objs +0
-2@@ -1,4 +1,2 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-$(CONFIG_SOFTMMU) += mmu.o machine.o - -$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)target-microblaze/helper.h +24
-24@@ -1,39 +1,39 @@#include "def-helper.h" -DEF_HELPER_1(raise_exception, void, i32) -DEF_HELPER_0(debug, void) +DEF_HELPER_2(raise_exception, void, env, i32) +DEF_HELPER_1(debug, void, env) DEF_HELPER_FLAGS_3(carry, TCG_CALL_PURE | TCG_CALL_CONST, i32, i32, i32, i32) DEF_HELPER_2(cmp, i32, i32, i32) DEF_HELPER_2(cmpu, i32, i32, i32) DEF_HELPER_FLAGS_1(clz, TCG_CALL_PURE | TCG_CALL_CONST, i32, i32) -DEF_HELPER_2(divs, i32, i32, i32) -DEF_HELPER_2(divu, i32, i32, i32) - -DEF_HELPER_2(fadd, i32, i32, i32) -DEF_HELPER_2(frsub, i32, i32, i32) -DEF_HELPER_2(fmul, i32, i32, i32) -DEF_HELPER_2(fdiv, i32, i32, i32) -DEF_HELPER_1(flt, i32, i32) -DEF_HELPER_1(fint, i32, i32) -DEF_HELPER_1(fsqrt, i32, i32) - -DEF_HELPER_2(fcmp_un, i32, i32, i32) -DEF_HELPER_2(fcmp_lt, i32, i32, i32) -DEF_HELPER_2(fcmp_eq, i32, i32, i32) -DEF_HELPER_2(fcmp_le, i32, i32, i32) -DEF_HELPER_2(fcmp_gt, i32, i32, i32) -DEF_HELPER_2(fcmp_ne, i32, i32, i32) -DEF_HELPER_2(fcmp_ge, i32, i32, i32) +DEF_HELPER_3(divs, i32, env, i32, i32) +DEF_HELPER_3(divu, i32, env, i32, i32) + +DEF_HELPER_3(fadd, i32, env, i32, i32) +DEF_HELPER_3(frsub, i32, env, i32, i32) +DEF_HELPER_3(fmul, i32, env, i32, i32) +DEF_HELPER_3(fdiv, i32, env, i32, i32) +DEF_HELPER_2(flt, i32, env, i32) +DEF_HELPER_2(fint, i32, env, i32) +DEF_HELPER_2(fsqrt, i32, env, i32) + +DEF_HELPER_3(fcmp_un, i32, env, i32, i32) +DEF_HELPER_3(fcmp_lt, i32, env, i32, i32) +DEF_HELPER_3(fcmp_eq, i32, env, i32, i32) +DEF_HELPER_3(fcmp_le, i32, env, i32, i32) +DEF_HELPER_3(fcmp_gt, i32, env, i32, i32) +DEF_HELPER_3(fcmp_ne, i32, env, i32, i32) +DEF_HELPER_3(fcmp_ge, i32, env, i32, i32) DEF_HELPER_FLAGS_2(pcmpbf, TCG_CALL_PURE | TCG_CALL_CONST, i32, i32, i32)#if !defined(CONFIG_USER_ONLY ) -DEF_HELPER_1(mmu_read, i32, i32) -DEF_HELPER_2(mmu_write, void, i32, i32) +DEF_HELPER_2(mmu_read, i32, env, i32) +DEF_HELPER_3(mmu_write, void, env, i32, i32)#endif -DEF_HELPER_4(memalign, void, i32, i32, i32, i32) -DEF_HELPER_1(stackprot, void, i32) +DEF_HELPER_5(memalign, void, env, i32, i32, i32, i32) +DEF_HELPER_2(stackprot, void, env, i32) DEF_HELPER_2(get, i32, i32, i32)DEF_HELPER_3 (put, void, i32, i32, i32)target-microblaze/op_helper.c +52
-63@@ -20,7 +20,6 @@#include <assert.h> #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" #include "host-utils.h" @@ -42,17 +41,12 @@/* Try to fill the TLB and return an exception if error. If retaddr is NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ -/* XXX: fix it to restore all registers */ -void tlb_fill (CPUMBState *env1,target_ulong addr,int is_write,int mmu_idx, +void tlb_fill (CPUMBState *env,target_ulong addr,int is_write,int mmu_idx,uintptr_t retaddr) {TranslationBlock *tb; -CPUMBState *saved_env;int ret; - saved_env = env; - env = env1; - ret =cpu_mb_handle_mmu_fault (env, addr, is_write, mmu_idx);if (unlikely (ret)) {if (retaddr) {@@ -66,7 +60,6 @@ void tlb_fill(CPUMBState *env1, target_ulong addr, int is_write, int mmu_idx, }cpu_loop_exit (env); } - env = saved_env; }#endif @@ -105,13 +98,13 @@ uint32_t helper_get(uint32_t id, uint32_t ctrl)return 0xdead0000 | id; } -void helper_raise_exception (uint32_t index) +void helper_raise_exception (CPUMBState *env,uint32_t index) { env->exception_index = index;cpu_loop_exit (env); } -void helper_debug (void ) +void helper_debug (CPUMBState *env) {int i;@@ -176,7 +169,7 @@ uint32_t helper_carry(uint32_t a, uint32_t b, uint32_t cf)return ncf; } -static inline int div_prepare (uint32_t a,uint32_t b) +static inline int div_prepare (CPUMBState *env,uint32_t a,uint32_t b) {if (b ==0 ) { env->sregs[SR_MSR ] |=MSR_DZ ;@@ -184,7 +177,7 @@ static inline int div_prepare(uint32_t a, uint32_t b)if ((env->sregs[SR_MSR ] &MSR_EE ) && !(env->pvr.regs[2 ] &PVR2_DIV_ZERO_EXC_MASK )) { env->sregs[SR_ESR ] =ESR_EC_DIVZERO ; -helper_raise_exception (EXCP_HW_EXCP ); +helper_raise_exception (env,EXCP_HW_EXCP ); }return 0 ; }@@ -192,28 +185,30 @@ static inline int div_prepare(uint32_t a, uint32_t b)return 1 ; } -uint32_t helper_divs (uint32_t a,uint32_t b) +uint32_t helper_divs (CPUMBState *env,uint32_t a,uint32_t b) { -if (!div_prepare (a, b)) +if (!div_prepare (env, a, b)) {return 0 ; + }return (int32_t )a / (int32_t )b; } -uint32_t helper_divu (uint32_t a,uint32_t b) +uint32_t helper_divu (CPUMBState *env,uint32_t a,uint32_t b) { -if (!div_prepare (a, b)) +if (!div_prepare (env, a, b)) {return 0 ; + }return a / b; }/* raise FPU exception. */ -static void raise_fpu_exception (void ) +static void raise_fpu_exception (CPUMBState *env) { env->sregs[SR_ESR ] =ESR_EC_FPU ; -helper_raise_exception (EXCP_HW_EXCP ); +helper_raise_exception (env,EXCP_HW_EXCP ); } -static void update_fpu_flags (int flags) +static void update_fpu_flags (CPUMBState *env,int flags) {int raise =0 ;@@ -236,11 +231,11 @@ static void update_fpu_flags(int flags)if (raise && (env->pvr.regs[2 ] &PVR2_FPU_EXC_MASK ) && (env->sregs[SR_MSR ] &MSR_EE )) { -raise_fpu_exception (); +raise_fpu_exception (env); } } -uint32_t helper_fadd (uint32_t a,uint32_t b) +uint32_t helper_fadd (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fd, fa, fb;int flags;@@ -251,11 +246,11 @@ uint32_t helper_fadd(uint32_t a, uint32_t b) fd.f =float32_add (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags); +update_fpu_flags (env, flags);return fd.l; } -uint32_t helper_frsub (uint32_t a,uint32_t b) +uint32_t helper_frsub (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fd, fa, fb;int flags;@@ -265,11 +260,11 @@ uint32_t helper_frsub(uint32_t a, uint32_t b) fb.l = b; fd.f =float32_sub (fb.f, fa.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags); +update_fpu_flags (env, flags);return fd.l; } -uint32_t helper_fmul (uint32_t a,uint32_t b) +uint32_t helper_fmul (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fd, fa, fb;int flags;@@ -279,12 +274,12 @@ uint32_t helper_fmul(uint32_t a, uint32_t b) fb.l = b; fd.f =float32_mul (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags); +update_fpu_flags (env, flags);return fd.l; } -uint32_t helper_fdiv (uint32_t a,uint32_t b) +uint32_t helper_fdiv (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fd, fa, fb;int flags;@@ -294,12 +289,12 @@ uint32_t helper_fdiv(uint32_t a, uint32_t b) fb.l = b; fd.f =float32_div (fb.f, fa.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags); +update_fpu_flags (env, flags);return fd.l; } -uint32_t helper_fcmp_un (uint32_t a,uint32_t b) +uint32_t helper_fcmp_un (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;uint32_t r =0 ;@@ -308,7 +303,7 @@ uint32_t helper_fcmp_un(uint32_t a, uint32_t b) fb.l = b;if (float32_is_signaling_nan (fa.f) ||float32_is_signaling_nan (fb.f)) { -update_fpu_flags (float_flag_invalid); +update_fpu_flags (env, float_flag_invalid); r =1 ; }@@ -319,7 +314,7 @@ uint32_t helper_fcmp_un(uint32_t a, uint32_t b)return r; } -uint32_t helper_fcmp_lt (uint32_t a,uint32_t b) +uint32_t helper_fcmp_lt (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;int r;@@ -330,12 +325,12 @@ uint32_t helper_fcmp_lt(uint32_t a, uint32_t b) fb.l = b; r =float32_lt (fb.f, fa.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags & float_flag_invalid); +update_fpu_flags (env, flags & float_flag_invalid);return r; } -uint32_t helper_fcmp_eq (uint32_t a,uint32_t b) +uint32_t helper_fcmp_eq (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;int flags;@@ -346,12 +341,12 @@ uint32_t helper_fcmp_eq(uint32_t a, uint32_t b) fb.l = b; r =float32_eq_quiet (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags & float_flag_invalid); +update_fpu_flags (env, flags & float_flag_invalid);return r; } -uint32_t helper_fcmp_le (uint32_t a,uint32_t b) +uint32_t helper_fcmp_le (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;int flags;@@ -362,13 +357,13 @@ uint32_t helper_fcmp_le(uint32_t a, uint32_t b)set_float_exception_flags (0 , &env->fp_status); r =float32_le (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags & float_flag_invalid); +update_fpu_flags (env, flags & float_flag_invalid);return r; } -uint32_t helper_fcmp_gt (uint32_t a,uint32_t b) +uint32_t helper_fcmp_gt (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;int flags, r;@@ -378,11 +373,11 @@ uint32_t helper_fcmp_gt(uint32_t a, uint32_t b)set_float_exception_flags (0 , &env->fp_status); r =float32_lt (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags & float_flag_invalid); +update_fpu_flags (env, flags & float_flag_invalid);return r; } -uint32_t helper_fcmp_ne (uint32_t a,uint32_t b) +uint32_t helper_fcmp_ne (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;int flags, r;@@ -392,12 +387,12 @@ uint32_t helper_fcmp_ne(uint32_t a, uint32_t b)set_float_exception_flags (0 , &env->fp_status); r = !float32_eq_quiet (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags & float_flag_invalid); +update_fpu_flags (env, flags & float_flag_invalid);return r; } -uint32_t helper_fcmp_ge (uint32_t a,uint32_t b) +uint32_t helper_fcmp_ge (CPUMBState *env,uint32_t a,uint32_t b) {CPU_FloatU fa, fb;int flags, r;@@ -407,12 +402,12 @@ uint32_t helper_fcmp_ge(uint32_t a, uint32_t b)set_float_exception_flags (0 , &env->fp_status); r = !float32_lt (fa.f, fb.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags & float_flag_invalid); +update_fpu_flags (env, flags & float_flag_invalid);return r; } -uint32_t helper_flt (uint32_t a) +uint32_t helper_flt (CPUMBState *env,uint32_t a) {CPU_FloatU fd, fa;@@ -421,7 +416,7 @@ uint32_t helper_flt(uint32_t a)return fd.l; } -uint32_t helper_fint (uint32_t a) +uint32_t helper_fint (CPUMBState *env,uint32_t a) {CPU_FloatU fa;uint32_t r;@@ -431,12 +426,12 @@ uint32_t helper_fint(uint32_t a) fa.l = a; r =float32_to_int32 (fa.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags); +update_fpu_flags (env, flags);return r; } -uint32_t helper_fsqrt (uint32_t a) +uint32_t helper_fsqrt (CPUMBState *env,uint32_t a) {CPU_FloatU fd, fa;int flags;@@ -445,7 +440,7 @@ uint32_t helper_fsqrt(uint32_t a) fa.l = a; fd.l =float32_sqrt (fa.f, &env->fp_status); flags =get_float_exception_flags (&env->fp_status); -update_fpu_flags (flags); +update_fpu_flags (env, flags);return fd.l; }@@ -463,7 +458,8 @@ uint32_t helper_pcmpbf(uint32_t a, uint32_t b)return 0 ; } -void helper_memalign (uint32_t addr,uint32_t dr,uint32_t wr,uint32_t mask) +void helper_memalign (CPUMBState *env,uint32_t addr,uint32_t dr,uint32_t wr, +uint32_t mask) {if (addr & mask) { qemu_log_mask(CPU_LOG_INT,@@ -478,45 +474,39 @@ void helper_memalign(uint32_t addr, uint32_t dr, uint32_t wr, uint32_t mask)if (!(env->sregs[SR_MSR ] &MSR_EE )) {return ; } -helper_raise_exception (EXCP_HW_EXCP ); +helper_raise_exception (env,EXCP_HW_EXCP ); } } -void helper_stackprot (uint32_t addr) +void helper_stackprot (CPUMBState *env,uint32_t addr) {if (addr < env->slr || addr > env->shr) {qemu_log ("Stack protector violation at %x %x %x\n" , addr, env->slr, env->shr); env->sregs[SR_EAR ] = addr; env->sregs[SR_ESR ] =ESR_EC_STACKPROT ; -helper_raise_exception (EXCP_HW_EXCP ); +helper_raise_exception (env,EXCP_HW_EXCP ); } }#if !defined(CONFIG_USER_ONLY )/* Writes/reads to the MMU's special regs end up here. */ -uint32_t helper_mmu_read (uint32_t rn) +uint32_t helper_mmu_read (CPUMBState *env,uint32_t rn) {return mmu_read (env, rn); } -void helper_mmu_write (uint32_t rn,uint32_t v) +void helper_mmu_write (CPUMBState *env,uint32_t rn,uint32_t v) {mmu_write (env, rn, v); } -void cpu_unassigned_access (CPUMBState *env1,target_phys_addr_t addr, +void cpu_unassigned_access (CPUMBState *env,target_phys_addr_t addr,int is_write,int is_exec,int is_asi,int size) { -CPUMBState *saved_env; - - saved_env = env; - env = env1; -qemu_log_mask (CPU_LOG_INT ,"Unassigned " TARGET_FMT_plx" wr=%d exe=%d\n" , addr, is_write, is_exec);if (!(env->sregs[SR_MSR ] &MSR_EE )) { - env = saved_env;return ; }@@ -524,14 +514,13 @@ void cpu_unassigned_access(CPUMBState *env1, target_phys_addr_t addr,if (is_exec) {if ((env->pvr.regs[2 ] &PVR2_IOPB_BUS_EXC_MASK )) { env->sregs[SR_ESR ] =ESR_EC_INSN_BUS ; -helper_raise_exception (EXCP_HW_EXCP ); +helper_raise_exception (env,EXCP_HW_EXCP ); } }else {if ((env->pvr.regs[2 ] &PVR2_DOPB_BUS_EXC_MASK )) { env->sregs[SR_ESR ] =ESR_EC_DATA_BUS ; -helper_raise_exception (EXCP_HW_EXCP ); +helper_raise_exception (env,EXCP_HW_EXCP ); } } - env = saved_env; }#endif target-microblaze/translate.c +29
-23@@ -126,7 +126,7 @@ static inline void t_gen_raise_exception(DisasContext *dc, uint32_t index)t_sync_flags (dc);tcg_gen_movi_tl (cpu_SR[SR_PC ], dc->pc); -gen_helper_raise_exception (tmp); +gen_helper_raise_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp); dc->is_jmp =DISAS_UPDATE ; }@@ -503,9 +503,9 @@ static void dec_msr(DisasContext *dc) sr &=7 ;LOG_DIS ("m%ss sr%d r%d imm=%x\n" , to ?"t" :"f" , sr, dc->ra, dc->imm);if (to) -gen_helper_mmu_write (tcg_const_tl (sr), cpu_R[dc->ra]); +gen_helper_mmu_write (cpu_env,tcg_const_tl (sr), cpu_R[dc->ra]);else -gen_helper_mmu_read (cpu_R[dc->rd],tcg_const_tl (sr)); +gen_helper_mmu_read (cpu_R[dc->rd], cpu_env,tcg_const_tl (sr)); return; }#endif @@ -704,9 +704,11 @@ static void dec_div(DisasContext *dc) }if (u) -gen_helper_divu (cpu_R[dc->rd], *(dec_alu_op_b (dc)), cpu_R[dc->ra]); +gen_helper_divu (cpu_R[dc->rd], cpu_env, *(dec_alu_op_b (dc)), + cpu_R[dc->ra]);else -gen_helper_divs (cpu_R[dc->rd], *(dec_alu_op_b (dc)), cpu_R[dc->ra]); +gen_helper_divs (cpu_R[dc->rd], cpu_env, *(dec_alu_op_b (dc)), + cpu_R[dc->ra]);if (!dc->rd)tcg_gen_movi_tl (cpu_R[dc->rd],0 ); }@@ -912,7 +914,7 @@ static inline TCGv *compute_ldst_addr(DisasContext *dc, TCGv *t)tcg_gen_add_tl (*t, cpu_R[dc->ra], cpu_R[dc->rb]);if (stackprot) { -gen_helper_stackprot (*t); +gen_helper_stackprot (cpu_env, *t); }return t; }@@ -930,7 +932,7 @@ static inline TCGv *compute_ldst_addr(DisasContext *dc, TCGv *t) }if (stackprot) { -gen_helper_stackprot (*t); +gen_helper_stackprot (cpu_env, *t); }return t; }@@ -1056,7 +1058,7 @@ static void dec_load(DisasContext *dc)gen_load (dc, v, *addr, size);tcg_gen_movi_tl (cpu_SR[SR_PC ], dc->pc); -gen_helper_memalign (*addr,tcg_const_tl (dc->rd), +gen_helper_memalign (cpu_env, *addr,tcg_const_tl (dc->rd),tcg_const_tl (0 ),tcg_const_tl (size -1 ));if (dc->rd) {if (rev) {@@ -1218,7 +1220,7 @@ static void dec_store(DisasContext *dc)* the alignment checks in between the probe and the mem * access. */ -gen_helper_memalign (*addr,tcg_const_tl (dc->rd), +gen_helper_memalign (cpu_env, *addr,tcg_const_tl (dc->rd),tcg_const_tl (1 ),tcg_const_tl (size -1 )); }@@ -1493,49 +1495,53 @@ static void dec_fpu(DisasContext *dc)switch (fpu_insn) {case 0 : -gen_helper_fadd (cpu_R[dc->rd], cpu_R[dc->ra], cpu_R[dc->rb]); +gen_helper_fadd (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], + cpu_R[dc->rb]);break ;case 1 : -gen_helper_frsub (cpu_R[dc->rd], cpu_R[dc->ra], cpu_R[dc->rb]); +gen_helper_frsub (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], + cpu_R[dc->rb]);break ;case 2 : -gen_helper_fmul (cpu_R[dc->rd], cpu_R[dc->ra], cpu_R[dc->rb]); +gen_helper_fmul (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], + cpu_R[dc->rb]);break ;case 3 : -gen_helper_fdiv (cpu_R[dc->rd], cpu_R[dc->ra], cpu_R[dc->rb]); +gen_helper_fdiv (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], + cpu_R[dc->rb]);break ;case 4 :switch ((dc->ir >>4 ) &7 ) {case 0 : -gen_helper_fcmp_un (cpu_R[dc->rd], +gen_helper_fcmp_un (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;case 1 : -gen_helper_fcmp_lt (cpu_R[dc->rd], +gen_helper_fcmp_lt (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;case 2 : -gen_helper_fcmp_eq (cpu_R[dc->rd], +gen_helper_fcmp_eq (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;case 3 : -gen_helper_fcmp_le (cpu_R[dc->rd], +gen_helper_fcmp_le (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;case 4 : -gen_helper_fcmp_gt (cpu_R[dc->rd], +gen_helper_fcmp_gt (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;case 5 : -gen_helper_fcmp_ne (cpu_R[dc->rd], +gen_helper_fcmp_ne (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;case 6 : -gen_helper_fcmp_ge (cpu_R[dc->rd], +gen_helper_fcmp_ge (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra], cpu_R[dc->rb]);break ;default :@@ -1552,21 +1558,21 @@ static void dec_fpu(DisasContext *dc)if (!dec_check_fpuv2 (dc)) {return ; } -gen_helper_flt (cpu_R[dc->rd], cpu_R[dc->ra]); +gen_helper_flt (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra]);break ;case 6 :if (!dec_check_fpuv2 (dc)) {return ; } -gen_helper_fint (cpu_R[dc->rd], cpu_R[dc->ra]); +gen_helper_fint (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra]);break ;case 7 :if (!dec_check_fpuv2 (dc)) {return ; } -gen_helper_fsqrt (cpu_R[dc->rd], cpu_R[dc->ra]); +gen_helper_fsqrt (cpu_R[dc->rd], cpu_env, cpu_R[dc->ra]);break ;default :
target-microblaze/translate.c static inline void decode(DisasContext *dc) · line 1672
Quoted 6 lines
target-microblaze/translate.c +1
-1@@ -1662,7 +1668,7 @@ static inline void decode(DisasContext *dc)if (unlikely (qemu_loglevel_mask (CPU_LOG_TB_OP )))tcg_gen_debug_insn_start (dc->pc); - dc->ir = ir =ldl_code (dc->pc); + dc->ir = ir =cpu_ldl_code (cpu_single_env, dc->pc);LOG_DIS ("%8.8x\t" , dc->ir);
Similarly to the sh4 patch, it should be quite easy to just pass env to decode() and use it there instead of cpu_single_env.
Quoted 15 lines
target-microblaze/translate.c +1
-1if (dc->ir)@@ -1871,7 +1877,7 @@ gen_intermediate_code_internal(CPUMBState *env, TranslationBlock *tb,if (dc->is_jmp !=DISAS_JUMP ) {tcg_gen_movi_tl (cpu_SR[SR_PC ], npc); } -gen_helper_raise_exception (tmp); +gen_helper_raise_exception (cpu_env, tmp);tcg_temp_free_i32 (tmp); }else {switch (dc->is_jmp) {Signature · 1 line
1.7.2.5
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net