arch: move and improve asm_pointer

2 files changed, 56 insertions, 76 deletions

diff --git a/arch/include/arch/asm_pointer.hpp b/arch/include/arch/asm_pointer.hpp
new file mode 100644
index 0000000..c867d8f
--- /dev/null
+++ b/arch/include/arch/asm_pointer.hpp
@@ -0,0 +1,56 @@
+#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/kern/include/kern/asm_pointer.hpp b/kern/include/kern/asm_pointer.hpp
deleted file mode 100644
index 4c25658..0000000
--- a/kern/include/kern/asm_pointer.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef TEACHOS_MEMORY_ASM_POINTER_HPP
-#define TEACHOS_MEMORY_ASM_POINTER_HPP
-
-namespace teachos::memory
-{
-
-  /**
-   * @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
-  {
-    /**
-     * @brief The type of the underlying pointer.
-     */
-    using pointer = Type *;
-
-    /**
-     * @brief Construct a new asm_pointer for a given assembly-defined pointer.
-     *
-     * @param pointer A pointer defined in assembly.
-     */
-    constexpr asm_pointer(Type *& pointer)
-        : m_pointer{&pointer}
-    {
-      // Nothing to do
-    }
-
-    /**
-     * @brief Access the underlying pointer.
-     *
-     * @return The pointer wrapped by this asm_pointer.
-     */
-    auto constexpr operator*() -> pointer & { return *m_pointer; }
-
-    /**
-     * @brief Access the underlying pointer.
-     *
-     * @return The pointer wrapped by this asm_pointer.
-     */
-    auto constexpr operator*() const -> pointer const & { return *m_pointer; }
-
-  private:
-    pointer * m_pointer;
-  };
-
-  /**
-   * @copydoc asm_pointer
-   *
-   * @note This specialization allows the use of this type for pointers to constant data.
-   * @since 0.0.1
-   */
-  template<typename Type>
-  struct asm_pointer<Type const>
-  {
-    /** @copydoc asm_pointer<Type>::asm_pointer */
-    constexpr asm_pointer(Type const & pointer)
-        : m_pointer{&pointer}
-    {
-    }
-
-    /** @copydoc asm_pointer<Type>::operator*() */
-    auto constexpr operator*() -> Type const & { return *m_pointer; }
-    /** @copydoc asm_pointer<Type>::operator*() const */
-    auto constexpr operator*() const -> Type const & { return *m_pointer; }
-
-  private:
-    Type const * m_pointer;
-  };
-
-}  // namespace teachos::memory
-
-#endif  // TEACHOS_MEMORY_ASM_POINTER_HPP