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

- there were cases where BX_APIC_SUPPORT were used and others where

Browse Source 
BX_SUPPORT_APIC were used.  To follow the pattern used by other
  names like this, I changed them all to BX_SUPPORT_APIC.
  Thanks to Tom Lindström for chasing this down!
This commit is contained in:
Bryce Denney 2001-06-12 13:07:43 +00:00
parent 85372121ac
commit f822257511
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/.bochsrc
View File

@ -141,7 +141,7 @@ log: bochsout.txt
# cause bochs to become unstable. The panic is a "graceful exit," so
# if you disable it you may get a spectacular disaster instead.
#=======================================================================
panic: action=fatal
panic: action=ask
error: action=report
info: action=report
debug: action=ignore

2
bochs/bochs.h
View File

@ -497,7 +497,7 @@ typedef struct {
#ifdef MAGIC_BREAKPOINT
Boolean magic_break_enabled;
#endif /* MAGIC_BREAKPOINT */
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
Boolean apic;
Boolean ioapic;
#endif

6
bochs/config.h.in
View File

@ -58,11 +58,11 @@
// For cosimulation, you could use two processors and two address
// spaces.
#define BX_APIC_SUPPORT 0
#define BX_SUPPORT_APIC 0
// include in APIC models, required for a multiprocessor system.
#if (BX_SMP_PROCESSORS>1 && !BX_APIC_SUPPORT)
#error For multiprocessor simulation, BX_APIC_SUPPORT is required.
#if (BX_SMP_PROCESSORS>1 && !BX_SUPPORT_APIC)
#error For multiprocessor simulation, BX_SUPPORT_APIC is required.
#endif
#define BX_DEBUG_LINUX 0

8
bochs/configure.in
View File

@ -253,7 +253,7 @@ AC_ARG_ENABLE(apic,
[ --enable-apic enable APIC support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_APIC_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_APIC, 1)
IOAPIC_OBJS='ioapic.o'
APIC_OBJS='apic.o'
else
@ -263,7 +263,7 @@ AC_ARG_ENABLE(apic,
echo "ERROR: With processors > 1 you must use --enable-apic"
exit 1
fi
AC_DEFINE(BX_APIC_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_APIC, 0)
IOAPIC_OBJS=''
APIC_OBJS=''
fi
@ -272,12 +272,12 @@ AC_ARG_ENABLE(apic,
if test "$bx_procs" -gt 1 -o "$bx_cpu_level" -gt 5; then
# enable APIC by default, if processors>1 or if cpulevel>5
AC_MSG_RESULT(yes)
AC_DEFINE(BX_APIC_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_APIC, 1)
IOAPIC_OBJS='ioapic.o'
APIC_OBJS='apic.o'
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_APIC_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_APIC, 0)
IOAPIC_OBJS=''
APIC_OBJS=''
fi

2
bochs/cpu/cpu.cc
View File

@ -481,7 +481,7 @@ handle_async_event:
Bit8u vector;
// NOTE: similar code in ::take_irq()
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
if (BX_CPU_THIS_PTR int_from_local_apic)
vector = BX_CPU_THIS_PTR local_apic.acknowledge_int ();
else

6
bochs/cpu/cpu.h
View File

@ -517,7 +517,7 @@ typedef enum {
APIC_TYPE_LOCAL_APIC
} bx_apic_type_t;
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
class bx_generic_apic_c : public logfunctions {
protected:
Bit32u base_addr;
@ -616,7 +616,7 @@ public:
#define APIC_MAX_ID 16
extern bx_generic_apic_c *apic_index[APIC_MAX_ID];
#endif // if BX_APIC_SUPPORT
#endif // if BX_SUPPORT_APIC
#if BX_USE_CPU_SMF == 0
@ -1505,7 +1505,7 @@ public: // for now...
BX_SMF BX_CPP_INLINE Boolean protected_mode(void);
BX_SMF BX_CPP_INLINE Boolean v8086_mode(void);
#endif
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
bx_local_apic_c local_apic;
Boolean int_from_local_apic;
#endif

4
bochs/cpu/init.cc
View File

@ -33,7 +33,7 @@
#define BX_STEPPING_ID 0
BX_CPU_C::BX_CPU_C()
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
: local_apic (this)
#endif
{
@ -46,7 +46,7 @@ void BX_CPU_C::init(BX_MEM_C *addrspace)
{
// BX_CPU_C constructor
BX_CPU_THIS_PTR set_INTR (0);
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
local_apic.init ();
#endif
setprefix("[CPU ]");

6
bochs/debug/dbg_main.cc
View File

@ -359,7 +359,7 @@ process_sim2:
// call init routines for each CPU+mem simulator
// initialize for SMP. one memory, multiple processors.
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
memset(apic_index, 0, sizeof(apic_index[0]) * APIC_MAX_ID);
#endif
@ -379,7 +379,7 @@ process_sim2:
BX_CPU(i) = new BX_CPU_C ();
BX_CPU(i)->init (BX_MEM(0));
// assign apic ID from the index of this loop
// if !BX_APIC_SUPPORT, this will not compile.
// if !BX_SUPPORT_APIC, this will not compile.
BX_CPU(i)->local_apic.set_id (i);
BX_CPU(i)->reset(BX_RESET_HARDWARE);
}
@ -2822,7 +2822,7 @@ bx_dbg_set_symbol_command(char *symbol, Bit32u val)
is_OK = BX_CPU(dbg_cpu)->dbg_set_reg(BX_DBG_REG_GS, val);
}
else if ( !strcmp(symbol, "cpu") ) {
#if ((BX_SMP_PROCESSORS>1) && (BX_APIC_SUPPORT))
#if ((BX_SMP_PROCESSORS>1) && (BX_SUPPORT_APIC))
if ((val > BX_SMP_PROCESSORS)
|| (val >= APIC_MAX_ID)
|| (apic_index[val] == NULL)) {

4
bochs/iodev/devices.cc
View File

@ -112,7 +112,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
pci->reset();
#endif
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
// I/O APIC 82093AA
ioapic = & bx_ioapic;
ioapic->init ();
@ -297,7 +297,7 @@ bx_devices_c::timer()
if (retval & 0x02)
pic->trigger_irq(12);
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
// update local APIC timers
for (int i=0; i<BX_SMP_PROCESSORS; i++) {
BX_CPU(i)->local_apic.periodic (TIMER_DELTA);

2
bochs/iodev/iodev.h
View File

@ -142,7 +142,7 @@ private:
#else
# include "iodev/hga.h"
#endif
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
# include "iodev/ioapic.h"
#endif
#include "iodev/cmos.h"

4
bochs/iodev/pic.cc
View File

@ -492,7 +492,7 @@ bx_pic_c::write(Bit32u address, Bit32u value, unsigned io_len)
void
bx_pic_c::trigger_irq(unsigned irq_no)
{
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
// forward this function call to the ioapic too
BX_PIC_THIS devices->ioapic->trigger_irq (irq_no, -1);
#endif
@ -522,7 +522,7 @@ bx_pic_c::trigger_irq(unsigned irq_no)
void
bx_pic_c::untrigger_irq(unsigned irq_no)
{
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
// forward this function call to the ioapic too
BX_PIC_THIS devices->ioapic->untrigger_irq (irq_no, -1);
#endif

4
bochs/main.cc
View File

@ -579,7 +579,7 @@ bx_init_hardware()
}
// set up memory and CPU objects
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
memset(apic_index, 0, sizeof(apic_index[0]) * APIC_MAX_ID);
#endif
@ -599,7 +599,7 @@ bx_init_hardware()
BX_CPU(i) = new BX_CPU_C ();
BX_CPU(i)->init (bx_mem_array[0]);
// assign apic ID from the index of this loop
// if !BX_APIC_SUPPORT, this will not compile.
// if !BX_SUPPORT_APIC, this will not compile.
BX_CPU(i)->local_apic.set_id (i);
BX_CPU(i)->reset(BX_RESET_HARDWARE);
}

4
bochs/memory/memory.cc
View File

@ -218,7 +218,7 @@ inc_one:
data_ptr = (Bit8u *) data + (len - 1);
#endif
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
bx_generic_apic_c *local_apic = &cpu->local_apic;
bx_generic_apic_c *ioapic = bx_devices.ioapic;
if (local_apic->is_selected (a20addr, len)) {
@ -413,7 +413,7 @@ inc_one:
data_ptr = (Bit8u *) data + (len - 1);
#endif
#if BX_APIC_SUPPORT
#if BX_SUPPORT_APIC
bx_generic_apic_c *local_apic = &cpu->local_apic;
bx_generic_apic_c *ioapic = bx_devices.ioapic;
if (local_apic->is_selected (addr, len)) {