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_plugins.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'build-aux/measurestack/app_plugins.py') 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 From 4342605da113113e9f4c80f1237a6e7b4459e180 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sun, 9 Mar 2025 03:43:22 -0600 Subject: pico-fmt: Pull in enhancements --- build-aux/measurestack/app_plugins.py | 57 ++++++++++++----------------------- 1 file changed, 19 insertions(+), 38 deletions(-) (limited to 'build-aux/measurestack/app_plugins.py') diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 555651c..1eee739 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -456,21 +456,15 @@ class LibMiscPlugin: class PicoFmtPlugin: - known_out: dict[BaseName, BaseName] known_fct: dict[BaseName, BaseName] def __init__(self) -> None: - self.known_out = { - BaseName(""): BaseName("_out_null"), # XXX - 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"), + # pico_fmt + BaseName("fmt_vsnprintf"): BaseName("_out_buffer"), + # pico_stdio BaseName("__wrap_vprintf"): BaseName("stdio_buffered_printer"), + BaseName("stdio_vprintf"): BaseName("stdio_buffered_printer"), } def is_intrhandler(self, name: QName) -> bool: @@ -493,44 +487,31 @@ class PicoFmtPlugin: if "/printf.c:" in loc: m = util.re_call_other.fullmatch(line) call: str | None = m.group("func") if m else None - if call == "out": - return [x.as_qname() for x in self.known_out.values()], False if "->fct" in line: return [x.as_qname() for x in self.known_fct.values()], False + if "specifier_table" in line: + return [ + QName("conv_sint"), + QName("conv_uint"), + # QName("conv_double"), + QName("conv_char"), + QName("conv_str"), + QName("conv_ptr"), + QName("conv_pct"), + ], False return None def skipmodels(self) -> dict[BaseName, analyze.SkipModel]: ret: dict[BaseName, analyze.SkipModel] = { - BaseName("_out_rev"): analyze.SkipModel( - self.known_out.keys(), self._skipmodel_outcaller - ), - BaseName("_etoa"): analyze.SkipModel( - self.known_out.keys(), self._skipmodel_outcaller - ), - BaseName("_vsnprintf"): analyze.SkipModel( - self.known_out.keys(), self._skipmodel_outcaller - ), - BaseName("_out_fct"): analyze.SkipModel( - self.known_fct.keys(), self._skipmodel__out_fct + BaseName("fmt_state_putchar"): analyze.SkipModel( + self.known_fct.keys(), self._skipmodel_fmt_state_putchar ), } return ret - def _skipmodel_outcaller(self, chain: typing.Sequence[QName], call: QName) -> bool: - if call.base() in self.known_out.values(): - out: BaseName | None = None - for pcall in reversed(chain): - if pcall.base() in self.known_out: - out = self.known_out[pcall.base()] - if out == BaseName("_out_buffer") and call.base() == BaseName( - "_out_null" - ): # XXX: Gross hack - out = BaseName("_out_null") - return call.base() != out - return True - return False - - def _skipmodel__out_fct(self, chain: typing.Sequence[QName], call: QName) -> bool: + def _skipmodel_fmt_state_putchar( + self, chain: typing.Sequence[QName], call: QName + ) -> bool: if call.base() in self.known_fct.values(): fct: BaseName | None = None for pcall in reversed(chain): -- cgit v1.2.3-2-g168b From 797164f75b91c5cdfb68fc91d6853e7609d97e12 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Thu, 6 Mar 2025 17:21:10 -0700 Subject: Add libfmt to bypass output buffering for libmisc:assert --- build-aux/measurestack/app_plugins.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'build-aux/measurestack/app_plugins.py') diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 1eee739..064ea06 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -448,7 +448,7 @@ class LibMiscPlugin: def _skipmodel___assert_msg_fail( self, chain: typing.Sequence[QName], call: QName ) -> bool: - if call.base() in [BaseName("__lm_printf")]: + if call.base() in [BaseName("__lm_printf"), BaseName("__lm_light_printf")]: return any( c.base() == BaseName("__assert_msg_fail") for c in reversed(chain[:-1]) ) @@ -458,14 +458,30 @@ class LibMiscPlugin: class PicoFmtPlugin: known_fct: dict[BaseName, BaseName] - def __init__(self) -> None: + def __init__(self, arg_pico_platform: str) -> None: self.known_fct = { # pico_fmt BaseName("fmt_vsnprintf"): BaseName("_out_buffer"), - # pico_stdio - BaseName("__wrap_vprintf"): BaseName("stdio_buffered_printer"), - BaseName("stdio_vprintf"): BaseName("stdio_buffered_printer"), } + match arg_pico_platform: + case "rp2040": + self.known_fct.update( + { + # pico_stdio + BaseName("__wrap_vprintf"): BaseName("stdio_buffered_printer"), + BaseName("stdio_vprintf"): BaseName("stdio_buffered_printer"), + # libfmt + BaseName("__lm_light_printf"): BaseName("libfmt_light_fct"), + } + ) + case "host": + self.known_fct.update( + { + # libfmt + BaseName("__lm_printf"): BaseName("libfmt_libc_fct"), + BaseName("__lm_light_printf"): BaseName("libfmt_libc_fct"), + } + ) def is_intrhandler(self, name: QName) -> bool: return False -- cgit v1.2.3-2-g168b From bb33c30ad89e28d5ff9f4d8073d4f9ee068f484d Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sat, 8 Mar 2025 01:50:15 -0700 Subject: libfmt: Add %v for libobj to implement --- build-aux/measurestack/app_plugins.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'build-aux/measurestack/app_plugins.py') diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 064ea06..1155098 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -507,6 +507,7 @@ class PicoFmtPlugin: return [x.as_qname() for x in self.known_fct.values()], False if "specifier_table" in line: return [ + # pico-fmt QName("conv_sint"), QName("conv_uint"), # QName("conv_double"), @@ -514,6 +515,8 @@ class PicoFmtPlugin: QName("conv_str"), QName("conv_ptr"), QName("conv_pct"), + # libfmt + QName("libfmt_conv_formatter"), ], False return None @@ -548,7 +551,7 @@ class PicoSDKPlugin: *, get_init_array: typing.Callable[[], typing.Collection[QName]], ) -> None: - # grep for '__attribute__((constructor))'. + # grep for '__attribute__((constructor))' / '[[gnu::constructor]]'. self.get_init_array = get_init_array self.app_init_array = None @@ -952,7 +955,9 @@ class LibGCCPlugin: return False def init_array(self) -> typing.Collection[QName]: - return [] + return [ + QName("libfmt_install_formatter"), + ] def extra_includes(self) -> typing.Collection[BaseName]: return [] -- cgit v1.2.3-2-g168b From 8b7f4ae67bca75e1d2e9429805011f3044941cac Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sat, 8 Mar 2025 20:54:55 -0700 Subject: libfmt: Add %q to quote strings --- build-aux/measurestack/app_plugins.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'build-aux/measurestack/app_plugins.py') diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 1155098..3a09272 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -517,6 +517,7 @@ class PicoFmtPlugin: QName("conv_pct"), # libfmt QName("libfmt_conv_formatter"), + QName("libfmt_conv_quote"), ], False return None @@ -957,6 +958,7 @@ class LibGCCPlugin: def init_array(self) -> typing.Collection[QName]: return [ QName("libfmt_install_formatter"), + QName("libfmt_install_quote"), ] def extra_includes(self) -> typing.Collection[BaseName]: -- cgit v1.2.3-2-g168b From f41d9a88c07226d107b56873bdbc801e484b524e Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Fri, 14 Mar 2025 18:25:12 -0600 Subject: lib9p: Have all IDL-defined types implement fmt_formatter --- build-aux/measurestack/app_plugins.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'build-aux/measurestack/app_plugins.py') diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 3a09272..36e661b 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -274,8 +274,20 @@ class Lib9PPlugin: _CONFIG_9P_NUM_SOCKS: int | None CONFIG_9P_SRV_MAX_REQS: int | None CONFIG_9P_SRV_MAX_DEPTH: int | None + formatters: typing.Collection[BaseName] + + def __init__( + self, + arg_base_dir: str, + arg_c_fnames: typing.Collection[str], + libobj_plugin: LibObjPlugin, + ) -> None: + self.formatters = { + x.base() + for x in libobj_plugin.objcalls["format"] + if str(x.base()).startswith("lib9p_") + } - def __init__(self, arg_base_dir: str, arg_c_fnames: typing.Collection[str]) -> None: # Find filenames ####################################################### def _is_config_h(fname: str) -> bool: @@ -389,6 +401,9 @@ class Lib9PPlugin: 2, self._skipmodel__lib9p_validate_unmarshal_marshal, ), + BaseName("_vfctprintf"): analyze.SkipModel( + self.formatters, self._skipmodel__vfctprintf + ), } if isinstance(self.CONFIG_9P_SRV_MAX_DEPTH, int): ret[BaseName("srv_util_pathfree")] = analyze.SkipModel( @@ -419,6 +434,13 @@ class Lib9PPlugin: ) return False + def _skipmodel__vfctprintf( + self, chain: typing.Sequence[QName], call: QName + ) -> bool: + if call.base() == BaseName("libfmt_conv_formatter"): + return any(c.base() in self.formatters for c in chain) + return False + class LibMiscPlugin: def is_intrhandler(self, name: QName) -> bool: -- cgit v1.2.3-2-g168b