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

cleanups

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-10-15 21:39:40 +00:00
parent 22fa00831a
commit 140d2d1508
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bochs/memory/memory.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: memory.h,v 1.61 2009-10-15 20:53:30 sshwarts Exp $
// $Id: memory.h,v 1.62 2009-10-15 21:39:40 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -50,12 +50,12 @@ class BX_CPU_C;
typedef bx_bool (*memory_handler_t)(bx_phy_address addr, unsigned len, void *data, void *param);
struct memory_handler_struct {
struct memory_handler_struct *next;
void *param;
bx_phy_address begin;
bx_phy_address end;
memory_handler_t read_handler;
memory_handler_t write_handler;
struct memory_handler_struct *next;
void *param;
bx_phy_address begin;
bx_phy_address end;
memory_handler_t read_handler;
memory_handler_t write_handler;
};
#define SMRAM_CODE 1
@ -130,7 +130,7 @@ BX_CPP_INLINE Bit8u* BX_MEM_C::get_vector(bx_phy_address addr)
BX_CPP_INLINE Bit64u BX_MEM_C::get_memory_len(void)
{
return(BX_MEM_THIS len);
return (BX_MEM_THIS len);
}
#endif

12
bochs/memory/misc_mem.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.132 2009-10-15 20:50:33 sshwarts Exp $
// $Id: misc_mem.cc,v 1.133 2009-10-15 21:39:40 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -72,7 +72,7 @@ void BX_MEM_C::init_memory(Bit32u memsize)
{
unsigned idx;
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.132 2009-10-15 20:50:33 sshwarts Exp $"));
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.133 2009-10-15 21:39:40 sshwarts Exp $"));
if (BX_MEM_THIS actual_vector != NULL) {
BX_INFO (("freeing existing memory vector"));
@ -477,8 +477,7 @@ bx_bool BX_MEM_C::dbg_crc32(bx_phy_address addr1, bx_phy_address addr2, Bit32u *
// 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}.
// used for direct access to guest memory.
// Values of 'op' are { BX_READ, BX_WRITE, BX_EXECUTE, BX_RW }.
//
// The other assumption is that the calling code _only_ accesses memory
@ -589,7 +588,6 @@ Bit8u *BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, bx_phy_address addr, unsigned rw)
}
else
{ // op == {BX_WRITE, BX_RW}
Bit8u *retAddr;
if (a20addr >= BX_MEM_THIS len)
return(NULL); // Error, requested addr is out of bounds.
else if (a20addr >= 0x000a0000 && a20addr < 0x000c0000)
@ -609,14 +607,12 @@ Bit8u *BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, bx_phy_address addr, unsigned rw)
else
{
if (a20addr < 0x000c0000 || a20addr >= 0x00100000) {
retAddr = BX_MEM_THIS get_vector(a20addr);
return BX_MEM_THIS get_vector(a20addr);
}
else {
return(NULL); // Vetoed! ROMs
}
}
return retAddr;
}
}