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

removed cr1 from cpu

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-05-01 09:32:46 +00:00
parent f089a920cc
commit 78418c6a74
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.594 2009-04-27 14:00:54 sshwarts Exp $
// $Id: cpu.h,v 1.595 2009-05-01 09:32:46 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -835,7 +835,6 @@ public: // for now...
/* Control registers */
bx_cr0_t cr0;
Bit32u cr1;
bx_address cr2;
bx_address cr3;
bx_phy_address cr3_masked;

4
bochs/cpu/init.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: init.cc,v 1.208 2009-04-05 19:38:44 sshwarts Exp $
// $Id: init.cc,v 1.209 2009-05-01 09:32:46 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -214,7 +214,6 @@ void BX_CPU_C::register_wx_state(void)
DEFPARAM_NORMAL(DR6, dr6);
DEFPARAM_NORMAL(DR7, dr7);
DEFPARAM_NORMAL(CR0, cr0.val32);
DEFPARAM_NORMAL(CR1, cr1);
DEFPARAM_NORMAL(CR2, cr2);
DEFPARAM_NORMAL(CR3, cr3);
#if BX_CPU_LEVEL >= 4
@ -890,7 +889,6 @@ void BX_CPU_C::reset(unsigned source)
#endif
#if BX_CPU_LEVEL >= 3
BX_CPU_THIS_PTR cr1 = 0;
BX_CPU_THIS_PTR cr2 = 0;
BX_CPU_THIS_PTR cr3 = 0;
BX_CPU_THIS_PTR cr3_masked = 0;

4
bochs/gui/wxdialog.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////
// $Id: wxdialog.h,v 1.75 2009-04-05 08:33:27 vruppert Exp $
// $Id: wxdialog.h,v 1.76 2009-05-01 09:32:46 sshwarts Exp $
////////////////////////////////////////////////////////////////////
//
// wxWidgets dialogs for Bochs
@ -449,7 +449,7 @@ class CpuRegistersDialog : public ParamDialog
{ "TR3", "TR4", "TR5", "TR6", "TR7", \
NULL }
#define CPU_REGS_CONTROL_REGS \
{ "CR0", "CR1", "CR2", "CR3", "CR4", \
{ "CR0", "CR2", "CR3", "CR4", \
NULL }
void Init(); // called automatically by ShowModal()

4
bochs/plex86-interface.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////
// $Id: plex86-interface.cc,v 1.16 2009-04-05 19:09:43 sshwarts Exp $
// $Id: plex86-interface.cc,v 1.17 2009-05-01 09:32:46 sshwarts Exp $
///////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 Kevin P. Lawton
@ -214,7 +214,7 @@ unsigned plex86ExecuteInVM(BX_CPU_C *cpu)
plex86GuestCPU->tr7 = 0; // Unimplemented in bochs.
plex86GuestCPU->cr0.raw = cpu->cr0.val32;
plex86GuestCPU->cr1 = cpu->cr1;
plex86GuestCPU->cr1 = 0;
plex86GuestCPU->cr2 = cpu->cr2;
plex86GuestCPU->cr3 = cpu->cr3;
plex86GuestCPU->cr4.raw = cpu->cr4.registerValue;