2001-10-03 17:10:38 +04:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
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
|
|
|
// $Id: memory.h,v 1.8 2002-09-01 20:12:09 kevinlawton Exp $
|
2001-10-03 17:10:38 +04:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
2001-04-10 06:20:02 +04:00
|
|
|
// Copyright (C) 2001 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
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-05-23 12:02:15 +04:00
|
|
|
#define BX_USE_MEM_SMF 0
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
#if BX_USE_MEM_SMF
|
2001-05-23 12:02:15 +04:00
|
|
|
// if static member functions on, then there is only one memory
|
2001-04-10 05:04:59 +04:00
|
|
|
# define BX_MEM_SMF static
|
2001-06-05 21:35:08 +04:00
|
|
|
# define BX_MEM_THIS BX_MEM(0)->
|
2001-04-10 05:04:59 +04:00
|
|
|
#else
|
|
|
|
# define BX_MEM_SMF
|
|
|
|
# define BX_MEM_THIS this->
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
class BX_MEM_C : public logfunctions {
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
public:
|
|
|
|
Bit8u *vector;
|
|
|
|
size_t len;
|
|
|
|
size_t megabytes; // (len in Megabytes)
|
2002-08-31 16:24:41 +04:00
|
|
|
#if BX_PCI_SUPPORT
|
|
|
|
Bit8u shadow[4*16*4096]; // 256k of memory
|
|
|
|
#endif
|
2001-04-10 05:04:59 +04:00
|
|
|
#if BX_DEBUGGER
|
|
|
|
unsigned char dbg_dirty_pages[(BX_MAX_DIRTY_PAGE_TABLE_MEGS * 1024 * 1024) / 4096];
|
2001-05-23 12:02:15 +04:00
|
|
|
Bit32u dbg_count_dirty_pages () {
|
|
|
|
return (BX_MAX_DIRTY_PAGE_TABLE_MEGS * 1024 * 1024) / 4096;
|
|
|
|
}
|
2001-04-10 05:04:59 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
BX_MEM_C(void);
|
|
|
|
BX_MEM_C(size_t memsize);
|
|
|
|
~BX_MEM_C(void);
|
|
|
|
BX_MEM_SMF void init_memory(int memsize);
|
2001-05-23 12:02:15 +04:00
|
|
|
BX_MEM_SMF void read_physical(BX_CPU_C *cpu, Bit32u addr, unsigned len, void *data);
|
|
|
|
BX_MEM_SMF void write_physical(BX_CPU_C *cpu, Bit32u addr, unsigned len, void *data);
|
2001-04-10 05:04:59 +04:00
|
|
|
BX_MEM_SMF void load_ROM(const char *path, Bit32u romaddress);
|
|
|
|
BX_MEM_SMF Bit32u get_memory_in_k(void);
|
2002-08-31 16:24:41 +04:00
|
|
|
#if BX_PCI_SUPPORT
|
|
|
|
BX_MEM_SMF Bit8u* pci_fetch_ptr(Bit32u addr);
|
|
|
|
#endif
|
2001-04-10 05:04:59 +04:00
|
|
|
BX_MEM_SMF Boolean dbg_fetch_mem(Bit32u addr, unsigned len, Bit8u *buf);
|
|
|
|
BX_MEM_SMF Boolean dbg_set_mem(Bit32u addr, unsigned len, Bit8u *buf);
|
|
|
|
BX_MEM_SMF Boolean dbg_crc32(
|
|
|
|
unsigned long (*f)(unsigned char *buf, int len),
|
|
|
|
Bit32u addr1, Bit32u addr2, Bit32u *crc);
|
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
|
|
|
BX_MEM_SMF Bit8u * getHostMemAddr(Bit32u a20Addr, unsigned op);
|
2001-04-10 05:04:59 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
#if BX_PROVIDE_CPU_MEMORY==1
|
2001-06-05 21:35:08 +04:00
|
|
|
|
|
|
|
#if BX_SMP_PROCESSORS==1
|
|
|
|
extern BX_MEM_C bx_mem;
|
|
|
|
#else
|
2001-05-23 12:02:15 +04:00
|
|
|
extern BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES];
|
2001-06-05 21:35:08 +04:00
|
|
|
#endif /* BX_SMP_PROCESSORS */
|
|
|
|
|
|
|
|
#endif /* BX_PROVIDE_CPU_MEMORY==1 */
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
#if BX_DEBUGGER
|
2001-05-23 12:02:15 +04:00
|
|
|
# define BX_DBG_DIRTY_PAGE(page) BX_MEM(0)->dbg_dirty_pages[page] = 1;
|
2001-04-10 05:04:59 +04:00
|
|
|
#else
|
|
|
|
# define BX_DBG_DIRTY_PAGE(page)
|
|
|
|
#endif
|