mirrors/ZLUDA
0
0
Fork 0
mirror of https://github.com/vosen/ZLUDA.git synced 2025-08-02 22:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle more types of specifiers in vprintf

Browse source
This commit is contained in:
NyanCatTW1 2024-04-23 23:59:08 +03:00
commit bd94fb8d31
2 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
ptx/lib/zluda_ptx_impl.bc
View file

Binary file not shown.

34
ptx/lib/zluda_ptx_impl.cpp
View file

@ -1395,8 +1395,36 @@ extern "C"
char c = *(s++); char c = *(s++);
if (c == 0) if (c == 0)
break; break;
if (c == '%') if (c != '%')
continue;
// %% requires no additional handling
if (*s == '%')
{ {
s++;
continue;
}
// %s uses __ockl_printf_append_string_n
// https://github.com/ROCm/clr/blob/5a715ed160c69a2deebac187a0368900a774f3e8/hipamd/include/hip/amd_detail/hip_assert.h#L73
if (*s == 's')
{
s++;
const char *value = (const char *)read_valist(valist_ptr, valist_offset, 8);
handle = __ockl_printf_append_string_n(handle, value, strlen_plus_one(value), 0);
continue;
}
// Keep scanning until we figure out the length of this specifier or if we reach the end of the string
while (*s != 0) {
// "The width is not specified in the format string, but as an additional integer value argument preceding the argument that has to be formatted."
if (*s == '*') {
s++;
uint64_t value = read_valist(valist_ptr, valist_offset, 4);
handle = __ockl_printf_append_args(handle, 1, value, 0, 0, 0, 0, 0, 0, 0);
continue;
}
uint8_t len = 0; uint8_t len = 0;
if (parse_printf_specifier(s, len)) if (parse_printf_specifier(s, len))
{ {
@ -1408,6 +1436,9 @@ extern "C"
if (specifier_with_length) if (specifier_with_length)
{ {
s += specifier_with_length; s += specifier_with_length;
} else {
s++;
continue;
} }
} }
@ -1416,6 +1447,7 @@ extern "C"
uint64_t value = read_valist(valist_ptr, valist_offset, len); uint64_t value = read_valist(valist_ptr, valist_offset, len);
handle = __ockl_printf_append_args(handle, 1, value, 0, 0, 0, 0, 0, 0, 0); handle = __ockl_printf_append_args(handle, 1, value, 0, 0, 0, 0, 0, 0, 0);
} }
break;
} }
} }
return (uint32_t)__ockl_printf_append_args(handle, 0, 0, 0, 0, 0, 0, 0, 0, 1); return (uint32_t)__ockl_printf_append_args(handle, 0, 0, 0, 0, 0, 0, 0, 0, 1);