From 0c03ed32ccdfa48e18b2c4d52639e4a6bd4cefb3 Mon Sep 17 00:00:00 2001
From: Henny Sipma <hennysipma@mac.com>
Date: Tue, 15 Sep 2026 17:19:49 -0700
Subject: [PATCH] CHB:ARM: fix substitution in context rewriting

---
 CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml b/CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml
index e7d27cdb..d061d342 100644
--- a/CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml
+++ b/CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml
@@ -338,7 +338,7 @@ object (self)
          (match tcond with
           | XOp (XEq, [XVar vr; XConst (IntConst n)]) ->
              let subst v =
-               if v#equal vr then XConst (IntConst n) else XVar vr in
+               if v#equal vr then XConst (IntConst n) else XVar v in
              simplify_xpr (substitute_expr subst xx)
           | _ -> xx)
       | _ -> xx in