x86_64: move basic text output implementation

3 files changed, 80 insertions, 80 deletions

diff --git a/arch/x86_64/src/io.cpp b/arch/x86_64/src/io.cpp
index 8808dbb..5fb1c85 100644
--- a/arch/x86_64/src/io.cpp
+++ b/arch/x86_64/src/io.cpp
@@ -1,22 +1,22 @@
+#include "kern/print.hpp"
+#include "x86_64/vga/text.hpp"
+
 namespace teachos::arch::io
 {
 
-  // using x86_64::vga::text_mode::attributes;
-  // using x86_64::vga::text_mode::color;
-
-  // namespace
-  // {
-  //   auto constexpr error_attributes =
-  //       attributes{.foreground = color::light_gray, .bright = true, .background = color::red, .blink = true};
-  // }  // namespace
-
   auto init() -> void
   {
-    // kernel::set_print_handler([](auto text) { return x86_64::vga::text_mode::print(text); });
-    // kernel::set_println_handler([](auto text) { return x86_64::vga::text_mode::println(text); });
-    // kernel::set_print_error_handler([](auto text) { return x86_64::vga::text_mode::print(text, error_attributes); });
-    // kernel::set_println_error_handler(
-    //     [](auto text) { return x86_64::vga::text_mode::println(text, error_attributes); });
+    teachos::set_print_handler(
+        [](auto text) { return x86_64::vga::text::write(text, x86_64::vga::text::common_attributes::green_on_black); });
+    teachos::set_println_handler(
+        [](auto text) { return x86_64::vga::text::write(text, x86_64::vga::text::common_attributes::green_on_black); });
+
+    teachos::set_print_error_handler(
+        [](auto text) { return x86_64::vga::text::write(text, x86_64::vga::text::common_attributes::red_on_black); });
+    teachos::set_println_error_handler(
+        [](auto text) { return x86_64::vga::text::write(text, x86_64::vga::text::common_attributes::red_on_black); });
+
+    teachos::println("[x86-64] Basic VGA text output initialized.");
   }
 
 }  // namespace teachos::arch::io
diff --git a/arch/x86_64/src/vga/text.cpp b/arch/x86_64/src/vga/text.cpp
new file mode 100644
index 0000000..9b7946d
--- /dev/null
+++ b/arch/x86_64/src/vga/text.cpp
@@ -0,0 +1,66 @@
+#include "x86_64/vga/text.hpp"
+
+#include "arch/asm_pointer.hpp"
+#include "x86_64/vga/io.hpp"
+
+#include <algorithm>
+#include <cstddef>
+#include <string_view>
+#include <utility>
+
+extern "C" teachos::arch::asm_pointer<std::pair<char, teachos::x86_64::vga::text::attribute>> vga_buffer_pointer;
+
+namespace teachos::x86_64::vga::text
+{
+  namespace
+  {
+    // auto constexpr DEFAULT_VGA_TEXT_BUFFER_ADDRESS = 0xB8000;
+
+    auto buffer_offset = std::ptrdiff_t{};
+
+    auto constexpr DEFAULT_TEXT_BUFFER_WIDTH = 80U;
+    auto constexpr DEFAULT_TEXT_BUFFER_HEIGHT = 25U;
+  }  // namespace
+
+  auto clear(attribute attribute) -> void
+  {
+    buffer_offset = 0;
+    std::ranges::fill_n(vga_buffer_pointer.get(), 2000, std::pair{' ', attribute});
+  }
+
+  auto cursor(bool enabled) -> void
+  {
+    auto cursor_disable_byte = std::byte{!enabled} << 5;
+
+    io::crtc::address_port::write(io::crtc::registers::cursor_start);
+    io::crtc::data_port::write(io::crtc::data_port::read() | cursor_disable_byte);
+  }
+
+  auto newline() -> void
+  {
+    auto current_line = buffer_offset / DEFAULT_TEXT_BUFFER_WIDTH;
+    auto next_line = current_line + 1;
+
+    if (next_line >= DEFAULT_TEXT_BUFFER_HEIGHT)
+    {
+      auto begin = vga_buffer_pointer + DEFAULT_TEXT_BUFFER_WIDTH;
+      auto end = vga_buffer_pointer + DEFAULT_TEXT_BUFFER_WIDTH * DEFAULT_TEXT_BUFFER_HEIGHT;
+      std::ranges::move(begin, end, vga_buffer_pointer.get());
+      buffer_offset = current_line * DEFAULT_TEXT_BUFFER_WIDTH;
+    }
+    else
+    {
+      buffer_offset = next_line * DEFAULT_TEXT_BUFFER_WIDTH;
+    }
+  }
+
+  auto write_char(char code_point, attribute attribute) -> void
+  {
+    vga_buffer_pointer[buffer_offset++] = std::pair{code_point, attribute};
+  };
+
+  auto write(std::string_view code_points, attribute attribute) -> void
+  {
+    std::ranges::for_each(code_points, [&](auto code_point) { write_char(code_point, attribute); });
+  }
+}  // namespace teachos::x86_64::vga::text
diff --git a/arch/x86_64/src/video/vga/text.cpp b/arch/x86_64/src/video/vga/text.cpp
deleted file mode 100644
index b070a0a..0000000
--- a/arch/x86_64/src/video/vga/text.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "arch/video/vga/text.hpp"
-
-#include "arch/video/vga/io.hpp"
-#include "memory/asm_pointer.hpp"
-
-#include <algorithm>
-#include <string_view>
-#include <utility>
-
-extern "C" std::pair<char, teachos::arch::video::vga::text::attribute> * vga_buffer_pointer;
-
-namespace teachos::arch::video::vga::text
-{
-  namespace
-  {
-    auto constexpr DEFAULT_TEXT_BUFFER_WIDTH = 80U;
-    auto constexpr DEFAULT_TEXT_BUFFER_HEIGHT = 25U;
-
-    auto constinit text_buffer = teachos::memory::asm_pointer{vga_buffer_pointer};
-  }  // namespace
-
-  auto clear(attribute attribute) -> void
-  {
-    *text_buffer = reinterpret_cast<decltype(text_buffer)::pointer>(DEFAULT_VGA_TEXT_BUFFER_ADDRESS);
-    std::ranges::fill_n(*text_buffer, 2000, std::pair{' ', attribute});
-  }
-
-  auto cursor(bool enabled) -> void
-  {
-    auto cursor_disable_byte = std::byte{!enabled} << 5;
-
-    crtc::address_port::write(crtc::registers::cursor_start);
-    crtc::data_port::write(vga::crtc::data_port::read() | cursor_disable_byte);
-  }
-
-  auto newline() -> void
-  {
-    auto base = reinterpret_cast<decltype(text_buffer)::pointer>(DEFAULT_VGA_TEXT_BUFFER_ADDRESS);
-    auto & raw_buffer = *text_buffer;
-    auto current_line = (raw_buffer - base) / DEFAULT_TEXT_BUFFER_WIDTH;
-    auto next_line = current_line + 1;
-
-    if (next_line >= DEFAULT_TEXT_BUFFER_HEIGHT)
-    {
-      auto begin = base + DEFAULT_TEXT_BUFFER_WIDTH;
-      auto end = base + DEFAULT_TEXT_BUFFER_WIDTH * DEFAULT_TEXT_BUFFER_HEIGHT;
-      std::ranges::move(begin, end, base);
-      raw_buffer = base + current_line * DEFAULT_TEXT_BUFFER_WIDTH;
-    }
-    else
-    {
-      raw_buffer = base + next_line * DEFAULT_TEXT_BUFFER_WIDTH;
-    }
-  }
-
-  auto write_char(char code_point, attribute attribute) -> void
-  {
-    auto & p = *text_buffer;
-    (*p++) = std::pair{code_point, attribute};
-  };
-
-  auto write(std::string_view code_points, attribute attribute) -> void
-  {
-    std::ranges::for_each(code_points, [&](auto code_point) { write_char(code_point, attribute); });
-  }
-}  // namespace teachos::arch::video::vga::text