cec9135e9f
"bx_bool" which is always defined as Bit32u on all platforms. In Carbon
specific code, Boolean is still used because the Carbon header files
define it to unsigned char.
- this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95.
The bug was that some code in Bochs depends on Boolean to be a
32 bit value. (This should be fixed, but I don't know all the places
where it needs to be fixed yet.) Because Carbon defined Boolean as
an unsigned char, Bochs just followed along and used the unsigned char
definition to avoid compile problems. This exposed the dependency
on 32 bit Boolean on MacOS X only and led to major simulation problems,
that could only be reproduced and debugged on that platform.
- On the mailing list we debated whether to make all Booleans into "bool" or
our own type. I chose bx_bool for several reasons.
1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all
platforms, which makes it much less likely to have more platform-specific
simulation differences in the future. (I spent hours on a borrowed
MacOSX machine chasing bug 618388 before discovering that different sized
Booleans were the problem, and I don't want to repeat that.)
2. We still have at least one dependency on 32 bit Booleans which must be
fixed some time, but I don't want to risk introducing new bugs into the
simulation just before the 2.0 release.
Modified Files:
bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc
pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc
cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc
cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc
cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc
cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc
cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc
cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc
cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc
cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc
cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc
disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile
docs-html/cosimulation.html fpu/wmFPUemu_glue.cc
gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h
gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc
gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h
gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h
gui/x.cc instrument/example0/instrument.cc
instrument/example0/instrument.h
instrument/example1/instrument.cc
instrument/example1/instrument.h
instrument/stubs/instrument.cc instrument/stubs/instrument.h
iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc
iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc
iodev/eth_packetmaker.cc iodev/eth_packetmaker.h
iodev/floppy.cc iodev/floppy.h iodev/guest2host.h
iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc
iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h
iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h
iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h
iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h
iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h
iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
221 lines
8.2 KiB
C++
221 lines
8.2 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: instrument.h,v 1.9 2002-10-25 11:44:37 bdenney Exp $
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2001 MandrakeSoft S.A.
|
|
//
|
|
// MandrakeSoft S.A.
|
|
// 43, rue d'Aboukir
|
|
// 75002 Paris - France
|
|
// http://www.linux-mandrake.com/
|
|
// http://www.mandrakesoft.com/
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2 of the License, or (at your option) any later version.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
// possible types passed to BX_INSTR_TLB_CNTRL()
|
|
#define BX_INSTR_MOV_CR3 10
|
|
#define BX_INSTR_INVLPG 11
|
|
#define BX_INSTR_TASKSWITCH 12
|
|
|
|
// possible types passed to BX_INSTR_CACHE_CNTRL()
|
|
#define BX_INSTR_INVD 20
|
|
#define BX_INSTR_WBINVD 21
|
|
|
|
#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_PREFETCH_NTA 00
|
|
#define BX_INSTR_PREFETCH_T0 01
|
|
#define BX_INSTR_PREFETCH_T1 02
|
|
#define BX_INSTR_PREFETCH_T2 03
|
|
|
|
|
|
|
|
#if BX_INSTRUMENTATION
|
|
|
|
class bxInstruction_c;
|
|
|
|
// called from the CPU core
|
|
|
|
void bx_instr_reset(unsigned cpu);
|
|
void bx_instr_new_instruction(unsigned cpu);
|
|
|
|
void bx_instr_cnear_branch_taken(unsigned cpu, bx_address new_eip);
|
|
void bx_instr_cnear_branch_not_taken(unsigned cpu);
|
|
void bx_instr_ucnear_branch(unsigned cpu, unsigned what, bx_address new_eip);
|
|
void bx_instr_far_branch(unsigned cpu, unsigned what, Bit16u new_cs, bx_address new_eip);
|
|
|
|
void bx_instr_opcode(unsigned cpu, Bit8u *opcode, unsigned len, bx_bool is32);
|
|
void bx_instr_fetch_decode_completed(unsigned cpu, const bxInstruction_c *i);
|
|
|
|
void bx_instr_prefix_as(unsigned cpu);
|
|
void bx_instr_prefix_os(unsigned cpu);
|
|
void bx_instr_prefix_rep(unsigned cpu);
|
|
void bx_instr_prefix_repne(unsigned cpu);
|
|
void bx_instr_prefix_lock(unsigned cpu);
|
|
void bx_instr_prefix_cs(unsigned cpu);
|
|
void bx_instr_prefix_ss(unsigned cpu);
|
|
void bx_instr_prefix_ds(unsigned cpu);
|
|
void bx_instr_prefix_es(unsigned cpu);
|
|
void bx_instr_prefix_fs(unsigned cpu);
|
|
void bx_instr_prefix_gs(unsigned cpu);
|
|
void bx_instr_prefix_extend8b(unsigned cpu);
|
|
|
|
void bx_instr_interrupt(unsigned cpu, unsigned vector);
|
|
void bx_instr_exception(unsigned cpu, unsigned vector);
|
|
void bx_instr_hwinterrupt(unsigned cpu, unsigned vector, Bit16u cs, bx_address eip);
|
|
|
|
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_RESET(cpu_id) bx_instr_reset(cpu_id)
|
|
# define BX_INSTR_NEW_INSTRUCTION(cpu_id) bx_instr_new_instruction(cpu_id)
|
|
|
|
/* called from command line debugger */
|
|
# define BX_INSTR_DEBUG_PROMPT()
|
|
# define BX_INSTR_START()
|
|
# define BX_INSTR_STOP()
|
|
# define BX_INSTR_PRINT()
|
|
|
|
/* branch resoultion */
|
|
# define BX_INSTR_CNEAR_BRANCH_TAKEN(cpu_id, new_eip) bx_instr_cnear_branch_taken(cpu_id, new_eip)
|
|
# define BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(cpu_id) bx_instr_cnear_branch_not_taken(cpu_id)
|
|
# define BX_INSTR_UCNEAR_BRANCH(cpu_id, what, new_eip) bx_instr_ucnear_branch(cpu_id, what, new_eip)
|
|
# define BX_INSTR_FAR_BRANCH(cpu_id, what, new_cs, new_eip) bx_instr_far_branch(cpu_id, what, new_cs, new_eip)
|
|
|
|
/* decoding completed */
|
|
# define BX_INSTR_OPCODE(cpu_id, opcode, len, is32) \
|
|
bx_instr_opcode(cpu_id, opcode, len, is32)
|
|
# define BX_INSTR_FETCH_DECODE_COMPLETED(cpu_id, i) \
|
|
bx_instr_fetch_decode_completed(cpu_id, i)
|
|
|
|
/* prefix decoded */
|
|
# define BX_INSTR_PREFIX_AS(cpu_id) bx_instr_prefix_as(cpu_id)
|
|
# define BX_INSTR_PREFIX_OS(cpu_id) bx_instr_prefix_os(cpu_id)
|
|
# define BX_INSTR_PREFIX_REP(cpu_id) bx_instr_prefix_rep(cpu_id)
|
|
# define BX_INSTR_PREFIX_REPNE(cpu_id) bx_instr_prefix_repne(cpu_id)
|
|
# define BX_INSTR_PREFIX_LOCK(cpu_id) bx_instr_prefix_lock(cpu_id)
|
|
# define BX_INSTR_PREFIX_CS(cpu_id) bx_instr_prefix_cs(cpu_id)
|
|
# define BX_INSTR_PREFIX_SS(cpu_id) bx_instr_prefix_ss(cpu_id)
|
|
# define BX_INSTR_PREFIX_DS(cpu_id) bx_instr_prefix_ds(cpu_id)
|
|
# define BX_INSTR_PREFIX_ES(cpu_id) bx_instr_prefix_es(cpu_id)
|
|
# define BX_INSTR_PREFIX_FS(cpu_id) bx_instr_prefix_fs(cpu_id)
|
|
# define BX_INSTR_PREFIX_GS(cpu_id) bx_instr_prefix_gs(cpu_id)
|
|
# define BX_INSTR_PREFIX_EXTEND8B(cpu_id) bx_instr_prefix_extend8b(cpu_id)
|
|
|
|
/* exceptional case and interrupt */
|
|
# define BX_INSTR_EXCEPTION(cpu_id, vector) bx_instr_exception(cpu_id, vector)
|
|
# define BX_INSTR_INTERRUPT(cpu_id, vector) bx_instr_interrupt(cpu_id, vector)
|
|
# define BX_INSTR_HWINTERRUPT(cpu_id, vector, cs, eip) bx_instr_hwinterrupt(cpu_id, vector, cs, eip)
|
|
|
|
/* TLB/CACHE control instruction executed */
|
|
# define BX_INSTR_CACHE_CNTRL(cpu_id, what)
|
|
# define BX_INSTR_TLB_CNTRL(cpu_id, what, newval)
|
|
# define BX_INSTR_PREFETCH_HINT(cpu_id, what, seg, offset)
|
|
|
|
# define BX_INSTR_REPEAT_ITERATION(cpu_id)
|
|
|
|
/* memory access */
|
|
# define BX_INSTR_LIN_READ(cpu_id, lin, phy, len)
|
|
# define BX_INSTR_LIN_WRITE(cpu_id, lin, phy, len)
|
|
|
|
# define BX_INSTR_MEM_CODE(cpu_id, linear, size)
|
|
# define BX_INSTR_MEM_DATA(cpu_id, linear, size, rw) bx_instr_mem_data(cpu_id, linear, size, rw)
|
|
|
|
/* called from memory object */
|
|
# define BX_INSTR_PHY_WRITE(addr, len)
|
|
# define BX_INSTR_PHY_READ(addr, len)
|
|
|
|
/* feedback from device units */
|
|
# define BX_INSTR_INP(addr, len)
|
|
# define BX_INSTR_INP2(addr, len, val)
|
|
# define BX_INSTR_OUTP(addr, len)
|
|
# define BX_INSTR_OUTP2(addr, len, val)
|
|
|
|
#else
|
|
|
|
/* simulation init, shutdown, reset */
|
|
# define BX_INSTR_INIT(cpu_id)
|
|
# define BX_INSTR_SHUTDOWN(cpu_id)
|
|
# define BX_INSTR_RESET(cpu_id)
|
|
# define BX_INSTR_NEW_INSTRUCTION(cpu_id)
|
|
|
|
/* called from command line debugger */
|
|
# define BX_INSTR_DEBUG_PROMPT()
|
|
# define BX_INSTR_START()
|
|
# define BX_INSTR_STOP()
|
|
# define BX_INSTR_PRINT()
|
|
|
|
/* branch resoultion */
|
|
# define BX_INSTR_CNEAR_BRANCH_TAKEN(cpu_id, new_eip)
|
|
# define BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(cpu_id)
|
|
# define BX_INSTR_UCNEAR_BRANCH(cpu_id, what, new_eip)
|
|
# define BX_INSTR_FAR_BRANCH(cpu_id, what, new_cs, new_eip)
|
|
|
|
/* decoding completed */
|
|
# define BX_INSTR_OPCODE(cpu_id, opcode, len, is32)
|
|
# define BX_INSTR_FETCH_DECODE_COMPLETED(cpu_id, i)
|
|
|
|
/* prefix decoded */
|
|
# define BX_INSTR_PREFIX_AS(cpu_id)
|
|
# define BX_INSTR_PREFIX_OS(cpu_id)
|
|
# define BX_INSTR_PREFIX_REP(cpu_id)
|
|
# define BX_INSTR_PREFIX_REPNE(cpu_id)
|
|
# define BX_INSTR_PREFIX_LOCK(cpu_id)
|
|
# define BX_INSTR_PREFIX_CS(cpu_id)
|
|
# define BX_INSTR_PREFIX_SS(cpu_id)
|
|
# define BX_INSTR_PREFIX_DS(cpu_id)
|
|
# define BX_INSTR_PREFIX_ES(cpu_id)
|
|
# define BX_INSTR_PREFIX_FS(cpu_id)
|
|
# define BX_INSTR_PREFIX_GS(cpu_id)
|
|
# define BX_INSTR_PREFIX_EXTEND8B(cpu_id)
|
|
|
|
/* exceptional case and interrupt */
|
|
# define BX_INSTR_EXCEPTION(cpu_id, vector)
|
|
# define BX_INSTR_INTERRUPT(cpu_id, vector)
|
|
# define BX_INSTR_HWINTERRUPT(cpu_id, vector, cs, eip)
|
|
|
|
/* TLB/CACHE control instruction executed */
|
|
# define BX_INSTR_CACHE_CNTRL(cpu_id, what)
|
|
# define BX_INSTR_TLB_CNTRL(cpu_id, what, newval)
|
|
# define BX_INSTR_PREFETCH_HINT(cpu_id, what, seg, offset)
|
|
|
|
# define BX_INSTR_REPEAT_ITERATION(cpu_id)
|
|
|
|
/* memory access */
|
|
# define BX_INSTR_LIN_READ(cpu_id, lin, phy, len)
|
|
# define BX_INSTR_LIN_WRITE(cpu_id, lin, phy, len)
|
|
|
|
# define BX_INSTR_MEM_CODE(cpu_id, linear, size)
|
|
# define BX_INSTR_MEM_DATA(cpu_id, linear, size, rw)
|
|
|
|
/* called from memory object */
|
|
# define BX_INSTR_PHY_WRITE(addr, len)
|
|
# define BX_INSTR_PHY_READ(addr, len)
|
|
|
|
/* feedback from device units */
|
|
# define BX_INSTR_INP(addr, len)
|
|
# define BX_INSTR_INP2(addr, len, val)
|
|
# define BX_INSTR_OUTP(addr, len)
|
|
# define BX_INSTR_OUTP2(addr, len, val)
|
|
|
|
#endif
|