Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2026-04-20 18:17:02 +00:00
Code Issues Projects Releases Wiki Activity

memctrlbase: overload add_ram_region()

Browse Source 
to accept externally allocated memory.
This commit is contained in:
Maxim Poliakovski
2025-01-14 14:17:27 +01:00
parent d4d19e880c
commit 2a3e46eab4
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/memctrl/memctrlbase.cpp
+12 -6
View File
@@ -189,8 +189,8 @@ bool MemCtrlBase::is_range_free(uint32_t addr, uint32_t size) {
AddressMapEntry* MemCtrlBase::add_mem_region(uint32_t start_addr, uint32_t size,
uint32_t dest_addr, uint32_t type,
uint8_t init_val = 0)
uint32_t dest_addr, uint32_t type,
uint8_t *mem_ptr = nullptr)
{
AddressMapEntry *entry;
@@ -198,9 +198,10 @@ AddressMapEntry* MemCtrlBase::add_mem_region(uint32_t start_addr, uint32_t size,
if (!is_range_free(start_addr, size))
return nullptr;
uint8_t* reg_content = new uint8_t[size](); // allocate and clear to zero
this->mem_regions.push_back(reg_content);
if (!mem_ptr) {
mem_ptr = new uint8_t[size](); // allocate and clear to zero
this->mem_regions.push_back(mem_ptr);
}
entry = new AddressMapEntry;
@@ -210,7 +211,7 @@ AddressMapEntry* MemCtrlBase::add_mem_region(uint32_t start_addr, uint32_t size,
entry->mirror = dest_addr;
entry->type = type;
entry->devobj = nullptr;
entry->mem_ptr = reg_content;
entry->mem_ptr = mem_ptr;
// Keep address_map sorted, that way the RAM region (which starts at 0 and
// is most often requested) will be found by find_range on the first
@@ -246,6 +247,11 @@ AddressMapEntry* MemCtrlBase::add_ram_region(uint32_t start_addr, uint32_t size)
return add_mem_region(start_addr, size, 0, RT_RAM);
}
AddressMapEntry* MemCtrlBase::add_ram_region(uint32_t start_addr, uint32_t size,
uint8_t *mem_ptr) {
return add_mem_region(start_addr, size, 0, RT_RAM, mem_ptr);
}
AddressMapEntry* MemCtrlBase::add_mem_mirror_common(uint32_t start_addr, uint32_t dest_addr,
uint32_t offset, uint32_t size) {
devices/memctrl/memctrlbase.h
+3 -1
View File
@@ -66,6 +66,8 @@ public:
virtual ~MemCtrlBase();
virtual AddressMapEntry* add_rom_region(uint32_t start_addr, uint32_t size);
virtual AddressMapEntry* add_ram_region(uint32_t start_addr, uint32_t size);
virtual AddressMapEntry* add_ram_region(uint32_t start_addr, uint32_t size,
uint8_t *mem_ptr);
virtual AddressMapEntry* add_mem_mirror(uint32_t start_addr, uint32_t dest_addr);
virtual AddressMapEntry* add_mem_mirror_partial(uint32_t start_addr, uint32_t dest_addr,
uint32_t offset, uint32_t size);
@@ -93,7 +95,7 @@ public:
protected:
AddressMapEntry* add_mem_region(
uint32_t start_addr, uint32_t size, uint32_t dest_addr, uint32_t type,
uint8_t init_val
uint8_t *mem_ptr
);
AddressMapEntry* add_mem_mirror_common(uint32_t start_addr, uint32_t dest_addr,