diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | kernel/src/kapi/cio.cpp | 183 | ||||
| -rw-r--r-- | kernel/src/kapi/system.cpp | 7 | ||||
| -rw-r--r-- | kernel/src/kstd/os.cpp (renamed from kernel/src/kstd.cpp) | 0 | ||||
| -rw-r--r-- | kernel/src/kstd/print.cpp | 145 | ||||
| -rw-r--r-- | kernel/src/main.cpp | 6 |
6 files changed, 161 insertions, 185 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 6bddf7c..7733c1b 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -1,7 +1,10 @@ add_executable("kernel" - "src/kstd.cpp" "src/main.cpp" + # KSTD OS Implementation + "src/kstd/os.cpp" + "src/kstd/print.cpp" + # Platform Independent KAPI implementation "src/kapi/cio.cpp" "src/kapi/memory.cpp" diff --git a/kernel/src/kapi/cio.cpp b/kernel/src/kapi/cio.cpp index 500d61e..fd5ad0d 100644 --- a/kernel/src/kapi/cio.cpp +++ b/kernel/src/kapi/cio.cpp @@ -1,10 +1,5 @@ #include "kapi/cio.hpp" -#include <kstd/format> - -#include <array> -#include <cstddef> -#include <iterator> #include <optional> #include <string_view> #include <utility> @@ -16,72 +11,10 @@ namespace teachos::cio struct null_device final : public output_device { null_device static instance; - - auto write(std::string_view) -> void override {} - auto writeln(std::string_view) -> void override {} - - auto write_error(std::string_view) -> void override {} - auto writeln_error(std::string_view) -> void override {} + auto write(output_stream, std::string_view) -> void override {} }; constinit null_device null_device::instance; - - struct write_buffer - { - constexpr auto static size = 128uz; - - write_buffer(write_buffer const &) = delete; - write_buffer(write_buffer &&) = delete; - auto operator=(write_buffer const &) -> write_buffer & = delete; - auto operator=(write_buffer &&) -> write_buffer & = delete; - - explicit write_buffer(output_device * device, bool write_to_error) - : m_device{device} - , m_write_to_error{write_to_error} - {} - - ~write_buffer() noexcept - { - flush(); - } - - auto flush() noexcept -> void - { - if (m_position > 0) - { - std::string_view chunk{m_buffer.data(), m_position}; - if (m_write_to_error) - { - m_device->write_error(chunk); - } - else - { - m_device->write(chunk); - } - m_position = 0; - } - } - - auto static callback(void * object, std::string_view text) -> void - { - auto * self = static_cast<write_buffer *>(object); - for (char const character : text) - { - if (self->m_position >= size) - { - self->flush(); - } - self->m_buffer.at(self->m_position++) = character; - } - } - - private: - output_device * m_device; - bool m_write_to_error; - std::array<char, size> m_buffer{}; - std::size_t m_position{}; - }; - } // namespace // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) @@ -96,117 +29,9 @@ namespace teachos::cio return std::exchange(active_device, &device); } - auto print(std::string_view text) -> void - { - active_device->write(text); - } - - auto println(std::string_view text) -> void - { - active_device->writeln(text); - } - - auto print_error(std::string_view text) -> void - { - active_device->write_error(text); - } - - auto println_error(std::string_view text) -> void - { - active_device->writeln_error(text); - } - - namespace - { - auto static vprint_impl(std::string_view fmt, kstd::format_args args, bool write_to_error) -> void - { - if (!active_device) - return; - - auto writer = write_buffer{active_device, write_to_error}; - auto context = kstd::format_context{.writer = write_buffer::callback, .user_data = &writer}; - - auto current = fmt.begin(); - auto end = fmt.end(); - auto next_automatic_index = 0uz; - - while (current != end) - { - if (*current != '{') - { - auto start = current; - while (current != end && *current != '{') - { - std::advance(current, 1); - } - context.push(std::string_view(start, current - start)); - continue; - } - - if (std::next(current) != end && *(std::next(current)) == '{') - { - context.push('{'); - std::advance(current, 2); - continue; - } - - std::advance(current, 1); - - auto index = 0uz; - if (current != end && *current >= '0' && *current <= '9') - { - while (current != end && *current >= '0' && *current <= '9') - { - // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) - index = index * 10 + static_cast<std::size_t>(*current - '0'); - std::advance(current, 1); - } - } - else - { - index = next_automatic_index++; - } - - auto remaining_fmt = std::string_view{current, static_cast<std::size_t>(std::distance(current, end))}; - - auto const arg = args.get(index); - if (arg.format) - { - auto const after_specs = arg.format(arg.value, remaining_fmt, context); - auto const consumed = remaining_fmt.size() - after_specs.size(); - std::advance(current, consumed); - } - else - { - context.push("{?}"); - while (current != end && *current != '}') - std::advance(current, 1); - } - - if (current != end && *current == '}') - { - std::advance(current, 1); - } - else - { - context.push("{fmt-err}"); - while (current != end && *current != '}') - std::advance(current, 1); - if (current != end) - std::advance(current, 1); - } - } - } - } // namespace - - auto vprint(std::string_view fmt, kstd::format_args args) -> void - { - vprint_impl(fmt, args, false); - } - - auto vprint_error(std::string_view fmt, kstd::format_args args) -> void + auto write(output_stream stream, std::string_view text) -> void { - vprint_impl(fmt, args, true); + active_device->write(stream, text); } -} // namespace teachos::cio
\ No newline at end of file +} // namespace teachos::cio diff --git a/kernel/src/kapi/system.cpp b/kernel/src/kapi/system.cpp index 1cca82e..cdde049 100644 --- a/kernel/src/kapi/system.cpp +++ b/kernel/src/kapi/system.cpp @@ -1,8 +1,9 @@ #include "kapi/system.hpp" -#include "kapi/cio.hpp" #include "kapi/cpu.hpp" +#include <kstd/print> + #include <source_location> #include <string_view> @@ -12,8 +13,8 @@ namespace teachos::system [[gnu::weak]] auto panic(std::string_view message, std::source_location location) -> void { - cio::println_error("[PANIC] in {} : {} @ {}:{}", location.function_name(), message, location.file_name(), - location.line()); + kstd::println(kstd::print_sink::stderr, "[PANIC] in {} : {} @ {}:{}", location.function_name(), message, + location.file_name(), location.line()); cpu::halt(); } diff --git a/kernel/src/kstd.cpp b/kernel/src/kstd/os.cpp index 41c4d60..41c4d60 100644 --- a/kernel/src/kstd.cpp +++ b/kernel/src/kstd/os.cpp diff --git a/kernel/src/kstd/print.cpp b/kernel/src/kstd/print.cpp new file mode 100644 index 0000000..d2fdafa --- /dev/null +++ b/kernel/src/kstd/print.cpp @@ -0,0 +1,145 @@ +#include "kapi/cio.hpp" + +#include <kstd/format> +#include <kstd/print> + +#include <array> +#include <cstddef> +#include <iterator> +#include <string_view> + +namespace kstd::os +{ + + namespace + { + struct write_buffer + { + using output_stream = teachos::cio::output_stream; + + constexpr auto static size = 128uz; + + write_buffer(write_buffer const &) = delete; + write_buffer(write_buffer &&) = delete; + auto operator=(write_buffer const &) -> write_buffer & = delete; + auto operator=(write_buffer &&) -> write_buffer & = delete; + + explicit write_buffer(output_stream stream) + : m_stream{stream} + {} + + ~write_buffer() noexcept + { + flush(); + } + + auto flush() noexcept -> void + { + if (m_position > 0) + { + std::string_view chunk{m_buffer.data(), m_position}; + teachos::cio::write(m_stream, chunk); + m_position = 0; + } + } + + auto static callback(void * object, std::string_view text) -> void + { + auto * self = static_cast<write_buffer *>(object); + for (char const character : text) + { + if (self->m_position >= size) + { + self->flush(); + } + self->m_buffer.at(self->m_position++) = character; + } + } + + private: + output_stream m_stream; + std::array<char, size> m_buffer{}; + std::size_t m_position{}; + }; + + } // namespace + + auto vprint(print_sink sink, std::string_view format, kstd::format_args args) -> void + { + auto writer = write_buffer{(sink == print_sink::stderr) ? teachos::cio::output_stream::stderr + : teachos::cio::output_stream::stdout}; + auto context = kstd::format_context{.writer = write_buffer::callback, .user_data = &writer}; + + auto current = format.begin(); + auto end = format.end(); + auto next_automatic_index = 0uz; + + while (current != end) + { + if (*current != '{') + { + auto start = current; + while (current != end && *current != '{') + { + std::advance(current, 1); + } + context.push(std::string_view(start, current - start)); + continue; + } + + if (std::next(current) != end && *(std::next(current)) == '{') + { + context.push('{'); + std::advance(current, 2); + continue; + } + + std::advance(current, 1); + + auto index = 0uz; + if (current != end && *current >= '0' && *current <= '9') + { + while (current != end && *current >= '0' && *current <= '9') + { + // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) + index = index * 10 + static_cast<std::size_t>(*current - '0'); + std::advance(current, 1); + } + } + else + { + index = next_automatic_index++; + } + + auto remaining_fmt = std::string_view{current, static_cast<std::size_t>(std::distance(current, end))}; + + auto const arg = args.get(index); + if (arg.format) + { + auto const after_specs = arg.format(arg.value, remaining_fmt, context); + auto const consumed = remaining_fmt.size() - after_specs.size(); + std::advance(current, consumed); + } + else + { + context.push("{?}"); + while (current != end && *current != '}') + std::advance(current, 1); + } + + if (current != end && *current == '}') + { + std::advance(current, 1); + } + else + { + context.push("{fmt-err}"); + while (current != end && *current != '}') + std::advance(current, 1); + if (current != end) + std::advance(current, 1); + } + } + } + +} // namespace kstd::os diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp index 3394275..f1e5dd0 100644 --- a/kernel/src/main.cpp +++ b/kernel/src/main.cpp @@ -2,13 +2,15 @@ #include "kapi/memory.hpp" #include "kapi/system.hpp" +#include <kstd/print> + auto main() -> int { teachos::cio::init(); - teachos::cio::println("[OS] IO subsystem initialized."); + kstd::println("[OS] IO subsystem initialized."); teachos::memory::init(); - teachos::cio::println("[OS] Memory subsystem initialized."); + kstd::println("[OS] Memory subsystem initialized."); teachos::system::panic("Returning from kernel main!"); } |