summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/common/FSConfig.py11
-rw-r--r--src/dev/x86/Opteron.py18
-rw-r--r--src/dev/x86/PC.py57
-rw-r--r--src/dev/x86/SConscript4
-rw-r--r--src/dev/x86/pc.cc (renamed from src/dev/x86/opteron.cc)26
-rw-r--r--src/dev/x86/pc.hh (renamed from src/dev/x86/opteron.hh)16
6 files changed, 82 insertions, 50 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 44c13ef78..bcc80eaf9 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -177,19 +177,12 @@ def makeLinuxX86System(mem_mode, mdesc = None):
self.bridge.side_a = self.iobus.port
self.bridge.side_b = self.membus.port
- # Serial port and console
- self.console = SimConsole()
- self.com_1 = Uart8250()
- self.com_1.pio_addr = x86IOAddress(0x3f8)
- self.com_1.pio = self.iobus.port
- self.com_1.sim_console = self.console
-
# Command line
self.boot_osflags = 'earlyprintk=ttyS0'
# Platform
- self.opteron = Opteron()
- self.opteron.attachIO(self.iobus)
+ self.pc = PC()
+ self.pc.attachIO(self.iobus)
self.intrctrl = IntrControl()
diff --git a/src/dev/x86/Opteron.py b/src/dev/x86/Opteron.py
deleted file mode 100644
index cb015e2e7..000000000
--- a/src/dev/x86/Opteron.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from m5.params import *
-from m5.proxy import *
-from Device import BasicPioDevice, PioDevice, IsaFake, BadAddr
-from Uart import Uart8250
-from Platform import Platform
-from Pci import PciConfigAll
-from SimConsole import SimConsole
-
-class Opteron(Platform):
- type = 'Opteron'
- system = Param.System(Parent.any, "system")
-
- pciconfig = PciConfigAll()
-
- def attachIO(self, bus):
- self.pciconfig.pio = bus.default
- bus.responder_set = True
- bus.responder = self.pciconfig
diff --git a/src/dev/x86/PC.py b/src/dev/x86/PC.py
new file mode 100644
index 000000000..3314e7741
--- /dev/null
+++ b/src/dev/x86/PC.py
@@ -0,0 +1,57 @@
+# Copyright (c) 2008 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Gabe Black
+
+from m5.params import *
+from m5.proxy import *
+from Device import BasicPioDevice, PioDevice, IsaFake, BadAddr
+from Uart import Uart8250
+from Platform import Platform
+from Pci import PciConfigAll
+from SimConsole import SimConsole
+
+def x86IOAddress(port):
+ IO_address_space_base = 0x8000000000000000
+ return IO_address_space_base + port;
+
+class PC(Platform):
+ type = 'PC'
+ system = Param.System(Parent.any, "system")
+
+ pciconfig = PciConfigAll()
+
+ # Serial port and console
+ console = SimConsole()
+ com_1 = Uart8250()
+ com_1.pio_addr = x86IOAddress(0x3f8)
+ com_1.sim_console = console
+
+ def attachIO(self, bus):
+ self.com_1.pio = bus.port
+ self.pciconfig.pio = bus.default
+ bus.responder_set = True
+ bus.responder = self.pciconfig
diff --git a/src/dev/x86/SConscript b/src/dev/x86/SConscript
index c500531b1..6ebaed265 100644
--- a/src/dev/x86/SConscript
+++ b/src/dev/x86/SConscript
@@ -32,6 +32,6 @@
Import('*')
if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'x86':
- SimObject('Opteron.py')
+ SimObject('PC.py')
- Source('opteron.cc')
+ Source('pc.cc')
diff --git a/src/dev/x86/opteron.cc b/src/dev/x86/pc.cc
index ba46f2dfa..148ba92f7 100644
--- a/src/dev/x86/opteron.cc
+++ b/src/dev/x86/pc.cc
@@ -29,7 +29,7 @@
*/
/** @file
- * Implementation of Opteron platform.
+ * Implementation of PC platform.
*/
#include <deque>
@@ -39,13 +39,13 @@
#include "arch/x86/x86_traits.hh"
#include "cpu/intr_control.hh"
#include "dev/simconsole.hh"
-#include "dev/x86/opteron.hh"
+#include "dev/x86/pc.hh"
#include "sim/system.hh"
using namespace std;
using namespace TheISA;
-Opteron::Opteron(const Params *p)
+PC::PC(const Params *p)
: Platform(p), system(p->system)
{
// set the back pointer from the system to myself
@@ -53,40 +53,40 @@ Opteron::Opteron(const Params *p)
}
Tick
-Opteron::intrFrequency()
+PC::intrFrequency()
{
panic("Need implementation\n");
M5_DUMMY_RETURN
}
void
-Opteron::postConsoleInt()
+PC::postConsoleInt()
{
warn_once("Don't know what interrupt to post for console.\n");
//panic("Need implementation\n");
}
void
-Opteron::clearConsoleInt()
+PC::clearConsoleInt()
{
warn_once("Don't know what interrupt to clear for console.\n");
//panic("Need implementation\n");
}
void
-Opteron::postPciInt(int line)
+PC::postPciInt(int line)
{
panic("Need implementation\n");
}
void
-Opteron::clearPciInt(int line)
+PC::clearPciInt(int line)
{
panic("Need implementation\n");
}
Addr
-Opteron::pciToDma(Addr pciAddr) const
+PC::pciToDma(Addr pciAddr) const
{
panic("Need implementation\n");
M5_DUMMY_RETURN
@@ -94,7 +94,7 @@ Opteron::pciToDma(Addr pciAddr) const
Addr
-Opteron::calcConfigAddr(int bus, int dev, int func)
+PC::calcConfigAddr(int bus, int dev, int func)
{
assert(func < 8);
assert(dev < 32);
@@ -102,8 +102,8 @@ Opteron::calcConfigAddr(int bus, int dev, int func)
return (PhysAddrPrefixPciConfig | (func << 8) | (dev << 11));
}
-Opteron *
-OpteronParams::create()
+PC *
+PCParams::create()
{
- return new Opteron(this);
+ return new PC(this);
}
diff --git a/src/dev/x86/opteron.hh b/src/dev/x86/pc.hh
index 3026bce73..6e3a7f45e 100644
--- a/src/dev/x86/opteron.hh
+++ b/src/dev/x86/pc.hh
@@ -30,29 +30,29 @@
/**
* @file
- * Declaration of top level class for the Opteron platform chips. This class
+ * Declaration of top level class for PC platform components. This class
* just retains pointers to all its children so the children can communicate.
*/
-#ifndef __DEV_Opteron_HH__
-#define __DEV_Opteron_HH__
+#ifndef __DEV_PC_HH__
+#define __DEV_PC_HH__
#include "dev/platform.hh"
-#include "params/Opteron.hh"
+#include "params/PC.hh"
class IdeController;
class System;
-class Opteron : public Platform
+class PC : public Platform
{
public:
/** Pointer to the system */
System *system;
public:
- typedef OpteronParams Params;
+ typedef PCParams Params;
- Opteron(const Params *p);
+ PC(const Params *p);
/**
* Return the interrupting frequency to AlphaAccess
@@ -89,4 +89,4 @@ class Opteron : public Platform
virtual Addr calcConfigAddr(int bus, int dev, int func);
};
-#endif // __DEV_OPTERON_HH__
+#endif // __DEV_PC_HH__