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

- MS VC++ did not accept initialization of static const fields in the

Browse Source 
class declaration, for example:
     static const unsigned os_64=0, as_64=0;
  After reading some suggestions on usenet, I changed these into
  enums instead, like this:
     enum { os_64=0, as_64=0 };
This commit is contained in:
Bryce Denney 2002-09-16 15:21:51 +00:00
parent 9eb006ee66
commit 42f412c43b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.54 2002-09-14 23:17:55 kevinlawton Exp $
// $Id: cpu.h,v 1.55 2002-09-16 15:21:51 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -644,7 +644,7 @@ typedef struct {
typedef void * (*BxVoidFPtr_t)(void);
class BX_CPU_C;
typedef struct BxInstruction_tag {
// prefix stuff here...
unsigned attr; // attribute from fetchdecode
@ -673,8 +673,8 @@ typedef struct BxInstruction_tag {
Bit64u Iq; // for MOV Rx,imm64
unsigned os_64, as_64; // OperandSize/AddressSize is 64bit (overrides os_32/as_32)
unsigned extend8bit;
#else
static const unsigned os_64=0, as_64=0; // x86-32: hardcode to 0.
#else
enum { os_64=0, as_64=0 }; // x86-32: hardcode to 0.
//static const unsigned extend8bit=0; // x86-32: hardcode to 0.
#endif
unsigned ilen; // instruction length
@ -1148,9 +1148,8 @@ union {
// for x86-64 (MODE_IA32,MODE_LONG,MODE_64)
unsigned cpu_mode;
#else
// x86-32 is always in IA32 mode. Let compiler optimize if-then-else
// statements.
static const unsigned cpu_mode=BX_MODE_IA32;
// x86-32 is always in IA32 mode.
enum { cpu_mode = BX_MODE_IA32 };
#endif
#if BX_DEBUGGER