[Qemu-devel] [PATCH 2/2] s390x: Add laa and laag instructions

[Alexander Graf <agraf@suse.de>]

We're currently missing the laa and laag instructions in our emulation.
In fact, we're missing the complete "interlocked-access facility 1" which
is part of zEC12. However, I really only needed the laa instruction for now.

Signed-off-by: Alexander Graf <agraf@suse.de>

---

This really should implement all the other atomic load&modify instructions,
but I'd like to make sure we have a smart scheme to implement them. I couldn't
really see a good way on making them fit into the current load/store mechanism
we have in place.

So the best thing I can think of right now for those instructions is to add
flags in the data field what type of operation we're looking at and just map
them all to the same op function.
---
 target-s390x/insn-data.def |  3 +++
 target-s390x/translate.c   | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 48e979e..80a640c 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -359,6 +359,9 @@
     C(0xe371, LAY,     RXY_a, LD,  0, a2, 0, r1, mov2, 0)
 /* LOAD ADDRESS RELATIVE LONG */
     C(0xc000, LARL,    RIL_b, Z,   0, ri2, 0, r1, mov2, 0)
+/* LOAD AND ADD */
+    C(0xebf8, LAA,     RSY_a, ILA, r3_32s, a2, new, r1, laa, adds32)
+    C(0xebe8, LAAG,    RSY_a, ILA, r3, a2, new, r1, laag, adds64)
 /* LOAD AND TEST */
     C(0x1200, LTR,     RR_a,  Z,   0, r2_o, 0, cond_r1r2_32, mov2, s32)
     C(0xb902, LTGR,    RRE,   Z,   0, r2_o, 0, r1, mov2, s64)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 8784112..40e7337 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1118,6 +1118,7 @@ typedef enum DisasFacility {
     FAC_PC,                 /* population count */
     FAC_SCF,                /* store clock fast */
     FAC_SFLE,               /* store facility list extended */
+    FAC_ILA,                /* interlocked access facility 1 */
 } DisasFacility;
 
 struct DisasInsn {
@@ -2505,6 +2506,48 @@ static ExitStatus op_lurag(DisasContext *s, DisasOps *o)
 }
 #endif
 
+static ExitStatus op_laa(DisasContext *s, DisasOps *o)
+{
+    TCGv_i64 m2 = tcg_temp_new_i64();
+
+    /* XXX should be atomic */
+    tcg_gen_qemu_ld32s(m2, o->in2, get_mem_index(s));
+
+    /* Set r1 to the unmodified contents of m2 */
+    tcg_gen_mov_i64(o->out, m2);
+
+    /* m2 = r3 + m2 */
+    tcg_gen_add_i64(m2, o->in1, m2);
+    tcg_gen_qemu_st32(m2, o->in2, get_mem_index(s));
+
+    /* Set in2 to the input operand for cc calculation */
+    tcg_gen_mov_i64(o->in2, o->out);
+
+    tcg_temp_free_i64(m2);
+    return NO_EXIT;
+}
+
+static ExitStatus op_laag(DisasContext *s, DisasOps *o)
+{
+    TCGv_i64 m2 = tcg_temp_new_i64();
+
+    /* XXX should be atomic */
+    tcg_gen_qemu_ld64(m2, o->in2, get_mem_index(s));
+
+    /* Set r1 to the unmodified contents of m2 */
+    tcg_gen_mov_i64(o->out, m2);
+
+    /* m2 = r3 + m2 */
+    tcg_gen_add_i64(m2, o->in1, m2);
+    tcg_gen_qemu_st64(m2, o->in2, get_mem_index(s));
+
+    /* Set in2 to the input operand for cc calculation */
+    tcg_gen_mov_i64(o->in2, o->out);
+
+    tcg_temp_free_i64(m2);
+    return NO_EXIT;
+}
+
 static ExitStatus op_mov2(DisasContext *s, DisasOps *o)
 {
     o->out = o->in2;
-- 
1.7.12.4