hw/core/loader.c: Track last-seen ROM in rom_check_and_register_reset()
In rom_check_and_register_reset() we detect overlaps by looking at whether the ROM blob we're currently examining is in the same address space and starts before the previous ROM blob ends. (This works because the ROM list is kept sorted in order by AddressSpace and then by address.) Instead of keeping the AddressSpace and last address of the previous ROM blob in local variables, just keep a pointer to it. This will allow us to print more useful information when we do detect an overlap. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20201129203923.10622-2-peter.maydell@linaro.org
This commit is contained in:
parent
05bcbcf279
commit
5b1de52047
|
@ -1166,28 +1166,35 @@ static void rom_reset(void *unused)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Return true if two consecutive ROMs in the ROM list overlap */
|
||||||
|
static bool roms_overlap(Rom *last_rom, Rom *this_rom)
|
||||||
|
{
|
||||||
|
if (!last_rom) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return last_rom->as == this_rom->as &&
|
||||||
|
last_rom->addr + last_rom->romsize > this_rom->addr;
|
||||||
|
}
|
||||||
|
|
||||||
int rom_check_and_register_reset(void)
|
int rom_check_and_register_reset(void)
|
||||||
{
|
{
|
||||||
hwaddr addr = 0;
|
|
||||||
MemoryRegionSection section;
|
MemoryRegionSection section;
|
||||||
Rom *rom;
|
Rom *rom, *last_rom = NULL;
|
||||||
AddressSpace *as = NULL;
|
|
||||||
|
|
||||||
QTAILQ_FOREACH(rom, &roms, next) {
|
QTAILQ_FOREACH(rom, &roms, next) {
|
||||||
if (rom->fw_file) {
|
if (rom->fw_file) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!rom->mr) {
|
if (!rom->mr) {
|
||||||
if ((addr > rom->addr) && (as == rom->as)) {
|
if (roms_overlap(last_rom, rom)) {
|
||||||
fprintf(stderr, "rom: requested regions overlap "
|
fprintf(stderr, "rom: requested regions overlap "
|
||||||
"(rom %s. free=0x" TARGET_FMT_plx
|
"(rom %s. free=0x" TARGET_FMT_plx
|
||||||
", addr=0x" TARGET_FMT_plx ")\n",
|
", addr=0x" TARGET_FMT_plx ")\n",
|
||||||
rom->name, addr, rom->addr);
|
rom->name, last_rom->addr + last_rom->romsize,
|
||||||
|
rom->addr);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
addr = rom->addr;
|
last_rom = rom;
|
||||||
addr += rom->romsize;
|
|
||||||
as = rom->as;
|
|
||||||
}
|
}
|
||||||
section = memory_region_find(rom->mr ? rom->mr : get_system_memory(),
|
section = memory_region_find(rom->mr ? rom->mr : get_system_memory(),
|
||||||
rom->addr, 1);
|
rom->addr, 1);
|
||||||
|
|
Loading…
Reference in a new issue