From: Mark Wielaard <mark@klomp.org>
Date: Tue, 2 Jul 2024 14:47:19 +0000 (+0200)
Subject: VEX/priv/host_arm_isel.c (doHelperCall): Fix nextArgReg guard
X-Git-Tag: VALGRIND_3_24_0~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=645a7bc190a7664bb5be2e353b57e85ba6dec07d;p=thirdparty%2Fvalgrind.git

VEX/priv/host_arm_isel.c (doHelperCall): Fix nextArgReg guard

We need two args, so change the guard to nextArgReg + 1 >= ARM_N_ARGREGS.
---

diff --git a/VEX/priv/host_arm_isel.c b/VEX/priv/host_arm_isel.c
index 8b3264843..d19efe5c3 100644
--- a/VEX/priv/host_arm_isel.c
+++ b/VEX/priv/host_arm_isel.c
@@ -683,7 +683,7 @@ Bool doHelperCall ( /*OUT*/UInt*   stackAdjustAfterCall,
                addInstr(env, ARMInstr_Imm32( argregs[nextArgReg], 0xAA ));
                nextArgReg++;
             }
-            if (nextArgReg >= ARM_N_ARGREGS)
+            if (nextArgReg + 1 >= ARM_N_ARGREGS)
                return False; /* out of argregs */
             HReg raHi, raLo;
             iselInt64Expr(&raHi, &raLo, env, arg);