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

minimize diff with x2apic patch

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-03-26 11:17:02 +00:00
parent a220edc5bb
commit 01d88bc155
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bochs/cpu/apic.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: apic.cc,v 1.135 2010-03-01 17:35:49 sshwarts Exp $
// $Id: apic.cc,v 1.136 2010-03-26 11:17:02 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2002-2009 Zwane Mwaikambo, Stanislav Shwartsman
@ -375,7 +375,7 @@ void bx_local_apic_c::write_aligned(bx_phy_address addr, Bit32u value)
break;
case BX_LAPIC_ICR_LO: // interrupt command reg 0-31
icr_lo = value & ~(1<<12); // force delivery status bit = 0(idle)
send_ipi();
send_ipi((icr_hi >> 24) & 0xff, icr_lo);
break;
case BX_LAPIC_ICR_HI: // interrupt command reg 31-63
icr_hi = value & 0xff000000;
@ -440,15 +440,14 @@ void bx_local_apic_c::write_aligned(bx_phy_address addr, Bit32u value)
}
}
void bx_local_apic_c::send_ipi(void)
void bx_local_apic_c::send_ipi(Bit8u dest, Bit32u lo_cmd)
{
int dest = (icr_hi >> 24) & 0xff;
int dest_shorthand = (icr_lo >> 18) & 3;
int trig_mode = (icr_lo >> 15) & 1;
int level = (icr_lo >> 14) & 1;
int logical_dest = (icr_lo >> 11) & 1;
int delivery_mode = (icr_lo >> 8) & 7;
int vector = (icr_lo & 0xff);
int dest_shorthand = (lo_cmd >> 18) & 3;
int trig_mode = (lo_cmd >> 15) & 1;
int level = (lo_cmd >> 14) & 1;
int logical_dest = (lo_cmd >> 11) & 1;
int delivery_mode = (lo_cmd >> 8) & 7;
int vector = (lo_cmd & 0xff);
int accepted = 0;
if(delivery_mode == APIC_DM_INIT)

4
bochs/cpu/apic.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: apic.h,v 1.51 2010-02-28 14:52:16 sshwarts Exp $
// $Id: apic.h,v 1.52 2010-03-26 11:17:02 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2002-2009 Zwane Mwaikambo, Stanislav Shwartsman
@ -134,7 +134,7 @@ public:
Bit8u acknowledge_int(void); // only the local CPU should call this
int highest_priority_int(Bit8u *array);
void receive_EOI(Bit32u value);
void send_ipi(void);
void send_ipi(Bit8u dest, Bit32u lo_cmd);
void write_spurious_interrupt_register(Bit32u value);
void service_local_apic(void);
void print_status(void);