Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Anthony Liguori 2011-11-21 14:36:55 -06:00
commit 1571b6cba2
40 changed files with 342 additions and 177 deletions

View file

@ -1996,11 +1996,13 @@ void glue(helper_pcmpestrm, SUFFIX) (Reg *d, Reg *s, uint32_t ctrl)
if ((ctrl >> 6) & 1) {
if (ctrl & 1)
for (i = 0; i <= 8; i--, res >>= 1)
for (i = 0; i < 8; i++, res >>= 1) {
d->W(i) = (res & 1) ? ~0 : 0;
}
else
for (i = 0; i <= 16; i--, res >>= 1)
for (i = 0; i < 16; i++, res >>= 1) {
d->B(i) = (res & 1) ? ~0 : 0;
}
} else {
d->Q(1) = 0;
d->Q(0) = res;
@ -2028,11 +2030,13 @@ void glue(helper_pcmpistrm, SUFFIX) (Reg *d, Reg *s, uint32_t ctrl)
if ((ctrl >> 6) & 1) {
if (ctrl & 1)
for (i = 0; i <= 8; i--, res >>= 1)
for (i = 0; i < 8; i++, res >>= 1) {
d->W(i) = (res & 1) ? ~0 : 0;
}
else
for (i = 0; i <= 16; i--, res >>= 1)
for (i = 0; i < 16; i++, res >>= 1) {
d->B(i) = (res & 1) ? ~0 : 0;
}
} else {
d->Q(1) = 0;
d->Q(0) = res;