motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target-s390: Convert INSERT CHARACTERS UNDER MASK

Browse source 
Change the CC handling to be more like TEST UNDER MASK, with val & mask.
This lets us handle ICMH much more like ICM.

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2012-08-21 13:13:09 -07:00
parent 443aaeb899
commit 58a9e35bcc
5 changed files with 74 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

31
target-s390x/cc_helper.c
View file

@ -331,35 +331,18 @@ static uint32_t cc_calc_comp_32(int32_t dst)
}
/* calculate condition code for insert character under mask insn */
static uint32_t cc_calc_icm_32(uint32_t mask, uint32_t val)
static uint32_t cc_calc_icm(uint64_t mask, uint64_t val)
{
uint32_t cc;
HELPER_LOG("%s: mask 0x%x val %d\n", __func__, mask, val);
if (mask == 0xf) {
if (!val) {
return 0;
} else if (val & 0x80000000) {
if ((val & mask) == 0) {
return 0;
} else {
int top = clz64(mask);
if ((int64_t)(val << top) < 0) {
return 1;
} else {
return 2;
}
}
if (!val || !mask) {
cc = 0;
} else {
while (mask != 1) {
mask >>= 1;
val >>= 8;
}
if (val & 0x80) {
cc = 1;
} else {
cc = 2;
}
}
return cc;
}
static uint32_t cc_calc_slag(uint64_t src, uint64_t shift)
@ -488,7 +471,7 @@ static uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op,
break;
case CC_OP_ICM:
r = cc_calc_icm_32(src, dst);
r = cc_calc_icm(src, dst);
break;
case CC_OP_SLAG:
r = cc_calc_slag(src, dst);