3 files changed, 8 insertions, 65 deletions
diff --git a/arch/include/arch/asm_pointer.hpp b/arch/include/arch/asm_pointer.hpp
deleted file mode 100644
index c867d8f..0000000
--- a/arch/include/arch/asm_pointer.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef TEACHOS_MEMORY_ASM_POINTER_HPP
-#define TEACHOS_MEMORY_ASM_POINTER_HPP
-
-#include <bit>
-
-namespace teachos::arch
-{
-
-  /**
-   * @brief A pointer that is defined in some assembly source file.
-   *
-   * @tparam Type The type of the pointer
-   * @since 0.0.1
-   */
-  template<typename Type>
-  struct asm_pointer
-  {
-    using value_type = Type;
-    using pointer = value_type *;
-    using const_pointer = value_type const *;
-    using reference = value_type &;
-    using const_reference = value_type const &;
-
-    asm_pointer() = delete;
-    asm_pointer(asm_pointer const &) = delete;
-    asm_pointer(asm_pointer &&) = delete;
-
-    auto constexpr operator=(asm_pointer const &) = delete;
-    auto constexpr operator=(asm_pointer &&) = delete;
-
-    auto get() const noexcept -> pointer { return m_ptr; }
-
-    auto constexpr operator+(std::ptrdiff_t offset) const noexcept -> pointer
-    {
-      return std::bit_cast<pointer>(m_ptr) + offset;
-    }
-
-    auto constexpr operator*() noexcept -> reference { return *(std::bit_cast<pointer>(m_ptr)); }
-
-    auto constexpr operator*() const noexcept -> const_reference { return *(std::bit_cast<const_pointer>(m_ptr)); }
-
-    auto constexpr operator[](std::ptrdiff_t offset) noexcept -> reference { return *(*this + offset); }
-
-    auto constexpr operator[](std::ptrdiff_t offset) const noexcept -> const_reference { return *(*this + offset); }
-
-    auto constexpr operator->() noexcept -> pointer { return m_ptr; }
-
-    auto constexpr operator->() const noexcept -> const_pointer { return m_ptr; }
-
-  private:
-    pointer m_ptr;
-  };
-
-}  // namespace teachos::arch
-
-#endif  // TEACHOS_MEMORY_ASM_POINTER_HPP
diff --git a/arch/x86_64/include/x86_64/boot/boot.hpp b/arch/x86_64/include/x86_64/boot/boot.hpp
index 066e49e..1887e73 100644
--- a/arch/x86_64/include/x86_64/boot/boot.hpp
+++ b/arch/x86_64/include/x86_64/boot/boot.hpp
@@ -44,21 +44,21 @@
 
 #else
 
-#include "arch/asm_pointer.hpp"
-
 #include <multiboot2/information.hpp>
 
+#include <kstd/asm_ptr>
+
 extern "C"
 {
   /**
    * @brief A pointer to the multiboot 2 information structure provided by the boot loader.
    */
-  extern teachos::arch::asm_pointer<multiboot2::information_view> multiboot_information_pointer;
+  extern kstd::asm_ptr<multiboot2::information_view> multiboot_information_pointer;
 
   /**
    * @brief A pointer to the VGA text mode buffer.
    */
-  extern teachos::arch::asm_pointer<std::pair<char, std::byte>> vga_buffer_pointer;
+  extern kstd::asm_ptr<std::pair<char, std::byte>> vga_buffer_pointer;
 }
 
 #endif
diff --git a/arch/x86_64/src/vga/text.cpp b/arch/x86_64/src/vga/text.cpp
index 16abf08..dcfdb6b 100644
--- a/arch/x86_64/src/vga/text.cpp
+++ b/arch/x86_64/src/vga/text.cpp
@@ -1,15 +1,14 @@
 #include "x86_64/vga/text.hpp"
 
-#include "arch/asm_pointer.hpp"
+#include "x86_64/boot/boot.hpp"
 #include "x86_64/vga/io.hpp"
 
 #include <algorithm>
+#include <bit>
 #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
@@ -23,7 +22,7 @@ namespace teachos::x86_64::vga::text
   auto clear(attribute attribute) -> void
   {
     buffer_offset = 0;
-    std::ranges::fill_n(vga_buffer_pointer.get(), 2000, std::pair{' ', attribute});
+    std::ranges::fill_n(vga_buffer_pointer.get(), 2000, std::pair{' ', std::bit_cast<std::byte>(attribute)});
   }
 
   auto cursor(bool enabled) -> void
@@ -54,7 +53,7 @@ namespace teachos::x86_64::vga::text
 
   auto write_char(char code_point, attribute attribute) -> void
   {
-    vga_buffer_pointer[buffer_offset++] = std::pair{code_point, attribute};
+    vga_buffer_pointer[buffer_offset++] = std::pair{code_point, std::bit_cast<std::byte>(attribute)};
   };
 
   auto write(std::string_view code_points, attribute attribute) -> void