[v2,3/6] target/hppa: fix access_id check

Commit Message

Sven Schnelle March 19, 2024, 4:19 p.m. UTC

PA2.0 provides 8 instead of 4 PID registers.

Signed-off-by: Sven Schnelle <[e-mail]>
---
 target/hppa/mem_helper.c | 59 +++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 10 deletions(-)

Comments

Richard Henderson March 19, 2024, 6:35 p.m. UTC | #1

On 3/19/24 06:19, Sven Schnelle wrote:
> PA2.0 provides 8 instead of 4 PID registers.
> 
> Signed-off-by: Sven Schnelle <[e-mail]>
> ---
>   target/hppa/mem_helper.c | 59 +++++++++++++++++++++++++++++++++-------
>   1 file changed, 49 insertions(+), 10 deletions(-)

Reviewed-by: Richard Henderson <[e-mail]>

> +/* Return the set of protections allowed by a PID match. */
> +static int match_prot_id_1(uint32_t access_id, uint32_t prot_id)
> +{
> +    if (((access_id ^ (prot_id >> 1)) & ACCESS_ID_MASK) == 0) {
> +            return (prot_id & 1
> +                    ? PROT_EXEC | PROT_READ
> +                    : PROT_EXEC | PROT_READ | PROT_WRITE);

Tabs?  Anyway, weird indentation...


r~

Patch

diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c
index 80f51e753f..f89ba91b20 100644
--- a/target/hppa/mem_helper.c
+++ b/target/hppa/mem_helper.c
@@ -152,6 +152,49 @@  static HPPATLBEntry *hppa_alloc_tlb_ent(CPUHPPAState *env)
     return ent;
 }
 
+#define ACCESS_ID_MASK 0xffff
+
+/* Return the set of protections allowed by a PID match. */
+static int match_prot_id_1(uint32_t access_id, uint32_t prot_id)
+{
+    if (((access_id ^ (prot_id >> 1)) & ACCESS_ID_MASK) == 0) {
+            return (prot_id & 1
+                    ? PROT_EXEC | PROT_READ
+                    : PROT_EXEC | PROT_READ | PROT_WRITE);
+    }
+    return 0;
+}
+
+static int match_prot_id32(CPUHPPAState *env, uint32_t access_id)
+{
+    int r, i;
+
+    for (i = CR_PID1; i <= CR_PID4; ++i) {
+        r = match_prot_id_1(access_id, env->cr[i]);
+        if (r) {
+            return r;
+        }
+    }
+    return 0;
+}
+
+static int match_prot_id64(CPUHPPAState *env, uint32_t access_id)
+{
+    int r, i;
+
+    for (i = CR_PID1; i <= CR_PID4; ++i) {
+        r = match_prot_id_1(access_id, env->cr[i]);
+        if (r) {
+            return r;
+        }
+        r = match_prot_id_1(access_id, env->cr[i] >> 32);
+        if (r) {
+            return r;
+        }
+    }
+    return 0;
+}
+
 int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
                               int type, hwaddr *pphys, int *pprot,
                               HPPATLBEntry **tlb_entry)
@@ -226,16 +269,12 @@  int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
 
     /* access_id == 0 means public page and no check is performed */
     if (ent->access_id && MMU_IDX_TO_P(mmu_idx)) {
-        /* If bits [31:1] match, and bit 0 is set, suppress write.  */
-        int match = ent->access_id * 2 + 1;
-
-        if (match == env->cr[CR_PID1] || match == env->cr[CR_PID2] ||
-            match == env->cr[CR_PID3] || match == env->cr[CR_PID4]) {
-            prot &= PAGE_READ | PAGE_EXEC;
-            if (type == PAGE_WRITE) {
-                ret = EXCP_DMPI;
-                goto egress;
-            }
+        int access_prot = (hppa_is_pa20(env)
+                           ? match_prot_id64(env, ent->access_id)
+                           : match_prot_id32(env, ent->access_id));
+        if (prot & ~access_prot) {
+            ret = type & PAGE_EXEC ? EXCP_IMP : EXCP_DMPI;
+            goto egress;
         }
     }