[libc] move printf_main in to object library

[michaelrj]

Summary

Previously printf_main was a header library, but header library
dependencies don't work properly so it's been moved to an object
library. Additionally, the writers have been marked inline.

[sivachandra]

libc/src/stdio/printf_core/file_writer.h

20

Since we need pointers to these functions, they being inline is of no benefit? They could very well be in an object library of their own?

[michaelrj]

move writers to be object libraries

[michaelrj]

rebase before landing

libc/src/stdio/printf_core/CMakeLists.txt

DEPENDS
     .core_structs
     libc.src.__support.arg_list
     libc.src.__support.ctype_utils
     libc.src.__support.str_to_integer
     libc.src.__support.CPP.bit
     libc.src.string.memory_utils.memset_implementation
 )
 
-add_header_library(
+add_object_library(
   string_writer
+  SRCS
+    string_writer.cpp
   HDRS
     string_writer.h
   DEPENDS
     libc.src.string.memory_utils.memcpy_implementation
 )
 
-add_header_library(
+add_object_library(
   file_writer
+  SRCS
+    file_writer.cpp
   HDRS
     file_writer.h
   DEPENDS
     libc.src.__support.File.file
 )
 
 add_object_library(
   writer
HDRS
     char_converter.h
     int_converter.h
   DEPENDS
     .writer
     .core_structs
 )
 
 
-add_header_library(
+add_object_library(
   printf_main
+  SRCS
+    printf_main.cpp
   HDRS
     printf_main.h
   DEPENDS
     .parser
     .converter
     .writer
     .core_structs
     libc.src.__support.arg_list
 )

libc/src/stdio/printf_core/file_writer.h

-//===-- FILE Writer class for printf ----------------------------*- C++ -*-===//
+//===-- FILE Writer definition for printf -----------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FILE_WRITER_H
 #define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FILE_WRITER_H
 
 #include "src/__support/File/file.h"
 #include <stddef.h>
 
 namespace __llvm_libc {
 namespace printf_core {
 
 // write_to_file treats raw_pointer as a File and calls its write
 // function.
 void write_to_file(void *raw_pointer, const char *__restrict to_write,
-                   size_t len) {
-  __llvm_libc::File *file = reinterpret_cast<__llvm_libc::File *>(raw_pointer);
-  file->write(to_write, len);
-}
+                   size_t len);
 
 } // namespace printf_core
 } // namespace __llvm_libc
 
 #endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FILE_WRITER_H

libc/src/stdio/printf_core/file_writer.cpp

-//===-- FILE Writer class for printf ----------------------------*- C++ -*-===//
+//===-- FILE Writer implementation for printf -------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FILE_WRITER_H
-#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FILE_WRITER_H
-
+#include "src/stdio/printf_core/file_writer.h"
 #include "src/__support/File/file.h"
 #include <stddef.h>
 
 namespace __llvm_libc {
 namespace printf_core {
 
-// write_to_file treats raw_pointer as a File and calls its write
-// function.
 void write_to_file(void *raw_pointer, const char *__restrict to_write,
                    size_t len) {
   __llvm_libc::File *file = reinterpret_cast<__llvm_libc::File *>(raw_pointer);
   file->write(to_write, len);
 }
 
 } // namespace printf_core
 } // namespace __llvm_libc
-
-#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FILE_WRITER_H

libc/src/stdio/printf_core/printf_main.h

 //===-- Starting point for printf -------------------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H
 #define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H
 
 #include "src/__support/arg_list.h"
-#include "src/stdio/printf_core/converter.h"
-#include "src/stdio/printf_core/core_structs.h"
-#include "src/stdio/printf_core/parser.h"
 #include "src/stdio/printf_core/writer.h"
 
 #include <stddef.h>
 
 namespace __llvm_libc {
 namespace printf_core {
 
 int printf_main(Writer *writer, const char *__restrict str,
-                internal::ArgList &args) {
-  Parser parser(str, args);
-
-  for (FormatSection cur_section = parser.get_next_section();
-       cur_section.raw_len > 0; cur_section = parser.get_next_section()) {
-    if (cur_section.has_conv)
-      convert(writer, cur_section);
-    else
-      writer->write(cur_section.raw_string, cur_section.raw_len);
-  }
-
-  return writer->get_chars_written();
-}
+                internal::ArgList &args);
 
 } // namespace printf_core
 } // namespace __llvm_libc
 
 #endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H

libc/src/stdio/printf_core/printf_main.cpp

 //===-- Starting point for printf -------------------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H
-#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H
+#include "src/stdio/printf_core/printf_main.h"
 
 #include "src/__support/arg_list.h"
 #include "src/stdio/printf_core/converter.h"
 #include "src/stdio/printf_core/core_structs.h"
 #include "src/stdio/printf_core/parser.h"
 #include "src/stdio/printf_core/writer.h"
 
 #include <stddef.h>
else
       writer->write(cur_section.raw_string, cur_section.raw_len);
   }
 
   return writer->get_chars_written();
 }
 
 } // namespace printf_core
 } // namespace __llvm_libc
-
-#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H

libc/src/stdio/printf_core/string_writer.h

-//===-- String Writer class for printf -----------------------*- C++ -*-===//
+//===-- String Writer definition for printf ---------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_STRING_WRITER_H

 
 public:
   // StringWriter is intended to take a copy of the cur_buffer pointer, as well
   // as the maximum length of the string. This maximum length should not include
   // the null terminator, since that's written separately.
   StringWriter(char *__restrict buffer, size_t max_len = ~size_t(0))
       : cur_buffer(buffer), available_capacity(max_len) {}
 
-  void write(const char *__restrict to_write, size_t len) {
-    if (len > available_capacity)
-      len = available_capacity;
-
-    if (len > 0) {
-      inline_memcpy(cur_buffer, to_write, len);
-      cur_buffer += len;
-      available_capacity -= len;
-    }
-  }
+  void write(const char *__restrict to_write, size_t len);
+
   // Terminate should only be called if the original max length passed to
   // snprintf was greater than 0. It writes a null byte to the end of the
   // cur_buffer, regardless of available_capacity.
   void terminate() { *cur_buffer = '\0'; }
 };
 
 // write_to_string treats raw_pointer as a StringWriter and calls its write
 // function.
 void write_to_string(void *raw_pointer, const char *__restrict to_write,
-                     size_t len) {
-  StringWriter *string_writer = reinterpret_cast<StringWriter *>(raw_pointer);
-  string_writer->write(to_write, len);
-}
+                     size_t len);
 
 } // namespace printf_core
 } // namespace __llvm_libc
 
 #endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_STRING_WRITER_H

libc/src/stdio/printf_core/string_writer.cpp

+//===-- String Writer implementation for printf -----------------*- C++ -*-===//
+//
+// 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_core/string_writer.h"
+#include "src/string/memory_utils/memcpy_implementations.h"
+#include <stddef.h>
+
+namespace __llvm_libc {
+namespace printf_core {
+
+void StringWriter::write(const char *__restrict to_write, size_t len) {
+  if (len > available_capacity)
+    len = available_capacity;
+
+  if (len > 0) {
+    inline_memcpy(cur_buffer, to_write, len);
+    cur_buffer += len;
+    available_capacity -= len;
+  }
+}
+
+void write_to_string(void *raw_pointer, const char *__restrict to_write,
+                     size_t len) {
+  StringWriter *string_writer = reinterpret_cast<StringWriter *>(raw_pointer);
+  string_writer->write(to_write, len);
+}
+
+} // namespace printf_core
+} // namespace __llvm_libc