summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-11-18 16:20:50 +1000
committerDave Airlie <airlied@redhat.com>2020-12-29 09:07:23 +1000
commit77b70fa35d4802af06c40ba82af8976e2938c5b0 (patch)
treed2654aed8c6478505967e72464f25dab2a64c366
parent9ef23e428bd18c412499471b4e3550a489b72c3f (diff)
util: add printf specifier shared helper code.
clover needs to walk valid specifiers in C++, vtn needs to find string specifiers in C, let's do both. This writes the format walker in C++, and wraps it with C. Acked-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Francisco Jerez <currojerez@riseup.net> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8254>
-rw-r--r--src/util/Makefile.sources2
-rw-r--r--src/util/meson.build2
-rw-r--r--src/util/u_printf.cpp53
-rw-r--r--src/util/u_printf.h41
4 files changed, 98 insertions, 0 deletions
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 2ea1e0cf68d..46d7dd2e3d7 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -125,6 +125,8 @@ MESA_UTIL_FILES := \
u_debug_symbol.h \
u_cpu_detect.c \
u_cpu_detect.h \
+ u_printf.cpp \
+ u_printf.h \
os_memory_aligned.h \
os_memory_debug.h \
os_memory_stdc.h \
diff --git a/src/util/meson.build b/src/util/meson.build
index 705de9c1093..810ee9369a9 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -126,6 +126,8 @@ files_mesa_util = files(
'u_debug_memory.c',
'u_cpu_detect.c',
'u_cpu_detect.h',
+ 'u_printf.cpp',
+ 'u_printf.h',
'vma.c',
'vma.h',
'xxhash.h',
diff --git a/src/util/u_printf.cpp b/src/util/u_printf.cpp
new file mode 100644
index 00000000000..02449d294ad
--- /dev/null
+++ b/src/util/u_printf.cpp
@@ -0,0 +1,53 @@
+//
+// Copyright 2020 Serge Martin
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// Extract from Serge's printf clover code by airlied.
+
+#include "u_printf.h"
+
+size_t util_printf_next_spec_pos(const std::string &s, size_t pos)
+{
+ size_t next_tok, spec_pos;
+ do {
+ pos = s.find_first_of('%', pos);
+
+ if (pos == std::string::npos)
+ return -1;
+
+ if (s[pos + 1] == '%') {
+ pos += 2;
+ continue;
+ }
+
+ next_tok = s.find_first_of('%', pos + 1);
+ spec_pos = s.find_first_of("cdieEfFgGaAosuxXp", pos + 1);
+ if (spec_pos != std::string::npos)
+ if (spec_pos < next_tok)
+ return spec_pos;
+
+ pos++;
+ } while (1);
+}
+
+size_t util_printf_next_spec_pos(const char *str, size_t pos)
+{
+ return util_printf_next_spec_pos(std::string(str), pos);
+}
diff --git a/src/util/u_printf.h b/src/util/u_printf.h
new file mode 100644
index 00000000000..2ffa66dd351
--- /dev/null
+++ b/src/util/u_printf.h
@@ -0,0 +1,41 @@
+//
+// Copyright 2020 Serge Martin
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+#ifndef U_PRINTF_H
+#define U_PRINTF_H
+
+#ifdef __cplusplus
+
+#include <string>
+
+/* find next valid printf specifier in a C++ std::string */
+size_t util_printf_next_spec_pos(const std::string &s, size_t pos);
+
+extern "C" {
+#endif
+
+/* find next valid printf specifier in a C string wrapper */
+size_t util_printf_next_spec_pos(const char *str, size_t pos);
+#ifdef __cplusplus
+}
+#endif
+
+#endif