diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-09-30 00:28:33 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-09-30 00:28:33 -0700 |
| commit | 51f7a6666027870c24432dcaa56cfc1b4741fdc6 (patch) | |
| tree | 6dd74cdab55616bae7c974bc6c4fc39e60c9808a /src/dev/x86 | |
| parent | 35e20c7470a16cbc1187553375269800b980eb78 (diff) | |
| download | gem5-51f7a6666027870c24432dcaa56cfc1b4741fdc6.tar.xz | |
SE/FS: Build the devices in SE mode.
Diffstat (limited to 'src/dev/x86')
| -rw-r--r-- | src/dev/x86/SConscript | 2 | ||||
| -rw-r--r-- | src/dev/x86/i82094aa.cc | 7 | ||||
| -rw-r--r-- | src/dev/x86/pc.cc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/dev/x86/SConscript b/src/dev/x86/SConscript index eeb68cf44..038e4824b 100644 --- a/src/dev/x86/SConscript +++ b/src/dev/x86/SConscript @@ -30,7 +30,7 @@ Import('*') -if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'x86': +if env['TARGET_ISA'] == 'x86': SimObject('Pc.py') Source('pc.cc') diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc index 584090a9e..be7852e86 100644 --- a/src/dev/x86/i82094aa.cc +++ b/src/dev/x86/i82094aa.cc @@ -28,7 +28,12 @@ * Authors: Gabe Black */ +#include "config/full_system.hh" + +#if FULL_SYSTEM #include "arch/x86/interrupts.hh" +#endif + #include "arch/x86/intmessage.hh" #include "debug/I82094AA.hh" #include "dev/x86/i82094aa.hh" @@ -167,6 +172,7 @@ X86ISA::I82094AA::signalInterrupt(int line) DPRINTF(I82094AA, "Entry was masked.\n"); return; } else { +#if FULL_SYSTEM //XXX No interrupt controller in SE mode. TriggerIntMessage message = 0; message.destination = entry.dest; if (entry.deliveryMode == DeliveryMode::ExtInt) { @@ -225,6 +231,7 @@ X86ISA::I82094AA::signalInterrupt(int line) } intPort->sendMessage(apics, message, sys->getMemoryMode() == Enums::timing); +#endif } } diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc index 7912a45e1..ec2bb209c 100644 --- a/src/dev/x86/pc.cc +++ b/src/dev/x86/pc.cc @@ -56,7 +56,9 @@ Pc::Pc(const Params *p) { southBridge = NULL; // set the back pointer from the system to myself +#if FULL_SYSTEM //XXX No platform pointer in SE mode. system->platform = this; +#endif } void |