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

- change lots of "if (bx_dbg.apic) BX_INFO(...)" into "BX_DEBUG(...)".

Browse Source 
This allows you to turn on debug msgs at runtime.  The old BX_INFOs
  were created before BX_DEBUG existed.
This commit is contained in:
Bryce Denney 2002-03-23 00:54:37 +00:00
parent 96ef24df80
commit ae6094c268
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
bochs/cpu/apic.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: apic.cc,v 1.10 2002-03-20 23:32:43 bdenney Exp $
// $Id: apic.cc,v 1.11 2002-03-23 00:54:37 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
#define NEED_CPU_REG_SHORTCUTS 1
@ -301,15 +301,13 @@ void bx_local_apic_c::set_divide_configuration (Bit32u value) {
value = ((value & 8) >> 1) | (value & 3);
BX_ASSERT (value >= 0 && value <= 7);
timer_divide_factor = (value==7)? 1 : (2 << value);
if (bx_dbg.apic)
BX_INFO(("%s: set timer divide factor to %d", cpu->name, timer_divide_factor));
BX_DEBUG(("%s: set timer divide factor to %d", cpu->name, timer_divide_factor));
}
void bx_local_apic_c::write (Bit32u addr, Bit32u *data, unsigned len)
{
assert (len == 4);
if (bx_dbg.apic)
BX_INFO(("%s: write %08x to APIC address %08x", cpu->name, *data, addr));
BX_DEBUG(("%s: write %08x to APIC address %08x", cpu->name, *data, addr));
//assert (!(addr & 0xf));
addr &= 0xff0;
switch (addr) {
@ -321,14 +319,12 @@ void bx_local_apic_c::write (Bit32u addr, Bit32u *data, unsigned len)
break;
case 0xb0: // EOI
{
if (bx_dbg.apic)
BX_INFO(("%s: Wrote 0x%04x to EOI", cpu->name, *data));
BX_DEBUG(("%s: Wrote 0x%04x to EOI", cpu->name, *data));
int vec = highest_priority_int (isr);
if (vec < 0) {
BX_INFO(("EOI written without any bit in ISR"));
} else {
if (bx_dbg.apic)
BX_INFO(("%s: local apic received EOI, hopefully for vector 0x%02x", cpu->name, vec));
BX_DEBUG(("%s: local apic received EOI, hopefully for vector 0x%02x", cpu->name, vec));
isr[vec] = 0;
service_local_apic ();
}
@ -541,24 +537,21 @@ void bx_local_apic_c::service_local_apic ()
// interrupt has appeared in irr. raise INTR. When the CPU
// acknowledges, we will run highest_priority_int again and
// return it.
if (bx_dbg.apic)
BX_INFO(("service_local_apic(): setting INTR=1 for vector 0x%02x", first_irr));
BX_DEBUG(("service_local_apic(): setting INTR=1 for vector 0x%02x", first_irr));
cpu->set_INTR (1);
cpu->int_from_local_apic = 1;
}
void bx_local_apic_c::trigger_irq (unsigned vector, unsigned from)
{
if (bx_dbg.apic)
BX_INFO(("Local apic on %s: trigger interrupt vector=0x%x", cpu->name, vector));
BX_DEBUG(("Local apic on %s: trigger interrupt vector=0x%x", cpu->name, vector));
irr[vector] = 1;
service_local_apic ();
}
void bx_local_apic_c::untrigger_irq (unsigned vector, unsigned from)
{
if (bx_dbg.apic)
BX_INFO(("Local apic on %s: untrigger interrupt vector=0x%x", cpu->name, vector));
BX_DEBUG(("Local apic on %s: untrigger interrupt vector=0x%x", cpu->name, vector));
// hardware says "no more". clear the bit. If the CPU hasn't yet
// acknowledged the interrupt, it will never be serviced.
BX_ASSERT (irr[vector] == 1);
@ -575,8 +568,7 @@ bx_local_apic_c::acknowledge_int ()
BX_ASSERT (cpu->int_from_local_apic);
int vector = highest_priority_int (irr);
BX_ASSERT (irr[vector] == 1);
if (bx_dbg.apic)
BX_INFO(("%s: acknowledge_int returning vector 0x%x", cpu->name, vector));
BX_DEBUG(("%s: acknowledge_int returning vector 0x%x", cpu->name, vector));
// currently isr never gets cleared, so no point
//BX_ASSERT (isr[vector] == 0);
irr[vector] = 0;
@ -608,14 +600,12 @@ Boolean bx_local_apic_c::match_logical_addr (Bit8u address)
}
// if all address bits are 1, send to all local APICs. SDG3:7-27.
if (address == 0xff) {
if (bx_dbg.apic) BX_INFO(("%s: MDA=0xff matches everybody", cpu->name));
BX_DEBUG (("%s: MDA=0xff matches everybody", cpu->name));
return true;
}
Boolean match = ((address & log_dest) != 0);
if (bx_dbg.apic) {
BX_INFO(("%s: comparing MDA %02x to my LDR %02x -> %s", cpu->name,
address, log_dest, match? "Match" : "Not a match"));
}
BX_DEBUG (("%s: comparing MDA %02x to my LDR %02x -> %s", cpu->name,
address, log_dest, match? "Match" : "Not a match"));
return match;
}
@ -641,15 +631,13 @@ bx_local_apic_c::get_delivery_bitmask (Bit8u dest, Bit8u dest_mode)
|| (apic_index[bit]->get_type () != APIC_TYPE_LOCAL_APIC))
mask &= ~(1<<bit);
}
if (bx_dbg.apic)
BX_INFO(("local::get_delivery_bitmask returning 0x%04x", mask));
BX_DEBUG (("local::get_delivery_bitmask returning 0x%04x", mask));
return mask;
}
Bit8u bx_local_apic_c::get_ppr ()
{
if (bx_dbg.apic)
BX_INFO(("WARNING: Local APIC Processor Priority not implemented, returning 0"));
BX_ERROR(("WARNING: Local APIC Processor Priority not implemented, returning 0"));
// should look at TPR, vector of highest priority isr, etc.
return 0;
}
@ -657,8 +645,7 @@ Bit8u bx_local_apic_c::get_ppr ()
Bit8u bx_local_apic_c::get_apr ()
{
if (bx_dbg.apic)
BX_INFO(("WARNING: Local APIC Arbitration Priority not implemented, returning 0"));
BX_ERROR (("WARNING: Local APIC Arbitration Priority not implemented, returning 0"));
// should look at TPR, vector of highest priority isr, etc.
return 0;
}
@ -668,9 +655,8 @@ void
bx_local_apic_c::periodic (Bit32u usec_delta)
{
if (!timer_active) return;
if (bx_dbg.apic)
BX_INFO(("%s: bx_local_apic_c::periodic called with %d usec",
cpu->name, usec_delta));
BX_DEBUG(("%s: bx_local_apic_c::periodic called with %d usec",
cpu->name, usec_delta));
// unless usec_delta is guaranteed to be a multiple of 128, I can't
// just divide usec_delta by the divide-down value. Instead, it will
// have a similar effect to implement the divide-down by ignoring
@ -701,16 +687,14 @@ bx_local_apic_c::periodic (Bit32u usec_delta)
// negative timer_current.
BX_ASSERT ((timer_current + timer_initial) >= usec_delta);
}
if (bx_dbg.apic)
BX_INFO(("%s: local apic timer (periodic) triggered int, reset counter to 0x%08x", cpu->name, timer_current));
BX_DEBUG(("%s: local apic timer (periodic) triggered int, reset counter to 0x%08x", cpu->name, timer_current));
} else {
// one-shot mode
timer_current = 0;
if (timer_active) {
trigger_irq (timervec & 0xff, id);
timer_active = false;
if (bx_dbg.apic)
BX_INFO(("%s: local apic timer (one-shot) triggered int", cpu->name));
BX_DEBUG (("%s: local apic timer (one-shot) triggered int", cpu->name));
}
}
}