@@ -1915,6 +1915,8 @@ object (self)
19151915 let tresult =
19161916 let is_pointer (y : xpr_t ) =
19171917 TR. tfold_default BCHBCTypeUtil. is_pointer false (self#get_xpr_type y) in
1918+ let is_integer (y : xpr_t ) =
1919+ TR. tfold_default BCHBCTypeUtil. is_int false (self#get_xpr_type y) in
19181920 let default () = self#convert_xpr_offsets ~xtype ~size x in
19191921 match x with
19201922 | XOp (XPlus, [y ; XOp (XMult, [XConst (IntConst n ); XVar v ])]) ->
@@ -1969,6 +1971,21 @@ object (self)
19691971 result)
19701972 (self#xpr_to_cxpr y)
19711973 (BCHBCTypeUtil. size_of_btype derefty)
1974+
1975+ | XOp (XPlus , [y; XConst (IntConst n)])
1976+ when is_integer y && n#geq (mkNumerical 0x100000000 ) ->
1977+ let rresult =
1978+ simplify_xpr (XOp (XMinus , [x; int_constant_expr 0x100000000 ])) in
1979+ begin
1980+ log_diagnostics_result
1981+ ~msg: (p2s self#l#toPretty)
1982+ ~tag: " xpr_to_cxpr:subtract 2^32"
1983+ __FILE__ __LINE__
1984+ [" x: " ^ (x2s x);
1985+ " rresult: " ^ (x2s rresult)];
1986+ Ok rresult
1987+ end
1988+
19721989 | _ ->
19731990 match xtype with
19741991 | None -> default ()
@@ -2130,7 +2147,7 @@ object (self)
21302147 let _ =
21312148 log_diagnostics_result
21322149 ~msg: (p2s self#l#toPretty)
2133- ~tag: " convert-variable-offsets "
2150+ ~tag: " convert_variable_offsets:basevar_memory_variable "
21342151 __FILE__ __LINE__
21352152 [" tgttype: " ^ (TR. tfold_default btype_to_string " ?" tgttype_r);
21362153 " tgtbtype: " ^ (btype_to_string optvtype);
@@ -2148,7 +2165,7 @@ object (self)
21482165 let _ =
21492166 log_diagnostics_result
21502167 ~msg: (p2s self#l#toPretty)
2151- ~tag: " convert-variable-offsets :default"
2168+ ~tag: " convert_variable_offsets :default"
21522169 __FILE__ __LINE__
21532170 [(p2s v#toPretty)] in
21542171 Ok v in
0 commit comments