Revision 7c60cc4b target-sparc/translate.c

b/target-sparc/translate.c
46 46
                         according to jump_pc[T2] */
47 47

  
48 48
/* global register indexes */
49
static TCGv cpu_env, cpu_T[3], cpu_regwptr, cpu_cc_src, cpu_cc_src2, cpu_cc_dst;
49
static TCGv cpu_env, cpu_T[2], cpu_regwptr, cpu_cc_src, cpu_cc_src2, cpu_cc_dst;
50 50
static TCGv cpu_psr, cpu_fsr, cpu_pc, cpu_npc, cpu_gregs[8];
51 51
static TCGv cpu_cond, cpu_src1, cpu_src2, cpu_dst, cpu_addr, cpu_val;
52 52
#ifdef TARGET_SPARC64
......
4223 4223
                        tcg_gen_helper_0_2(helper_check_align, cpu_addr, tcg_const_i32(7));
4224 4224
                        r_low = tcg_temp_new(TCG_TYPE_I32);
4225 4225
                        gen_movl_reg_TN(rd + 1, r_low);
4226
#ifndef __i386__
4227 4226
                        tcg_gen_helper_1_2(helper_pack64, cpu_tmp64, cpu_val,
4228 4227
                                           r_low);
4229 4228
                        tcg_gen_qemu_st64(cpu_tmp64, cpu_addr, dc->mem_idx);
4230
#else /* __i386__ */
4231
                        tcg_gen_st_tl(cpu_val, cpu_env, offsetof(CPUState, t1));
4232
                        tcg_gen_st_tl(r_low, cpu_env, offsetof(CPUState, t2));
4233
                        tcg_gen_helper_0_2(helper_std_i386, cpu_addr,
4234
                                           tcg_const_i32(dc->mem_idx));
4235
#endif /* __i386__ */
4236 4229
                    }
4237 4230
                    break;
4238 4231
#if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64)
......
4475 4468
    cpu_tmp32 = tcg_temp_new(TCG_TYPE_I32);
4476 4469
    cpu_tmp64 = tcg_temp_new(TCG_TYPE_I64);
4477 4470

  
4478
    cpu_cond = cpu_T[2];
4479

  
4480 4471
    do {
4481 4472
        if (env->nb_breakpoints > 0) {
4482 4473
            for(j = 0; j < env->nb_breakpoints; j++) {
......
4599 4590
        cpu_regwptr = tcg_global_mem_new(TCG_TYPE_PTR, TCG_AREG0,
4600 4591
                                         offsetof(CPUState, regwptr),
4601 4592
                                         "regwptr");
4602
        //#if TARGET_LONG_BITS > HOST_LONG_BITS
4603 4593
#ifdef TARGET_SPARC64
4604
        cpu_T[0] = tcg_global_mem_new(TCG_TYPE_TL,
4605
                                      TCG_AREG0, offsetof(CPUState, t0), "T0");
4606
        cpu_T[1] = tcg_global_mem_new(TCG_TYPE_TL,
4607
                                      TCG_AREG0, offsetof(CPUState, t1), "T1");
4608
        cpu_T[2] = tcg_global_mem_new(TCG_TYPE_TL,
4609
                                      TCG_AREG0, offsetof(CPUState, t2), "T2");
4610 4594
        cpu_xcc = tcg_global_mem_new(TCG_TYPE_I32,
4611 4595
                                     TCG_AREG0, offsetof(CPUState, xcc),
4612 4596
                                     "xcc");
4613
#else
4614
        cpu_T[0] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG1, "T0");
4615
        cpu_T[1] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG2, "T1");
4616
        cpu_T[2] = tcg_global_reg_new(TCG_TYPE_TL, TCG_AREG3, "T2");
4617 4597
#endif
4598
        /* XXX: T0 and T1 should be temporaries */
4599
        cpu_T[0] = tcg_global_mem_new(TCG_TYPE_TL,
4600
                                      TCG_AREG0, offsetof(CPUState, t0), "T0");
4601
        cpu_T[1] = tcg_global_mem_new(TCG_TYPE_TL,
4602
                                      TCG_AREG0, offsetof(CPUState, t1), "T1");
4603
        cpu_cond = tcg_global_mem_new(TCG_TYPE_TL,
4604
                                      TCG_AREG0, offsetof(CPUState, cond), "cond");
4618 4605
        cpu_cc_src = tcg_global_mem_new(TCG_TYPE_TL,
4619 4606
                                        TCG_AREG0, offsetof(CPUState, cc_src),
4620 4607
                                        "cc_src");

Also available in: Unified diff