fixup! fixup! [libc] Add putc, fputc, and fprintf to stdio/baremetal

Author: saturn691

libc/src/stdio/baremetal/CMakeLists.txt

@@ -6,7 +6,6 @@ add_entrypoint_object(
     ../fprintf.h
     write_utils.h
   DEPENDS
-    libc.src.__support.OSUtil.osutil
     libc.src.__support.CPP.string_view
     libc.src.stdio.printf_core.printf_main
 )
@@ -64,9 +63,7 @@ add_entrypoint_object(
     write_utils.h
   DEPENDS
     libc.src.stdio.printf_core.printf_main
-    libc.src.stdio.printf_core.writer
     libc.src.__support.arg_list
-    libc.src.__support.OSUtil.osutil
 )
 
 add_entrypoint_object(
@@ -121,9 +118,7 @@ add_entrypoint_object(
     ../vprintf.h
   DEPENDS
     libc.src.stdio.printf_core.printf_main
-    libc.src.stdio.printf_core.writer
     libc.src.__support.arg_list
-    libc.src.__support.OSUtil.osutil
 )
 
 add_entrypoint_object(

libc/src/stdio/baremetal/fprintf.cpp

@@ -31,7 +31,7 @@ LLVM_LIBC_FUNCTION(int, fprintf,
   char buffer[BUFF_SIZE];
 
   printf_core::WriteBuffer<printf_core::WriteMode::FLUSH_TO_STREAM> wb(
-      buffer, BUFF_SIZE, get_write_hook(stream), nullptr);
+      buffer, BUFF_SIZE, write_utils::get_write_hook(stream), nullptr);
   printf_core::Writer<printf_core::WriteMode::FLUSH_TO_STREAM> writer(wb);
 
   int retval = printf_core::printf_main(&writer, format, args);

libc/src/stdio/baremetal/fputc.cpp

@@ -1,4 +1,4 @@
-//===-- Baremetal Implementation of fputc ---------------------------------===//
+//===-- Implementation of fputc for baremetal -------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,7 +17,7 @@ namespace LIBC_NAMESPACE_DECL {
 LLVM_LIBC_FUNCTION(int, fputc, (int c, ::FILE *stream)) {
   char uc = static_cast<char>(c);
 
-  write(stream, cpp::string_view(&uc, 1));
+  write_utils::write(stream, cpp::string_view(&uc, 1));
 
   return 0;
 }

libc/src/stdio/baremetal/getchar.cpp

@@ -1,4 +1,4 @@
-//===-- Baremetal implementation of getchar -------------------------------===//
+//===-- Implementation of getchar for baremetal -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

libc/src/stdio/baremetal/printf.cpp

@@ -29,7 +29,7 @@ LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
   char buffer[BUFF_SIZE];
 
   printf_core::WriteBuffer<printf_core::WriteMode::FLUSH_TO_STREAM> wb(
-      buffer, BUFF_SIZE, &stdout_write_hook, nullptr);
+      buffer, BUFF_SIZE, &write_utils::stdout_write_hook, nullptr);
   printf_core::Writer<printf_core::WriteMode::FLUSH_TO_STREAM> writer(wb);
 
   int retval = printf_core::printf_main(&writer, format, args);

libc/src/stdio/baremetal/putc.cpp

@@ -1,4 +1,4 @@
-//===-- Baremetal Implementation of putc ----------------------------------===//
+//===-- Implementation of putc for baremetal --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,7 +17,7 @@ namespace LIBC_NAMESPACE_DECL {
 LLVM_LIBC_FUNCTION(int, putc, (int c, ::FILE *stream)) {
   char uc = static_cast<char>(c);
 
-  write(stream, cpp::string_view(&uc, 1));
+  write_utils::write(stream, cpp::string_view(&uc, 1));
 
   return 0;
 }

libc/src/stdio/baremetal/putchar.cpp

@@ -1,4 +1,4 @@
-//===-- Baremetal Implementation of putchar -------------------------------===//
+//===-- Implementation of putchar for baremetal -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -15,7 +15,7 @@
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
-  char uc = static_cast<unsigned char>(c);
+  char uc = static_cast<char>(c);
 
   write_to_stdout(cpp::string_view(&uc, 1));
 

libc/src/stdio/baremetal/puts.cpp

@@ -1,4 +1,4 @@
-//===-- Implementation of puts for baremetal-------------------------------===//
+//===-- Implementation of puts for baremetal -------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

libc/src/stdio/baremetal/remove.cpp

@@ -1,4 +1,4 @@
-//===-- Linux implementation of remove ------------------------------------===//
+//===-- Implementation of remove for baremetal -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

libc/src/stdio/baremetal/vprintf.cpp

@@ -8,13 +8,10 @@
 
 #include "src/stdio/vprintf.h"
 
-#include "src/__support/OSUtil/io.h"
 #include "src/__support/arg_list.h"
 #include "src/__support/macros/config.h"
 #include "src/stdio/baremetal/write_utils.h"
-#include "src/stdio/printf_core/core_structs.h"
 #include "src/stdio/printf_core/printf_main.h"
-#include "src/stdio/printf_core/writer.h"
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -30,7 +27,7 @@ LLVM_LIBC_FUNCTION(int, vprintf,
   char buffer[BUFF_SIZE];
 
   printf_core::WriteBuffer<printf_core::WriteMode::FLUSH_TO_STREAM> wb(
-      buffer, BUFF_SIZE, &stdout_write_hook, nullptr);
+      buffer, BUFF_SIZE, &write_utils::stdout_write_hook, nullptr);
   printf_core::Writer<printf_core::WriteMode::FLUSH_TO_STREAM> writer(wb);
 
   int retval = printf_core::printf_main(&writer, format, args);

libc/src/stdio/baremetal/write_utils.h

@@ -13,10 +13,8 @@
 #include "src/__support/macros/config.h"
 #include "src/stdio/printf_core/core_structs.h" // For printf_core::WRITE_OK
 
-#include <stddef.h>
-
 namespace LIBC_NAMESPACE_DECL {
-namespace {
+namespace write_utils {
 
 LIBC_INLINE int stdout_write_hook(cpp::string_view new_str, void *) {
   write_to_stdout(new_str);
@@ -36,13 +34,13 @@ LIBC_INLINE void write(::FILE *f, cpp::string_view new_str) {
   }
 }
 
-LIBC_INLINE decltype(&stdout_write_hook) get_write_hook(::FILE *f) {
-  if (f == stdout) {
+using StreamWriter = int (*)(cpp::string_view, void *);
+LIBC_INLINE StreamWriter get_write_hook(::FILE *f) {
+  if (f == stdout)
     return &stdout_write_hook;
-  }
 
   return &stderr_write_hook;
 }
 
-} // namespace
+} // namespace write_utils
 } // namespace LIBC_NAMESPACE_DECL