X86: Fix the ordering of special physical address ranges.
This commit is contained in:
parent
3a1905157e
commit
d0a43ce2b2
2 changed files with 3 additions and 3 deletions
|
@ -92,8 +92,8 @@ namespace X86ISA
|
||||||
|
|
||||||
const Addr PhysAddrPrefixIO = ULL(0x8000000000000000);
|
const Addr PhysAddrPrefixIO = ULL(0x8000000000000000);
|
||||||
const Addr PhysAddrPrefixPciConfig = ULL(0xC000000000000000);
|
const Addr PhysAddrPrefixPciConfig = ULL(0xC000000000000000);
|
||||||
const Addr PhysAddrPrefixLocalAPIC = ULL(0xA000000000000000);
|
const Addr PhysAddrPrefixLocalAPIC = ULL(0x2000000000000000);
|
||||||
const Addr PhysAddrPrefixInterrupts = ULL(0x2000000000000000);
|
const Addr PhysAddrPrefixInterrupts = ULL(0xA000000000000000);
|
||||||
// Each APIC gets two pages. One page is used for local apics to field
|
// Each APIC gets two pages. One page is used for local apics to field
|
||||||
// accesses from the CPU, and the other is for all APICs to communicate.
|
// accesses from the CPU, and the other is for all APICs to communicate.
|
||||||
const Addr PhysAddrAPICRangeSize = 1 << 12;
|
const Addr PhysAddrAPICRangeSize = 1 << 12;
|
||||||
|
|
|
@ -97,7 +97,7 @@ class BaseCPU(MemObject):
|
||||||
dtb = Param.X86DTB(X86DTB(), "Data TLB")
|
dtb = Param.X86DTB(X86DTB(), "Data TLB")
|
||||||
itb = Param.X86ITB(X86ITB(), "Instruction TLB")
|
itb = Param.X86ITB(X86ITB(), "Instruction TLB")
|
||||||
if build_env['FULL_SYSTEM']:
|
if build_env['FULL_SYSTEM']:
|
||||||
_localApic = X86LocalApic(pio_addr=0xa000000000000000)
|
_localApic = X86LocalApic(pio_addr=0x2000000000000000)
|
||||||
interrupts = \
|
interrupts = \
|
||||||
Param.X86LocalApic(_localApic, "Interrupt Controller")
|
Param.X86LocalApic(_localApic, "Interrupt Controller")
|
||||||
elif build_env['TARGET_ISA'] == 'mips':
|
elif build_env['TARGET_ISA'] == 'mips':
|
||||||
|
|
Loading…
Reference in a new issue