Commit cd6e9320 authored by Thomas Huth's avatar Thomas Huth Committed by Alexander Graf
Browse files

PPC64: Add support for ldbrx and stdbrx instructions 



These instructions for loading and storing byte-swapped 64-bit values have
been introduced in PowerISA 2.06.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent b5aec396

target-ppc/cpu.h

+3 −1
Original line number Diff line number Diff line
@@ -1918,8 +1918,10 @@ enum { 
    PPC2_DFP           = 0x0000000000000004ULL,

    /* Embedded.Processor Control                                            */

    PPC2_PRCNTL        = 0x0000000000000008ULL,

    /* Byte-reversed, indexed, double-word load and store                    */

    PPC2_DBRX          = 0x0000000000000010ULL,



#define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_PRCNTL)

#define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_DBRX)

};



/*****************************************************************************/

target-ppc/translate.c

+43 −9
Original line number Diff line number Diff line
@@ -2650,7 +2650,7 @@ static void glue(gen_, name##ux)(DisasContext *ctx) 
    tcg_temp_free(EA);                                                        \

}



#define GEN_LDX(name, ldop, opc2, opc3, type)                                 \

#define GEN_LDX_E(name, ldop, opc2, opc3, type, type2)                        \

static void glue(gen_, name##x)(DisasContext *ctx)                            \

{                                                                             \

    TCGv EA;                                                                  \
@@ -2660,6 +2660,8 @@ static void glue(gen_, name##x)(DisasContext *ctx) \ 
    gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA);                       \

    tcg_temp_free(EA);                                                        \

}

#define GEN_LDX(name, ldop, opc2, opc3, type)                                 \

    GEN_LDX_E(name, ldop, opc2, opc3, type, PPC_NONE)



#define GEN_LDS(name, ldop, op, type)                                         \

GEN_LD(name, ldop, op | 0x20, type);                                          \
@@ -2793,7 +2795,7 @@ static void glue(gen_, name##ux)(DisasContext *ctx) 
    tcg_temp_free(EA);                                                        \

}



#define GEN_STX(name, stop, opc2, opc3, type)                                 \

#define GEN_STX_E(name, stop, opc2, opc3, type, type2)                        \

static void glue(gen_, name##x)(DisasContext *ctx)                            \

{                                                                             \

    TCGv EA;                                                                  \
@@ -2803,6 +2805,8 @@ static void glue(gen_, name##x)(DisasContext *ctx) 
    gen_qemu_##stop(ctx, cpu_gpr[rS(ctx->opcode)], EA);                       \

    tcg_temp_free(EA);                                                        \

}

#define GEN_STX(name, stop, opc2, opc3, type)                                 \

    GEN_STX_E(name, stop, opc2, opc3, type, PPC_NONE)



#define GEN_STS(name, stop, op, type)                                         \

GEN_ST(name, stop, op | 0x20, type);                                          \
@@ -2891,6 +2895,18 @@ static inline void gen_qemu_ld32ur(DisasContext *ctx, TCGv arg1, TCGv arg2) 
}

GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER);



#if defined(TARGET_PPC64)

/* ldbrx */

static inline void gen_qemu_ld64ur(DisasContext *ctx, TCGv arg1, TCGv arg2)

{

    tcg_gen_qemu_ld64(arg1, arg2, ctx->mem_idx);

    if (likely(!ctx->le_mode)) {

        tcg_gen_bswap64_tl(arg1, arg1);

    }

}

GEN_LDX_E(ldbr, ld64ur, 0x14, 0x10, PPC_NONE, PPC2_DBRX);

#endif  /* TARGET_PPC64 */



/* sthbrx */

static inline void gen_qemu_st16r(DisasContext *ctx, TCGv arg1, TCGv arg2)

{
@@ -2921,6 +2937,22 @@ static inline void gen_qemu_st32r(DisasContext *ctx, TCGv arg1, TCGv arg2) 
}

GEN_STX(stwbr, st32r, 0x16, 0x14, PPC_INTEGER);



#if defined(TARGET_PPC64)

/* stdbrx */

static inline void gen_qemu_st64r(DisasContext *ctx, TCGv arg1, TCGv arg2)

{

    if (likely(!ctx->le_mode)) {

        TCGv t0 = tcg_temp_new();

        tcg_gen_bswap64_tl(t0, arg1);

        tcg_gen_qemu_st64(t0, arg2, ctx->mem_idx);

        tcg_temp_free(t0);

    } else {

        tcg_gen_qemu_st64(arg1, arg2, ctx->mem_idx);

    }

}

GEN_STX_E(stdbr, st64r, 0x14, 0x14, PPC_NONE, PPC2_DBRX);

#endif  /* TARGET_PPC64 */



/***                    Integer load and store multiple                    ***/



/* lmw */
@@ -8818,7 +8850,7 @@ GEN_FLOAT_B(neg, 0x08, 0x01, 0, PPC_FLOAT), 
#undef GEN_LD

#undef GEN_LDU

#undef GEN_LDUX

#undef GEN_LDX

#undef GEN_LDX_E

#undef GEN_LDS

#define GEN_LD(name, ldop, opc, type)                                         \

GEN_HANDLER(name, opc, 0xFF, 0xFF, 0x00000000, type),
@@ -8826,8 +8858,8 @@ GEN_HANDLER(name, opc, 0xFF, 0xFF, 0x00000000, type), 
GEN_HANDLER(name##u, opc, 0xFF, 0xFF, 0x00000000, type),

#define GEN_LDUX(name, ldop, opc2, opc3, type)                                \

GEN_HANDLER(name##ux, 0x1F, opc2, opc3, 0x00000001, type),

#define GEN_LDX(name, ldop, opc2, opc3, type)                                 \

GEN_HANDLER(name##x, 0x1F, opc2, opc3, 0x00000001, type),

#define GEN_LDX_E(name, ldop, opc2, opc3, type, type2)                        \

GEN_HANDLER_E(name##x, 0x1F, opc2, opc3, 0x00000001, type, type2),

#define GEN_LDS(name, ldop, op, type)                                         \

GEN_LD(name, ldop, op | 0x20, type)                                           \

GEN_LDU(name, ldop, op | 0x21, type)                                          \
@@ -8843,6 +8875,7 @@ GEN_LDUX(lwa, ld32s, 0x15, 0x0B, PPC_64B) 
GEN_LDX(lwa, ld32s, 0x15, 0x0A, PPC_64B)

GEN_LDUX(ld, ld64, 0x15, 0x01, PPC_64B)

GEN_LDX(ld, ld64, 0x15, 0x00, PPC_64B)

GEN_LDX_E(ldbr, ld64ur, 0x14, 0x10, PPC_NONE, PPC2_DBRX)

#endif

GEN_LDX(lhbr, ld16ur, 0x16, 0x18, PPC_INTEGER)

GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER)
@@ -8850,7 +8883,7 @@ GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER) 
#undef GEN_ST

#undef GEN_STU

#undef GEN_STUX

#undef GEN_STX

#undef GEN_STX_E

#undef GEN_STS

#define GEN_ST(name, stop, opc, type)                                         \

GEN_HANDLER(name, opc, 0xFF, 0xFF, 0x00000000, type),
@@ -8858,8 +8891,8 @@ GEN_HANDLER(name, opc, 0xFF, 0xFF, 0x00000000, type), 
GEN_HANDLER(stop##u, opc, 0xFF, 0xFF, 0x00000000, type),

#define GEN_STUX(name, stop, opc2, opc3, type)                                \

GEN_HANDLER(name##ux, 0x1F, opc2, opc3, 0x00000001, type),

#define GEN_STX(name, stop, opc2, opc3, type)                                 \

GEN_HANDLER(name##x, 0x1F, opc2, opc3, 0x00000001, type),

#define GEN_STX_E(name, stop, opc2, opc3, type, type2)                        \

GEN_HANDLER_E(name##x, 0x1F, opc2, opc3, 0x00000001, type, type2),

#define GEN_STS(name, stop, op, type)                                         \

GEN_ST(name, stop, op | 0x20, type)                                           \

GEN_STU(name, stop, op | 0x21, type)                                          \
@@ -8872,6 +8905,7 @@ GEN_STS(stw, st32, 0x04, PPC_INTEGER) 
#if defined(TARGET_PPC64)

GEN_STUX(std, st64, 0x15, 0x05, PPC_64B)

GEN_STX(std, st64, 0x15, 0x04, PPC_64B)

GEN_STX_E(stdbr, st64r, 0x14, 0x14, PPC_NONE, PPC2_DBRX)

#endif

GEN_STX(sthbr, st16r, 0x16, 0x1C, PPC_INTEGER)

GEN_STX(stwbr, st32r, 0x16, 0x14, PPC_INTEGER)

target-ppc/translate_init.c

+1 −1
Original line number Diff line number Diff line
@@ -6571,7 +6571,7 @@ static void init_proc_970MP (CPUPPCState *env) 
                              PPC_64B | PPC_ALTIVEC |                         \

                              PPC_SEGMENT_64B | PPC_SLBI |                    \

                              PPC_POPCNTB | PPC_POPCNTWD)

#define POWERPC_INSNS2_POWER7 (PPC2_VSX | PPC2_DFP)

#define POWERPC_INSNS2_POWER7 (PPC2_VSX | PPC2_DFP | PPC2_DBRX)

#define POWERPC_MSRM_POWER7   (0x800000000204FF36ULL)

#define POWERPC_MMU_POWER7    (POWERPC_MMU_2_06)

#define POWERPC_EXCP_POWER7   (POWERPC_EXCP_POWER7)