use custom integer types

1 files changed, 36 insertions, 30 deletions

diff --git a/lib/nes/sys/cartridge.hh b/lib/nes/sys/cartridge.hh
index d82af84..f8c3c3b 100644
--- a/lib/nes/sys/cartridge.hh
+++ b/lib/nes/sys/cartridge.hh
@@ -2,7 +2,7 @@
 
 #include "nes/sys/types/status.hh"
 #include "nes/sys/mapper.hh"
-#include <cstddef>
+#include "nes/common/types.hh"
 #include <vector>
 #include <string_view>
 
@@ -16,32 +16,35 @@ namespace nes::sys
 
 	class cartridge
 	{
-		static constexpr auto prg_rom_bank_size = std::size_t{ 16 * 1024 };
-		static constexpr auto chr_rom_bank_size = std::size_t{ 8 * 1024 };
-		static constexpr auto ram_bank_size = std::size_t{ 8 * 1024 };
-		static constexpr auto header_length = std::size_t{ 16 };
+		static constexpr auto prg_rom_bank_size = u32{ 16 * 1024 };
+		static constexpr auto chr_rom_bank_size = u32{ 8 * 1024 };
+		static constexpr auto ram_bank_size = u32{ 8 * 1024 };
+		static constexpr auto max_prg_rom_size = u32{ 4 * prg_rom_bank_size };
+		static constexpr auto max_chr_rom_size = u32{ 4 * chr_rom_bank_size };
+		static constexpr auto max_ram_size = u32{ 4 * ram_bank_size };
+		static constexpr auto header_length = u32{ 16 };
 
 		struct header
 		{
-			auto get_magic_0() const -> std::uint8_t { return value[0]; }
-			auto get_magic_1() const -> std::uint8_t { return value[1]; }
-			auto get_magic_2() const -> std::uint8_t { return value[2]; }
-			auto get_magic_3() const -> std::uint8_t { return value[3]; }
-			auto get_prg_rom_banks() const -> unsigned { return value[4]; }
-			auto get_chr_rom_banks() const -> unsigned { return value[5]; }
-			auto get_control_1() const -> std::uint8_t { return value[6]; }
-			auto get_control_2() const -> std::uint8_t { return value[7]; }
-			auto get_ram_banks() const -> unsigned { return value[8]; }
+			auto get_magic_0() const -> u8 { return value[0]; }
+			auto get_magic_1() const -> u8 { return value[1]; }
+			auto get_magic_2() const -> u8 { return value[2]; }
+			auto get_magic_3() const -> u8 { return value[3]; }
+			auto get_prg_rom_banks() const -> u32 { return value[4]; }
+			auto get_chr_rom_banks() const -> u32 { return value[5]; }
+			auto get_control_1() const -> u8 { return value[6]; }
+			auto get_control_2() const -> u8 { return value[7]; }
+			auto get_ram_banks() const -> u32 { return value[8]; }
 			auto get_has_trainer() const -> bool { return get_control_1() & 0b00000100; }
-			auto get_mapper_low() const -> unsigned { return (get_control_1() & 0b11110000) >> 4; }
-			auto get_mapper_high() const -> unsigned { return (get_control_2() & 0b11110000) >> 0; }
+			auto get_mapper_low() const -> u32 { return (get_control_1() & 0b11110000) >> 4; }
+			auto get_mapper_high() const -> u32 { return (get_control_2() & 0b11110000) >> 0; }
 			auto get_name_table_arrangement() const -> name_table_arrangement { return static_cast<name_table_arrangement>((get_control_1() & 0b00000001) >> 0); }
 
-			std::uint8_t value[header_length]{};
+			u8 value[header_length]{};
 
-			explicit header(std::uint8_t const* v)
+			explicit header(u8 const* v)
 			{
-				for (auto i = std::size_t{ 0 }; i < header_length; ++i)
+				for (auto i = u32{ 0 }; i < header_length; ++i)
 				{
 					value[i] = v[i];
 				}
@@ -49,26 +52,29 @@ namespace nes::sys
 		};
 
 		status status_{ status::error_uninitialized };
-		std::vector<std::uint8_t> prg_rom_;
-		std::vector<std::uint8_t> chr_rom_;
-		std::vector<std::uint8_t> ram_;
+		u8 prg_rom_[max_prg_rom_size]{};
+		u8 chr_rom_[max_chr_rom_size]{};
+		u8 ram_[max_ram_size]{};
+		u32 prg_rom_size_{};
+		u32 chr_rom_size_{};
+		u32 ram_size_{};
 		name_table_arrangement name_table_arrangement_{};
 		mapper* mapper_{ &mapper::invalid() };
 
 	public:
 		explicit cartridge() = default;
 
-		static auto from_data(void const* data, std::size_t length) -> cartridge;
+		static auto from_data(void const* data, u32 length) -> cartridge;
 		static auto from_file(std::string_view path) -> cartridge;
 
 		auto get_status() const -> status { return status_; }
-		auto get_prg_rom() const -> std::uint8_t const* { return prg_rom_.data(); }
-		auto get_prg_rom_length() const -> std::size_t { return prg_rom_.size(); }
-		auto get_chr_rom() const -> std::uint8_t const* { return chr_rom_.data(); }
-		auto get_chr_rom_length() const -> std::size_t { return chr_rom_.size(); }
-		auto get_ram() const -> std::uint8_t const* { return ram_.data(); }
-		auto get_ram_mut() -> std::uint8_t* { return ram_.data(); }
-		auto get_ram_length() const -> std::size_t { return ram_.size(); }
+		auto get_prg_rom() const -> u8 const* { return prg_rom_; }
+		auto get_prg_rom_length() const -> u32 { return prg_rom_size_; }
+		auto get_chr_rom() const -> u8 const* { return chr_rom_; }
+		auto get_chr_rom_length() const -> u32 { return chr_rom_size_; }
+		auto get_ram() const -> u8 const* { return ram_; }
+		auto get_ram_mut() -> u8* { return ram_; }
+		auto get_ram_length() const -> u32 { return ram_size_; }
 		auto get_mapper() const -> mapper& { return *mapper_; }
 		auto get_name_table_arrangement() const -> name_table_arrangement { return name_table_arrangement_; }