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

Fixed number of problems with instrumentation merge cause to instrumentation fail the compilation

Browse Source
This commit is contained in:
Stanislav Shwartsman 2002-09-29 15:06:58 +00:00
parent 8d99157993
commit abb1530faf
5 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.55 2002-09-29 14:16:30 sshwarts Exp $ // $Id: cpu.cc,v 1.56 2002-09-29 15:06:58 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -263,7 +263,15 @@ async_events_processed:
#endif #endif
boundaryFetch(i); boundaryFetch(i);
resolveModRM = i->ResolveModrm; // Get function pointers as early resolveModRM = i->ResolveModrm; // Get function pointers as early
} }
#if BX_INSTRUMENTATION
else
{
// An instruction was either fetched, or found in the iCache.
BX_INSTR_OPCODE(CPU_ID, fetchPtr, i->ilen(),
BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.d_b);
}
#endif
// An instruction will have been fetched using either the normal case, // An instruction will have been fetched using either the normal case,
// or the boundary fetch (across pages), by this point. // or the boundary fetch (across pages), by this point.
@ -276,11 +284,6 @@ async_events_processed:
} }
} }
// An instruction was either fetched, or found in the iCache.
BX_INSTR_OPCODE(CPU_ID, fetchPtr, i->ilen(),
BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.d_b);
#if BX_DEBUGGER #if BX_DEBUGGER
if (BX_CPU_THIS_PTR trace) { if (BX_CPU_THIS_PTR trace) {
// print the instruction that is about to be executed. // print the instruction that is about to be executed.

8
bochs/cpu/ctrl_xfer16.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: ctrl_xfer16.cc,v 1.16 2002-09-28 00:54:04 kevinlawton Exp $ // $Id: ctrl_xfer16.cc,v 1.17 2002-09-29 15:06:58 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -367,7 +367,7 @@ BailBigRSP("JCC_Jw");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -396,7 +396,7 @@ BailBigRSP("JZ_Jw");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -425,7 +425,7 @@ BailBigRSP("JNZ_Jw");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }

8
bochs/cpu/ctrl_xfer32.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: ctrl_xfer32.cc,v 1.20 2002-09-28 00:54:04 kevinlawton Exp $ // $Id: ctrl_xfer32.cc,v 1.21 2002-09-29 15:06:58 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -425,7 +425,7 @@ BailBigRSP("JCC_Jd");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -453,7 +453,7 @@ BailBigRSP("JZ_Jd");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -481,7 +481,7 @@ BailBigRSP("JNZ_Jd");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }

20
bochs/cpu/ctrl_xfer64.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: ctrl_xfer64.cc,v 1.15 2002-09-28 00:54:04 kevinlawton Exp $ // $Id: ctrl_xfer64.cc,v 1.16 2002-09-29 15:06:58 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -332,7 +332,7 @@ BX_CPU_C::JCC_Jq(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -461,7 +461,7 @@ BX_CPU_C::JCXZ64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -475,7 +475,7 @@ BX_CPU_C::JCXZ64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -497,7 +497,7 @@ BX_CPU_C::LOOPNE64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -511,7 +511,7 @@ BX_CPU_C::LOOPNE64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -531,7 +531,7 @@ BX_CPU_C::LOOPE64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -545,7 +545,7 @@ BX_CPU_C::LOOPE64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -565,7 +565,7 @@ BX_CPU_C::LOOP64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -579,7 +579,7 @@ BX_CPU_C::LOOP64_Jb(bxInstruction_c *i)
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }

18
bochs/cpu/ctrl_xfer8.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: ctrl_xfer8.cc,v 1.12 2002-09-28 00:54:04 kevinlawton Exp $ // $Id: ctrl_xfer8.cc,v 1.13 2002-09-29 15:06:58 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -51,7 +51,7 @@ BailBigRSP("JCXZ_Jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -83,7 +83,7 @@ BailBigRSP("JCXZ_Jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -105,7 +105,7 @@ BailBigRSP("loopne_jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -137,7 +137,7 @@ BailBigRSP("loopne_jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
@ -162,7 +162,7 @@ BailBigRSP("loope_jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -194,7 +194,7 @@ BailBigRSP("loope_jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
@ -219,7 +219,7 @@ BailBigRSP("loop_jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif
} }
@ -251,7 +251,7 @@ BailBigRSP("loop_jb");
} }
#if BX_INSTRUMENTATION #if BX_INSTRUMENTATION
else { else {
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, ); BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
} }
#endif #endif