github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-02-25 16:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Only allow get_mapped functions to return RAM and ROM ranges

Browse Source
This commit is contained in:
beeanyew
2021-06-03 11:14:49 +02:00
parent 86f99314c6
commit 6a345535ee
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config_file/config_file.c
View File

@@ -538,8 +538,10 @@ int get_mapped_item_by_address(struct emulator_config *cfg, uint32_t address) {
for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) {
if (cfg->map_type[i] == MAPTYPE_NONE || !cfg->map_data[i])
continue;
if (address >= cfg->map_offset[i] && address < cfg->map_high[i])
return i;
else if (address >= cfg->map_offset[i] && address < cfg->map_high[i]) {
if (cfg->map_type[i] == MAPTYPE_RAM || cfg->map_type[i] == MAPTYPE_RAM_NOALLOC || cfg->map_type[i] == MAPTYPE_ROM)
return i;
}
}
return -1;
@@ -549,12 +551,9 @@ uint8_t *get_mapped_data_pointer_by_address(struct emulator_config *cfg, uint32_
for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) {
if (cfg->map_type[i] == MAPTYPE_NONE || !cfg->map_data[i])
continue;
if (address >= cfg->map_offset[i] && address < cfg->map_high[i]) {
if (cfg->map_type[i] == MAPTYPE_RAM || cfg->map_type[i] == MAPTYPE_RAM_NOALLOC) {
else if (address >= cfg->map_offset[i] && address < cfg->map_high[i]) {
if (cfg->map_type[i] == MAPTYPE_RAM || cfg->map_type[i] == MAPTYPE_RAM_NOALLOC || cfg->map_type[i] == MAPTYPE_ROM)
return cfg->map_data[i] + (address - cfg->map_offset[i]);
} else {
return NULL;
}
}
}