SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix enough FPU/R2 support to get 24Kf going.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2528 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-03-23 00:43:28 +00:00
parent 51789c410b
commit e397ee3382
5 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-mips/cpu.h
View File

@ -203,6 +203,8 @@ struct CPUMIPSState {
#define CP0C3_MT 2 #define CP0C3_MT 2
#define CP0C3_SM 1 #define CP0C3_SM 1
#define CP0C3_TL 0 #define CP0C3_TL 0
int32_t CP0_Config6;
int32_t CP0_Config7;
target_ulong CP0_LLAddr; target_ulong CP0_LLAddr;
target_ulong CP0_WatchLo; target_ulong CP0_WatchLo;
int32_t CP0_WatchHi; int32_t CP0_WatchHi;

1
target-mips/exec.h
View File

@ -152,6 +152,7 @@ void invalidate_tlb (CPUState *env, int idx, int use_extra);
void cpu_loop_exit(void); void cpu_loop_exit(void);
void do_raise_exception_err (uint32_t exception, int error_code); void do_raise_exception_err (uint32_t exception, int error_code);
void do_raise_exception (uint32_t exception); void do_raise_exception (uint32_t exception);
void do_raise_exception_direct_err (uint32_t exception, int error_code);
void do_raise_exception_direct (uint32_t exception); void do_raise_exception_direct (uint32_t exception);
void cpu_dump_state(CPUState *env, FILE *f, void cpu_dump_state(CPUState *env, FILE *f,

14
target-mips/op.c
View File

@ -1180,6 +1180,18 @@ void op_mfc0_config3 (void)
RETURN(); RETURN();
} }
void op_mfc0_config6 (void)
{
T0 = env->CP0_Config6;
RETURN();
}
void op_mfc0_config7 (void)
{
T0 = env->CP0_Config7;
RETURN();
}
void op_mfc0_lladdr (void) void op_mfc0_lladdr (void)
{ {
T0 = (int32_t)env->CP0_LLAddr >> 4; T0 = (int32_t)env->CP0_LLAddr >> 4;
@ -1653,7 +1665,7 @@ void op_dmtc0_errorepc (void)
void op_cp1_enabled(void) void op_cp1_enabled(void)
{ {
if (!(env->CP0_Status & (1 << CP0St_CU1))) { if (!(env->CP0_Status & (1 << CP0St_CU1))) {
CALL_FROM_TB2(do_raise_exception_err, EXCP_CpU, 1); CALL_FROM_TB2(do_raise_exception_direct_err, EXCP_CpU, 1);
} }
RETURN(); RETURN();
} }

9
target-mips/op_helper.c
View File

@ -56,10 +56,15 @@ void do_restore_state (void *pc_ptr)
cpu_restore_state (tb, env, pc, NULL); cpu_restore_state (tb, env, pc, NULL);
} }
void do_raise_exception_direct (uint32_t exception) void do_raise_exception_direct_err (uint32_t exception, int error_code)
{ {
do_restore_state (GETPC ()); do_restore_state (GETPC ());
do_raise_exception_err (exception, 0); do_raise_exception_err (exception, error_code);
}
void do_raise_exception_direct (uint32_t exception)
{
do_raise_exception_direct_err (exception, 0);
} }
#define MEMSUFFIX _raw #define MEMSUFFIX _raw

46
target-mips/translate.c
View File

@ -829,7 +829,7 @@ static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft,
break; break;
default: default:
MIPS_INVAL("float load/store"); MIPS_INVAL("float load/store");
generate_exception_err(ctx, EXCP_CpU, 1); generate_exception(ctx, EXCP_RI);
return; return;
} }
MIPS_DEBUG("%s %s, %d(%s)", opn, fregnames[ft], offset, regnames[base]); MIPS_DEBUG("%s %s, %d(%s)", opn, fregnames[ft], offset, regnames[base]);
@ -1947,7 +1947,16 @@ static void gen_mfc0 (DisasContext *ctx, int reg, int sel)
gen_op_mfc0_config3(); gen_op_mfc0_config3();
rn = "Config3"; rn = "Config3";
break; break;
/* 4,5 are reserved */
/* 6,7 are implementation dependent */ /* 6,7 are implementation dependent */
case 6:
gen_op_mfc0_config6();
rn = "Config6";
break;
case 7:
gen_op_mfc0_config7();
rn = "Config7";
break;
default: default:
goto die; goto die;
} }
@ -2520,7 +2529,7 @@ static void gen_mtc0 (DisasContext *ctx, int reg, int sel)
rn = "Config"; rn = "Config";
break; break;
case 1: case 1:
/* ignored */ /* ignored, read only */
rn = "Config1"; rn = "Config1";
break; break;
case 2: case 2:
@ -2528,10 +2537,19 @@ static void gen_mtc0 (DisasContext *ctx, int reg, int sel)
rn = "Config2"; rn = "Config2";
break; break;
case 3: case 3:
/* ignored */ /* ignored, read only */
rn = "Config3"; rn = "Config3";
break; break;
/* 4,5 are reserved */
/* 6,7 are implementation dependent */ /* 6,7 are implementation dependent */
case 6:
/* ignored */
rn = "Config6";
break;
case 7:
/* ignored */
rn = "Config7";
break;
default: default:
rn = "Invalid config selector"; rn = "Invalid config selector";
goto die; goto die;
@ -4140,7 +4158,7 @@ static void gen_compute_branch1 (DisasContext *ctx, uint32_t op,
break; break;
default: default:
MIPS_INVAL("cp1 branch/jump"); MIPS_INVAL("cp1 branch/jump");
generate_exception_err (ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
return; return;
} }
gen_op_set_bcond(); gen_op_set_bcond();
@ -4173,7 +4191,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)
case OPC_CFC1: case OPC_CFC1:
if (fs != 0 && fs != 31) { if (fs != 0 && fs != 31) {
MIPS_INVAL("cfc1 freg"); MIPS_INVAL("cfc1 freg");
generate_exception_err (ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
return; return;
} }
GEN_LOAD_IMM_TN(T1, fs); GEN_LOAD_IMM_TN(T1, fs);
@ -4184,7 +4202,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)
case OPC_CTC1: case OPC_CTC1:
if (fs != 0 && fs != 31) { if (fs != 0 && fs != 31) {
MIPS_INVAL("ctc1 freg"); MIPS_INVAL("ctc1 freg");
generate_exception_err (ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
return; return;
} }
GEN_LOAD_IMM_TN(T1, fs); GEN_LOAD_IMM_TN(T1, fs);
@ -4201,7 +4219,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)
ctx->opcode, ctx->opcode >> 26, ctx->opcode & 0x3F, ctx->opcode, ctx->opcode >> 26, ctx->opcode & 0x3F,
((ctx->opcode >> 16) & 0x1F)); ((ctx->opcode >> 16) & 0x1F));
} }
generate_exception_err (ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
return; return;
} }
MIPS_DEBUG("%s %s %s", opn, regnames[rt], fregnames[fs]); MIPS_DEBUG("%s %s %s", opn, regnames[rt], fregnames[fs]);
@ -4219,7 +4237,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)
*/ */
#define CHECK_FR(ctx, freg) do { \ #define CHECK_FR(ctx, freg) do { \
if (!((ctx)->CP0_Status & (1<<CP0St_FR)) && ((freg) & 1)) { \ if (!((ctx)->CP0_Status & (1<<CP0St_FR)) && ((freg) & 1)) { \
generate_exception_err (ctx, EXCP_RI, 1); \ generate_exception (ctx, EXCP_RI); \
return; \ return; \
} \ } \
} while(0) } while(0)
@ -4504,7 +4522,7 @@ static void gen_farith (DisasContext *ctx, uint32_t op1, int ft, int fs, int fd)
ctx->opcode, ctx->opcode >> 26, ctx->opcode & 0x3F, ctx->opcode, ctx->opcode >> 26, ctx->opcode & 0x3F,
((ctx->opcode >> 16) & 0x1F)); ((ctx->opcode >> 16) & 0x1F));
} }
generate_exception_err (ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
return; return;
} }
if (binary) if (binary)
@ -4627,11 +4645,12 @@ static void decode_opc (CPUState *env, DisasContext *ctx)
case OPC_MOVCI: case OPC_MOVCI:
if (env->CP0_Config1 & (1 << CP0C1_FP)) { if (env->CP0_Config1 & (1 << CP0C1_FP)) {
save_cpu_state(ctx, 1);
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);
} else { } else {
generate_exception(ctx, EXCP_RI); generate_exception_err(ctx, EXCP_CpU, 1);
} }
break; break;
@ -4905,7 +4924,7 @@ static void decode_opc (CPUState *env, DisasContext *ctx)
gen_farith(ctx, MASK_CP1_FUNC(ctx->opcode), rt, rd, sa); gen_farith(ctx, MASK_CP1_FUNC(ctx->opcode), rt, rd, sa);
break; break;
default: default:
generate_exception_err(ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
break; break;
} }
} else { } else {
@ -4925,16 +4944,17 @@ static void decode_opc (CPUState *env, DisasContext *ctx)
case OPC_CP3: case OPC_CP3:
if (env->CP0_Config1 & (1 << CP0C1_FP)) { if (env->CP0_Config1 & (1 << CP0C1_FP)) {
save_cpu_state(ctx, 1);
gen_op_cp1_enabled(); gen_op_cp1_enabled();
op1 = MASK_CP3(ctx->opcode); op1 = MASK_CP3(ctx->opcode);
switch (op1) { switch (op1) {
/* Not implemented */ /* Not implemented */
default: default:
generate_exception_err(ctx, EXCP_RI, 1); generate_exception (ctx, EXCP_RI);
break; break;
} }
} else { } else {
generate_exception(ctx, EXCP_RI); generate_exception_err(ctx, EXCP_CpU, 1);
} }
break; break;