10c79efe55
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
127 lines
4.4 KiB
C++
127 lines
4.4 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
/** @file
|
|
* System Console Interface
|
|
*/
|
|
|
|
#ifndef __ALPHA_CONSOLE_HH__
|
|
#define __ALPHA_CONSOLE_HH__
|
|
|
|
#include "base/range.hh"
|
|
#include "dev/alpha_access.h"
|
|
#include "dev/io_device.hh"
|
|
#include "sim/host.hh"
|
|
#include "sim/sim_object.hh"
|
|
|
|
class BaseCPU;
|
|
class SimConsole;
|
|
class System;
|
|
class SimpleDisk;
|
|
|
|
/**
|
|
* Memory mapped interface to the system console. This device
|
|
* represents a shared data region between the OS Kernel and the
|
|
* System Console.
|
|
*
|
|
* The system console is a small standalone program that is initially
|
|
* run when the system boots. It contains the necessary code to
|
|
* access the boot disk, to read/write from the console, and to pass
|
|
* boot parameters to the kernel.
|
|
*
|
|
* This version of the system console is very different from the one
|
|
* that would be found in a real system. Many of the functions use
|
|
* some sort of backdoor to get their job done. For example, reading
|
|
* from the boot device on a real system would require a minimal
|
|
* device driver to access the disk controller, but since we have a
|
|
* simulator here, we are able to bypass the disk controller and
|
|
* access the disk image directly. There are also some things like
|
|
* reading the kernel off the disk image into memory that are normally
|
|
* taken care of by the console that are now taken care of by the
|
|
* simulator.
|
|
*
|
|
* These shortcuts are acceptable since the system console is
|
|
* primarily used doing boot before the kernel has loaded its device
|
|
* drivers.
|
|
*/
|
|
class AlphaConsole : public PioDevice
|
|
{
|
|
protected:
|
|
struct Access : public AlphaAccess
|
|
{
|
|
void serialize(std::ostream &os);
|
|
void unserialize(Checkpoint *cp, const std::string §ion);
|
|
};
|
|
|
|
union {
|
|
Access *alphaAccess;
|
|
uint8_t *consoleData;
|
|
};
|
|
|
|
/** the disk must be accessed from the console */
|
|
SimpleDisk *disk;
|
|
|
|
/** the system console (the terminal) is accessable from the console */
|
|
SimConsole *console;
|
|
|
|
/** a pointer to the system we are running in */
|
|
System *system;
|
|
|
|
/** a pointer to the CPU boot cpu */
|
|
BaseCPU *cpu;
|
|
|
|
Addr addr;
|
|
static const Addr size = 0x80; // equal to sizeof(alpha_access);
|
|
|
|
public:
|
|
/** Standard Constructor */
|
|
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
|
|
System *s, BaseCPU *c, Platform *platform,
|
|
MemoryController *mmu, Addr addr,
|
|
HierParams *hier, Bus *pio_bus);
|
|
|
|
virtual void startup();
|
|
|
|
/**
|
|
* memory mapped reads and writes
|
|
*/
|
|
virtual Fault * read(MemReqPtr &req, uint8_t *data);
|
|
virtual Fault * write(MemReqPtr &req, const uint8_t *data);
|
|
|
|
/**
|
|
* standard serialization routines for checkpointing
|
|
*/
|
|
virtual void serialize(std::ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
|
|
public:
|
|
Tick cacheAccess(MemReqPtr &req);
|
|
};
|
|
|
|
#endif // __ALPHA_CONSOLE_HH__
|