diff options
Diffstat (limited to 'libc/src/stdio')
32 files changed, 71 insertions, 67 deletions
diff --git a/libc/src/stdio/gpu/CMakeLists.txt b/libc/src/stdio/gpu/CMakeLists.txt index c4ad333e2516..bea113409263 100644 --- a/libc/src/stdio/gpu/CMakeLists.txt +++ b/libc/src/stdio/gpu/CMakeLists.txt @@ -59,6 +59,7 @@ add_entrypoint_object( DEPENDS libc.hdr.types.FILE libc.src.__support.RPC.rpc_client + .gpu_file ) add_entrypoint_object( @@ -70,6 +71,7 @@ add_entrypoint_object( DEPENDS libc.hdr.types.FILE libc.src.__support.RPC.rpc_client + .gpu_file ) add_entrypoint_object( @@ -114,6 +116,7 @@ add_entrypoint_object( DEPENDS libc.hdr.types.FILE libc.src.__support.RPC.rpc_client + .gpu_file ) add_entrypoint_object( @@ -124,6 +127,7 @@ add_entrypoint_object( ../fopen.h DEPENDS libc.hdr.types.FILE + .gpu_file ) add_entrypoint_object( @@ -134,6 +138,8 @@ add_entrypoint_object( ../fclose.h DEPENDS libc.hdr.types.FILE + libc.hdr.stdio_macros + .gpu_file ) add_entrypoint_object( @@ -144,6 +150,7 @@ add_entrypoint_object( ../fread.h DEPENDS libc.hdr.types.FILE + .gpu_file ) add_entrypoint_object( @@ -254,8 +261,6 @@ add_entrypoint_object( DEPENDS libc.hdr.types.FILE .gpu_file - .feof - .ferror ) add_entrypoint_object( diff --git a/libc/src/stdio/gpu/clearerr.cpp b/libc/src/stdio/gpu/clearerr.cpp index 4d843e4be33e..5a0ca52e33fa 100644 --- a/libc/src/stdio/gpu/clearerr.cpp +++ b/libc/src/stdio/gpu/clearerr.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/clearerr.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fclose.cpp b/libc/src/stdio/gpu/fclose.cpp index 847d6b846172..1e00515e0650 100644 --- a/libc/src/stdio/gpu/fclose.cpp +++ b/libc/src/stdio/gpu/fclose.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fclose.h" -#include "src/__support/macros/config.h" -#include "src/stdio/gpu/file.h" #include "hdr/stdio_macros.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" +#include "src/stdio/gpu/file.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/feof.cpp b/libc/src/stdio/gpu/feof.cpp index a15e4874d0e2..3ae308bad60b 100644 --- a/libc/src/stdio/gpu/feof.cpp +++ b/libc/src/stdio/gpu/feof.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/feof.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/ferror.cpp b/libc/src/stdio/gpu/ferror.cpp index 827382037067..64d62e706525 100644 --- a/libc/src/stdio/gpu/ferror.cpp +++ b/libc/src/stdio/gpu/ferror.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/ferror.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fflush.cpp b/libc/src/stdio/gpu/fflush.cpp index 5a5137be6a4a..0b6ef92f346a 100644 --- a/libc/src/stdio/gpu/fflush.cpp +++ b/libc/src/stdio/gpu/fflush.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fflush.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fgetc.cpp b/libc/src/stdio/gpu/fgetc.cpp index cb42f3100a9f..aaeb1591d3fa 100644 --- a/libc/src/stdio/gpu/fgetc.cpp +++ b/libc/src/stdio/gpu/fgetc.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fgetc.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF. #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fgets.cpp b/libc/src/stdio/gpu/fgets.cpp index d90b7aa4aa66..5447e86d1c76 100644 --- a/libc/src/stdio/gpu/fgets.cpp +++ b/libc/src/stdio/gpu/fgets.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fgets.h" -#include "file.h" -#include "src/__support/macros/config.h" -#include "src/stdio/feof.h" -#include "src/stdio/ferror.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF. #include "hdr/types/FILE.h" -#include <stddef.h> +#include "src/__support/common.h" + +#include <stdint.h> namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/file.h b/libc/src/stdio/gpu/file.h index 437ee9982438..102c6c601b30 100644 --- a/libc/src/stdio/gpu/file.h +++ b/libc/src/stdio/gpu/file.h @@ -6,12 +6,11 @@ // //===----------------------------------------------------------------------===// -#include "src/__support/RPC/rpc_client.h" -#include "src/__support/macros/config.h" -#include "src/string/string_utils.h" - #include "hdr/stdio_macros.h" // For stdin/out/err #include "hdr/types/FILE.h" +#include "src/__support/RPC/rpc_client.h" +#include "src/__support/common.h" +#include "src/__support/macros/attributes.h" namespace LIBC_NAMESPACE_DECL { namespace file { diff --git a/libc/src/stdio/gpu/fopen.cpp b/libc/src/stdio/gpu/fopen.cpp index 18dd71953778..eee3edaac1c1 100644 --- a/libc/src/stdio/gpu/fopen.cpp +++ b/libc/src/stdio/gpu/fopen.cpp @@ -7,11 +7,12 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fopen.h" -#include "src/__support/CPP/string_view.h" -#include "src/__support/macros/config.h" -#include "src/stdio/gpu/file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" +#include "src/stdio/gpu/file.h" +#include "src/string/memory_utils/inline_memcpy.h" +#include "src/string/string_utils.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fprintf.cpp b/libc/src/stdio/gpu/fprintf.cpp index 46196d7d2b10..5b8f01d7d534 100644 --- a/libc/src/stdio/gpu/fprintf.cpp +++ b/libc/src/stdio/gpu/fprintf.cpp @@ -11,6 +11,7 @@ #include "hdr/types/FILE.h" #include "src/__support/CPP/string_view.h" #include "src/__support/arg_list.h" +#include "src/__support/common.h" #include "src/errno/libc_errno.h" #include "src/stdio/gpu/vfprintf_utils.h" diff --git a/libc/src/stdio/gpu/fputc.cpp b/libc/src/stdio/gpu/fputc.cpp index ad2db03df0ca..8a8959b04d20 100644 --- a/libc/src/stdio/gpu/fputc.cpp +++ b/libc/src/stdio/gpu/fputc.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fputc.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF. #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fputs.cpp b/libc/src/stdio/gpu/fputs.cpp index 7a08244bc26e..780a40d1eb05 100644 --- a/libc/src/stdio/gpu/fputs.cpp +++ b/libc/src/stdio/gpu/fputs.cpp @@ -7,13 +7,12 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fputs.h" -#include "src/__support/CPP/string_view.h" -#include "src/__support/macros/config.h" -#include "src/errno/libc_errno.h" -#include "src/stdio/gpu/file.h" #include "hdr/stdio_macros.h" // for EOF. #include "hdr/types/FILE.h" +#include "src/__support/CPP/string_view.h" +#include "src/__support/common.h" +#include "src/stdio/gpu/file.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fread.cpp b/libc/src/stdio/gpu/fread.cpp index 57fa5b6111ff..5619b54b8890 100644 --- a/libc/src/stdio/gpu/fread.cpp +++ b/libc/src/stdio/gpu/fread.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fread.h" -#include "src/__support/macros/config.h" -#include "src/stdio/gpu/file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" +#include "src/stdio/gpu/file.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fseek.cpp b/libc/src/stdio/gpu/fseek.cpp index 5ada5de50db8..468d65ff77e2 100644 --- a/libc/src/stdio/gpu/fseek.cpp +++ b/libc/src/stdio/gpu/fseek.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fseek.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/ftell.cpp b/libc/src/stdio/gpu/ftell.cpp index 04bb0ddfa06a..7ee33d7b05d9 100644 --- a/libc/src/stdio/gpu/ftell.cpp +++ b/libc/src/stdio/gpu/ftell.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/ftell.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/fwrite.cpp b/libc/src/stdio/gpu/fwrite.cpp index 6c548690039a..73c265158103 100644 --- a/libc/src/stdio/gpu/fwrite.cpp +++ b/libc/src/stdio/gpu/fwrite.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fwrite.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/getc.cpp b/libc/src/stdio/gpu/getc.cpp index 9c329749ee1f..6dfb5cef0ad9 100644 --- a/libc/src/stdio/gpu/getc.cpp +++ b/libc/src/stdio/gpu/getc.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/getc.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF. #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/getchar.cpp b/libc/src/stdio/gpu/getchar.cpp index d99b97b5c5a0..7bf561fe6a90 100644 --- a/libc/src/stdio/gpu/getchar.cpp +++ b/libc/src/stdio/gpu/getchar.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/getchar.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF and stdin. +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/printf.cpp b/libc/src/stdio/gpu/printf.cpp index be1885fd6801..53fe69d5e2eb 100644 --- a/libc/src/stdio/gpu/printf.cpp +++ b/libc/src/stdio/gpu/printf.cpp @@ -10,6 +10,7 @@ #include "src/__support/CPP/string_view.h" #include "src/__support/arg_list.h" +#include "src/__support/common.h" #include "src/errno/libc_errno.h" #include "src/stdio/gpu/vfprintf_utils.h" diff --git a/libc/src/stdio/gpu/putc.cpp b/libc/src/stdio/gpu/putc.cpp index f8ae98d26cf0..da80d6c35a53 100644 --- a/libc/src/stdio/gpu/putc.cpp +++ b/libc/src/stdio/gpu/putc.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/putc.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF. #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/putchar.cpp b/libc/src/stdio/gpu/putchar.cpp index c49b02e2f1f1..da2d0a837619 100644 --- a/libc/src/stdio/gpu/putchar.cpp +++ b/libc/src/stdio/gpu/putchar.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/putchar.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/stdio_macros.h" // for EOF and stdout. +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/puts.cpp b/libc/src/stdio/gpu/puts.cpp index fc252abe52d1..9b4ae661b148 100644 --- a/libc/src/stdio/gpu/puts.cpp +++ b/libc/src/stdio/gpu/puts.cpp @@ -7,19 +7,18 @@ //===----------------------------------------------------------------------===// #include "src/stdio/puts.h" -#include "src/__support/CPP/string_view.h" -#include "src/__support/macros/config.h" -#include "src/errno/libc_errno.h" -#include "src/stdio/gpu/file.h" #include "hdr/stdio_macros.h" // for EOF and stdout. +#include "src/__support/CPP/string_view.h" +#include "src/__support/common.h" +#include "src/stdio/gpu/file.h" namespace LIBC_NAMESPACE_DECL { LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) { cpp::string_view str_view(str); - auto written = file::write_impl<LIBC_WRITE_TO_STDOUT_NEWLINE>(stdout, str, - str_view.size()); + auto written = file::write_impl<LIBC_WRITE_TO_STDOUT_NEWLINE>( + stdout, str, str_view.size()); if (written != str_view.size() + 1) return EOF; return 0; diff --git a/libc/src/stdio/gpu/remove.cpp b/libc/src/stdio/gpu/remove.cpp index 4bfb5d3fe8ed..3cd72745cb6d 100644 --- a/libc/src/stdio/gpu/remove.cpp +++ b/libc/src/stdio/gpu/remove.cpp @@ -7,10 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/remove.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" +#include "src/string/string_utils.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/rename.cpp b/libc/src/stdio/gpu/rename.cpp index 589bf2456c8d..d7c71fc82682 100644 --- a/libc/src/stdio/gpu/rename.cpp +++ b/libc/src/stdio/gpu/rename.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/stdio/rename.h" -#include "src/__support/CPP/string_view.h" -#include "src/__support/macros/config.h" -#include "src/stdio/gpu/file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" +#include "src/stdio/gpu/file.h" +#include "src/string/string_utils.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/stderr.cpp b/libc/src/stdio/gpu/stderr.cpp index efbc3b407d60..d0fa1aeb54ee 100644 --- a/libc/src/stdio/gpu/stderr.cpp +++ b/libc/src/stdio/gpu/stderr.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/types/FILE.h" -#include "src/__support/macros/config.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { static struct { diff --git a/libc/src/stdio/gpu/stdin.cpp b/libc/src/stdio/gpu/stdin.cpp index 66618fd0b4db..fef4c3e8f2df 100644 --- a/libc/src/stdio/gpu/stdin.cpp +++ b/libc/src/stdio/gpu/stdin.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/types/FILE.h" -#include "src/__support/macros/config.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { static struct { diff --git a/libc/src/stdio/gpu/stdout.cpp b/libc/src/stdio/gpu/stdout.cpp index e3869f9e26b7..e458dccf917d 100644 --- a/libc/src/stdio/gpu/stdout.cpp +++ b/libc/src/stdio/gpu/stdout.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/types/FILE.h" -#include "src/__support/macros/config.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { static struct { diff --git a/libc/src/stdio/gpu/ungetc.cpp b/libc/src/stdio/gpu/ungetc.cpp index fd1db467975e..fadd1d7db13c 100644 --- a/libc/src/stdio/gpu/ungetc.cpp +++ b/libc/src/stdio/gpu/ungetc.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/stdio/ungetc.h" -#include "file.h" -#include "src/__support/macros/config.h" +#include "file.h" #include "hdr/types/FILE.h" +#include "src/__support/common.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/vfprintf.cpp b/libc/src/stdio/gpu/vfprintf.cpp index c92685f48c72..16a5ed4e47d1 100644 --- a/libc/src/stdio/gpu/vfprintf.cpp +++ b/libc/src/stdio/gpu/vfprintf.cpp @@ -11,7 +11,7 @@ #include "hdr/types/FILE.h" #include "src/__support/CPP/string_view.h" #include "src/__support/arg_list.h" -#include "src/errno/libc_errno.h" +#include "src/__support/common.h" #include "src/stdio/gpu/vfprintf_utils.h" namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/stdio/gpu/vfprintf_utils.h b/libc/src/stdio/gpu/vfprintf_utils.h index df157d36c516..6df46489d6c9 100644 --- a/libc/src/stdio/gpu/vfprintf_utils.h +++ b/libc/src/stdio/gpu/vfprintf_utils.h @@ -10,7 +10,6 @@ #include "src/__support/GPU/utils.h" #include "src/__support/RPC/rpc_client.h" #include "src/__support/arg_list.h" -#include "src/__support/macros/config.h" #include "src/stdio/gpu/file.h" #include "src/string/string_utils.h" diff --git a/libc/src/stdio/gpu/vprintf.cpp b/libc/src/stdio/gpu/vprintf.cpp index 54012f307184..65f5dbfe7c76 100644 --- a/libc/src/stdio/gpu/vprintf.cpp +++ b/libc/src/stdio/gpu/vprintf.cpp @@ -10,7 +10,7 @@ #include "src/__support/CPP/string_view.h" #include "src/__support/arg_list.h" -#include "src/errno/libc_errno.h" +#include "src/__support/common.h" #include "src/stdio/gpu/vfprintf_utils.h" namespace LIBC_NAMESPACE_DECL { |