diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/measurestack/app_main.py | 16 | ||||
| -rw-r--r-- | build-aux/measurestack/app_plugins.py | 115 |
2 files changed, 80 insertions, 51 deletions
diff --git a/build-aux/measurestack/app_main.py b/build-aux/measurestack/app_main.py index 517fa2c..7573146 100644 --- a/build-aux/measurestack/app_main.py +++ b/build-aux/measurestack/app_main.py @@ -27,7 +27,8 @@ def main( # sbc-harness #################################################### - lib9p_plugin = app_plugins.Lib9PPlugin(arg_base_dir, arg_c_fnames) + libobj_plugin = app_plugins.LibObjPlugin(arg_c_fnames) + lib9p_plugin = app_plugins.Lib9PPlugin(arg_base_dir, arg_c_fnames, libobj_plugin) def sbc_is_thread(name: QName) -> int: if str(name).endswith("_cr") and name.base() != BaseName("lib9p_srv_read_cr"): @@ -44,11 +45,10 @@ def main( return 1 return 0 - libobj_plugin = app_plugins.LibObjPlugin(arg_c_fnames) - plugins += [ app_plugins.CmdPlugin(), libobj_plugin, + app_plugins.PicoFmtPlugin(arg_pico_platform), app_plugins.LibHWPlugin(arg_pico_platform, libobj_plugin), app_plugins.LibCRPlugin(), app_plugins.LibCRIPCPlugin(), @@ -67,7 +67,6 @@ def main( return ret plugins += [ - app_plugins.PicoFmtPlugin(), app_plugins.PicoSDKPlugin( get_init_array=get_init_array, ), @@ -88,9 +87,12 @@ def main( return 0, False def misc_filter(name: QName) -> tuple[int, bool]: - if name.base() in [ - BaseName("__lm_printf"), - BaseName("__assert_msg_fail"), + if name in [ + QName("__assert_msg_fail"), + QName("__lm_printf"), + QName("__lm_light_printf"), + QName("fmt_vfctprintf"), + QName("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..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: @@ -448,7 +470,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]) ) @@ -456,21 +478,32 @@ 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("__wrap_sprintf"): BaseName("_out_buffer"), - BaseName("__wrap_snprintf"): BaseName("_out_buffer"), - BaseName("__wrap_vsnprintf"): BaseName("_out_buffer"), - BaseName("vfctprintf"): BaseName("_out_fct"), - } + def __init__(self, arg_pico_platform: str) -> None: self.known_fct = { - BaseName("stdio_vprintf"): BaseName("stdio_buffered_printer"), - BaseName("__wrap_vprintf"): BaseName("stdio_buffered_printer"), + # pico_fmt + BaseName("fmt_vsnprintf"): BaseName("_out_buffer"), } + 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 @@ -487,49 +520,40 @@ 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) 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 [ + # pico-fmt + QName("conv_sint"), + QName("conv_uint"), + # QName("conv_double"), + QName("conv_char"), + QName("conv_str"), + QName("conv_ptr"), + QName("conv_pct"), + # libfmt + QName("libfmt_conv_formatter"), + QName("libfmt_conv_quote"), + ], 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): @@ -550,7 +574,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 @@ -954,7 +978,10 @@ class LibGCCPlugin: return False def init_array(self) -> typing.Collection[QName]: - return [] + return [ + QName("libfmt_install_formatter"), + QName("libfmt_install_quote"), + ] def extra_includes(self) -> typing.Collection[BaseName]: return [] |