Message ID | 1346135785-12119-6-git-send-email-proljc@gmail.com |
---|---|
State | New |
Headers | show |
On Tue, Aug 28, 2012 at 02:36:16PM +0800, Jia Liu wrote: > Add MIPS ASE DSP Load instructions. > > Signed-off-by: Jia Liu <proljc@gmail.com> > --- > target-mips/translate.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > > diff --git a/target-mips/translate.c b/target-mips/translate.c > index 18d827d..9a86b2c 100644 > --- a/target-mips/translate.c > +++ b/target-mips/translate.c > @@ -313,6 +313,9 @@ enum { > OPC_MODU_G_2E = 0x23 | OPC_SPECIAL3, > OPC_DMOD_G_2E = 0x26 | OPC_SPECIAL3, > OPC_DMODU_G_2E = 0x27 | OPC_SPECIAL3, > + > + /* MIPS DSP Load */ > + OPC_LX_DSP = 0x0A | OPC_SPECIAL3, > }; > > /* BSHFL opcodes */ > @@ -340,6 +343,17 @@ enum { > #endif > }; > > +#define MASK_LX(op) (MASK_SPECIAL3(op) | (op & (0x1F << 6))) > +/* MIPS DSP Load */ > +enum { > + OPC_LBUX = (0x06 << 6) | OPC_LX_DSP, > + OPC_LHX = (0x04 << 6) | OPC_LX_DSP, > + OPC_LWX = (0x00 << 6) | OPC_LX_DSP, > +#if defined(TARGET_MIPS64) > + OPC_LDX = (0x08 << 6) | OPC_LX_DSP, > +#endif > +}; > + > /* Coprocessor 0 (rs field) */ > #define MASK_CP0(op) MASK_OP_MAJOR(op) | (op & (0x1F << 21)) > > @@ -12184,6 +12198,54 @@ static void decode_opc (CPUMIPSState *env, DisasContext *ctx, int *is_branch) > check_insn(env, ctx, INSN_LOONGSON2E); > gen_loongson_integer(ctx, op1, rd, rs, rt); > break; > + case OPC_LX_DSP: > + check_dsp(ctx); > + op2 = MASK_LX(ctx->opcode); > + switch (op2) { > + case OPC_LBUX: > + { > + TCGv addr = tcg_temp_new(); > + I think you got my comment on the previous version wrong here. You do need to call op_ld_lbu to save the hflags and the possible btarget, but you don't need to save PC (it can be recovered from TB retranslation). Thus you need to call (note the 0 as the second argument): save_cpu_state(ctx, 0); > + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); > + op_ld_lbu(cpu_gpr[rd], addr, ctx); > + tcg_temp_free(addr); > + break; > + } > + case OPC_LHX: > + { > + TCGv addr = tcg_temp_new(); > + Ditto > + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); > + op_ld_lh(cpu_gpr[rd], addr, ctx); > + tcg_temp_free(addr); > + break; > + } > + case OPC_LWX: > + { > + TCGv addr = tcg_temp_new(); > + Ditto > + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); > + op_ld_lw(cpu_gpr[rd], addr, ctx); > + tcg_temp_free(addr); > + break; > + } > +#if defined(TARGET_MIPS64) > + case OPC_LDX: > + { > + TCGv addr = tcg_temp_new(); > + Ditto > + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); > + op_ld_ld(cpu_gpr[rd], addr, ctx); > + tcg_temp_free(addr); > + break; > + } > +#endif > + default: /* Invalid */ > + MIPS_INVAL("MASK LX"); > + generate_exception(ctx, EXCP_RI); > + break; > + } > + break; > #if defined(TARGET_MIPS64) > case OPC_DEXTM ... OPC_DEXT: > case OPC_DINSM ... OPC_DINS: > -- > 1.7.9.5 > >
diff --git a/target-mips/translate.c b/target-mips/translate.c index 18d827d..9a86b2c 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -313,6 +313,9 @@ enum { OPC_MODU_G_2E = 0x23 | OPC_SPECIAL3, OPC_DMOD_G_2E = 0x26 | OPC_SPECIAL3, OPC_DMODU_G_2E = 0x27 | OPC_SPECIAL3, + + /* MIPS DSP Load */ + OPC_LX_DSP = 0x0A | OPC_SPECIAL3, }; /* BSHFL opcodes */ @@ -340,6 +343,17 @@ enum { #endif }; +#define MASK_LX(op) (MASK_SPECIAL3(op) | (op & (0x1F << 6))) +/* MIPS DSP Load */ +enum { + OPC_LBUX = (0x06 << 6) | OPC_LX_DSP, + OPC_LHX = (0x04 << 6) | OPC_LX_DSP, + OPC_LWX = (0x00 << 6) | OPC_LX_DSP, +#if defined(TARGET_MIPS64) + OPC_LDX = (0x08 << 6) | OPC_LX_DSP, +#endif +}; + /* Coprocessor 0 (rs field) */ #define MASK_CP0(op) MASK_OP_MAJOR(op) | (op & (0x1F << 21)) @@ -12184,6 +12198,54 @@ static void decode_opc (CPUMIPSState *env, DisasContext *ctx, int *is_branch) check_insn(env, ctx, INSN_LOONGSON2E); gen_loongson_integer(ctx, op1, rd, rs, rt); break; + case OPC_LX_DSP: + check_dsp(ctx); + op2 = MASK_LX(ctx->opcode); + switch (op2) { + case OPC_LBUX: + { + TCGv addr = tcg_temp_new(); + + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); + op_ld_lbu(cpu_gpr[rd], addr, ctx); + tcg_temp_free(addr); + break; + } + case OPC_LHX: + { + TCGv addr = tcg_temp_new(); + + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); + op_ld_lh(cpu_gpr[rd], addr, ctx); + tcg_temp_free(addr); + break; + } + case OPC_LWX: + { + TCGv addr = tcg_temp_new(); + + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); + op_ld_lw(cpu_gpr[rd], addr, ctx); + tcg_temp_free(addr); + break; + } +#if defined(TARGET_MIPS64) + case OPC_LDX: + { + TCGv addr = tcg_temp_new(); + + gen_op_addr_add(ctx, addr, cpu_gpr[rs], cpu_gpr[rt]); + op_ld_ld(cpu_gpr[rd], addr, ctx); + tcg_temp_free(addr); + break; + } +#endif + default: /* Invalid */ + MIPS_INVAL("MASK LX"); + generate_exception(ctx, EXCP_RI); + break; + } + break; #if defined(TARGET_MIPS64) case OPC_DEXTM ... OPC_DEXT: case OPC_DINSM ... OPC_DINS:
Add MIPS ASE DSP Load instructions. Signed-off-by: Jia Liu <proljc@gmail.com> --- target-mips/translate.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)