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

Fixed compilation error on MAC

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-02-20 08:12:51 +00:00
parent 31a367283a
commit d01725b1e9
3 changed files with 6 additions and 6 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.574 2009-02-18 22:24:56 sshwarts Exp $ // $Id: cpu.h,v 1.575 2009-02-20 08:12:51 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -261,7 +261,7 @@
#endif // defined(NEED_CPU_REG_SHORTCUTS) #endif // defined(NEED_CPU_REG_SHORTCUTS)
struct ExceptionInfo { struct BxExceptionInfo {
unsigned exception_type; unsigned exception_type;
unsigned exception_class; unsigned exception_class;
bx_bool push_error; bx_bool push_error;

4
bochs/cpu/exception.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: exception.cc,v 1.137 2009-02-13 09:51:57 sshwarts Exp $ // $Id: exception.cc,v 1.138 2009-02-20 08:12:51 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -838,7 +838,7 @@ void BX_CPU_C::interrupt(Bit8u vector, unsigned type, bx_bool push_error, Bit16u
#endif #endif
} }
struct ExceptionInfo exceptions_info[BX_CPU_HANDLED_EXCEPTIONS+1] = { struct BxExceptionInfo exceptions_info[BX_CPU_HANDLED_EXCEPTIONS+1] = {
/* DE */ { BX_ET_CONTRIBUTORY, BX_EXCEPTION_CLASS_FAULT, 0 }, /* DE */ { BX_ET_CONTRIBUTORY, BX_EXCEPTION_CLASS_FAULT, 0 },
/* DB */ { BX_ET_BENIGN, BX_EXCEPTION_CLASS_FAULT, 0 }, /* DB */ { BX_ET_BENIGN, BX_EXCEPTION_CLASS_FAULT, 0 },
/* -- */ { BX_ET_BENIGN, BX_EXCEPTION_CLASS_FAULT, 0 }, // NMI /* -- */ { BX_ET_BENIGN, BX_EXCEPTION_CLASS_FAULT, 0 }, // NMI

4
bochs/cpu/vmx.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: vmx.cc,v 1.8 2009-02-17 19:20:47 sshwarts Exp $ // $Id: vmx.cc,v 1.9 2009-02-20 08:12:51 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (c) 2009 Stanislav Shwartsman // Copyright (c) 2009 Stanislav Shwartsman
@ -173,7 +173,7 @@ void BX_CPU_C::VMabort(VMX_vmabort_code error_code)
// VMenter // VMenter
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
extern struct ExceptionInfo exceptions_info[]; extern struct BxExceptionInfo exceptions_info[];
#define VMENTRY_INJECTING_EVENT(vmentry_interr_info) (vmentry_interr_info & 0x80000000) #define VMENTRY_INJECTING_EVENT(vmentry_interr_info) (vmentry_interr_info & 0x80000000)