pico-fmt: Pull in enhancements

1 files changed, 19 insertions, 38 deletions

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):