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

- fixed memory init code for restart support in wx (a lot more changes in other

Browse Source 
parts of Bochs are needed to make it really work)
This commit is contained in:
Volker Ruppert 2006-09-01 18:14:13 +00:00
parent 173d126763
commit 77217aa7b8
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bochs/memory/misc_mem.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.94 2006-06-06 16:46:08 sshwarts Exp $ // $Id: misc_mem.cc,v 1.95 2006-09-01 18:14:13 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -89,8 +89,10 @@ BX_MEM_C::~BX_MEM_C()
vector = NULL; vector = NULL;
delete [] memory_handlers; delete [] memory_handlers;
memory_handlers = NULL; memory_handlers = NULL;
} #if BX_DEBUGGER
else { delete [] BX_MEM_THIS dbg_dirty_pages;
#endif
} else {
BX_DEBUG(("Memory not freed as it wasn't allocated !")); BX_DEBUG(("Memory not freed as it wasn't allocated !"));
} }
} }
@ -99,12 +101,19 @@ void BX_MEM_C::init_memory(int memsize)
{ {
unsigned idx; unsigned idx;
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.94 2006-06-06 16:46:08 sshwarts Exp $")); BX_DEBUG(("Init $Id: misc_mem.cc,v 1.95 2006-09-01 18:14:13 vruppert Exp $"));
// you can pass 0 if memory has been allocated already through
// the constructor, or the desired size of memory if it hasn't if (BX_MEM_THIS vector != NULL) {
delete [] BX_MEM_THIS actual_vector;
BX_MEM_THIS actual_vector = NULL;
BX_MEM_THIS vector = NULL;
delete [] BX_MEM_THIS memory_handlers;
BX_MEM_THIS memory_handlers = NULL;
#if BX_DEBUGGER
delete [] BX_MEM_THIS dbg_dirty_pages;
#endif
}
if (BX_MEM_THIS vector == NULL) {
// memory not already allocated, do now...
alloc_vector_aligned (memsize+ BIOSROMSZ + EXROMSIZE + 4096, BX_MEM_VECTOR_ALIGN); alloc_vector_aligned (memsize+ BIOSROMSZ + EXROMSIZE + 4096, BX_MEM_VECTOR_ALIGN);
BX_MEM_THIS len = memsize; BX_MEM_THIS len = memsize;
BX_MEM_THIS megabytes = memsize / (1024*1024); BX_MEM_THIS megabytes = memsize / (1024*1024);
@ -122,8 +131,6 @@ void BX_MEM_C::init_memory(int memsize)
BX_MEM_THIS memory_handlers[idx] = NULL; BX_MEM_THIS memory_handlers[idx] = NULL;
for (idx = 0; idx < 65; idx++) for (idx = 0; idx < 65; idx++)
BX_MEM_THIS rom_present[idx] = 0; BX_MEM_THIS rom_present[idx] = 0;
BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes)));
}
BX_MEM_THIS pci_enabled = SIM->get_param_bool(BXPN_I440FX_SUPPORT)->get(); BX_MEM_THIS pci_enabled = SIM->get_param_bool(BXPN_I440FX_SUPPORT)->get();
BX_MEM_THIS smram_available = 0; BX_MEM_THIS smram_available = 0;
BX_MEM_THIS smram_enable = 0; BX_MEM_THIS smram_enable = 0;
@ -131,6 +138,7 @@ void BX_MEM_C::init_memory(int memsize)
// accept only memory size which is multiply of 1M // accept only memory size which is multiply of 1M
BX_ASSERT((BX_MEM_THIS len & 0xfffff) == 0); BX_ASSERT((BX_MEM_THIS len & 0xfffff) == 0);
BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes)));
#if BX_SUPPORT_SAVE_RESTORE #if BX_SUPPORT_SAVE_RESTORE
bx_list_c *list = new bx_list_c(SIM->get_sr_root(), "memory", "Memory State"); bx_list_c *list = new bx_list_c(SIM->get_sr_root(), "memory", "Memory State");