Skip to content

Commit

Permalink
target-mips: Fix for helpers for EXTR_* instructions
Browse files Browse the repository at this point in the history 
The change removes some unnecessary and incorrect code for EXTR_S.H.
Further, it corrects the mask for shift value in the EXTR_ instructions. It also
extends the existing tests so they trigger the issues corrected with the change.

Signed-off-by: Petar Jovanovic <petarj@mips.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
  • Loading branch information
@petar-jovanovic @aurel32
petar-jovanovic authored and aurel32 committed Jan 1, 2013
1 parent eec8972 commit b8abbbe
Show file tree
Hide file tree
Showing 9 changed files with 195 additions and 35 deletions.
45 changes: 10 additions & 35 deletions target-mips/dsp_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,35 +484,6 @@ static inline uint8_t mipsdsp_rrshift1_sub_u8(uint8_t a, uint8_t b)
return (temp >> 1) & 0x00FF;
}

static inline int64_t mipsdsp_rashift_short_acc(int32_t ac,
int32_t shift,
CPUMIPSState *env)
{
int32_t sign, temp31;
int64_t temp, acc;

sign = (env->active_tc.HI[ac] >> 31) & 0x01;
acc = ((int64_t)env->active_tc.HI[ac] << 32) |
((int64_t)env->active_tc.LO[ac] & 0xFFFFFFFF);
if (shift == 0) {
temp = acc;
} else {
if (sign == 0) {
temp = (((int64_t)0x01 << (32 - shift + 1)) - 1) & (acc >> shift);
} else {
temp = ((((int64_t)0x01 << (shift + 1)) - 1) << (32 - shift)) |
(acc >> shift);
}
}

temp31 = (temp >> 31) & 0x01;
if (sign != temp31) {
set_DSPControl_overflow_flag(1, 23, env);
}

return temp;
}

/* 128 bits long. p[0] is LO, p[1] is HI. */
static inline void mipsdsp_rndrashift_short_acc(int64_t *p,
int32_t ac,
Expand Down Expand Up @@ -3407,7 +3378,7 @@ target_ulong helper_extr_w(target_ulong ac, target_ulong shift,
int32_t tempI;
int64_t tempDL[2];

shift = shift & 0x0F;
shift = shift & 0x1F;

mipsdsp_rndrashift_short_acc(tempDL, ac, shift, env);
if ((tempDL[1] != 0 || (tempDL[0] & MIPSDSP_LHI) != 0) &&
Expand Down Expand Up @@ -3435,7 +3406,7 @@ target_ulong helper_extr_r_w(target_ulong ac, target_ulong shift,
{
int64_t tempDL[2];

shift = shift & 0x0F;
shift = shift & 0x1F;

mipsdsp_rndrashift_short_acc(tempDL, ac, shift, env);
if ((tempDL[1] != 0 || (tempDL[0] & MIPSDSP_LHI) != 0) &&
Expand All @@ -3462,7 +3433,7 @@ target_ulong helper_extr_rs_w(target_ulong ac, target_ulong shift,
int32_t tempI, temp64;
int64_t tempDL[2];

shift = shift & 0x0F;
shift = shift & 0x1F;

mipsdsp_rndrashift_short_acc(tempDL, ac, shift, env);
if ((tempDL[1] != 0 || (tempDL[0] & MIPSDSP_LHI) != 0) &&
Expand Down Expand Up @@ -3645,11 +3616,15 @@ target_ulong helper_dextr_rs_l(target_ulong ac, target_ulong shift,
target_ulong helper_extr_s_h(target_ulong ac, target_ulong shift,
CPUMIPSState *env)
{
int64_t temp;
int64_t temp, acc;

shift = shift & 0x1F;

acc = ((int64_t)env->active_tc.HI[ac] << 32) |
((int64_t)env->active_tc.LO[ac] & 0xFFFFFFFF);

shift = shift & 0x0F;
temp = acc >> shift;

temp = mipsdsp_rashift_short_acc(ac, shift, env);
if (temp > (int64_t)0x7FFF) {
temp = 0x00007FFF;
set_DSPControl_overflow_flag(1, 23, env);
Expand Down
23 changes: 23 additions & 0 deletions tests/tcg/mips/mips32-dsp/extr_r_w.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,28 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dspcontrol */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

ach = 0x3fffffff;
acl = 0x2bcdef01;
result = 0x7ffffffe;
__asm
("mthi %2, $ac1\n\t"
"mtlo %3, $ac1\n\t"
"extr_r.w %0, $ac1, 0x1F\n\t"
"rddsp %1\n\t"
: "=r"(rt), "=r"(dsp)
: "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
23 changes: 23 additions & 0 deletions tests/tcg/mips/mips32-dsp/extr_rs_w.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,28 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dspcontrol */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

ach = 0x3fffffff;
acl = 0x2bcdef01;
result = 0x7ffffffe;
__asm
("mthi %2, $ac1\n\t"
"mtlo %3, $ac1\n\t"
"extr_rs.w %0, $ac1, 0x1F\n\t"
"rddsp %1\n\t"
: "=r"(rt), "=r"(dsp)
: "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
23 changes: 23 additions & 0 deletions tests/tcg/mips/mips32-dsp/extr_s_h.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,28 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dsp */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

ach = 0x123;
acl = 0x87654321;
result = 0x1238;
__asm
("mthi %2, $ac1\n\t"
"mtlo %3, $ac1\n\t"
"extr_s.h %0, $ac1, 28\n\t"
"rddsp %1\n\t"
: "=r"(rt), "=r"(dsp)
: "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
23 changes: 23 additions & 0 deletions tests/tcg/mips/mips32-dsp/extr_w.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,28 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dspcontrol */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

ach = 0x3fffffff;
acl = 0x2bcdef01;
result = 0x7ffffffe;
__asm
("mthi %2, $ac1\n\t"
"mtlo %3, $ac1\n\t"
"extr.w %0, $ac1, 0x1F\n\t"
"rddsp %1\n\t"
: "=r"(rt), "=r"(dsp)
: "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
25 changes: 25 additions & 0 deletions tests/tcg/mips/mips32-dsp/extrv_r_w.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,30 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dspcontrol */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

rs = 31;
ach = 0x3fffffff;
acl = 0x2bcdef01;
result = 0x7ffffffe;
__asm
("wrdsp %1, 0x01\n\t"
"mthi %3, $ac1\n\t"
"mtlo %4, $ac1\n\t"
"extrv_r.w %0, $ac1, %2\n\t"
"rddsp %1\n\t"
: "=r"(rt), "+r"(dsp)
: "r"(rs), "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
25 changes: 25 additions & 0 deletions tests/tcg/mips/mips32-dsp/extrv_rs_w.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,30 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dspcontrol */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

rs = 0x1F;
ach = 0x3fffffff;
acl = 0x2bcdef01;
result = 0x7ffffffe;
__asm
("wrdsp %1, 0x01\n\t"
"mthi %3, $ac1\n\t"
"mtlo %4, $ac1\n\t"
"extrv_rs.w %0, $ac1, %2\n\t"
"rddsp %1\n\t"
: "=r"(rt), "+r"(dsp)
: "r"(rs), "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
17 changes: 17 additions & 0 deletions tests/tcg/mips/mips32-dsp/extrv_s_h.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,22 @@ int main()
assert(dsp == 0);
assert(result == rt);

rs = 0x1C;
ach = 0x123;
acl = 0x87654321;
result = 0x1238;
__asm
("wrdsp %1, 0x01\n\t"
"mthi %3, $ac1\n\t"
"mtlo %4, $ac1\n\t"
"extrv_s.h %0, $ac1, %2\n\t"
"rddsp %1\n\t"
: "=r"(rt), "+r"(dsp)
: "r"(rs), "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);

return 0;
}
26 changes: 26 additions & 0 deletions tests/tcg/mips/mips32-dsp/extrv_w.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,31 @@ int main()
assert(dsp == 0);
assert(result == rt);

/* Clear dspcontrol */
dsp = 0;
__asm
("wrdsp %0\n\t"
:
: "r"(dsp)
);

rs = 31;
ach = 0x3fffffff;
acl = 0x2bcdef01;
result = 0x7ffffffe;
__asm
("wrdsp %1, 0x01\n\t"
"mthi %3, $ac1\n\t"
"mtlo %4, $ac1\n\t"
"extrv.w %0, $ac1, %2\n\t"
"rddsp %1\n\t"
: "=r"(rt), "+r"(dsp)
: "r"(rs), "r"(ach), "r"(acl)
);
dsp = (dsp >> 23) & 0x01;
assert(dsp == 0);
assert(result == rt);


return 0;
}

0 comments on commit b8abbbe

Please sign in to comment.