[libc] Modular printf option (float only) #147426
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| //===-- Implementation of printf_modular-----------------------------------===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #include "src/stdio/printf.h" | ||
|
|
||
| #include "src/__support/File/file.h" | ||
| #include "src/__support/arg_list.h" | ||
| #include "src/__support/macros/config.h" | ||
| #include "src/stdio/printf_core/vfprintf_internal.h" | ||
|
|
||
| #include "hdr/types/FILE.h" | ||
| #include <stdarg.h> | ||
|
|
||
| #ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE | ||
| #define PRINTF_STDOUT LIBC_NAMESPACE::stdout | ||
| #else // LIBC_COPT_STDIO_USE_SYSTEM_FILE | ||
| #define PRINTF_STDOUT ::stdout | ||
| #endif // LIBC_COPT_STDIO_USE_SYSTEM_FILE | ||
|
|
||
| namespace LIBC_NAMESPACE_DECL { | ||
|
|
||
| LLVM_LIBC_FUNCTION(int, __printf_modular, | ||
| (const char *__restrict format, ...)) { | ||
| va_list vlist; | ||
| va_start(vlist, format); | ||
| internal::ArgList args(vlist); // This holder class allows for easier copying | ||
| // and pointer semantics, as well as handling | ||
| // destruction automatically. | ||
| va_end(vlist); | ||
| int ret_val = printf_core::vfprintf_internal_modular( | ||
| reinterpret_cast<::FILE *>(PRINTF_STDOUT), format, args); | ||
| return ret_val; | ||
| } | ||
|
|
||
| } // namespace LIBC_NAMESPACE_DECL |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #ifdef LIBC_COPT_PRINTF_MODULAR | ||
|
There was a problem hiding this comment. This file needs the copyright header. |
||
| #include "src/__support/arg_list.h" | ||
|
|
||
| #define LIBC_PRINTF_DEFINE_MODULAR | ||
| #include "src/stdio/printf_core/float_dec_converter.h" | ||
| #include "src/stdio/printf_core/float_hex_converter.h" | ||
| #include "src/stdio/printf_core/parser.h" | ||
|
Comment on lines
+4
to
+7
There was a problem hiding this comment. given this, do you need to modify |
||
|
|
||
| namespace LIBC_NAMESPACE_DECL { | ||
| namespace printf_core { | ||
| template class Parser<internal::ArgList>; | ||
| template class Parser<internal::DummyArgList<false>>; | ||
| template class Parser<internal::DummyArgList<true>>; | ||
| template class Parser<internal::StructArgList<false>>; | ||
| template class Parser<internal::StructArgList<true>>; | ||
|
|
||
| #define INSTANTIATE_CONVERT_FN(NAME) \ | ||
| template int NAME<WriteMode::FILL_BUFF_AND_DROP_OVERFLOW>( \ | ||
| Writer<WriteMode::FILL_BUFF_AND_DROP_OVERFLOW> * writer, \ | ||
| const FormatSection &to_conv); \ | ||
| template int NAME<WriteMode::FLUSH_TO_STREAM>( \ | ||
| Writer<WriteMode::FLUSH_TO_STREAM> * writer, \ | ||
| const FormatSection &to_conv); \ | ||
| template int NAME<WriteMode::RESIZE_AND_FILL_BUFF>( \ | ||
| Writer<WriteMode::RESIZE_AND_FILL_BUFF> * writer, \ | ||
| const FormatSection &to_conv); \ | ||
| template int NAME<WriteMode::RUNTIME_DISPATCH>( \ | ||
| Writer<WriteMode::RUNTIME_DISPATCH> * writer, \ | ||
| const FormatSection &to_conv) | ||
|
|
||
| INSTANTIATE_CONVERT_FN(convert_float_decimal); | ||
| INSTANTIATE_CONVERT_FN(convert_float_dec_exp); | ||
| INSTANTIATE_CONVERT_FN(convert_float_dec_auto); | ||
| INSTANTIATE_CONVERT_FN(convert_float_hex_exp); | ||
|
|
||
| } // namespace printf_core | ||
| } // namespace LIBC_NAMESPACE_DECL | ||
|
|
||
| // Bring this file into the link if __printf_float is referenced. | ||
| extern "C" void __printf_float() {} | ||
|
There was a problem hiding this comment. One risk with this strategy: what happens if this file is compiled with If I wanted to be sure of this technique, I'd either enforce via compile options that everything in this file is in the same code section, or else add further There was a problem hiding this comment.
To my knowledge, this isn't possible. For LLD at least, the weakness of the reference isn't examined when determining whether or not a reference preserves a section. Weakness only controls whether or not an undefined or duplicate reference fails the link and whether an undefined reference extracts archive members. (There's some other differences with shared libraries unimportant to this case.) I'd be surprised if other linkers differ; wasn't this usage the whole point of allowing undefined weak references? |
||
| #endif | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would it make sense to have
__printf_floatas a separate entrypoint so that it can be controlled per-platform with the same mechanism as other entrypoints?