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

Fixed several compilation errors under OSX

Browse Source
This commit is contained in:
Stanislav Shwartsman 2007-12-10 19:05:07 +00:00
parent 83529c1dd8
commit 92f7a3a805
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/memory/memory.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: memory.h,v 1.43 2007-11-01 18:03:48 sshwarts Exp $
// $Id: memory.h,v 1.44 2007-12-10 19:05:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -78,8 +78,8 @@ private:
public:
Bit8u *actual_vector;
Bit8u *vector; // aligned correctly
size_t len;
size_t megabytes; // (len in Megabytes)
Bit32u len;
Bit32u megabytes; // (len in Megabytes)
Bit8u *rom; // 512k BIOS rom space + 128k expansion rom space
Bit8u *bogus; // 4k for unexisting memory
#if BX_DEBUGGER
@ -88,8 +88,8 @@ public:
BX_MEM_C();
~BX_MEM_C();
BX_MEM_SMF void alloc_vector_aligned (size_t bytes, size_t alignment) BX_CPP_AttrRegparmN(2);
BX_MEM_SMF void init_memory(int memsize);
BX_MEM_SMF void alloc_vector_aligned (Bit32u bytes, Bit32u alignment) BX_CPP_AttrRegparmN(2);
BX_MEM_SMF void init_memory(Bit32u memsize);
BX_MEM_SMF void cleanup_memory(void);
BX_MEM_SMF void enable_smram(bx_bool enable, bx_bool restricted);
BX_MEM_SMF void disable_smram(void);

10
bochs/memory/misc_mem.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.105 2007-11-02 23:30:07 vruppert Exp $
// $Id: misc_mem.cc,v 1.106 2007-12-10 19:05:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -59,7 +59,7 @@ BX_MEM_C::BX_MEM_C()
}
void BX_CPP_AttrRegparmN(2)
BX_MEM_C::alloc_vector_aligned (size_t bytes, size_t alignment)
BX_MEM_C::alloc_vector_aligned (Bit32u bytes, Bit32u alignment)
{
if (BX_MEM_THIS actual_vector != NULL) {
BX_INFO (("freeing existing memory vector"));
@ -68,7 +68,7 @@ BX_MEM_C::alloc_vector_aligned (size_t bytes, size_t alignment)
BX_MEM_THIS vector = NULL;
}
Bit64u test_mask = alignment - 1;
BX_MEM_THIS actual_vector = new Bit8u [(unsigned int)(bytes+test_mask)];
BX_MEM_THIS actual_vector = new Bit8u [(Bit32u)(bytes+test_mask)];
// round address forward to nearest multiple of alignment. Alignment
// MUST BE a power of two for this to work.
Bit64u masked = ((Bit64u)(BX_MEM_THIS actual_vector + test_mask)) & ~test_mask;
@ -86,11 +86,11 @@ BX_MEM_C::~BX_MEM_C()
cleanup_memory();
}
void BX_MEM_C::init_memory(int memsize)
void BX_MEM_C::init_memory(Bit32u memsize)
{
unsigned idx;
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.105 2007-11-02 23:30:07 vruppert Exp $"));
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.106 2007-12-10 19:05:07 sshwarts Exp $"));
alloc_vector_aligned(memsize+ BIOSROMSZ + EXROMSIZE + 4096, BX_MEM_VECTOR_ALIGN);
BX_MEM_THIS len = memsize;