diff options
| -rw-r--r-- | target-mips/translate.c | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c index a6da67b7ce..9657e79ab6 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -6378,13 +6378,10 @@ static void gen_farith (DisasContext *ctx, uint32_t op1, TCGv_i32 fp0 = tcg_temp_new_i32(); TCGv_i32 fp1 = tcg_temp_new_i32(); - if (ctx->opcode & (1 << 6)) { - check_cop1x(ctx); - } - gen_load_fpr32(fp0, fs); gen_load_fpr32(fp1, ft); if (ctx->opcode & (1 << 6)) { + check_cop1x(ctx); gen_cmpabs_s(func-48, fp0, fp1, cc); opn = condnames_abs[func-48]; } else { @@ -6743,17 +6740,16 @@ static void gen_farith (DisasContext *ctx, uint32_t op1, { TCGv_i64 fp0 = tcg_temp_new_i64(); TCGv_i64 fp1 = tcg_temp_new_i64(); - if (ctx->opcode & (1 << 6)) { - check_cop1x(ctx); - } - check_cp1_registers(ctx, fs | ft); gen_load_fpr64(ctx, fp0, fs); gen_load_fpr64(ctx, fp1, ft); if (ctx->opcode & (1 << 6)) { + check_cop1x(ctx); + check_cp1_registers(ctx, fs | ft); gen_cmpabs_d(func-48, fp0, fp1, cc); opn = condnames_abs[func-48]; } else { + check_cp1_registers(ctx, fs | ft); gen_cmp_d(func-48, fp0, fp1, cc); opn = condnames[func-48]; } @@ -7222,22 +7218,6 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, int store = 0; TCGv t0 = tcg_temp_new(); - switch (opc) { - case OPC_LWXC1: - case OPC_SWXC1: - check_cop1x(ctx); - break; - case OPC_LDXC1: - case OPC_SDXC1: - check_cop1x(ctx); - check_cp1_registers(ctx, fd); - break; - case OPC_LUXC1: - case OPC_SUXC1: - check_cp1_64bitmode(ctx); - break; - } - if (base == 0) { gen_load_gpr(t0, index); } else if (index == 0) { @@ -7251,6 +7231,7 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, save_cpu_state(ctx, 0); switch (opc) { case OPC_LWXC1: + check_cop1x(ctx); { TCGv_i32 fp0 = tcg_temp_new_i32(); @@ -7262,6 +7243,8 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, opn = "lwxc1"; break; case OPC_LDXC1: + check_cop1x(ctx); + check_cp1_registers(ctx, fd); { TCGv_i64 fp0 = tcg_temp_new_i64(); @@ -7272,6 +7255,7 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, opn = "ldxc1"; break; case OPC_LUXC1: + check_cp1_64bitmode(ctx); tcg_gen_andi_tl(t0, t0, ~0x7); { TCGv_i64 fp0 = tcg_temp_new_i64(); @@ -7283,6 +7267,7 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, opn = "luxc1"; break; case OPC_SWXC1: + check_cop1x(ctx); { TCGv_i32 fp0 = tcg_temp_new_i32(); TCGv t1 = tcg_temp_new(); @@ -7297,6 +7282,8 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, store = 1; break; case OPC_SDXC1: + check_cop1x(ctx); + check_cp1_registers(ctx, fs); { TCGv_i64 fp0 = tcg_temp_new_i64(); @@ -7308,6 +7295,7 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, store = 1; break; case OPC_SUXC1: + check_cp1_64bitmode(ctx); tcg_gen_andi_tl(t0, t0, ~0x7); { TCGv_i64 fp0 = tcg_temp_new_i64(); |