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

Rename BX_INTR_SHUTDOWN callback to BX_INSTR_EXIT

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-04-15 21:27:11 +00:00
parent 4c26043969
commit 715b553aef
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/instrument/example0/instrument.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: instrument.h,v 1.25 2008-03-03 15:09:30 sshwarts Exp $
// $Id: instrument.h,v 1.26 2008-04-15 21:27:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -80,7 +80,7 @@ void bx_instr_mem_data(unsigned cpu, bx_address lin, unsigned size, unsigned rw)
/* simulation init, shutdown, reset */
# define BX_INSTR_INIT(cpu_id) bx_instr_init(cpu_id)
# define BX_INSTR_SHUTDOWN(cpu_id)
# define BX_INSTR_EXIT(cpu_id)
# define BX_INSTR_RESET(cpu_id) bx_instr_reset(cpu_id)
# define BX_INSTR_HLT(cpu_id)
# define BX_INSTR_MWAIT(cpu_id, addr, len, flags)
@ -147,7 +147,7 @@ void bx_instr_mem_data(unsigned cpu, bx_address lin, unsigned size, unsigned rw)
/* simulation init, shutdown, reset */
# define BX_INSTR_INIT(cpu_id)
# define BX_INSTR_SHUTDOWN(cpu_id)
# define BX_INSTR_EXIT(cpu_id)
# define BX_INSTR_RESET(cpu_id)
# define BX_INSTR_HLT(cpu_id)
# define BX_INSTR_MWAIT(cpu_id, addr, len, flags)

6
bochs/instrument/example1/instrument.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: instrument.h,v 1.23 2008-03-03 15:09:30 sshwarts Exp $
// $Id: instrument.h,v 1.24 2008-04-15 21:27:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -129,7 +129,7 @@ extern bxInstrumentation *icpu;
/* simulation init, shutdown, reset */
# define BX_INSTR_INIT(cpu_id) bx_instr_init(cpu_id);
# define BX_INSTR_SHUTDOWN(cpu_id)
# define BX_INSTR_EXIT(cpu_id)
# define BX_INSTR_RESET(cpu_id) icpu[cpu_id].bx_instr_reset()
# define BX_INSTR_HLT(cpu_id)
# define BX_INSTR_MWAIT(cpu_id, addr, len, flags)
@ -196,7 +196,7 @@ extern bxInstrumentation *icpu;
/* simulation init, shutdown, reset */
# define BX_INSTR_INIT(cpu_id)
# define BX_INSTR_SHUTDOWN(cpu_id)
# define BX_INSTR_EXIT(cpu_id)
# define BX_INSTR_RESET(cpu_id)
# define BX_INSTR_HLT(cpu_id)
# define BX_INSTR_MWAIT(cpu_id, addr, len, flags)

7
bochs/instrument/instrumentation.txt
View File

@ -24,7 +24,7 @@ The callback is called each time, when Bochs initializes the CPU object. It
can be used for initialization of user's data, dynamic memory allocation and
etc.
void bx_instr_shutdown(unsigned cpu);
void bx_instr_exit(unsigned cpu);
The callback is called each time, when Bochs destructs the CPU object. It can
be used for destruction of user's data, allocated by bx_instr_init callback.
@ -39,8 +39,9 @@ RESET BUTTON on the simulator's control panel.
void bx_instr_hlt(unsigned cpu);
The callback is called each time, when Bochs' emulated CPU enters to the HALT
state.
The callback is called each time, when Bochs' emulated CPU enters HALT or
SHUTDOWN state.
void bx_instr_mwait(unsigned cpu, bx_phy_address addr, unsigned len, Bit32u flags);

4
bochs/instrument/stubs/instrument.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: instrument.cc,v 1.24 2008-03-03 15:09:30 sshwarts Exp $
// $Id: instrument.cc,v 1.25 2008-04-15 21:27:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -30,7 +30,7 @@
#if BX_INSTRUMENTATION
void bx_instr_init(unsigned cpu) {}
void bx_instr_shutdown(unsigned cpu) {}
void bx_instr_exit(unsigned cpu) {}
void bx_instr_reset(unsigned cpu) {}
void bx_instr_hlt(unsigned cpu) {}
void bx_instr_mwait(unsigned cpu, bx_phy_address addr, unsigned len, Bit32u flags) {}

12
bochs/instrument/stubs/instrument.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: instrument.h,v 1.30 2008-03-03 15:09:30 sshwarts Exp $
// $Id: instrument.h,v 1.31 2008-04-15 21:27:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -59,7 +59,7 @@ class bxInstruction_c;
// called from the CPU core
void bx_instr_init(unsigned cpu);
void bx_instr_shutdown(unsigned cpu);
void bx_instr_exit(unsigned cpu);
void bx_instr_reset(unsigned cpu);
void bx_instr_hlt(unsigned cpu);
void bx_instr_mwait(unsigned cpu, bx_phy_address addr, unsigned len, Bit32u flags);
@ -109,12 +109,12 @@ void bx_instr_wrmsr(unsigned cpu, unsigned addr, Bit64u value);
/* simulation init, shutdown, reset */
# define BX_INSTR_INIT(cpu_id) bx_instr_init(cpu_id)
# define BX_INSTR_SHUTDOWN(cpu_id) bx_instr_shutdown(cpu_id)
# define BX_INSTR_EXIT(cpu_id) bx_instr_exit(cpu_id)
# define BX_INSTR_RESET(cpu_id) bx_instr_reset(cpu_id)
# define BX_INSTR_HLT(cpu_id) bx_instr_hlt(cpu_id)
# define BX_INSTR_MWAIT(cpu_id, addr, len, flags) \
bx_instr_hlt(cpu_id, addr, len, flags)
bx_instr_mwait(cpu_id, addr, len, flags)
# define BX_INSTR_NEW_INSTRUCTION(cpu_id) bx_instr_new_instruction(cpu_id)
@ -174,13 +174,13 @@ void bx_instr_wrmsr(unsigned cpu, unsigned addr, Bit64u value);
# define BX_INSTR_OUTP2(addr, len, val) bx_instr_outp2(addr, len, val)
/* wrmsr callback */
# define BX_INSTR_WRMSR(cpu_id, addr, value) bx_instr_wrmsr(cpu_id, addr, value)
# define BX_INSTR_WRMSR(cpu_id, addr, value) bx_instr_wrmsr(cpu_id, addr, value)
#else
/* simulation init, shutdown, reset */
# define BX_INSTR_INIT(cpu_id)
# define BX_INSTR_SHUTDOWN(cpu_id)
# define BX_INSTR_EXIT(cpu_id)
# define BX_INSTR_RESET(cpu_id)
# define BX_INSTR_HLT(cpu_id)
# define BX_INSTR_MWAIT(cpu_id, addr, len, flags)