From bf958a4a6ee414af1cd4e6dd6e7935c404c6f72e Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 29 Jun 2025 23:32:11 -0500
Subject: [PATCH] [teagba] Make memory regions cast to bounded ox::Arrays

---
 deps/teagba/include/teagba/addresses.hpp | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/deps/teagba/include/teagba/addresses.hpp b/deps/teagba/include/teagba/addresses.hpp
index 7a19f868d..a8a12bc3d 100644
--- a/deps/teagba/include/teagba/addresses.hpp
+++ b/deps/teagba/include/teagba/addresses.hpp
@@ -5,6 +5,8 @@
 #pragma once
 
 #include <ox/std/array.hpp>
+#include <ox/std/span.hpp>
+#include <ox/std/units.hpp>
 #include <ox/std/types.hpp>
 
 /////////////////////////////////////////////////////////////////
@@ -49,7 +51,7 @@ using BgCtl = uint16_t;
 #define REG_BG3CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000e)
 
 [[nodiscard]]
-inline volatile BgCtl &regBgCtl(uintptr_t bgIdx) noexcept {
+inline volatile BgCtl &regBgCtl(uintptr_t const bgIdx) noexcept {
 	return *reinterpret_cast<volatile BgCtl*>(0x0400'0008 + 2 * bgIdx);
 }
 
@@ -60,7 +62,7 @@ inline volatile BgCtl &regBgCtl(uintptr_t bgIdx) noexcept {
 #define REG_BG3HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001c)
 
 [[nodiscard]]
-inline volatile uint32_t &regBgHofs(auto bgIdx) noexcept {
+volatile uint32_t &regBgHofs(auto const bgIdx) noexcept {
 	return *reinterpret_cast<volatile uint32_t*>(0x0400'0010 + 4 * bgIdx);
 }
 
@@ -71,7 +73,7 @@ inline volatile uint32_t &regBgHofs(auto bgIdx) noexcept {
 #define REG_BG3VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001e)
 
 [[nodiscard]]
-inline volatile uint32_t &regBgVofs(auto bgIdx) noexcept {
+volatile uint32_t &regBgVofs(auto const bgIdx) noexcept {
 	return *reinterpret_cast<volatile uint32_t*>(0x0400'0012 + 4 * bgIdx);
 }
 
@@ -83,25 +85,23 @@ inline volatile uint32_t &regBgVofs(auto bgIdx) noexcept {
 /////////////////////////////////////////////////////////////////
 // Memory Addresses
 
-#define MEM_EWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0200'0000)
-#define MEM_EWRAM_END   reinterpret_cast<uint8_t*>(0x0203'FFFF)
+#define MEM_EWRAM (*reinterpret_cast<ox::Array<uint16_t, 0x0203'FFFF - 0x0200'0000>*>(0x0200'0000))
 
-#define MEM_IWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0300'0000)
-#define MEM_IWRAM_END   reinterpret_cast<uint8_t*>(0x0300'7FFF)
+#define MEM_IWRAM (*reinterpret_cast<ox::Array<uint8_t, 0x0300'7FFF - 0x0300'0000>*>(0x0300'0000))
 
 #define REG_BLNDCTL *reinterpret_cast<uint16_t*>(0x0400'0050)
 
-#define MEM_BG_PALETTE reinterpret_cast<uint16_t*>(0x0500'0000)
-#define MEM_SPRITE_PALETTE reinterpret_cast<uint16_t*>(0x0500'0200)
+using Palette = ox::Array<uint16_t, 128>;
+#define MEM_BG_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0000))
+#define MEM_SPRITE_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0200))
 
 using BgMapTile = ox::Array<uint16_t, 8192>;
-#define MEM_BG_TILES reinterpret_cast<BgMapTile*>(0x0600'0000)
-#define MEM_BG_MAP reinterpret_cast<BgMapTile*>(0x0600'e000)
+#define MEM_BG_TILES (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'0000))
+#define MEM_BG_MAP (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'e000))
 
-#define MEM_SPRITE_TILES reinterpret_cast<uint16_t*>(0x0601'0000)
-#define MEM_OAM reinterpret_cast<uint64_t*>(0x0700'0000)
+#define MEM_SPRITE_TILES (*reinterpret_cast<ox::Array<uint16_t, 32 * ox::units::KB>*>(0x0601'0000))
+#define MEM_OAM (*reinterpret_cast<ox::Array<uint64_t, 64>*>(0x0700'0000))
 
-#define MEM_ROM reinterpret_cast<char*>(0x0800'0000)
+#define MEM_ROM (*reinterpret_cast<ox::Array<char, 32 * ox::units::MB>*>(0x0700'0000))
 
-#define MEM_SRAM reinterpret_cast<char*>(0x0e00'0000)
-#define MEM_SRAM_SIZE 65535
+#define MEM_SRAM (*reinterpret_cast<ox::Array<char, 64 * ox::units::KB>*>(0x0e00'0000))