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

copy/paste typo fix

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-06-15 15:10:05 +00:00
parent 26a1cef63b
commit 733491871d
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.603 2009-06-15 09:30:56 sshwarts Exp $
// $Id: cpu.h,v 1.604 2009-06-15 15:10:05 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -302,7 +302,7 @@ struct BxExceptionInfo {
#define BX_MSR_LASTBRANCHTOIP 0x1dc
#define BX_MSR_LASTINTOIP 0x1dd
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
#define BX_MSR_MTRRCAP 0x0fe
#define BX_MSR_MTRRPHYSBASE0 0x200
#define BX_MSR_MTRRPHYSMASK0 0x201
@ -593,7 +593,7 @@ typedef struct
bx_address sysenter_eip_msr;
#endif
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
Bit64u mtrrphys[16];
Bit64u mtrrfix64k_00000;
Bit64u mtrrfix16k[2];

6
bochs/cpu/init.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: init.cc,v 1.213 2009-06-15 09:30:56 sshwarts Exp $
// $Id: init.cc,v 1.214 2009-06-15 15:10:05 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -432,7 +432,7 @@ void BX_CPU_C::register_state(void)
BXRS_HEX_PARAM_FIELD(MSR, sysenter_esp_msr, msr.sysenter_esp_msr);
BXRS_HEX_PARAM_FIELD(MSR, sysenter_eip_msr, msr.sysenter_eip_msr);
#endif
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
BXRS_HEX_PARAM_FIELD(MSR, mtrrphysbase0, msr.mtrrphys[0]);
BXRS_HEX_PARAM_FIELD(MSR, mtrrphysmask0, msr.mtrrphys[1]);
BXRS_HEX_PARAM_FIELD(MSR, mtrrphysbase1, msr.mtrrphys[2]);
@ -936,7 +936,7 @@ void BX_CPU_C::reset(unsigned source)
#endif
// Do not change MTRR on INIT
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
if (source == BX_RESET_HARDWARE) {
for (n=0; n<16; n++)
BX_CPU_THIS_PTR msr.mtrrphys[n] = 0;

8
bochs/cpu/msr.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: msr.cc,v 1.19 2009-06-15 09:30:56 sshwarts Exp $
// $Id: msr.cc,v 1.20 2009-06-15 15:10:05 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2008 Stanislav Shwartsman
@ -53,7 +53,7 @@ bx_bool BX_CPP_AttrRegparmN(2) BX_CPU_C::rdmsr(Bit32u index, Bit64u *msr)
break;
#endif
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
case BX_MSR_MTRRCAP: // read only MSR
val64 = BX_CONST64(0x0000000000000508);
break;
@ -233,7 +233,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::RDMSR(bxInstruction_c *i)
#endif
}
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
BX_CPP_INLINE bx_bool isMemTypeValidMTRR(Bit8u memtype)
{
switch(memtype) {
@ -290,7 +290,7 @@ bx_bool BX_CPP_AttrRegparmN(2) BX_CPU_C::wrmsr(Bit32u index, Bit64u val_64)
break;
#endif
#if CPU_LEVEL >= 6
#if BX_CPU_LEVEL >= 6
case BX_MSR_MTRRCAP:
BX_ERROR(("WRMSR: MTRRCAP is read only MSR"));
return 0;

4
bochs/cpu/vmx.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vmx.cc,v 1.21 2009-06-15 09:30:56 sshwarts Exp $
// $Id: vmx.cc,v 1.22 2009-06-15 15:10:05 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2009 Stanislav Shwartsman
@ -2869,9 +2869,7 @@ void BX_CPU_C::register_vmx_state(bx_param_c *parent)
BXRS_HEX_PARAM_FIELD(host, sysenter_esp_msr, BX_CPU_THIS_PTR vmcs.host_state.sysenter_esp_msr);
BXRS_HEX_PARAM_FIELD(host, sysenter_eip_msr, BX_CPU_THIS_PTR vmcs.host_state.sysenter_eip_msr);
BXRS_HEX_PARAM_FIELD(host, sysenter_cs_msr, BX_CPU_THIS_PTR vmcs.host_state.sysenter_cs_msr);
#if CPU_LEVEL >= 6
BXRS_HEX_PARAM_FIELD(host, pat_msr, BX_CPU_THIS_PTR vmcs.host_state.pat_msr);
#endif
#if BX_SUPPORT_X86_64
BXRS_HEX_PARAM_FIELD(host, efer_msr, BX_CPU_THIS_PTR vmcs.host_state.efer_msr);
#endif

4
bochs/cpu/vmx.h
View File

@ -415,9 +415,7 @@ typedef struct bx_VMCS_GUEST_STATE
Bit64u link_pointer;
#if BX_SUPPORT_MTRR
Bit64u pat_msr;
#endif
#if BX_SUPPORT_X86_64
Bit64u efer_msr;
#endif
@ -447,9 +445,7 @@ typedef struct bx_VMCS_HOST_STATE
bx_address sysenter_eip_msr;
Bit32u sysenter_cs_msr;
#if BX_SUPPORT_MTRR
Bit64u pat_msr;
#endif
#if BX_SUPPORT_X86_64
Bit64u efer_msr;
#endif