File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -208,6 +208,35 @@ object (self)
208208 None
209209 end )
210210 (finfo#env#get_initial_register_value_register v)
211+ | XVar v when finfo#env#is_stack_parameter_value v ->
212+ let indexopt = finfo#env#get_stack_parameter_index v in
213+ (match indexopt with
214+ | Some index ->
215+ let _ =
216+ finfo#update_summary
217+ (finfo#get_summary#add_stack_parameter_location
218+ (4 * index) btype 4 ) in
219+ TR. tfold
220+ ~ok: (fun ftspar -> Some (ArgValue ftspar))
221+ ~error: (fun e ->
222+ begin
223+ log_error_result
224+ ~tag: " xpr_to_bterm"
225+ __FILE__ __LINE__
226+ [" v: " ^ (p2s v#toPretty);
227+ " index: " ^ (string_of_int index);
228+ String. concat " , " e];
229+ None
230+ end )
231+ (finfo#get_summary#get_parameter_at_stack_offset (4 * index))
232+ | _ ->
233+ begin
234+ log_diagnostics_result
235+ ~tag: " xpr_to_bterm:stack-parameter"
236+ __FILE__ __LINE__
237+ [" xpr: " ^ (x2s xpr)];
238+ None
239+ end )
211240 | XOp ((Xf "indexsize" ), [xx ]) ->
212241 let optt = self#xpr_to_bterm t_int xx in
213242 (match optt with
@@ -268,9 +297,15 @@ object (self)
268297 self#finfo#update_summary
269298 (self#finfo#get_summary#add_stack_parameter_location
270299 (4 * index) btype 4 ) in
271- let ftspar =
272- self#finfo#get_summary#get_parameter_at_stack_offset (4 * index) in
273- Some (ArgValue ftspar)
300+ TR. tfold
301+ ~ok: (fun ftspar -> Some (ArgValue ftspar))
302+ ~error: (fun e ->
303+ log_error_result
304+ ~tag: " xpr_to_bterm"
305+ __FILE__ __LINE__
306+ [" v: " ^ (p2s v#toPretty); String. concat " , " e];
307+ None )
308+ (self#finfo#get_summary#get_parameter_at_stack_offset (4 * index))
274309 | _ -> None )
275310 | XOp ((Xf "indexsize" ), [xx ]) ->
276311 let optt = self#xpr_to_bterm t_int xx in
Original file line number Diff line number Diff line change @@ -960,13 +960,13 @@ let add_function_stack_parameter_location
960960 loc :: fintf.fintf_parameter_locations in
961961 {fintf with fintf_parameter_locations = newlocations}
962962 | Some bctype ->
963- let _ =
964- chlog#add
965- " add-function-stack-parameter-location "
966- ( LBLOCK [
967- STR " Location not added; bctype is fixed: " ;
968- STR (btype_to_string bctype)]) in
969- fintf
963+ begin
964+ log_diagnostics_result
965+ ~tag: " add_function_stack_parameter_location: not added "
966+ __FILE__ __LINE__
967+ [ " fixed function type: " ^ (btype_to_string bctype)] ;
968+ fintf
969+ end
970970
971971
972972let add_function_global_parameter_location
Original file line number Diff line number Diff line change @@ -156,14 +156,13 @@ object (self:'a)
156156 Option. is_some
157157 (get_register_parameter_for_register self#get_function_interface reg)
158158
159- method get_parameter_at_stack_offset (offset: int ): fts_parameter_t =
159+ method get_parameter_at_stack_offset (offset: int ): fts_parameter_t traceresult =
160160 let spar = get_stack_parameter_at_offset self#get_function_interface offset in
161161 match spar with
162- | Some p -> p
162+ | Some p -> Ok p
163163 | _ ->
164- raise
165- (BCH_failure
166- (LBLOCK [STR " Internal error: get_parameter_at_stack_offset" ]))
164+ Error [(elocm __LINE__) ^ " get_parameter_at_stack_offset" ;
165+ " offset: " ^ (string_of_int offset)]
167166
168167 method get_returntype = get_fts_returntype self#get_function_interface
169168
Original file line number Diff line number Diff line change @@ -2551,7 +2551,7 @@ object ('a)
25512551
25522552 method has_parameter_for_register: register_t -> bool
25532553
2554- method get_parameter_at_stack_offset: int -> fts_parameter_t
2554+ method get_parameter_at_stack_offset: int -> fts_parameter_t traceresult
25552555
25562556 method get_returntype: btype_t
25572557
Original file line number Diff line number Diff line change @@ -785,7 +785,7 @@ object (self)
785785 tfold
786786 ~ok: (fun numoffset ->
787787 let four = mkNumerical 4 in
788- if numoffset#gt numerical_zero
788+ if numoffset#geq numerical_zero
789789 && (numoffset#modulo four)#equal numerical_zero then
790790 Some ((numoffset#div four)#toInt)
791791 else
You can’t perform that action at this time.
0 commit comments