qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 1/4] Implement address masking for SPARC v9 CPUs


From: Artyom Tarasenko
Subject: Re: [Qemu-devel] [PATCH 1/4] Implement address masking for SPARC v9 CPUs
Date: Sat, 12 May 2012 11:23:55 +0200

Ups, the subject line was supposed to be [PATCH 1/4, master+QEMU 1.1]
... Should I resend?


On Sat, May 12, 2012 at 11:15 AM, Artyom Tarasenko <address@hidden> wrote:
> According to UltraSPARC - IIi User's manual:
>
> 14.1.11 Address Masking (Impdep #125)
> When PSTATE.AM=1, the CALL, JMPL, and RDPC instructions and all traps
> transmit zero in the high-order 32-bits of the PC to their specified 
> destination
> registers.
>
> Signed-off-by: Artyom Tarasenko <address@hidden>
> ---
>  target-sparc/translate.c |   25 ++++++++++++++++++++++++-
>  1 files changed, 24 insertions(+), 1 deletions(-)
>
> diff --git a/target-sparc/translate.c b/target-sparc/translate.c
> index 4967152..b95f91c 100644
> --- a/target-sparc/translate.c
> +++ b/target-sparc/translate.c
> @@ -1343,6 +1343,11 @@ static void do_branch(DisasContext *dc, int32_t 
> offset, uint32_t insn, int cc,
>     unsigned int cond = GET_FIELD(insn, 3, 6), a = (insn & (1 << 29));
>     target_ulong target = dc->pc + offset;
>
> +#ifdef TARGET_SPARC64
> +    if (unlikely(AM_CHECK(dc))) {
> +        target &= 0xffffffffULL;
> +    }
> +#endif
>     if (cond == 0x0) {
>         /* unconditional not taken */
>         if (a) {
> @@ -1388,6 +1393,11 @@ static void do_fbranch(DisasContext *dc, int32_t 
> offset, uint32_t insn, int cc,
>     unsigned int cond = GET_FIELD(insn, 3, 6), a = (insn & (1 << 29));
>     target_ulong target = dc->pc + offset;
>
> +#ifdef TARGET_SPARC64
> +    if (unlikely(AM_CHECK(dc))) {
> +        target &= 0xffffffffULL;
> +    }
> +#endif
>     if (cond == 0x0) {
>         /* unconditional not taken */
>         if (a) {
> @@ -1434,6 +1444,9 @@ static void do_branch_reg(DisasContext *dc, int32_t 
> offset, uint32_t insn,
>     unsigned int cond = GET_FIELD_SP(insn, 25, 27), a = (insn & (1 << 29));
>     target_ulong target = dc->pc + offset;
>
> +    if (unlikely(AM_CHECK(dc))) {
> +        target &= 0xffffffffULL;
> +    }
>     flush_cond(dc, r_cond);
>     gen_cond_reg(r_cond, cond, r_reg);
>     if (a) {
> @@ -2486,6 +2499,11 @@ static void disas_sparc_insn(DisasContext * dc, 
> unsigned int insn)
>             tcg_temp_free(r_const);
>             target += dc->pc;
>             gen_mov_pc_npc(dc, cpu_cond);
> +#ifdef TARGET_SPARC64
> +            if (unlikely(AM_CHECK(dc))) {
> +                target &= 0xffffffffULL;
> +            }
> +#endif
>             dc->npc = target;
>         }
>         goto jmp_insn;
> @@ -2610,7 +2628,11 @@ static void disas_sparc_insn(DisasContext * dc, 
> unsigned int insn)
>                     {
>                         TCGv r_const;
>
> -                        r_const = tcg_const_tl(dc->pc);
> +                        if (unlikely(AM_CHECK(dc))) {
> +                            r_const = tcg_const_tl(dc->pc & 0xffffffffULL);
> +                        } else {
> +                           r_const = tcg_const_tl(dc->pc);
> +                        }
>                         gen_movl_TN_reg(rd, r_const);
>                         tcg_temp_free(r_const);
>                     }
> @@ -4579,6 +4601,7 @@ static void disas_sparc_insn(DisasContext * dc, 
> unsigned int insn)
>                         r_const = tcg_const_i32(3);
>                         gen_helper_check_align(cpu_env, cpu_dst, r_const);
>                         tcg_temp_free_i32(r_const);
> +                        gen_address_mask(dc, cpu_dst);
>                         tcg_gen_mov_tl(cpu_npc, cpu_dst);
>                         dc->npc = DYNAMIC_PC;
>                     }
> --
> 1.7.1
>



-- 
Regards,
Artyom Tarasenko

solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu



reply via email to

[Prev in Thread] Current Thread [Next in Thread]