@@ -767,14 +767,80 @@ object (self)
767767 None )
768768 None
769769 (numerical_to_doubleword n)
770- | _ ->
770+ | Some (XVar v ) when self#f#env#is_initial_register_value v ->
771+ let bterm_o =
772+ (new arm_expression_externalizer_t self#f)#xpr_to_bterm
773+ t_charptr (XVar v) in
774+ (match bterm_o with
775+ | Some (ArgValue ftspar ) ->
776+ (match ftspar.apar_fmt with
777+ | RestrictedPrintFormat sl when sl <> [] ->
778+ let fmtstring =
779+ String. concat " " (List. map (fun s -> " %" ^ s) sl) in
780+ let _ =
781+ log_diagnostics_result
782+ ~tag: (" update-arm-varargs:restricted format specifiers "
783+ ^ " from enclosing function" )
784+ ~msg: self#cia
785+ __FILE__ __LINE__
786+ [" using restricted format specifiers: " ^ fmtstring] in
787+ let fmtspec = parse_formatstring fmtstring false in
788+ if fmtspec#has_arguments then
789+ let fmtargs = fmtspec#get_arguments in
790+ let newfintf = add_format_spec_parameters fintf false fmtargs in
791+ Some (newfintf, sem)
792+ else
793+ None
794+ | _ ->
795+ let _ =
796+ log_diagnostics_result
797+ ~tag: " update_arm_varargs:no format arg info available"
798+ ~msg: self#cia
799+ __FILE__ __LINE__
800+ [" argxpr: " ^ (x2s argxpr)] in
801+ None )
802+ | _ ->
803+ let _ =
804+ log_diagnostics_result
805+ ~tag: " update_arm_varargs:unable to externalize argument"
806+ ~msg: self#cia
807+ __FILE__ __LINE__
808+ [" argxpr: " ^ (x2s argxpr)];
809+ None )
810+ | Some argxpr ->
771811 let _ =
772812 log_diagnostics_result
773- ~tag: " update-arm-varargs "
813+ ~tag: " update_arm_varargs "
774814 ~msg: self#cia
775815 __FILE__ __LINE__
776- [" format string address is not a constant " ] in
816+ [" argxpr: " ^ (x2s argxpr) ] in
777817 None
818+ | _ ->
819+ (match lastpar.apar_fmt with
820+ | RestrictedPrintFormat sl when sl <> [] ->
821+ let fmtstring =
822+ String. concat " " (List. map (fun s -> " %" ^ s) sl) in
823+ let _ =
824+ log_diagnostics_result
825+ ~tag: " update-arm-varargs"
826+ ~msg: self#cia
827+ __FILE__ __LINE__
828+ [" using restricted format specifiers: " ^ fmtstring] in
829+ let fmtspec = parse_formatstring fmtstring false in
830+ if fmtspec#has_arguments then
831+ let fmtargs = fmtspec#get_arguments in
832+ let newfintf = add_format_spec_parameters fintf false fmtargs in
833+ Some (newfintf, sem)
834+ else
835+ None
836+ | _ ->
837+ let _ =
838+ log_diagnostics_result
839+ ~tag: " update-arm-varargs"
840+ ~msg: self#cia
841+ __FILE__ __LINE__
842+ [" format string address is not a constant" ] in
843+ None )
778844
779845 method private update_mips_varargs
780846 (fintf : function_interface_t )
@@ -861,13 +927,31 @@ object (self)
861927 None
862928 (numerical_to_doubleword n)
863929 | _ ->
864- let _ =
865- log_diagnostics_result
866- ~tag: " update-mips-varargs"
867- ~msg: self#cia
868- __FILE__ __LINE__
869- [" format string address is not a constant" ] in
870- None
930+ (match lastpar.apar_fmt with
931+ | RestrictedPrintFormat sl when sl <> [] ->
932+ let fmtstring =
933+ String. concat " " (List. map (fun s -> " %" ^ s) sl) in
934+ let _ =
935+ log_diagnostics_result
936+ ~tag: " update-mips-varargs"
937+ ~msg: self#cia
938+ __FILE__ __LINE__
939+ [" using restricted format specifiers: " ^ fmtstring] in
940+ let fmtspec = parse_formatstring fmtstring false in
941+ if fmtspec#has_arguments then
942+ let fmtargs = fmtspec#get_arguments in
943+ let newfintf = add_format_spec_parameters fintf false fmtargs in
944+ Some (newfintf, sem)
945+ else
946+ None
947+ | _ ->
948+ let _ =
949+ log_diagnostics_result
950+ ~tag: " update-mips-varargs"
951+ ~msg: self#cia
952+ __FILE__ __LINE__
953+ [" format string address is not a constant" ] in
954+ None )
871955
872956 method private update_varargs
873957 (fintf : function_interface_t )
0 commit comments