ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Finish implementing ETF2-ENH 

Missed the proper alignment in TRTO/TRTT, and ignoring the M3
field for all TRXX insns without ETF2-ENH.

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2017-06-16 17:37:59 -07:00
parent afa26f3bae
commit 3c39c800bf
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/s390x/mem_helper.c
View File

@ -1265,13 +1265,22 @@ uint32_t HELPER(trXX)(CPUS390XState *env, uint32_t r1, uint32_t r2,
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
int dsize = (sizes & 1) ? 1 : 2; int dsize = (sizes & 1) ? 1 : 2;
int ssize = (sizes & 2) ? 1 : 2; int ssize = (sizes & 2) ? 1 : 2;
uint64_t tbl = get_address(env, 1) & ~7; uint64_t tbl = get_address(env, 1);
uint64_t dst = get_address(env, r1); uint64_t dst = get_address(env, r1);
uint64_t len = get_length(env, r1 + 1); uint64_t len = get_length(env, r1 + 1);
uint64_t src = get_address(env, r2); uint64_t src = get_address(env, r2);
uint32_t cc = 3; uint32_t cc = 3;
int i; int i;
/* The lower address bits of TBL are ignored. For TROO, TROT, it's
the low 3 bits (double-word aligned). For TRTO, TRTT, it's either
the low 12 bits (4K, without ETF2-ENH) or 3 bits (with ETF2-ENH). */
if (ssize == 2 && !s390_has_feat(S390_FEAT_ETF2_ENH)) {
tbl &= -4096;
} else {
tbl &= -8;
}
check_alignment(env, len, ssize, ra); check_alignment(env, len, ssize, ra);
/* Lest we fail to service interrupts in a timely manner, */ /* Lest we fail to service interrupts in a timely manner, */

5
target/s390x/translate.c
View File

@ -4356,8 +4356,9 @@ static ExitStatus op_trXX(DisasContext *s, DisasOps *o)
TCGv_i32 tst = tcg_temp_new_i32(); TCGv_i32 tst = tcg_temp_new_i32();
int m3 = get_field(s->fields, m3); int m3 = get_field(s->fields, m3);
/* XXX: the C bit in M3 should be considered as 0 when the if (!s390_has_feat(S390_FEAT_ETF2_ENH)) {
ETF2-enhancement facility is not installed. */ m3 = 0;
}
if (m3 & 1) { if (m3 & 1) {
tcg_gen_movi_i32(tst, -1); tcg_gen_movi_i32(tst, -1);
} else { } else {