diff --git a/bochs/instrument/example0/instrument.h b/bochs/instrument/example0/instrument.h index a3f92b2ef..26d06273b 100644 --- a/bochs/instrument/example0/instrument.h +++ b/bochs/instrument/example0/instrument.h @@ -19,40 +19,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -// possible types passed to BX_INSTR_TLB_CNTRL() -#define BX_INSTR_MOV_CR0 10 -#define BX_INSTR_MOV_CR3 11 -#define BX_INSTR_MOV_CR4 12 -#define BX_INSTR_TASK_SWITCH 13 -#define BX_INSTR_CONTEXT_SWITCH 14 -#define BX_INSTR_INVLPG 15 -#define BX_INSTR_INVEPT 16 -#define BX_INSTR_INVVPID 17 -#define BX_INSTR_INVPCID 18 - -// possible types passed to BX_INSTR_CACHE_CNTRL() -#define BX_INSTR_INVD 20 -#define BX_INSTR_WBINVD 21 - -// possible types passed to BX_INSTR_FAR_BRANCH() -#define BX_INSTR_IS_CALL 10 -#define BX_INSTR_IS_RET 11 -#define BX_INSTR_IS_IRET 12 -#define BX_INSTR_IS_JMP 13 -#define BX_INSTR_IS_INT 14 -#define BX_INSTR_IS_SYSCALL 15 -#define BX_INSTR_IS_SYSRET 16 -#define BX_INSTR_IS_SYSENTER 17 -#define BX_INSTR_IS_SYSEXIT 18 - -// possible types passed to BX_INSTR_PREFETCH_HINT() -#define BX_INSTR_PREFETCH_NTA 0 -#define BX_INSTR_PREFETCH_T0 1 -#define BX_INSTR_PREFETCH_T1 2 -#define BX_INSTR_PREFETCH_T2 3 - - #if BX_INSTRUMENTATION class bxInstruction_c; diff --git a/bochs/instrument/example1/instrument.h b/bochs/instrument/example1/instrument.h index bda1a135f..f91a4cd18 100644 --- a/bochs/instrument/example1/instrument.h +++ b/bochs/instrument/example1/instrument.h @@ -19,40 +19,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -// possible types passed to BX_INSTR_TLB_CNTRL() -#define BX_INSTR_MOV_CR0 10 -#define BX_INSTR_MOV_CR3 11 -#define BX_INSTR_MOV_CR4 12 -#define BX_INSTR_TASK_SWITCH 13 -#define BX_INSTR_CONTEXT_SWITCH 14 -#define BX_INSTR_INVLPG 15 -#define BX_INSTR_INVEPT 16 -#define BX_INSTR_INVVPID 17 -#define BX_INSTR_INVPCID 18 - -// possible types passed to BX_INSTR_CACHE_CNTRL() -#define BX_INSTR_INVD 20 -#define BX_INSTR_WBINVD 21 - -// possible types passed to BX_INSTR_FAR_BRANCH() -#define BX_INSTR_IS_CALL 10 -#define BX_INSTR_IS_RET 11 -#define BX_INSTR_IS_IRET 12 -#define BX_INSTR_IS_JMP 13 -#define BX_INSTR_IS_INT 14 -#define BX_INSTR_IS_SYSCALL 15 -#define BX_INSTR_IS_SYSRET 16 -#define BX_INSTR_IS_SYSENTER 17 -#define BX_INSTR_IS_SYSEXIT 18 - -// possible types passed to BX_INSTR_PREFETCH_HINT() -#define BX_INSTR_PREFETCH_NTA 0 -#define BX_INSTR_PREFETCH_T0 1 -#define BX_INSTR_PREFETCH_T1 2 -#define BX_INSTR_PREFETCH_T2 3 - - #if BX_INSTRUMENTATION class bxInstruction_c; diff --git a/bochs/instrument/example2/instrument.h b/bochs/instrument/example2/instrument.h index fe1859c3e..3be080c3b 100755 --- a/bochs/instrument/example2/instrument.h +++ b/bochs/instrument/example2/instrument.h @@ -19,39 +19,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -// possible types passed to BX_INSTR_TLB_CNTRL() -#define BX_INSTR_MOV_CR0 10 -#define BX_INSTR_MOV_CR3 11 -#define BX_INSTR_MOV_CR4 12 -#define BX_INSTR_TASK_SWITCH 13 -#define BX_INSTR_CONTEXT_SWITCH 14 -#define BX_INSTR_INVLPG 15 -#define BX_INSTR_INVEPT 16 -#define BX_INSTR_INVVPID 17 -#define BX_INSTR_INVPCID 18 - -// possible types passed to BX_INSTR_CACHE_CNTRL() -#define BX_INSTR_INVD 20 -#define BX_INSTR_WBINVD 21 - -// possible types passed to BX_INSTR_FAR_BRANCH() -#define BX_INSTR_IS_CALL 10 -#define BX_INSTR_IS_RET 11 -#define BX_INSTR_IS_IRET 12 -#define BX_INSTR_IS_JMP 13 -#define BX_INSTR_IS_INT 14 -#define BX_INSTR_IS_SYSCALL 15 -#define BX_INSTR_IS_SYSRET 16 -#define BX_INSTR_IS_SYSENTER 17 -#define BX_INSTR_IS_SYSEXIT 18 - -// possible types passed to BX_INSTR_PREFETCH_HINT() -#define BX_INSTR_PREFETCH_NTA 0 -#define BX_INSTR_PREFETCH_T0 1 -#define BX_INSTR_PREFETCH_T1 2 -#define BX_INSTR_PREFETCH_T2 3 - #if BX_INSTRUMENTATION class bxInstruction_c; diff --git a/bochs/instrument/stubs/instrument.h b/bochs/instrument/stubs/instrument.h index fed1c7380..1510bbb16 100644 --- a/bochs/instrument/stubs/instrument.h +++ b/bochs/instrument/stubs/instrument.h @@ -19,40 +19,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -// possible types passed to BX_INSTR_TLB_CNTRL() -#define BX_INSTR_MOV_CR0 10 -#define BX_INSTR_MOV_CR3 11 -#define BX_INSTR_MOV_CR4 12 -#define BX_INSTR_TASK_SWITCH 13 -#define BX_INSTR_CONTEXT_SWITCH 14 -#define BX_INSTR_INVLPG 15 -#define BX_INSTR_INVEPT 16 -#define BX_INSTR_INVVPID 17 -#define BX_INSTR_INVPCID 18 - -// possible types passed to BX_INSTR_CACHE_CNTRL() -#define BX_INSTR_INVD 20 -#define BX_INSTR_WBINVD 21 - -// possible types passed to BX_INSTR_FAR_BRANCH() -#define BX_INSTR_IS_CALL 10 -#define BX_INSTR_IS_RET 11 -#define BX_INSTR_IS_IRET 12 -#define BX_INSTR_IS_JMP 13 -#define BX_INSTR_IS_INT 14 -#define BX_INSTR_IS_SYSCALL 15 -#define BX_INSTR_IS_SYSRET 16 -#define BX_INSTR_IS_SYSENTER 17 -#define BX_INSTR_IS_SYSEXIT 18 - -// possible types passed to BX_INSTR_PREFETCH_HINT() -#define BX_INSTR_PREFETCH_NTA 0 -#define BX_INSTR_PREFETCH_T0 1 -#define BX_INSTR_PREFETCH_T1 2 -#define BX_INSTR_PREFETCH_T2 3 - - #if BX_INSTRUMENTATION class bxInstruction_c;