From 4180233a07ab0f0b71278aa27c3e2cec7c00ac2f Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Thu, 6 Mar 2025 23:40:32 -0700 Subject: Use pico-fmt instead of pico-sdk's printf --- build-aux/measurestack/app_main.py | 4 ++-- build-aux/measurestack/app_plugins.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'build-aux/measurestack') diff --git a/build-aux/measurestack/app_main.py b/build-aux/measurestack/app_main.py index b0f5e39..397dc31 100644 --- a/build-aux/measurestack/app_main.py +++ b/build-aux/measurestack/app_main.py @@ -90,8 +90,8 @@ def main( def misc_filter(name: QName) -> tuple[int, bool]: if name.base() in [ BaseName("__assert_msg_fail"), - BaseName("vfctprintf"), - BaseName("__wrap_vsnprintf"), + BaseName("fmt_vfctprintf"), + BaseName("fmt_vsnprintf"), ]: return 1, False return 0, False diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 519e6b8..555651c 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -462,10 +462,11 @@ class PicoFmtPlugin: def __init__(self) -> None: self.known_out = { BaseName(""): BaseName("_out_null"), # XXX - BaseName("__wrap_sprintf"): BaseName("_out_buffer"), - BaseName("__wrap_snprintf"): BaseName("_out_buffer"), - BaseName("__wrap_vsnprintf"): BaseName("_out_buffer"), BaseName("vfctprintf"): BaseName("_out_fct"), + BaseName("fmt_sprintf"): BaseName("_out_buffer"), + BaseName("fmt_vsprintf"): BaseName("_out_buffer"), + BaseName("fmt_snprintf"): BaseName("_out_buffer"), + BaseName("fmt_vsnprintf"): BaseName("_out_buffer"), } self.known_fct = { BaseName("stdio_vprintf"): BaseName("stdio_buffered_printer"), @@ -487,7 +488,7 @@ class PicoFmtPlugin: def indirect_callees( self, loc: str, line: str ) -> tuple[typing.Collection[QName], bool] | None: - if "/3rd-party/pico-sdk/" not in loc: + if "/3rd-party/pico-fmt/" not in loc: return None if "/printf.c:" in loc: m = util.re_call_other.fullmatch(line) -- cgit v1.2.3-2-g168b