| Message ID | 20200928122717.30586-7-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x/tcg: Implement some z14 facilities | expand |
On 9/28/20 7:27 AM, David Hildenbrand wrote: > Just like BRANCH ON CONDITION - however the address is read from memory > (always 8 bytes are read), we have to wrap the address manually. The > address is read using current CPU DAT/address-space controls, just like > ordinary data. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/insn-data.def | 2 ++ > target/s390x/translate.c | 8 ++++++++ > 2 files changed, 10 insertions(+) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 455efe73da..cb40aea9a3 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -115,6 +115,8 @@ /* BRANCH RELATIVE AND SAVE */ C(0xa705, BRAS, RI_b, Z, 0, 0, r1, 0, basi, 0) C(0xc005, BRASL, RIL_b, Z, 0, 0, r1, 0, basi, 0) +/* BRANCH INDIRECT ON CONDITION */ + C(0xe347, BIC, RXY_b, MIE2,0, m2_64w, 0, 0, bc, 0) /* BRANCH ON CONDITION */ C(0x0700, BCR, RR_b, Z, 0, r2_nz, 0, 0, bc, 0) C(0x4700, BC, RX_b, Z, 0, a2, 0, 0, bc, 0) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index f20ebd7c6a..893b1f54a8 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -5935,6 +5935,14 @@ static void in2_m2_64(DisasContext *s, DisasOps *o) } #define SPEC_in2_m2_64 0 +static void in2_m2_64w(DisasContext *s, DisasOps *o) +{ + in2_a2(s, o); + tcg_gen_qemu_ld64(o->in2, o->in2, get_mem_index(s)); + gen_addi_and_wrap_i64(s, o->in2, o->in2, 0); +} +#define SPEC_in2_m2_64w 0 + #ifndef CONFIG_USER_ONLY static void in2_m2_64a(DisasContext *s, DisasOps *o) {
Just like BRANCH ON CONDITION - however the address is read from memory (always 8 bytes are read), we have to wrap the address manually. The address is read using current CPU DAT/address-space controls, just like ordinary data. Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/insn-data.def | 2 ++ target/s390x/translate.c | 8 ++++++++ 2 files changed, 10 insertions(+)