mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exception handling cornercase for rdhwr.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2641 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-04-09 14:13:40 +00:00
parent dac9321024
commit 97428a4d84
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
target-mips/op.c
View File

@ -2126,7 +2126,7 @@ void op_deret (void)
void op_rdhwr_cpunum(void)
{
if (!(env->hflags & MIPS_HFLAG_UM) ||
(env->CP0_HWREna & (1 << 0)) ||
(env->CP0_HWREna & (1 << 0)) ||
(env->CP0_Status & (1 << CP0St_CU0)))
T0 = env->CP0_EBase & 0x3ff;
else
@ -2137,7 +2137,7 @@ void op_rdhwr_cpunum(void)
void op_rdhwr_synci_step(void)
{
if (!(env->hflags & MIPS_HFLAG_UM) ||
(env->CP0_HWREna & (1 << 1)) ||
(env->CP0_HWREna & (1 << 1)) ||
(env->CP0_Status & (1 << CP0St_CU0)))
T0 = env->SYNCI_Step;
else
@ -2148,7 +2148,7 @@ void op_rdhwr_synci_step(void)
void op_rdhwr_cc(void)
{
if (!(env->hflags & MIPS_HFLAG_UM) ||
(env->CP0_HWREna & (1 << 2)) ||
(env->CP0_HWREna & (1 << 2)) ||
(env->CP0_Status & (1 << CP0St_CU0)))
T0 = env->CP0_Count;
else
@ -2159,7 +2159,7 @@ void op_rdhwr_cc(void)
void op_rdhwr_ccres(void)
{
if (!(env->hflags & MIPS_HFLAG_UM) ||
(env->CP0_HWREna & (1 << 3)) ||
(env->CP0_HWREna & (1 << 3)) ||
(env->CP0_Status & (1 << CP0St_CU0)))
T0 = env->CCRes;
else
@ -2167,28 +2167,6 @@ void op_rdhwr_ccres(void)
RETURN();
}
void op_rdhwr_unimpl30(void)
{
if (!(env->hflags & MIPS_HFLAG_UM) ||
(env->CP0_HWREna & (1 << 30)) ||
(env->CP0_Status & (1 << CP0St_CU0)))
T0 = 0;
else
CALL_FROM_TB1(do_raise_exception, EXCP_RI);
RETURN();
}
void op_rdhwr_unimpl31(void)
{
if (!(env->hflags & MIPS_HFLAG_UM) ||
(env->CP0_HWREna & (1 << 31)) ||
(env->CP0_Status & (1 << CP0St_CU0)))
T0 = 0;
else
CALL_FROM_TB1(do_raise_exception, EXCP_RI);
RETURN();
}
void op_save_state (void)
{
env->hflags = PARAM1;

16
target-mips/translate.c
View File

@ -4825,32 +4825,26 @@ static void decode_opc (CPUState *env, DisasContext *ctx)
case OPC_RDHWR:
switch (rd) {
case 0:
save_cpu_state(ctx, 1);
gen_op_rdhwr_cpunum();
break;
case 1:
save_cpu_state(ctx, 1);
gen_op_rdhwr_synci_step();
break;
case 2:
save_cpu_state(ctx, 1);
gen_op_rdhwr_cc();
break;
case 3:
save_cpu_state(ctx, 1);
gen_op_rdhwr_ccres();
break;
case 29:
#if defined (CONFIG_USER_ONLY)
gen_op_tls_value ();
#else
generate_exception(ctx, EXCP_RI);
break;
#endif
break;
case 30:
/* Implementation dependent */;
gen_op_rdhwr_unimpl30();
break;
case 31:
/* Implementation dependent */;
gen_op_rdhwr_unimpl31();
break;
default: /* Invalid */
MIPS_INVAL("rdhwr");
generate_exception(ctx, EXCP_RI);