motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-24 10:32:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build of MIPS target without FPU support.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2233 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2006-12-07 20:07:37 +00:00
parent 9f08349345
commit 71fb7241c6
2 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
target-mips/op.c
View file

@ -627,6 +627,7 @@ void op_movz (void)
RETURN(); RETURN();
} }
#ifdef MIPS_USES_FPU
void op_movf (void) void op_movf (void)
{ {
if (!(env->fcr31 & PARAM1)) if (!(env->fcr31 & PARAM1))
@ -640,6 +641,7 @@ void op_movt (void)
env->gpr[PARAM2] = env->gpr[PARAM3]; env->gpr[PARAM2] = env->gpr[PARAM3];
RETURN(); RETURN();
} }
#endif
/* Tests */ /* Tests */
#define OP_COND(name, cond) \ #define OP_COND(name, cond) \

24
target-mips/translate.c
View file

@ -390,6 +390,8 @@ GEN32(gen_op_load_gpr_T2, gen_op_load_gpr_T2_gpr);
GEN32(gen_op_store_T0_gpr, gen_op_store_T0_gpr_gpr); GEN32(gen_op_store_T0_gpr, gen_op_store_T0_gpr_gpr);
GEN32(gen_op_store_T1_gpr, gen_op_store_T1_gpr_gpr); GEN32(gen_op_store_T1_gpr, gen_op_store_T1_gpr_gpr);
#ifdef MIPS_USES_FPU
static const char *fregnames[] = static const char *fregnames[] =
{ "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", { "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
@ -473,6 +475,8 @@ static inline void gen_cmp_ ## fmt(int n) \
FOP_CONDS(d) FOP_CONDS(d)
FOP_CONDS(s) FOP_CONDS(s)
#endif /* MIPS_USES_FPU */
typedef struct DisasContext { typedef struct DisasContext {
struct TranslationBlock *tb; struct TranslationBlock *tb;
target_ulong pc, saved_pc; target_ulong pc, saved_pc;
@ -633,10 +637,12 @@ OP_LD_TABLE(bu);
OP_ST_TABLE(b); OP_ST_TABLE(b);
OP_LD_TABLE(l); OP_LD_TABLE(l);
OP_ST_TABLE(c); OP_ST_TABLE(c);
#ifdef MIPS_USES_FPU
OP_LD_TABLE(wc1); OP_LD_TABLE(wc1);
OP_ST_TABLE(wc1); OP_ST_TABLE(wc1);
OP_LD_TABLE(dc1); OP_LD_TABLE(dc1);
OP_ST_TABLE(dc1); OP_ST_TABLE(dc1);
#endif
/* Load and store */ /* Load and store */
static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt, static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt,
@ -785,6 +791,8 @@ static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt,
MIPS_DEBUG("%s %s, %d(%s)", opn, regnames[rt], offset, regnames[base]); MIPS_DEBUG("%s %s, %d(%s)", opn, regnames[rt], offset, regnames[base]);
} }
#ifdef MIPS_USES_FPU
/* Load and store */ /* Load and store */
static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft, static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft,
int base, int16_t offset) int base, int16_t offset)
@ -832,6 +840,8 @@ static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft,
MIPS_DEBUG("%s %s, %d(%s)", opn, fregnames[ft], offset, regnames[base]); MIPS_DEBUG("%s %s, %d(%s)", opn, fregnames[ft], offset, regnames[base]);
} }
#endif /* MIPS_USES_FPU */
/* Arithmetic with immediate operand */ /* Arithmetic with immediate operand */
static void gen_arith_imm (DisasContext *ctx, uint32_t opc, int rt, static void gen_arith_imm (DisasContext *ctx, uint32_t opc, int rt,
int rs, int16_t imm) int rs, int16_t imm)
@ -2903,6 +2913,8 @@ static void gen_cp0 (DisasContext *ctx, uint32_t opc, int rt, int rd)
MIPS_DEBUG("%s %s %d", opn, regnames[rt], rd); MIPS_DEBUG("%s %s %d", opn, regnames[rt], rd);
} }
#ifdef MIPS_USES_FPU
/* CP1 Branches (before delay slot) */ /* CP1 Branches (before delay slot) */
static void gen_compute_branch1 (DisasContext *ctx, uint32_t op, static void gen_compute_branch1 (DisasContext *ctx, uint32_t op,
int32_t offset) int32_t offset)
@ -3331,6 +3343,8 @@ static void gen_movci (DisasContext *ctx, int rd, int rs, int cc, int tf)
gen_op_movt(ccbit, rd, rs); gen_op_movt(ccbit, rd, rs);
} }
#endif /* MIPS_USES_FPU */
/* ISA extensions (ASEs) */ /* ISA extensions (ASEs) */
/* MIPS16 extension to MIPS32 */ /* MIPS16 extension to MIPS32 */
/* SmartMIPS extension to MIPS32 */ /* SmartMIPS extension to MIPS32 */
@ -3453,11 +3467,13 @@ static void decode_opc (DisasContext *ctx)
/* Treat as a noop. */ /* Treat as a noop. */
break; break;
#ifdef MIPS_USES_FPU
case OPC_MOVCI: case OPC_MOVCI:
gen_op_cp1_enabled(); gen_op_cp1_enabled();
gen_movci(ctx, rd, rs, (ctx->opcode >> 18) & 0x7, gen_movci(ctx, rd, rs, (ctx->opcode >> 18) & 0x7,
(ctx->opcode >> 16) & 1); (ctx->opcode >> 16) & 1);
break; break;
#endif
#ifdef MIPS_HAS_MIPS64 #ifdef MIPS_HAS_MIPS64
/* MIPS64 specific opcodes */ /* MIPS64 specific opcodes */
@ -3737,6 +3753,7 @@ static void decode_opc (DisasContext *ctx)
generate_exception_err(ctx, EXCP_CpU, 2); generate_exception_err(ctx, EXCP_CpU, 2);
break; break;
#ifdef MIPS_USES_FPU
case OPC_CP3: case OPC_CP3:
gen_op_cp1_enabled(); gen_op_cp1_enabled();
op1 = MASK_CP3(ctx->opcode); op1 = MASK_CP3(ctx->opcode);
@ -3747,6 +3764,7 @@ static void decode_opc (DisasContext *ctx)
break; break;
} }
break; break;
#endif
#ifdef MIPS_HAS_MIPS64 #ifdef MIPS_HAS_MIPS64
/* MIPS64 opcodes */ /* MIPS64 opcodes */
@ -3962,6 +3980,8 @@ int gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
return gen_intermediate_code_internal(env, tb, 1); return gen_intermediate_code_internal(env, tb, 1);
} }
#ifdef MIPS_USES_FPU
void fpu_dump_state(CPUState *env, FILE *f, void fpu_dump_state(CPUState *env, FILE *f,
int (*fpu_fprintf)(FILE *f, const char *fmt, ...), int (*fpu_fprintf)(FILE *f, const char *fmt, ...),
int flags) int flags)
@ -3996,6 +4016,8 @@ void dump_fpu (CPUState *env)
} }
} }
#endif /* MIPS_USES_FPU */
void cpu_dump_state (CPUState *env, FILE *f, void cpu_dump_state (CPUState *env, FILE *f,
int (*cpu_fprintf)(FILE *f, const char *fmt, ...), int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
int flags) int flags)
@ -4025,8 +4047,10 @@ void cpu_dump_state (CPUState *env, FILE *f,
c0_status, env->CP0_Cause, env->CP0_EPC); c0_status, env->CP0_Cause, env->CP0_EPC);
cpu_fprintf(f, " Config0 0x%08x Config1 0x%08x LLAddr 0x%08x\n", cpu_fprintf(f, " Config0 0x%08x Config1 0x%08x LLAddr 0x%08x\n",
env->CP0_Config0, env->CP0_Config1, env->CP0_LLAddr); env->CP0_Config0, env->CP0_Config1, env->CP0_LLAddr);
#ifdef MIPS_USES_FPU
if (c0_status & (1 << CP0St_CU1)) if (c0_status & (1 << CP0St_CU1))
fpu_dump_state(env, f, cpu_fprintf, flags); fpu_dump_state(env, f, cpu_fprintf, flags);
#endif
} }
CPUMIPSState *cpu_mips_init (void) CPUMIPSState *cpu_mips_init (void)