CHB: add scaled expression term arrangement

Author: sipma

CodeHawk/CHB/bchlib/bCHFunctionStackframe.ml

@@ -578,7 +578,7 @@ object (self)
     let ty = match typ with Some t -> t | _ -> t_unknown in
     let blread = StackBlockRead (offset, size, ty) in
     let ssrec = {
-        sslot_name = "blockread";
+        sslot_name = "localvar_" ^ (string_of_int (-offset));
         sslot_offset = offset;
         sslot_btype = ty;
         sslot_size = size;

CodeHawk/CHB/bchlib/bCHGlobalMemoryMap.ml

@@ -440,7 +440,8 @@ object (self)
              match optindex with
              | None ->
                 Error [__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": "
-                       ^ "Unable to extract index from " ^ (x2s xoffset)]
+                       ^ "Unable to extract index from " ^ (x2s xoffset)
+                       ^ " with element size " ^ (string_of_int elsize)]
              | Some (indexxpr, xrem) when
                     iszero xrem
                     && Option.is_none tgtsize

CodeHawk/CHB/bchlib/bCHVersion.ml

@@ -95,8 +95,8 @@ end
 
 
 let version = new version_info_t 
-  ~version:"0.6.0_20251021"
-  ~date:"2025-10-21"
+  ~version:"0.6.0_20251022"
+  ~date:"2025-10-22"
   ~licensee: None
   ~maxfilesize: None
   ()

CodeHawk/CHB/bchlib/bCHXprUtil.ml

@@ -127,7 +127,10 @@ let get_array_index_offset (xpr: xpr_t) (size: int): (xpr_t * xpr_t) option =
          when n#equal numsize ->
        Some (XVar v, xzero)
     | XOp (XPlus, [XOp (XMult, [XConst (IntConst n1); XVar v]);
-                   XConst (IntConst n2)]) when n1#equal numsize ->
+                   XConst (IntConst n2)])
+      | XOp (XPlus, [XConst (IntConst n2);
+                     XOp (XMult, [XConst (IntConst n1); XVar v])])
+         when n1#equal numsize ->
        if n2#equal numerical_zero then
          Some (XVar v, xzero)
        else
@@ -136,7 +139,10 @@ let get_array_index_offset (xpr: xpr_t) (size: int): (xpr_t * xpr_t) option =
          if quo#equal numerical_zero then
            Some (XVar v, xrem)
          else
-           Some (XOp (XPlus, [XVar v; num_constant_expr quo]), xrem)
+           if quo#lt numerical_zero then
+             Some (XOp (XMinus, [XVar v; num_constant_expr quo#neg]), xrem)
+           else
+             Some (XOp (XPlus, [XVar v; num_constant_expr quo]), xrem)
     | XOp (XMinus, [XOp (XMult, [XConst (IntConst n1); XVar v]);
                     XConst (IntConst n2)]) when n1#equal numsize ->
        if n2#equal numerical_zero then