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
226 lines
5.3 KiB
C++
226 lines
5.3 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: instrument.cc,v 1.4 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
|
|
|
|
|
|
#include "bochs.h"
|
|
#include "cpu/cpu.h"
|
|
|
|
bxInstrumentation icpu[BX_SMP_PROCESSORS];
|
|
|
|
|
|
void bxInstrumentation::bx_instr_reset()
|
|
{
|
|
valid = is_branch = 0;
|
|
nprefixes = num_data_accesses = 0;
|
|
active = 1;
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_new_instruction()
|
|
{
|
|
if (!active)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (valid)
|
|
{
|
|
char disasm_tbuf[512]; // buffer for instruction disassembly
|
|
unsigned length = opcode_size, n;
|
|
bx_disassemble.disasm(is32, 0, opcode, disasm_tbuf);
|
|
if(length != 0)
|
|
{
|
|
fprintf(stderr, "----------------------------------------------------------\n");
|
|
fprintf(stderr, "CPU: %d: %s\n", cpu_id, disasm_tbuf);
|
|
fprintf(stderr, "LEN: %d\tPREFIX: %d\tBYTES: ", length, nprefixes);
|
|
for(n=0;n<length;n++) fprintf(stderr, "%02x", opcode[n]);
|
|
if(is_branch)
|
|
{
|
|
fprintf(stderr, "\tBRANCH ");
|
|
|
|
if(is_taken)
|
|
fprintf(stderr, "TARGET %08x (TAKEN)", target_linear);
|
|
else
|
|
fprintf(stderr, "(NOT TAKEN)");
|
|
}
|
|
fprintf(stderr, "\n");
|
|
for(n=0;n < num_data_accesses;n++)
|
|
{
|
|
fprintf(stderr, "MEM ACCESS: %08x (linear) %08x (physical) %s SIZE: %d\n",
|
|
data_access[n].laddr,
|
|
data_access[n].paddr,
|
|
data_access[n].op == BX_READ ? "RD":"WR",
|
|
data_access[n].size);
|
|
}
|
|
fprintf(stderr, "\n");
|
|
}
|
|
}
|
|
|
|
valid = is_branch = 0;
|
|
nprefixes = num_data_accesses = 0;
|
|
}
|
|
|
|
void bxInstrumentation::branch_taken(bx_address new_eip)
|
|
{
|
|
Bit32u laddr;
|
|
|
|
if (!active || !valid) {
|
|
return;
|
|
}
|
|
|
|
// find linear address
|
|
laddr = BX_CPU(cpu_id)->get_segment_base(BX_SREG_CS) + new_eip;
|
|
|
|
is_branch = 1;
|
|
is_taken = 1;
|
|
target_linear = laddr;
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_cnear_branch_taken(bx_address new_eip)
|
|
{
|
|
branch_taken(new_eip);
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_cnear_branch_not_taken()
|
|
{
|
|
if (!active || !valid) {
|
|
return;
|
|
}
|
|
|
|
is_branch = 1;
|
|
is_taken = 0;
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_ucnear_branch(unsigned what, bx_address new_eip) {
|
|
branch_taken(new_eip);
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_far_branch(unsigned what, Bit16u new_cs, bx_address new_eip) {
|
|
branch_taken(new_eip);
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_opcode(Bit8u *opcode, unsigned len, bx_bool is32)
|
|
{
|
|
if (!active)
|
|
{
|
|
return;
|
|
}
|
|
|
|
for(int i=0;i<len;i++)
|
|
{
|
|
opcode[i] = opcode[i];
|
|
}
|
|
|
|
is32 = is32;
|
|
opcode_size = len;
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_fetch_decode_completed(const bxInstruction_c *i)
|
|
{
|
|
if(active)
|
|
{
|
|
valid = 1;
|
|
}
|
|
}
|
|
|
|
#define PROCESS_PREFIX(name) \
|
|
void bxInstrumentation::bx_instr_prefix_##name() \
|
|
{ \
|
|
if(active) nprefixes++; \
|
|
}
|
|
|
|
PROCESS_PREFIX(as);
|
|
PROCESS_PREFIX(os);
|
|
PROCESS_PREFIX(rep);
|
|
PROCESS_PREFIX(repne);
|
|
PROCESS_PREFIX(lock);
|
|
PROCESS_PREFIX(cs);
|
|
PROCESS_PREFIX(ss);
|
|
PROCESS_PREFIX(ds);
|
|
PROCESS_PREFIX(es);
|
|
PROCESS_PREFIX(fs);
|
|
PROCESS_PREFIX(gs);
|
|
PROCESS_PREFIX(extend8b);
|
|
|
|
void bxInstrumentation::bx_instr_interrupt(unsigned vector)
|
|
{
|
|
if(active)
|
|
{
|
|
fprintf(stderr, "CPU %u: interrupt %02xh\n", cpu_id, vector);
|
|
}
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_exception(unsigned vector)
|
|
{
|
|
if(active)
|
|
{
|
|
fprintf(stderr, "CPU %u: exception %02xh\n", cpu_id, vector);
|
|
}
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_hwinterrupt(unsigned vector, Bit16u cs, bx_address eip)
|
|
{
|
|
if(active)
|
|
{
|
|
fprintf(stderr, "CPU %u: hardware interrupt %02xh\n", cpu_id, vector);
|
|
}
|
|
}
|
|
|
|
void bxInstrumentation::bx_instr_mem_data(bx_address lin, unsigned size, unsigned rw)
|
|
{
|
|
bx_address phy;
|
|
bx_bool page_valid;
|
|
|
|
if(!active)
|
|
{
|
|
return;
|
|
}
|
|
if (!valid)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (num_data_accesses >= MAX_DATA_ACCESSES)
|
|
{
|
|
return;
|
|
}
|
|
|
|
BX_CPU(cpu_id)->dbg_xlate_linear2phy(lin, &phy, &page_valid);
|
|
phy = A20ADDR(phy);
|
|
|
|
// If linear translation doesn't exist, a paging exception will occur.
|
|
// Invalidate physical address data for now.
|
|
if (!page_valid)
|
|
{
|
|
phy = 0;
|
|
}
|
|
|
|
data_access[num_data_accesses].laddr = lin;
|
|
data_access[num_data_accesses].paddr = phy;
|
|
data_access[num_data_accesses].op = rw;
|
|
data_access[num_data_accesses].size = size;
|
|
num_data_accesses++;
|
|
}
|