diff mbox series

[v3,14/31] target/arm: Decode Load/store register (pac)

Message ID 20190108223129.5570-15-richard.henderson@linaro.org
State Superseded
Headers show
Series target/arm: Implement ARMv8.3-PAuth | expand

Commit Message

Richard Henderson Jan. 8, 2019, 10:31 p.m. UTC 
Not that there are any stores involved, but why argue with ARM's
naming convention.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
v3: Use do_gpr_ld; fix sextend typo; iss_valid only for !wback.
---
 target/arm/translate-a64.c | 60 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

-- 
2.17.2

Comments

Peter Maydell Jan. 8, 2019, 11:34 p.m. UTC | #1 
On Tue, 8 Jan 2019 at 22:32, Richard Henderson
<richard.henderson@linaro.org> wrote:
>

> Not that there are any stores involved, but why argue with ARM's

> naming convention.

>

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

> v3: Use do_gpr_ld; fix sextend typo; iss_valid only for !wback.


What was the sextend typo ?

> ---

>  target/arm/translate-a64.c | 60 ++++++++++++++++++++++++++++++++++++++

>  1 file changed, 60 insertions(+)

>

> diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c

> index fa50003f0b..a4dfdf5836 100644

> --- a/target/arm/translate-a64.c

> +++ b/target/arm/translate-a64.c

> @@ -3146,6 +3146,63 @@ static void disas_ldst_atomic(DisasContext *s, uint32_t insn,

>         s->be_data | size | MO_ALIGN);

>  }

>

> +/* PAC memory operations

> + *

> + *  31  30      27  26    24    22  21       12  11  10    5     0

> + * +------+-------+---+-----+-----+---+--------+---+---+----+-----+

> + * | size | 1 1 1 | V | 0 0 | M S | 1 |  imm9  | W | 1 | Rn |  Rt |

> + * +------+-------+---+-----+-----+------------+---+---+----+-----+


Utter nit: missing '+' between the '1' and 'imm9' boxes on
the bottom line. Not worth respinning unless you need to
for some other reason...

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


thanks
-- PMM
Richard Henderson Jan. 9, 2019, 11:01 a.m. UTC | #2 
On 1/9/19 9:34 AM, Peter Maydell wrote:
>> v3: Use do_gpr_ld; fix sextend typo; iss_valid only for !wback.

> What was the sextend typo ?


Operands to the sextract were reversed -- pos 10+x, len 0.


r~
diff mbox series

Patch

diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index fa50003f0b..a4dfdf5836 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -3146,6 +3146,63 @@  static void disas_ldst_atomic(DisasContext *s, uint32_t insn,
        s->be_data | size | MO_ALIGN);
 }
 
+/* PAC memory operations
+ *
+ *  31  30      27  26    24    22  21       12  11  10    5     0
+ * +------+-------+---+-----+-----+---+--------+---+---+----+-----+
+ * | size | 1 1 1 | V | 0 0 | M S | 1 |  imm9  | W | 1 | Rn |  Rt |
+ * +------+-------+---+-----+-----+------------+---+---+----+-----+
+ *
+ * Rt: the result register
+ * Rn: base address or SP
+ * V: vector flag (always 0 as of v8.3)
+ * M: clear for key DA, set for key DB
+ * W: pre-indexing flag
+ * S: sign for imm9.
+ */
+static void disas_ldst_pac(DisasContext *s, uint32_t insn,
+                           int size, int rt, bool is_vector)
+{
+    int rn = extract32(insn, 5, 5);
+    bool is_wback = extract32(insn, 11, 1);
+    bool use_key_a = !extract32(insn, 23, 1);
+    int offset;
+    TCGv_i64 tcg_addr, tcg_rt;
+
+    if (size != 3 || is_vector || !dc_isar_feature(aa64_pauth, s)) {
+        unallocated_encoding(s);
+        return;
+    }
+
+    if (rn == 31) {
+        gen_check_sp_alignment(s);
+    }
+    tcg_addr = read_cpu_reg_sp(s, rn, 1);
+
+    if (s->pauth_active) {
+        if (use_key_a) {
+            gen_helper_autda(tcg_addr, cpu_env, tcg_addr, cpu_X[31]);
+        } else {
+            gen_helper_autdb(tcg_addr, cpu_env, tcg_addr, cpu_X[31]);
+        }
+    }
+
+    /* Form the 10-bit signed, scaled offset.  */
+    offset = (extract32(insn, 22, 1) << 9) | extract32(insn, 12, 9);
+    offset = sextract32(offset << size, 0, 10 + size);
+    tcg_gen_addi_i64(tcg_addr, tcg_addr, offset);
+
+    tcg_rt = cpu_reg(s, rt);
+
+    do_gpr_ld(s, tcg_rt, tcg_addr, size, /* is_signed */ false,
+              /* extend */ false, /* iss_valid */ !is_wback,
+              /* iss_srt */ rt, /* iss_sf */ true, /* iss_ar */ false);
+
+    if (is_wback) {
+        tcg_gen_mov_i64(cpu_reg_sp(s, rn), tcg_addr);
+    }
+}
+
 /* Load/store register (all forms) */
 static void disas_ldst_reg(DisasContext *s, uint32_t insn)
 {
@@ -3171,6 +3228,9 @@  static void disas_ldst_reg(DisasContext *s, uint32_t insn)
         case 2:
             disas_ldst_reg_roffset(s, insn, opc, size, rt, is_vector);
             return;
+        default:
+            disas_ldst_pac(s, insn, size, rt, is_vector);
+            return;
         }
         break;
     case 1: