mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- moved array 'rom_present' to the memory class and initialize it at startup.

Browse Source 
This is required for the "second run" feature of the wx port. The simulation
  thread can be run multiple times without restarting the application.
This commit is contained in:
Volker Ruppert 2011-02-11 15:33:08 +00:00
parent d137f6d7db
commit 525e5a46f7
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bochs/memory/memory.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: memory.h,v 1.74 2011-02-11 09:56:23 sshwarts Exp $
// $Id: memory.h,v 1.75 2011-02-11 15:33:08 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2009 The Bochs Project
@ -73,6 +73,7 @@ private:
Bit8u *rom; // 512k BIOS rom space + 128k expansion rom space
Bit8u *bogus; // 4k for unexisting memory
unsigned used_blocks;
bx_bool rom_present[65];
public:
BX_MEM_C();

14
bochs/memory/misc_mem.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.151 2011-02-11 09:56:23 sshwarts Exp $
// $Id: misc_mem.cc,v 1.152 2011-02-11 15:33:08 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2009 The Bochs Project
@ -41,6 +41,8 @@ BX_MEM_C::BX_MEM_C()
blocks = NULL;
len = 0;
used_blocks = 0;
for (int i = 0; i < 65; i++)
rom_present[i] = 0;
memory_handlers = NULL;
}
@ -73,7 +75,7 @@ void BX_MEM_C::init_memory(Bit64u guest, Bit64u host)
{
unsigned idx;
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.151 2011-02-11 09:56:23 sshwarts Exp $"));
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.152 2011-02-11 15:33:08 vruppert Exp $"));
// accept only memory size which is multiply of 1M
BX_ASSERT((host & 0xfffff) == 0);
@ -229,8 +231,6 @@ void BX_MEM_C::cleanup_memory()
//
void BX_MEM_C::load_ROM(const char *path, bx_phy_address romaddress, Bit8u type)
{
static bx_bool rom_present[65];
struct stat stat_buf;
int fd, ret, i, start_idx, end_idx;
unsigned long size, max_size, offset;
@ -298,7 +298,7 @@ void BX_MEM_C::load_ROM(const char *path, bx_phy_address romaddress, Bit8u type)
}
offset = romaddress & BIOS_MASK;
if ((romaddress & 0xf0000) < 0xf0000) {
rom_present[64] = 1;
BX_MEM_THIS rom_present[64] = 1;
}
is_bochs_bios = (strstr(path, "BIOS-bochs-latest") != NULL);
} else {
@ -328,12 +328,12 @@ void BX_MEM_C::load_ROM(const char *path, bx_phy_address romaddress, Bit8u type)
end_idx = 64;
}
for (i = start_idx; i < end_idx; i++) {
if (rom_present[i]) {
if (BX_MEM_THIS rom_present[i]) {
close(fd);
BX_PANIC(("ROM: address space 0x%x already in use", (i * 2048) + 0xc0000));
return;
} else {
rom_present[i] = 1;
BX_MEM_THIS rom_present[i] = 1;
}
}
}