natto1784/matar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

--amend

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2024-06-11 22:57:32 +05:30
parent e585bb6bd6
commit 2c0df20647
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/memory.hh
View File

@@ -10,15 +10,16 @@
namespace matar { namespace matar {
class Memory { class Memory {
public: public:
static constexpr size_t BIOS_SIZE = 1024 * 16; static constexpr uint32_t BIOS_SIZE = 1024 * 16;
Memory(std::array<uint8_t, BIOS_SIZE>&& bios, std::vector<uint8_t>&& rom); Memory(std::array<uint8_t, BIOS_SIZE>&& bios, std::vector<uint8_t>&& rom);
uint8_t read(size_t address) const; uint8_t read(uint32_t address) const;
void write(size_t address, uint8_t byte); void write(uint32_t address, uint8_t byte);
private: private:
#define MEMORY_REGION(name, start) static constexpr size_t name##_START = start; #define MEMORY_REGION(name, start) \
static constexpr uint32_t name##_START = start;
#define DECL_MEMORY(name, ident, start, end) \ #define DECL_MEMORY(name, ident, start, end) \
MEMORY_REGION(name, start) \ MEMORY_REGION(name, start) \
@@ -50,7 +51,7 @@ class Memory {
#undef MEMORY_REGION #undef MEMORY_REGION
std::unordered_map<size_t, uint8_t> invalid_mem; std::unordered_map<uint32_t, uint8_t> invalid_mem;
std::vector<uint8_t> rom; std::vector<uint8_t> rom;
Header header; Header header;
void parse_header(); void parse_header();