@@ -378,6 +378,9 @@ object (self)
378378 | Some xpr ->
379379 match xpr with
380380 | XConst (IntConst n ) ->
381+ (* The callee is a variadic function. Retrieve the actual format
382+ string and parse it to determine the number of variadic arguments
383+ in the call.*)
381384 let dw = BCHDoubleword. numerical_mod_to_doubleword n in
382385 if BCHStrings. string_table#has_string dw then
383386 let fmtstring = BCHStrings. string_table#get_string dw in
@@ -417,6 +420,82 @@ object (self)
417420 [" No constant format string found in string table" ];
418421 None
419422 end
423+ | XVar v when self#finfo#env#is_initial_register_value v ->
424+ (* There is no constant format string. Instead the format string
425+ argument is received from the caller's parameter. Retrieve the
426+ the specification of the parameter by externalizing the expression
427+ to a parameter. If the parameter spec (as obtained from a
428+ header file) is a retricted format string, reconstruct a minimal
429+ format string from its argument spec list, and parse in the
430+ same way as before.*)
431+ let bterm_o =
432+ (new arm_expression_externalizer_t finfo)#xpr_to_bterm
433+ t_charptr (XVar v) in
434+ (match bterm_o with
435+ | Some (ArgValue ftspar ) ->
436+ (match ftspar.apar_fmt with
437+ | RestrictedPrintFormat sl when sl <> [] ->
438+ let fmtstring =
439+ String. concat " " (List. map (fun s -> " %" ^ s) sl) in
440+ let _ =
441+ log_diagnostics_result
442+ ~tag: " get_annotated_format_arguments:restricted_format"
443+ ~msg: finfo#get_name
444+ __FILE__ __LINE__
445+ [" restricted fmtstring: " ^ fmtstring] in
446+ let fmtspec = parse_formatstring fmtstring false in
447+ if fmtspec#has_arguments then
448+ let argspecs = fmtspec#get_arguments in
449+ let argxprs = List. map (fun (_ , x ) -> x) callargs in
450+ (match CHUtil. list_slice argxprs
451+ index (List. length argspecs) with
452+ | Some fmtargs ->
453+ Some
454+ (List. map2
455+ (fun argspec argxpr ->
456+ let fw =
457+ if argspec#has_fieldwidth then
458+ argspec#get_fieldwidth
459+ else
460+ CHFormatStringParser. NoFieldwidth in
461+ (argspec#get_conversion, fw, argxpr))
462+ argspecs fmtargs)
463+ | _ ->
464+ begin
465+ log_diagnostics_result
466+ ~tag: " get_annotated_format_arguments:no formatargs"
467+ ~msg: finfo#get_name
468+ __FILE__ __LINE__
469+ [" restricted fmtstring: no arguments: " ^ fmtstring];
470+ None
471+ end )
472+ else
473+ begin
474+ log_diagnostics_result
475+ ~tag: " get_annotated_format_arguments:restricted_format"
476+ ~msg: finfo#get_name
477+ __FILE__ __LINE__
478+ [" restricted fmtstring: no arguments: " ^ fmtstring];
479+ None
480+ end
481+ | _ ->
482+ begin
483+ log_diagnostics_result
484+ ~tag: " get_annotated_format_arguments: ftspar: no format"
485+ ~msg: finfo#get_name
486+ __FILE__ __LINE__
487+ [" param: " ^ (fts_parameter_to_string ftspar)];
488+ None
489+ end )
490+ | _ ->
491+ begin
492+ log_diagnostics_result
493+ ~tag: " get_annotated_format_arguments:initial_register_value"
494+ ~msg: finfo#get_name
495+ __FILE__ __LINE__
496+ [" format string: " ^ (p2s v#toPretty)];
497+ None
498+ end )
420499 | _ ->
421500 begin
422501 log_diagnostics_result
@@ -3360,10 +3439,19 @@ object (self)
33603439 [ABSTRACT_VARS [lhs]]
33613440
33623441 else
3442+ let fndata = self#f#get_function_data in
33633443 let rhs =
3444+ if fndata#has_regvar_freeze self#ia then
3445+ let _ =
3446+ log_diagnostics_result
3447+ ~tag: " get_assign_commands_r:freeze"
3448+ ~msg: self#cia
3449+ __FILE__ __LINE__
3450+ [" lhs: " ^ (p2s lhs#toPretty)] in
3451+ XVar (self#f#env#mk_frozen_value lhs self#cia)
33643452 (* if rhs is a composite symbolic expression, create a new variable
33653453 for it *)
3366- if self#is_composite_symbolic_value rhs then
3454+ else if self#is_composite_symbolic_value rhs then
33673455 XVar (self#env#mk_symbolic_value rhs)
33683456 else
33693457 rhs in
@@ -3372,7 +3460,7 @@ object (self)
33723460 let (rhscmds, rhs_c) = xpr_to_numexpr reqN reqC rhs in
33733461 let cmds = rhscmds @ [ASSIGN_NUM (lhs, rhs_c)] in
33743462
3375- let fndata = self#f#get_function_data in
3463+
33763464 match fndata#get_regvar_intro self#ia with
33773465 | Some rvi when rvi.rvi_cast && Option. is_some rvi.rvi_vartype ->
33783466 TR. tfold
0 commit comments