diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-08-27 09:36:20 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-05 12:18:43 -0800 |
| commit | 2c423fc070b3e260fc368e2573c76d7ddd52e165 (patch) | |
| tree | b4273236be7521b49da5278f38dd6046f980b648 | |
| parent | 5cc69c54f606005ea0432d83dafbec0f5b0e831a (diff) | |
target-s390: Convert subchannel instructions
While we're at it, list all of the chapter 14 subchannel insns.
Which is easy since all merely need indicate non-operation.
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target-s390x/insn-data.def | 14 | ||||
| -rw-r--r-- | target-s390x/translate.c | 18 |
2 files changed, 22 insertions, 10 deletions
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 2a045727ae..24a419c416 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -680,4 +680,18 @@ C(0xad00, STOSM, SI, Z, la1, 0, 0, 0, stnosm, 0) /* TEST PROTECTION */ C(0xe501, TPROT, SSE, Z, la1, a2, 0, 0, tprot, 0) + +/* I/O Instructions. For each we simply indicate non-operation. */ + C(0xb276, XSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb230, CSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb231, HSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb232, MSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb23b, RCHP, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb238, RSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb233, SSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb234, STSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb235, TSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + /* ??? Not listed in PoO ninth edition, but there's a linux driver that + uses it: "A CHSC subchannel is usually present on LPAR only." */ + C(0xb25f, CHSC, S, Z, 0, 0, 0, 0, subchannel, 0) #endif /* CONFIG_USER_ONLY */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index d7d991c58a..1172031465 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,11 +1033,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x34: /* STCH ? */ - /* Store Subchannel */ - check_privileged(s); - gen_op_movi_cc(s, 3); - break; case 0x46: /* STURA R1,R2 [RRE] */ /* Store Using Real Address */ check_privileged(s); @@ -1062,11 +1057,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, tcg_temp_free_i32(tmp32_1); tcg_temp_free_i32(tmp32_2); break; - case 0x5f: /* CHSC ? */ - /* Channel Subsystem Call */ - check_privileged(s); - gen_op_movi_cc(s, 3); - break; case 0x78: /* STCKE D2(B2) [S] */ /* Store Clock Extended */ decode_rs(s, insn, &r1, &r3, &b2, &d2); @@ -2916,6 +2906,14 @@ static ExitStatus op_spx(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_subchannel(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + /* Not operational. */ + gen_op_movi_cc(s, 3); + return NO_EXIT; +} + static ExitStatus op_stpx(DisasContext *s, DisasOps *o) { check_privileged(s); |