diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | 3rd-party/pico-fmt | 0 | ||||
| -rw-r--r-- | CMakeLists.txt | 31 | ||||
| -rw-r--r-- | build-aux/measurestack/app_main.py | 4 | ||||
| -rw-r--r-- | build-aux/measurestack/app_plugins.py | 9 |
5 files changed, 12 insertions, 35 deletions
diff --git a/.gitmodules b/.gitmodules index 8a4c874..17dec29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,6 @@ [submodule "3rd-party/pico-sdk"] path = 3rd-party/pico-sdk url = https://github.com/LukeShu/pico-sdk +[submodule "3rd-party/pico-fmt"] + path = 3rd-party/pico-fmt + url = https://github.com/LukeShu/pico-fmt diff --git a/3rd-party/pico-fmt b/3rd-party/pico-fmt new file mode 160000 +Subproject 5b2ef3a020a3747310cdb7573a84463a05e567b diff --git a/CMakeLists.txt b/CMakeLists.txt index df13977..f9e2d72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ include("${PICO_SDK_PATH}/external/pico_sdk_import.cmake") project(sbc_harness) +add_subdirectory(3rd-party/pico-fmt/pico_fmt) +add_subdirectory(3rd-party/pico-fmt/pico_printf) pico_sdk_init() if ((PICO_PLATFORM STREQUAL "host") AND (NOT PICO_NO_GC_SECTIONS)) @@ -115,35 +117,6 @@ function(add_lib_test arg_libname arg_testname) endif() endfunction() -function(_apply_matrix_helper _m_depth _m_assignments) - list(LENGTH _m_arg_matrix _m_dimensions) - math(EXPR _m_dimensions ${_m_dimensions}/2) - if("${_m_depth}" EQUAL "${_m_dimensions}") - cmake_language(CALL "${_m_arg_action}" "${_m_n}" "${_m_assignments}") - math(EXPR _m_n "${_m_n}+1") - set(_m_n "${_m_n}" PARENT_SCOPE) - else() - math(EXPR _m_ik "${_m_depth}*2") - list(GET _m_arg_matrix "${_m_ik}" _m_tmp_key) - - math(EXPR _m_iv "${_m_ik}+1") - list(GET _m_arg_matrix "${_m_iv}" _m_tmp_vals) - string(REGEX REPLACE "^\\[(.*)\\]$" "\\1" _m_tmp_vals "${_m_tmp_vals}") - - foreach(_m_tmp_val IN LISTS _m_tmp_vals) - math(EXPR _m_tmp_depth "${_m_depth}+1") - set(_m_tmp_assignments "${_m_assignments}") - list(APPEND _m_tmp_assignments "${_m_tmp_key}=${_m_tmp_val}") - _apply_matrix_helper("${_m_tmp_depth}" "${_m_tmp_assignments}") - set(_m_n "${_m_n}" PARENT_SCOPE) - endforeach() - endif() -endfunction() -function(apply_matrix _m_arg_action _m_arg_matrix) - set(_m_n 0) - _apply_matrix_helper(0 "") -endfunction() - add_subdirectory(libmisc) add_subdirectory(libobj) add_subdirectory(libcr) 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) |