diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-13 11:41:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-13 11:41:47 +0000 |
| commit | 508ba0f7e2092d3ca56e3f75e894d52d8b94818e (patch) | |
| tree | 2c5eae84479478f72ff1df18e84be4f330783b6a /target | |
| parent | 6b8d0ac0315f7ecfa41ebdc1467410a4d3342326 (diff) | |
| parent | fdaae351435147b9be6161d0f136ca7c40308059 (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171109' into staging
s390x changes: let pci devices start out in a usable state, and make
RISBGN work in tcg.
# gpg: Signature made Thu 09 Nov 2017 15:27:21 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20171109:
target/s390x: Finish implementing RISBGN
s390x/pci: let pci devices start in configured mode
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/translate.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/target/s390x/translate.c b/target/s390x/translate.c index dee72a787d..85d0a6c3af 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3432,6 +3432,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o) /* Adjust the arguments for the specific insn. */ switch (s->fields->op2) { case 0x55: /* risbg */ + case 0x59: /* risbgn */ i3 &= 63; i4 &= 63; pmask = ~0; @@ -3447,7 +3448,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o) pmask = 0x00000000ffffffffull; break; default: - abort(); + g_assert_not_reached(); } /* MASK is the set of bits to be inserted from R2. @@ -3464,11 +3465,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o) insns, we need to keep the other half of the register. */ imask = ~mask | ~pmask; if (do_zero) { - if (s->fields->op2 == 0x55) { - imask = 0; - } else { - imask = ~pmask; - } + imask = ~pmask; } len = i4 - i3 + 1; |