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

Fixed compilation errors

Browse Source
This commit is contained in:
Stanislav Shwartsman 2004-11-03 06:35:48 +00:00
parent 8191201e17
commit 2ce5495d38
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.184 2004-11-02 17:31:08 sshwarts Exp $
// $Id: cpu.h,v 1.185 2004-11-03 06:35:48 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -2744,7 +2744,7 @@ public: // for now...
BX_SMF void cpu_loop(Bit32s max_instr_count);
BX_SMF unsigned handleAsyncEvent(void);
BX_SMF void boundaryFetch(bxInstruction_c *i);
BX_SMF int branch_near32(Bit32u new_eip) BX_CPP_AttrRegparmN(1);
BX_SMF void branch_near32(Bit32u new_eip) BX_CPP_AttrRegparmN(1);
BX_SMF void prefetch(void);
// revalidate_prefetch_q is now a no-op, due to the newer EIP window

4
bochs/cpu/ctrl_xfer_pro.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ctrl_xfer_pro.cc,v 1.28 2004-11-02 17:31:14 sshwarts Exp $
// $Id: ctrl_xfer_pro.cc,v 1.29 2004-11-03 06:35:48 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -2009,7 +2009,7 @@ BX_CPU_C::iret_protected(bxInstruction_c *i)
#endif
#if BX_CPU_LEVEL >= 2
int BX_CPP_AttrRegparmN(1) BX_CPU_C::branch_near32(Bit32u new_EIP)
void BX_CPP_AttrRegparmN(1) BX_CPU_C::branch_near32(Bit32u new_EIP)
{
// check always, not only in protected mode
if (new_EIP > BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.limit_scaled)

3
bochs/cpu/extdb.cc
View File

@ -5,6 +5,9 @@
# error "extdb.cc only supported in win32 environment"
#endif
#include "iodev/iodev.h"
#include "extdb.h"
TRegs regs;
char debug_loaded = 0;