Re: [RFC PATCH 09/14] target/arm/ptw: Flip sense of get_phys_addr_twostage return value

[Richard Henderson]

On 5/15/26 07:25, Peter Maydell wrote:

Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
  target/arm/ptw.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index c89cccd431..545138464d 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -3571,7 +3571,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, 
S1Translate *ptw,

/* If S1 fails, return early. */

      if (ret) {
-        return ret;
+        return !ret;
      }

ipa = result->f.phys_addr;

@@ -3602,7 +3602,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, 
S1Translate *ptw,

/* If S2 fails, return early. */

      if (ret) {
-        return ret;
+        return !ret;
      }

Perhaps clearer to simply return false here, rather than operating on ret?
We know what the value must be after all, via the if.


r~

/*

@@ -3656,7 +3656,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, 
S1Translate *ptw,
          result->f.attrs.space = arm_secure_to_space(result->f.attrs.secure);
      }

- return false;

+    return true;
  }

static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw,

@@ -3724,7 +3724,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, 
S1Translate *ptw,
          ptw->in_mmu_idx = mmu_idx = s1_mmu_idx;
          if (arm_feature(env, ARM_FEATURE_EL2) &&
              !regime_translation_disabled(env, ARMMMUIdx_Stage2, 
ptw->in_space)) {
-            return get_phys_addr_twostage(env, ptw, address, access_type,
+            return !get_phys_addr_twostage(env, ptw, address, access_type,
                                            memop, result, fi);
          }
          /* fall through */