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

Fixed Makefile to compile with ACPI stub disabled

Browse Source 
Remove bx_debug.h from bochs.h to reduce compilation dependencies
This commit is contained in:
Stanislav Shwartsman 2006-09-25 20:13:52 +00:00
parent f37b969d1e
commit aab3feb2e0
10 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bochs/bochs.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.199 2006-09-24 16:58:13 vruppert Exp $
// $Id: bochs.h,v 1.200 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -93,7 +93,6 @@ extern "C" {
#endif
#include "osdep.h" /* platform dependent includes and defines */
#include "bx_debug/debug.h"
#include "bxversion.h"
#include "gui/siminterface.h"

3
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.78 2006-09-17 19:22:24 sshwarts Exp $
// $Id: dbg_main.cc,v 1.79 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -30,6 +30,7 @@ extern "C" {
}
#include "bochs.h"
#include "debug.h"
#include "cpu/cpu.h"
#include "iodev/iodev.h"
#if BX_DEBUGGER

3
bochs/bx_debug/linux.cc
View File

@ -1,10 +1,11 @@
/////////////////////////////////////////////////////////////////////////
// $Id: linux.cc,v 1.5 2006-03-06 22:02:50 sshwarts Exp $
// $Id: linux.cc,v 1.6 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
#include <stdio.h>
#include "bochs.h"
#include "bx_debug/debug.h"
#include "cpu/cpu.h"
#if BX_DEBUGGER

3
bochs/bx_debug/symbols.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: symbols.cc,v 1.4 2006-03-06 22:02:50 sshwarts Exp $
// $Id: symbols.cc,v 1.5 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -26,6 +26,7 @@
/////////////////////////////////////////////////////////////////////////
#include "bochs.h"
#include "debug.h"
#include "cpu/cpu.h"
#if !((BX_HAVE_HASH_MAP || BX_HAVE_HASH_MAP_H) && (BX_HAVE_SET || BX_HAVE_SET_H))

3
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.166 2006-09-20 17:02:20 sshwarts Exp $
// $Id: cpu.cc,v 1.167 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -27,6 +27,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "bx_debug/debug.h"
#include "cpu.h"
#define LOG_THIS BX_CPU_THIS_PTR

3
bochs/cpu/debugstuff.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: debugstuff.cc,v 1.74 2006-08-31 18:18:14 sshwarts Exp $
// $Id: debugstuff.cc,v 1.75 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -27,6 +27,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "bx_debug/debug.h"
#include "cpu.h"
#define LOG_THIS BX_CPU_THIS_PTR

3
bochs/cpu/exception.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: exception.cc,v 1.83 2006-06-22 19:53:58 sshwarts Exp $
// $Id: exception.cc,v 1.84 2006-09-25 20:13:51 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -27,6 +27,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "bx_debug/debug.h"
#include "cpu.h"
#define LOG_THIS BX_CPU_THIS_PTR

3
bochs/gui/siminterface.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.cc,v 1.169 2006-09-18 21:24:27 vruppert Exp $
// $Id: siminterface.cc,v 1.170 2006-09-25 20:13:52 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// See siminterface.h for description of the siminterface concept.
@ -7,6 +7,7 @@
// the configuration user interface, and allows them to talk to each other.
#include "bochs.h"
#include "bx_debug/debug.h"
#include "iodev.h"
bx_simulator_interface_c *SIM = NULL;

28
bochs/iodev/Makefile.in
View File

@ -608,6 +608,20 @@ pcivga.o: pcivga.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/sb16.h \
../iodev/unmapped.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h
acpi.o: acpi.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \
../extplugin.h ../gui/gui.h ../gui/textconfig.h ../config.h \
../gui/keymap.h ../instrument/stubs/instrument.h ../iodev/pci.h \
../iodev/pci2isa.h ../iodev/pci_ide.h ../iodev/pcivga.h \
../iodev/pciusb.h ../iodev/vga.h ../iodev/svga_cirrus.h \
../iodev/ioapic.h ../cpu/apic.h ../iodev/biosdev.h ../iodev/cmos.h \
../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h ../iodev/iodebug.h \
../config.h ../iodev/keyboard.h ../iodev/parallel.h ../iodev/pic.h \
../iodev/pit.h ../iodev/pit_wrap.h ../bochs.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/sb16.h \
../iodev/unmapped.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h
pic.o: pic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \
@ -1183,6 +1197,20 @@ pcivga.lo: pcivga.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/sb16.h \
../iodev/unmapped.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h
acpi.lo: acpi.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \
../extplugin.h ../gui/gui.h ../gui/textconfig.h ../config.h \
../gui/keymap.h ../instrument/stubs/instrument.h ../iodev/pci.h \
../iodev/pci2isa.h ../iodev/pci_ide.h ../iodev/pcivga.h \
../iodev/pciusb.h ../iodev/vga.h ../iodev/svga_cirrus.h \
../iodev/ioapic.h ../cpu/apic.h ../iodev/biosdev.h ../iodev/cmos.h \
../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h ../iodev/iodebug.h \
../config.h ../iodev/keyboard.h ../iodev/parallel.h ../iodev/pic.h \
../iodev/pit.h ../iodev/pit_wrap.h ../bochs.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/sb16.h \
../iodev/unmapped.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h
pic.lo: pic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \

6
bochs/iodev/devices.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: devices.cc,v 1.112 2006-09-24 16:58:13 vruppert Exp $
// $Id: devices.cc,v 1.113 2006-09-25 20:13:52 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -120,7 +120,7 @@ void bx_devices_c::init(BX_MEM_C *newmem)
unsigned i;
const char def_name[] = "Default";
BX_DEBUG(("Init $Id: devices.cc,v 1.112 2006-09-24 16:58:13 vruppert Exp $"));
BX_DEBUG(("Init $Id: devices.cc,v 1.113 2006-09-25 20:13:52 sshwarts Exp $"));
mem = newmem;
/* set no-default handlers, will be overwritten by the real default handler */
@ -196,7 +196,9 @@ void bx_devices_c::init(BX_MEM_C *newmem)
PLUG_load_plugin(pci, PLUGTYPE_CORE);
PLUG_load_plugin(pci2isa, PLUGTYPE_CORE);
PLUG_load_plugin(pci_ide, PLUGTYPE_OPTIONAL);
#if BX_SUPPORT_ACPI
PLUG_load_plugin(acpi, PLUGTYPE_OPTIONAL);
#endif
#if BX_SUPPORT_PCIVGA
if ((DEV_is_pci_device("pcivga")) &&
(!strcmp(SIM->get_param_string(BXPN_VGA_EXTENSION)->getptr(), "vbe"))) {