printf: extract clovers printf impl

Also make the code cleaner and simplier.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17334>
This commit is contained in:
Karol Herbst
2022-04-16 10:48:08 +02:00
committed by Marge Bot
parent 160aa603f5
commit aa82808645
7 changed files with 176 additions and 134 deletions
+146
View File
@@ -23,9 +23,13 @@
#include <assert.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include "macros.h"
#include "strndup.h"
#include "u_math.h"
#include "u_printf.h"
/* Some versions of MinGW are missing _vscprintf's declaration, although they
@@ -42,6 +46,14 @@ _CRTIMP int _vscprintf(const char *format, va_list argptr);
#endif
#endif
static const char*
util_printf_prev_tok(const char *str)
{
while (*str != '%')
str--;
return str;
}
size_t util_printf_next_spec_pos(const char *str, size_t pos)
{
if (str == NULL)
@@ -94,3 +106,137 @@ size_t u_printf_length(const char *fmt, va_list untouched_args)
return size;
}
void u_printf(FILE *out, const char *buffer, size_t buffer_size,
const u_printf_info *info, unsigned info_size)
{
for (size_t buf_pos = 0; buf_pos < buffer_size;) {
uint32_t fmt_idx = *(uint32_t*)&buffer[buf_pos];
/* the idx is 1 based */
assert(fmt_idx > 0);
fmt_idx -= 1;
/* The API allows more arguments than the format uses */
if (fmt_idx >= info_size)
return;
const u_printf_info *fmt = &info[fmt_idx];
const char *format = fmt->strings;
buf_pos += sizeof(fmt_idx);
if (!fmt->num_args) {
fprintf(out, "%s", format);
continue;
}
for (int i = 0; i < fmt->num_args; i++) {
int arg_size = fmt->arg_sizes[i];
size_t spec_pos = util_printf_next_spec_pos(format, 0);
if (spec_pos == -1) {
fprintf(out, "%s", format);
continue;
}
const char *token = util_printf_prev_tok(&format[spec_pos]);
const char *next_format = &format[spec_pos + 1];
/* print the part before the format token */
if (token != format)
fwrite(format, token - format, 1, out);
char *print_str = strndup(token, next_format - token);
/* rebase spec_pos so we can use it with print_str */
spec_pos += format - token;
/* print the formated part */
if (print_str[spec_pos] == 's') {
uint64_t idx;
memcpy(&idx, &buffer[buf_pos], 8);
fprintf(out, print_str, &fmt->strings[idx]);
/* Never pass a 'n' spec to the host printf */
} else if (print_str[spec_pos] != 'n') {
char *vec_pos = strchr(print_str, 'v');
char *mod_pos = strpbrk(print_str, "hl");
int component_count = 1;
if (vec_pos != NULL) {
/* non vector part of the format */
size_t base = mod_pos ? mod_pos - print_str : spec_pos;
size_t l = base - (vec_pos - print_str) - 1;
char *vec = strndup(&vec_pos[1], l);
component_count = atoi(vec);
free(vec);
/* remove the vector and precision stuff */
memmove(&print_str[vec_pos - print_str], &print_str[spec_pos], 2);
}
/* in fact vec3 are vec4 */
int men_components = component_count == 3 ? 4 : component_count;
size_t elmt_size = arg_size / men_components;
bool is_float = strpbrk(print_str, "fFeEgGaA") != NULL;
for (int i = 0; i < component_count; i++) {
size_t elmt_buf_pos = buf_pos + i * elmt_size;
switch (elmt_size) {
case 1: {
uint8_t v;
memcpy(&v, &buffer[elmt_buf_pos], elmt_size);
fprintf(out, print_str, v);
break;
}
case 2: {
uint16_t v;
memcpy(&v, &buffer[elmt_buf_pos], elmt_size);
fprintf(out, print_str, v);
break;
}
case 4: {
if (is_float) {
float v;
memcpy(&v, &buffer[elmt_buf_pos], elmt_size);
fprintf(out, print_str, v);
} else {
uint32_t v;
memcpy(&v, &buffer[elmt_buf_pos], elmt_size);
fprintf(out, print_str, v);
}
break;
}
case 8: {
if (is_float) {
double v;
memcpy(&v, &buffer[elmt_buf_pos], elmt_size);
fprintf(out, print_str, v);
} else {
uint64_t v;
memcpy(&v, &buffer[elmt_buf_pos], elmt_size);
fprintf(out, print_str, v);
}
break;
}
default:
assert(false);
break;
}
if (i < component_count - 1)
fprintf(out, ",");
}
}
/* rebase format */
format = next_format;
free(print_str);
buf_pos += arg_size;
buf_pos = ALIGN(buf_pos, 4);
}
/* print remaining */
fprintf(out, "%s", format);
}
}