2001-10-03 17:10:38 +04:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
2003-06-07 23:16:55 +04:00
|
|
|
// $Id: misc_mem.cc,v 1.38 2003-06-07 19:16:54 vruppert Exp $
|
2001-10-03 17:10:38 +04:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
2002-08-17 13:46:27 +04:00
|
|
|
// Copyright (C) 2002 MandrakeSoft S.A.
|
2001-04-10 05:04:59 +04:00
|
|
|
//
|
|
|
|
// MandrakeSoft S.A.
|
|
|
|
// 43, rue d'Aboukir
|
|
|
|
// 75002 Paris - France
|
|
|
|
// http://www.linux-mandrake.com/
|
|
|
|
// http://www.mandrakesoft.com/
|
|
|
|
//
|
|
|
|
// This library is free software; you can redistribute it and/or
|
|
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
|
|
// License as published by the Free Software Foundation; either
|
|
|
|
// version 2 of the License, or (at your option) any later version.
|
|
|
|
//
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
// Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
|
|
// License along with this library; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "bochs.h"
|
2001-05-23 12:02:15 +04:00
|
|
|
#define LOG_THIS BX_MEM(0)->
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
|
|
|
Bit32u
|
|
|
|
BX_MEM_C::get_memory_in_k(void)
|
|
|
|
{
|
|
|
|
return(BX_MEM_THIS megabytes * 1024);
|
|
|
|
}
|
|
|
|
#endif // #if BX_PROVIDE_CPU_MEMORY
|
|
|
|
|
|
|
|
|
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
|
|
|
// BX_MEM_C constructor
|
|
|
|
BX_MEM_C::BX_MEM_C(void)
|
|
|
|
{
|
2001-06-20 01:36:09 +04:00
|
|
|
char mem[6];
|
|
|
|
snprintf(mem, 6, "MEM%d", BX_SIM_ID);
|
2001-06-27 23:16:01 +04:00
|
|
|
put(mem);
|
merge in BRANCH-io-cleanup.
To see the commit logs for this use either cvsweb or
cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files.
In general this provides a generic interface for logging.
logfunctions:: is a class that is inherited by some classes, and also
. allocated as a standalone global called 'genlog'. All logging uses
. one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this
. class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros
. respectively.
.
. An example usage:
. BX_INFO(("Hello, World!\n"));
iofunctions:: is a class that is allocated once by default, and assigned
as the iofunction of each logfunctions instance. It is this class that
maintains the file descriptor and other output related code, at this
point using vfprintf(). At some future point, someone may choose to
write a gui 'console' for bochs to which messages would be redirected
simply by assigning a different iofunction class to the various logfunctions
objects.
More cleanup is coming, but this works for now. If you want to see alot
of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1.
Comments, bugs, flames, to me: todd@fries.net
2001-05-15 18:49:57 +04:00
|
|
|
settype(MEMLOG);
|
|
|
|
|
2001-05-23 12:02:15 +04:00
|
|
|
vector = NULL;
|
2002-09-18 09:28:55 +04:00
|
|
|
actual_vector = NULL;
|
2001-05-23 12:02:15 +04:00
|
|
|
len = 0;
|
|
|
|
megabytes = 0;
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
#endif // #if BX_PROVIDE_CPU_MEMORY
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-09-04 06:11:33 +04:00
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
2003-03-03 02:59:12 +03:00
|
|
|
void BX_CPP_AttrRegparmN(2)
|
2002-09-04 06:11:33 +04:00
|
|
|
BX_MEM_C::alloc_vector_aligned (size_t bytes, size_t alignment)
|
|
|
|
{
|
|
|
|
if (actual_vector != NULL) {
|
|
|
|
BX_INFO (("freeing existing memory vector"));
|
|
|
|
delete [] actual_vector;
|
|
|
|
actual_vector = NULL;
|
|
|
|
vector = NULL;
|
|
|
|
}
|
|
|
|
Bit64u test_mask = alignment - 1;
|
|
|
|
actual_vector = new Bit8u [bytes+test_mask];
|
|
|
|
// round address forward to nearest multiple of alignment. Alignment
|
|
|
|
// MUST BE a power of two for this to work.
|
2003-06-07 23:16:55 +04:00
|
|
|
Bit64u masked = ((Bit64u)(actual_vector + test_mask)) & ~test_mask;
|
2002-09-04 06:11:33 +04:00
|
|
|
vector = (Bit8u *)masked;
|
|
|
|
// sanity check: no lost bits during pointer conversion
|
|
|
|
BX_ASSERT (sizeof(masked) >= sizeof(vector));
|
|
|
|
// sanity check: after realignment, everything fits in allocated space
|
|
|
|
BX_ASSERT (vector+bytes <= actual_vector+bytes+test_mask);
|
|
|
|
BX_INFO (("allocated memory at %p. after alignment, vector=%p",
|
|
|
|
actual_vector, vector));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
|
|
|
// BX_MEM_C constructor
|
|
|
|
BX_MEM_C::BX_MEM_C(size_t memsize)
|
|
|
|
{
|
2002-09-18 09:28:55 +04:00
|
|
|
vector = NULL;
|
|
|
|
actual_vector = NULL;
|
2002-09-04 06:11:33 +04:00
|
|
|
alloc_vector_aligned (memsize, BX_MEM_VECTOR_ALIGN);
|
2001-04-10 05:04:59 +04:00
|
|
|
len = memsize;
|
|
|
|
megabytes = len / (1024*1024);
|
|
|
|
}
|
|
|
|
#endif // #if BX_PROVIDE_CPU_MEMORY
|
|
|
|
|
|
|
|
|
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
|
|
|
// BX_MEM_C destructor
|
|
|
|
BX_MEM_C::~BX_MEM_C(void)
|
|
|
|
{
|
|
|
|
if (this-> vector != NULL) {
|
2002-09-04 06:11:33 +04:00
|
|
|
delete [] actual_vector;
|
|
|
|
actual_vector = NULL;
|
|
|
|
vector = NULL;
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
else {
|
2001-05-30 22:56:02 +04:00
|
|
|
BX_DEBUG(("(%u) memory not freed as it wasn't allocated!", BX_SIM_ID));
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // #if BX_PROVIDE_CPU_MEMORY
|
|
|
|
|
|
|
|
|
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
|
|
|
void
|
|
|
|
BX_MEM_C::init_memory(int memsize)
|
|
|
|
{
|
2003-06-07 23:16:55 +04:00
|
|
|
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.38 2003-06-07 19:16:54 vruppert Exp $"));
|
2001-04-10 05:04:59 +04:00
|
|
|
// you can pass 0 if memory has been allocated already through
|
|
|
|
// the constructor, or the desired size of memory if it hasn't
|
2003-01-29 18:01:16 +03:00
|
|
|
BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes) ));
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
if (BX_MEM_THIS vector == NULL) {
|
|
|
|
// memory not already allocated, do now...
|
2002-09-04 06:11:33 +04:00
|
|
|
alloc_vector_aligned (memsize, BX_MEM_VECTOR_ALIGN);
|
2001-04-10 05:04:59 +04:00
|
|
|
BX_MEM_THIS len = memsize;
|
|
|
|
BX_MEM_THIS megabytes = memsize / (1024*1024);
|
2001-11-11 08:07:05 +03:00
|
|
|
BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes) ));
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
2002-08-31 16:24:41 +04:00
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
#if BX_DEBUGGER
|
2001-05-23 12:02:15 +04:00
|
|
|
if (megabytes > BX_MAX_DIRTY_PAGE_TABLE_MEGS) {
|
2001-05-30 22:56:02 +04:00
|
|
|
BX_INFO(("Error: memory larger than dirty page table can handle"));
|
|
|
|
BX_PANIC(("Error: increase BX_MAX_DIRTY_PAGE_TABLE_MEGS"));
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif // #if BX_PROVIDE_CPU_MEMORY
|
|
|
|
|
|
|
|
|
|
|
|
#if BX_PROVIDE_CPU_MEMORY
|
|
|
|
void
|
2003-04-02 21:03:34 +04:00
|
|
|
BX_MEM_C::load_ROM(const char *path, Bit32u romaddress, Bit8u type)
|
2001-04-10 05:04:59 +04:00
|
|
|
{
|
|
|
|
struct stat stat_buf;
|
|
|
|
int fd, ret;
|
|
|
|
unsigned long size, offset;
|
|
|
|
|
2003-04-02 21:03:34 +04:00
|
|
|
if (*path == '\0') {
|
|
|
|
if (type == 1) {
|
|
|
|
BX_PANIC(( "ROM: System BIOS image undefined."));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BX_PANIC(( "ROM: VGA BIOS image undefined."));
|
|
|
|
}
|
2002-07-03 21:13:29 +04:00
|
|
|
return;
|
2003-04-02 21:03:34 +04:00
|
|
|
}
|
2001-04-10 05:04:59 +04:00
|
|
|
// read in ROM BIOS image file
|
|
|
|
fd = open(path, O_RDONLY
|
|
|
|
#ifdef O_BINARY
|
|
|
|
| O_BINARY
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
if (fd < 0) {
|
2003-04-02 21:03:34 +04:00
|
|
|
if (type > 0) {
|
|
|
|
BX_PANIC(( "ROM: couldn't open ROM image file '%s'.", path));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BX_ERROR(( "ROM: couldn't open ROM image file '%s'.", path));
|
|
|
|
}
|
2002-09-03 20:44:33 +04:00
|
|
|
return;
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
ret = fstat(fd, &stat_buf);
|
|
|
|
if (ret) {
|
2003-04-02 21:03:34 +04:00
|
|
|
if (type > 0) {
|
|
|
|
BX_PANIC(( "ROM: couldn't stat ROM image file '%s'.", path));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BX_ERROR(( "ROM: couldn't stat ROM image file '%s'.", path));
|
|
|
|
}
|
2002-09-03 20:44:33 +04:00
|
|
|
return;
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
size = stat_buf.st_size;
|
|
|
|
|
|
|
|
if ( (romaddress + size) > BX_MEM_THIS len ) {
|
2002-09-03 20:44:33 +04:00
|
|
|
BX_PANIC(( "ROM: ROM address range > physical memsize!"));
|
|
|
|
return;
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
offset = 0;
|
|
|
|
while (size > 0) {
|
2002-08-17 13:46:27 +04:00
|
|
|
ret = read(fd, (bx_ptr_t) &BX_MEM_THIS vector[romaddress + offset], size);
|
2001-04-10 05:04:59 +04:00
|
|
|
if (ret <= 0) {
|
2001-05-30 22:56:02 +04:00
|
|
|
BX_PANIC(( "ROM: read failed on BIOS image: '%s'",path));
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
size -= ret;
|
|
|
|
offset += ret;
|
|
|
|
}
|
|
|
|
close(fd);
|
2001-08-31 20:06:32 +04:00
|
|
|
BX_INFO(("rom at 0x%05x/%u ('%s')",
|
merge in BRANCH-io-cleanup.
To see the commit logs for this use either cvsweb or
cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files.
In general this provides a generic interface for logging.
logfunctions:: is a class that is inherited by some classes, and also
. allocated as a standalone global called 'genlog'. All logging uses
. one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this
. class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros
. respectively.
.
. An example usage:
. BX_INFO(("Hello, World!\n"));
iofunctions:: is a class that is allocated once by default, and assigned
as the iofunction of each logfunctions instance. It is this class that
maintains the file descriptor and other output related code, at this
point using vfprintf(). At some future point, someone may choose to
write a gui 'console' for bochs to which messages would be redirected
simply by assigning a different iofunction class to the various logfunctions
objects.
More cleanup is coming, but this works for now. If you want to see alot
of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1.
Comments, bugs, flames, to me: todd@fries.net
2001-05-15 18:49:57 +04:00
|
|
|
(unsigned) romaddress,
|
|
|
|
(unsigned) stat_buf.st_size,
|
|
|
|
path
|
|
|
|
));
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
#endif // #if BX_PROVIDE_CPU_MEMORY
|
|
|
|
|
2002-08-31 16:24:41 +04:00
|
|
|
#if BX_PCI_SUPPORT
|
2003-03-03 02:59:12 +03:00
|
|
|
Bit8u* BX_CPP_AttrRegparmN(1)
|
2002-08-31 16:24:41 +04:00
|
|
|
BX_MEM_C::pci_fetch_ptr(Bit32u addr)
|
|
|
|
{
|
|
|
|
if (bx_options.Oi440FXSupport->get ()) {
|
2002-11-03 20:17:11 +03:00
|
|
|
switch (DEV_pci_rd_memtype (addr)) {
|
2002-08-31 19:35:51 +04:00
|
|
|
case 0x1: // Read from ShadowRAM
|
2002-08-31 16:24:41 +04:00
|
|
|
return (&BX_MEM_THIS shadow[addr - 0xc0000]);
|
|
|
|
|
2002-08-31 19:35:51 +04:00
|
|
|
case 0x0: // Read from ROM
|
2002-08-31 16:24:41 +04:00
|
|
|
return (&BX_MEM_THIS vector[addr]);
|
|
|
|
default:
|
|
|
|
BX_PANIC(("pci_fetch_ptr(): default case"));
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return (&BX_MEM_THIS vector[addr]);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
|
2002-10-03 09:15:28 +04:00
|
|
|
#if ( BX_DEBUGGER || BX_DISASM || BX_GDBSTUB)
|
2002-10-25 15:44:41 +04:00
|
|
|
bx_bool
|
2001-04-10 05:04:59 +04:00
|
|
|
BX_MEM_C::dbg_fetch_mem(Bit32u addr, unsigned len, Bit8u *buf)
|
|
|
|
{
|
2001-05-23 12:02:15 +04:00
|
|
|
if ( (addr + len) > this->len ) {
|
2003-06-07 23:16:55 +04:00
|
|
|
BX_INFO(("dbg_fetch_mem out of range. 0x%x > 0x%x",
|
2001-05-23 12:02:15 +04:00
|
|
|
addr+len, this->len));
|
2001-04-10 05:04:59 +04:00
|
|
|
return(0); // error, beyond limits of memory
|
|
|
|
}
|
|
|
|
for (; len>0; len--) {
|
|
|
|
#if BX_SUPPORT_VGA
|
|
|
|
if ( (addr & 0xfffe0000) == 0x000a0000 ) {
|
2002-10-25 01:07:56 +04:00
|
|
|
*buf = DEV_vga_mem_read(addr);
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
#endif
|
|
|
|
#if BX_PCI_SUPPORT == 0
|
2001-05-23 12:02:15 +04:00
|
|
|
*buf = vector[addr];
|
2001-04-10 05:04:59 +04:00
|
|
|
#else
|
2001-06-21 18:56:43 +04:00
|
|
|
if ( bx_options.Oi440FXSupport->get () &&
|
2001-04-10 05:04:59 +04:00
|
|
|
((addr >= 0x000C0000) && (addr <= 0x000FFFFF)) ) {
|
2002-11-03 20:17:11 +03:00
|
|
|
switch (DEV_pci_rd_memtype (addr)) {
|
2002-08-31 19:35:51 +04:00
|
|
|
case 0x1: // Fetch from ShadowRAM
|
2002-08-31 16:24:41 +04:00
|
|
|
*buf = shadow[addr - 0xc0000];
|
2001-05-30 22:56:02 +04:00
|
|
|
// BX_INFO(("Fetching from ShadowRAM %06x, len %u !", (unsigned)addr, (unsigned)len));
|
2001-04-10 05:04:59 +04:00
|
|
|
break;
|
|
|
|
|
2002-08-31 19:35:51 +04:00
|
|
|
case 0x0: // Fetch from ROM
|
2002-08-31 16:24:41 +04:00
|
|
|
*buf = vector[addr];
|
2001-05-30 22:56:02 +04:00
|
|
|
// BX_INFO(("Fetching from ROM %06x, Data %02x ", (unsigned)addr, *buf));
|
2001-04-10 05:04:59 +04:00
|
|
|
break;
|
|
|
|
default:
|
2001-05-30 22:56:02 +04:00
|
|
|
BX_PANIC(("dbg_fetch_mem: default case"));
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2001-05-23 12:02:15 +04:00
|
|
|
*buf = vector[addr];
|
2001-04-10 05:04:59 +04:00
|
|
|
#endif // #if BX_PCI_SUPPORT == 0
|
|
|
|
}
|
|
|
|
buf++;
|
|
|
|
addr++;
|
|
|
|
}
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-10-03 09:15:28 +04:00
|
|
|
#if BX_DEBUGGER || BX_GDBSTUB
|
2002-10-25 15:44:41 +04:00
|
|
|
bx_bool
|
2001-04-10 05:04:59 +04:00
|
|
|
BX_MEM_C::dbg_set_mem(Bit32u addr, unsigned len, Bit8u *buf)
|
|
|
|
{
|
2001-05-23 12:02:15 +04:00
|
|
|
if ( (addr + len) > this->len ) {
|
2001-04-10 05:04:59 +04:00
|
|
|
return(0); // error, beyond limits of memory
|
|
|
|
}
|
|
|
|
for (; len>0; len--) {
|
|
|
|
#if BX_SUPPORT_VGA
|
|
|
|
if ( (addr & 0xfffe0000) == 0x000a0000 ) {
|
2002-10-25 01:07:56 +04:00
|
|
|
DEV_vga_mem_write(addr, *buf);
|
2001-04-10 05:04:59 +04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2001-05-23 12:02:15 +04:00
|
|
|
vector[addr] = *buf;
|
2001-04-10 05:04:59 +04:00
|
|
|
buf++;
|
|
|
|
addr++;
|
|
|
|
}
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-10-25 15:44:41 +04:00
|
|
|
bx_bool
|
2001-04-10 05:04:59 +04:00
|
|
|
BX_MEM_C::dbg_crc32(unsigned long (*f)(unsigned char *buf, int len),
|
|
|
|
Bit32u addr1, Bit32u addr2, Bit32u *crc)
|
|
|
|
{
|
|
|
|
unsigned len;
|
|
|
|
|
|
|
|
*crc = 0;
|
|
|
|
if (addr1 > addr2)
|
|
|
|
return(0);
|
|
|
|
|
2001-05-23 12:02:15 +04:00
|
|
|
if (addr2 >= this->len) {
|
2001-04-10 05:04:59 +04:00
|
|
|
return(0); // error, specified address past last phy mem addr
|
|
|
|
}
|
|
|
|
|
|
|
|
len = 1 + addr2 - addr1;
|
2001-05-23 12:02:15 +04:00
|
|
|
*crc = f(vector + addr1, len);
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
return(1);
|
|
|
|
}
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
|
|
|
|
|
2003-03-03 02:59:12 +03:00
|
|
|
Bit8u * BX_CPP_AttrRegparmN(3)
|
2002-09-19 23:17:20 +04:00
|
|
|
BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, Bit32u a20Addr, unsigned op)
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
// Return a host address corresponding to the guest physical memory
|
|
|
|
// address (with A20 already applied), given that the calling
|
|
|
|
// code will perform an 'op' operation. This address will be
|
|
|
|
// used for direct access to guest memory as an acceleration by
|
|
|
|
// a few instructions, like REP {MOV, INS, OUTS, etc}.
|
|
|
|
// Values of 'op' are { BX_READ, BX_WRITE, BX_RW }.
|
|
|
|
|
|
|
|
// The other assumption is that the calling code _only_ accesses memory
|
|
|
|
// directly within the page that encompasses the address requested.
|
|
|
|
{
|
|
|
|
if ( a20Addr >= BX_MEM_THIS len )
|
|
|
|
return(NULL); // Error, requested addr is out of bounds.
|
|
|
|
if (op == BX_READ) {
|
|
|
|
if ( (a20Addr > 0x9ffff) && (a20Addr < 0xc0000) )
|
|
|
|
return(NULL); // Vetoed! Mem mapped IO (VGA)
|
|
|
|
#if !BX_PCI_SUPPORT
|
|
|
|
return( (Bit8u *) & vector[a20Addr] );
|
|
|
|
#else
|
|
|
|
else if ( (a20Addr < 0xa0000) || (a20Addr > 0xfffff)
|
|
|
|
|| (!bx_options.Oi440FXSupport->get ()) )
|
|
|
|
return( (Bit8u *) & vector[a20Addr] );
|
|
|
|
else {
|
2002-11-03 20:17:11 +03:00
|
|
|
switch (DEV_pci_rd_memtype (a20Addr)) {
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
case 0x0: // Read from ROM
|
|
|
|
return ( (Bit8u *) & vector[a20Addr]);
|
|
|
|
case 0x1: // Read from ShadowRAM
|
|
|
|
return( (Bit8u *) & shadow[a20Addr - 0xc0000]);
|
|
|
|
default:
|
|
|
|
BX_PANIC(("getHostMemAddr(): default case"));
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else { // op == {BX_WRITE, BX_RW}
|
2002-09-19 23:17:20 +04:00
|
|
|
Bit8u *retAddr;
|
|
|
|
|
|
|
|
if ( (a20Addr < 0xa0000) || (a20Addr > 0xfffff) ) {
|
|
|
|
retAddr = (Bit8u *) & vector[a20Addr];
|
|
|
|
}
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
#if !BX_PCI_SUPPORT
|
2002-09-19 23:17:20 +04:00
|
|
|
else
|
|
|
|
return(NULL); // Vetoed! Mem mapped IO (VGA) and ROMs
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
#else
|
2002-09-19 23:17:20 +04:00
|
|
|
else if ( (a20Addr < 0xc0000) || (!bx_options.Oi440FXSupport->get ()) )
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
return(NULL); // Vetoed! Mem mapped IO (VGA) and ROMs
|
2002-11-03 20:17:11 +03:00
|
|
|
else if (DEV_pci_wr_memtype (a20Addr) == 1) {
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
// Write to ShadowRAM
|
2002-09-19 23:17:20 +04:00
|
|
|
retAddr = (Bit8u *) & shadow[a20Addr - 0xc0000];
|
|
|
|
}
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
else
|
|
|
|
return(NULL); // Vetoed! ROMs
|
|
|
|
#endif
|
2002-09-19 23:17:20 +04:00
|
|
|
|
|
|
|
#if BX_SupportICache
|
|
|
|
cpu->iCache.decWriteStamp(cpu, a20Addr);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return(retAddr);
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
}
|
|
|
|
}
|