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

Fixed compilation issues

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-10-06 17:50:06 +00:00
parent 51d380551e
commit 2066d8b594
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/cpu/access32.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: access32.cc,v 1.18 2008-09-18 17:37:28 sshwarts Exp $
// $Id: access32.cc,v 1.19 2008-10-06 17:50:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2008 Stanislav Shwartsman
@ -264,6 +264,8 @@ accessOK:
goto accessOK;
}
#if BX_CPU_LEVEL >= 6
void BX_CPP_AttrRegparmN(3)
BX_CPU_C::write_virtual_dqword_32(unsigned s, Bit32u offset, const BxPackedXmmRegister *data)
{
@ -369,6 +371,8 @@ accessOK:
goto accessOK;
}
#endif
Bit8u BX_CPP_AttrRegparmN(2)
BX_CPU_C::read_virtual_byte_32(unsigned s, Bit32u offset)
{
@ -599,6 +603,8 @@ accessOK:
goto accessOK;
}
#if BX_CPU_LEVEL >= 6
void BX_CPP_AttrRegparmN(3)
BX_CPU_C::read_virtual_dqword_32(unsigned s, Bit32u offset, BxPackedXmmRegister *data)
{
@ -698,6 +704,8 @@ accessOK:
goto accessOK;
}
#endif
//////////////////////////////////////////////////////////////
// special Read-Modify-Write operations //
// address translation info is kept across read/write calls //

8
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.530 2008-10-03 16:53:08 sshwarts Exp $
// $Id: cpu.h,v 1.531 2008-10-06 17:50:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -929,7 +929,7 @@ public: // for now...
#endif
#if BX_DEBUGGER
bx_phy_address watchpoint;
bx_phy_address watchpoint
Bit8u break_point;
Bit8u magic_break;
Bit8u stop_reason;
@ -2781,15 +2781,19 @@ public: // for now...
BX_SMF Bit16u read_virtual_word_32(unsigned seg, Bit32u offset) BX_CPP_AttrRegparmN(2);
BX_SMF Bit32u read_virtual_dword_32(unsigned seg, Bit32u offset) BX_CPP_AttrRegparmN(2);
BX_SMF Bit64u read_virtual_qword_32(unsigned seg, Bit32u offset) BX_CPP_AttrRegparmN(2);
#if BX_CPU_LEVEL >= 6
BX_SMF void read_virtual_dqword_32(unsigned seg, Bit32u off, BxPackedXmmRegister *data) BX_CPP_AttrRegparmN(3);
BX_SMF void read_virtual_dqword_aligned_32(unsigned seg, Bit32u off, BxPackedXmmRegister *data) BX_CPP_AttrRegparmN(3);
#endif
BX_SMF void write_virtual_byte_32(unsigned seg, Bit32u offset, Bit8u data) BX_CPP_AttrRegparmN(3);
BX_SMF void write_virtual_word_32(unsigned seg, Bit32u offset, Bit16u data) BX_CPP_AttrRegparmN(3);
BX_SMF void write_virtual_dword_32(unsigned seg, Bit32u offset, Bit32u data) BX_CPP_AttrRegparmN(3);
BX_SMF void write_virtual_qword_32(unsigned seg, Bit32u offset, Bit64u data) BX_CPP_AttrRegparmN(3);
#if BX_CPU_LEVEL >= 6
BX_SMF void write_virtual_dqword_32(unsigned seg, Bit32u offset, const BxPackedXmmRegister *data) BX_CPP_AttrRegparmN(3);
BX_SMF void write_virtual_dqword_aligned_32(unsigned seg, Bit32u offset, const BxPackedXmmRegister *data) BX_CPP_AttrRegparmN(3);
#endif
BX_SMF Bit8u read_RMW_virtual_byte_32(unsigned seg, Bit32u offset) BX_CPP_AttrRegparmN(2);
BX_SMF Bit16u read_RMW_virtual_word_32(unsigned seg, Bit32u offset) BX_CPP_AttrRegparmN(2);

7
bochs/cpu/fetchdecode.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: fetchdecode.cc,v 1.217 2008-09-23 13:25:32 akrisak Exp $
// $Id: fetchdecode.cc,v 1.218 2008-10-06 17:50:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -2999,7 +2999,9 @@ void BX_CPP_AttrRegparmN(2) BX_CPU_C::optimize32(bxInstruction_c *i, unsigned re
};
#if BX_CPU_LEVEL >= 4 && BX_SUPPORT_ALIGNMENT_CHECK
if (! BX_CPU_THIS_PTR alignment_check()) {
if (! BX_CPU_THIS_PTR alignment_check())
#endif
{
if (i->execute == &BX_CPU_C::LOAD_Eb)
i->execute = BxTableLoad32_Eb[resolve];
else if (i->execute == &BX_CPU_C::LOAD_Ew)
@ -3007,7 +3009,6 @@ void BX_CPP_AttrRegparmN(2) BX_CPU_C::optimize32(bxInstruction_c *i, unsigned re
else if (i->execute == &BX_CPU_C::LOAD_Ed)
i->execute = BxTableLoad32_Ed[resolve];
}
#endif
}
void BX_CPP_AttrRegparmN(1) BX_CPU_C::BxError(bxInstruction_c *i)