diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-05 14:14:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-05 14:14:47 +0000 |
| commit | 3752ac89322d3351debf4bb87660606e137c839d (patch) | |
| tree | 840c795bb2f5fdab6f9bd8a7404d2442fecb48fc /target-s390x/translate.c | |
| parent | 30de46db50d2f9f74c5f7ab1cc463b8dec026407 (diff) | |
| parent | 44dd33ba8f60b5f513399f673351127af16bd304 (diff) | |
Merge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' into staging
Patch queue for s390 - 2014-11-05
Two simple bug fixes to enable slightly newer guest kernels
and preliminary -M s390-ccw support for TCG (virtio doesn't work yet!)
# gpg: Signature made Wed 05 Nov 2014 11:01:55 GMT using RSA key ID 03FEDC60
# gpg: Good signature from "Alexander Graf <agraf@suse.de>"
# gpg: aka "Alexander Graf <alex@csgraf.de>"
* remotes/agraf/tags/signed-s390-for-upstream:
s390x: Implement SAM{24,31,64}
s390x: Fix sclp console input
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-s390x/translate.c')
| -rw-r--r-- | target-s390x/translate.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 0cb036f667..dbf1993d46 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2925,6 +2925,18 @@ static ExitStatus op_sacf(DisasContext *s, DisasOps *o) /* Addressing mode has changed, so end the block. */ return EXIT_PC_STALE; } + +static ExitStatus op_sam(DisasContext *s, DisasOps *o) +{ + int sam = s->insn->data; + TCGv_i64 tsam = tcg_const_i64(sam); + + /* Overwrite PSW_MASK_64 and PSW_MASK_32 */ + tcg_gen_deposit_i64(psw_mask, psw_mask, tsam, 31, 2); + + tcg_temp_free_i64(tsam); + return EXIT_PC_STALE; +} #endif static ExitStatus op_sar(DisasContext *s, DisasOps *o) |