diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-08-20 16:28:56 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-05 12:18:37 -0800 |
| commit | d9a39927993a186b039d5be66cc85c0e735a78bc (patch) | |
| tree | 492b9efabfe824a50e735ee9a665996dd00e737e | |
| parent | 00d2dc192fb866d077935f0dd298472d65d87eb6 (diff) | |
target-s390: Convert SET ADDRESSING MODE
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target-s390x/insn-data.def | 7 | ||||
| -rw-r--r-- | target-s390x/translate.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index f70ede9bcf..69af25dbaa 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -344,3 +344,10 @@ D(0xa703, TMHL, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 32) D(0xa700, TMLH, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 16) D(0xa701, TMLL, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 0) + +#ifndef CONFIG_USER_ONLY +/* SET ADDRESSING MODE */ + /* We only do 64-bit, so accept this as a no-op. + Let SAM24 and SAM31 signal illegal instruction. */ + C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0) +#endif /* CONFIG_USER_ONLY */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 4e3451964f..26ca49b28a 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2371,12 +2371,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { -#ifndef CONFIG_USER_ONLY - case 0x01: /* SAM */ - insn = ld_code2(env, s->pc); - /* set addressing mode, but we only do 64bit anyways */ - break; -#endif case 0xa: /* SVC I [RR] */ insn = ld_code2(env, s->pc); debug_insn(insn); |