changeset fc12f4d657f0 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=fc12f4d657f0
description:
MIPS: Get rid of the backdoor device copy/pasted from and only used in
Alpha.
diffstat:
src/dev/mips/Malta.py | 3 -
src/dev/mips/MipsBackdoor.py | 38 -----
src/dev/mips/SConscript | 2 -
src/dev/mips/backdoor.cc | 297 -------------------------------------------
src/dev/mips/backdoor.hh | 126 ------------------
5 files changed, 0 insertions(+), 466 deletions(-)
diffs (truncated from 513 to 300 lines):
diff -r 956ac83b0a58 -r fc12f4d657f0 src/dev/mips/Malta.py
--- a/src/dev/mips/Malta.py Sat Oct 16 00:00:54 2010 -0700
+++ b/src/dev/mips/Malta.py Sun Oct 17 23:15:53 2010 -0700
@@ -31,7 +31,6 @@
from BadDevice import BadDevice
from Device import BasicPioDevice
-from MipsBackdoor import MipsBackdoor
from Pci import PciConfigAll
from Platform import Platform
from Uart import Uart8250
@@ -59,7 +58,6 @@
cchip = MaltaCChip(pio_addr=0x801a0000000)
io = MaltaIO(pio_addr=0x801fc000000)
uart = Uart8250(pio_addr=0xBFD003F8)
- backdoor = MipsBackdoor(pio_addr=0xBFD00F00, disk=Parent.simple_disk)
# Attach I/O devices to specified bus object. Can't do this
# earlier, since the bus object itself is typically defined at the
@@ -68,4 +66,3 @@
self.cchip.pio = bus.port
self.io.pio = bus.port
self.uart.pio = bus.port
- self.backdoor.pio = bus.port
diff -r 956ac83b0a58 -r fc12f4d657f0 src/dev/mips/MipsBackdoor.py
--- a/src/dev/mips/MipsBackdoor.py Sat Oct 16 00:00:54 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2007 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: Korey Sewell
-
-from m5.params import *
-from m5.proxy import *
-from Device import BasicPioDevice
-
-class MipsBackdoor(BasicPioDevice):
- type = 'MipsBackdoor'
- cpu = Param.BaseCPU(Parent.cpu[0], "Processor")
- disk = Param.SimpleDisk("Simple Disk")
- terminal = Param.Terminal(Parent.any, "The console terminal")
- system = Param.MipsSystem(Parent.any, "system object")
diff -r 956ac83b0a58 -r fc12f4d657f0 src/dev/mips/SConscript
--- a/src/dev/mips/SConscript Sat Oct 16 00:00:54 2010 -0700
+++ b/src/dev/mips/SConscript Sun Oct 17 23:15:53 2010 -0700
@@ -32,12 +32,10 @@
Import('*')
if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'mips':
- SimObject('MipsBackdoor.py')
SimObject('Malta.py')
TraceFlag('Malta')
- Source('backdoor.cc')
Source('malta.cc')
Source('malta_cchip.cc')
Source('malta_io.cc')
diff -r 956ac83b0a58 -r fc12f4d657f0 src/dev/mips/backdoor.cc
--- a/src/dev/mips/backdoor.cc Sat Oct 16 00:00:54 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2001-2005 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: Nathan Binkert
- * Ali Saidi
- * Steve Reinhardt
- * Erik Hallnor
- */
-
-/** @file
- * Mips Console Backdoor Definition
- */
-#include <cstddef>
-#include <string>
-
-#include "arch/mips/system.hh"
-#include "base/inifile.hh"
-#include "base/str.hh"
-#include "base/trace.hh"
-#include "cpu/base.hh"
-#include "cpu/thread_context.hh"
-#include "dev/mips/backdoor.hh"
-#include "dev/platform.hh"
-#include "dev/simple_disk.hh"
-#include "dev/terminal.hh"
-#include "mem/packet.hh"
-#include "mem/packet_access.hh"
-#include "mem/physical.hh"
-#include "params/MipsBackdoor.hh"
-#include "sim/sim_object.hh"
-
-
-using namespace std;
-using namespace MipsISA;
-
-MipsBackdoor::MipsBackdoor(const Params *p)
- : BasicPioDevice(p), disk(p->disk), terminal(p->terminal),
- system(p->system), cpu(p->cpu)
-{
-
- pioSize = sizeof(struct MipsAccess);
-
- mipsAccess = new Access();
- mipsAccess->last_offset = pioSize - 1;
-
- mipsAccess->version = MIPS_ACCESS_VERSION;
- mipsAccess->diskUnit = 1;
-
- mipsAccess->diskCount = 0;
- mipsAccess->diskPAddr = 0;
- mipsAccess->diskBlock = 0;
- mipsAccess->diskOperation = 0;
- mipsAccess->outputChar = 0;
- mipsAccess->inputChar = 0;
- bzero(mipsAccess->cpuStack, sizeof(mipsAccess->cpuStack));
-
-}
-
-void
-MipsBackdoor::startup()
-{
- system->setMipsAccess(pioAddr);
- mipsAccess->numCPUs = system->numContexts();
- mipsAccess->kernStart = MipsISA::Phys2K0Seg(system->getKernelStart());
- mipsAccess->kernEnd = MipsISA::Phys2K0Seg(system->getKernelEnd());
- mipsAccess->entryPoint = MipsISA::Phys2K0Seg(system->getKernelEntry());
- mipsAccess->mem_size = system->physmem->size();
- mipsAccess->cpuClock = cpu->frequency() / 1000000; // In MHz
- mipsAccess->intrClockFrequency = params()->platform->intrFrequency();
-}
-
-Tick
-MipsBackdoor::read(PacketPtr pkt)
-{
-
- /** XXX Do we want to push the addr munging to a bus brige or something? So
- * the device has it's physical address and then the bridge adds on
whatever
- * machine dependent address swizzle is required?
- */
- assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
-
- Addr daddr = pkt->getAddr() - pioAddr;
-
- pkt->allocate();
-
- switch (pkt->getSize())
- {
- case sizeof(uint32_t):
- switch (daddr)
- {
- case offsetof(MipsAccess, last_offset):
- pkt->set(mipsAccess->last_offset);
- break;
- case offsetof(MipsAccess, version):
- pkt->set(mipsAccess->version);
- break;
- case offsetof(MipsAccess, numCPUs):
- pkt->set(mipsAccess->numCPUs);
- break;
- case offsetof(MipsAccess, intrClockFrequency):
- pkt->set(mipsAccess->intrClockFrequency);
- break;
- case offsetof(MipsAccess, inputChar):
- pkt->set(terminal->console_in());
- break;
- case offsetof(MipsAccess, cpuClock):
- pkt->set(mipsAccess->cpuClock);
- break;
- case offsetof(MipsAccess, mem_size):
- pkt->set(mipsAccess->mem_size);
- break;
- case offsetof(MipsAccess, kernStart):
- pkt->set(mipsAccess->kernStart);
- break;
- case offsetof(MipsAccess, kernEnd):
- pkt->set(mipsAccess->kernEnd);
- break;
- case offsetof(MipsAccess, entryPoint):
- pkt->set(mipsAccess->entryPoint);
- break;
- case offsetof(MipsAccess, diskUnit):
- pkt->set(mipsAccess->diskUnit);
- break;
- case offsetof(MipsAccess, diskCount):
- pkt->set(mipsAccess->diskCount);
- break;
- case offsetof(MipsAccess, diskPAddr):
- pkt->set(mipsAccess->diskPAddr);
- break;
- case offsetof(MipsAccess, diskBlock):
- pkt->set(mipsAccess->diskBlock);
- break;
- case offsetof(MipsAccess, diskOperation):
- pkt->set(mipsAccess->diskOperation);
- break;
- case offsetof(MipsAccess, outputChar):
- pkt->set(mipsAccess->outputChar);
- break;
- default:
- int cpunum = (daddr - offsetof(MipsAccess, cpuStack)) /
- sizeof(mipsAccess->cpuStack[0]);
-
- if (cpunum >= 0 && cpunum < 64)
- pkt->set(mipsAccess->cpuStack[cpunum]);
- else
- panic("Unknown 32bit access, %#x\n", daddr);
- }
- //DPRINTF(MipsBackdoor, "read: offset=%#x val=%#x\n", daddr,
- // pkt->get<uint64_t>());
- break;
- default:
- pkt->setBadAddress();
- }
-
- pkt->makeAtomicResponse();
- return pioDelay;
-}
-
-Tick
-MipsBackdoor::write(PacketPtr pkt)
-{
- assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
- Addr daddr = pkt->getAddr() - pioAddr;
-
- uint32_t val = pkt->get<uint32_t>();
- assert(pkt->getSize() == sizeof(uint32_t));
- switch (daddr) {
- case offsetof(MipsAccess, diskUnit):
- mipsAccess->diskUnit = val;
- break;
-
- case offsetof(MipsAccess, diskCount):
- mipsAccess->diskCount = val;
- break;
-
- case offsetof(MipsAccess, diskPAddr):
- mipsAccess->diskPAddr = val;
- break;
-
- case offsetof(MipsAccess, diskBlock):
- mipsAccess->diskBlock = val;
- break;
-
- case offsetof(MipsAccess, diskOperation):
- if (val == 0x13)
- disk->read(mipsAccess->diskPAddr, mipsAccess->diskBlock,
- mipsAccess->diskCount);
- else
- panic("Invalid disk operation!");
-
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
