Get SPARC to the point that it starts running. Add ability to load the ROM bin files, cleanup lockstep printing a bit
Since we don't have a platform yet, you need to comment out the default responder stuff in Bus.py to make it work.
SConstruct:
Add TARGET_ISA to the list of environment variables that end up in the build_env for python
configs/common/FSConfig.py:
add a simple SPARC system to being testing with, you'll need to change makeLinuxAlphaSystem to makeSparcSystem in fs.py for now
src/SConscript:
add a raw file object, at least until we get more info about how to compile openboot properly
src/arch/sparc/system.cc:
src/arch/sparc/system.hh:
add parameters for ROM files (OBP/Reset/Hypervisor), a ROM, load files into ROM
src/base/loader/object_file.cc:
src/base/loader/object_file.hh:
add option to try raw when nothing works
src/cpu/exetrace.cc:
cleanup lockstep printing a little bit
src/cpu/m5legion_interface.h:
change the instruction to be 32 bits because it is
src/mem/physical.cc:
fix assert that doesn't work if memory starts somewhere above 0
src/python/m5/objects/BaseCPU.py:
Add if statement to choose between sparc tlbs and alpha tlbs
src/python/m5/objects/System.py:
Add a sparc system that sets the rom addresses correctly
src/python/m5/params.py:
add the ability to add Addr() together
--HG--
extra : convert_revision : bbbd8a56134f2dda2728091f740e2f7119b0c4af
This commit is contained in:
@@ -45,6 +45,7 @@
|
||||
#include "base/loader/ecoff_object.hh"
|
||||
#include "base/loader/aout_object.hh"
|
||||
#include "base/loader/elf_object.hh"
|
||||
#include "base/loader/raw_object.hh"
|
||||
|
||||
#include "mem/translating_port.hh"
|
||||
|
||||
@@ -107,7 +108,7 @@ ObjectFile::close()
|
||||
|
||||
|
||||
ObjectFile *
|
||||
createObjectFile(const string &fname)
|
||||
createObjectFile(const string &fname, bool raw)
|
||||
{
|
||||
// open the file
|
||||
int fd = open(fname.c_str(), O_RDONLY);
|
||||
@@ -141,6 +142,9 @@ createObjectFile(const string &fname)
|
||||
return fileObj;
|
||||
}
|
||||
|
||||
if (raw)
|
||||
return RawObject::tryFile(fname, fd, len, fileData);
|
||||
|
||||
// don't know what it is
|
||||
close(fd);
|
||||
munmap(fileData, len);
|
||||
|
||||
@@ -114,9 +114,11 @@ class ObjectFile
|
||||
size_t textSize() const { return text.size; }
|
||||
size_t dataSize() const { return data.size; }
|
||||
size_t bssSize() const { return bss.size; }
|
||||
|
||||
void setTextBase(Addr a) { text.baseAddr = a; }
|
||||
};
|
||||
|
||||
ObjectFile *createObjectFile(const std::string &fname);
|
||||
ObjectFile *createObjectFile(const std::string &fname, bool raw = false);
|
||||
|
||||
|
||||
#endif // __OBJECT_FILE_HH__
|
||||
|
||||
72
src/base/loader/raw_object.cc
Normal file
72
src/base/loader/raw_object.cc
Normal file
@@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Copyright (c) 2006 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: Steve Reinhardt
|
||||
*/
|
||||
|
||||
#include "base/loader/raw_object.hh"
|
||||
#include "base/trace.hh"
|
||||
|
||||
ObjectFile *
|
||||
RawObject::tryFile(const std::string &fname, int fd, size_t len, uint8_t *data)
|
||||
{
|
||||
return new RawObject(fname, fd, len, data, ObjectFile::UnknownArch,
|
||||
ObjectFile::UnknownOpSys);
|
||||
}
|
||||
|
||||
RawObject::RawObject(const std::string &_filename, int _fd, size_t _len,
|
||||
uint8_t *_data, Arch _arch, OpSys _opSys)
|
||||
: ObjectFile(_filename, _fd, _len, _data, _arch, _opSys)
|
||||
{
|
||||
text.baseAddr = 0;
|
||||
text.size = len;
|
||||
text.fileImage = fileData;
|
||||
|
||||
data.baseAddr = 0;
|
||||
data.size = 0;
|
||||
data.fileImage = NULL;
|
||||
|
||||
bss.baseAddr = 0;
|
||||
bss.size = 0;
|
||||
bss.fileImage = NULL;
|
||||
|
||||
DPRINTFR(Loader, "text: 0x%x %d\ndata: 0x%x %d\nbss: 0x%x %d\n",
|
||||
text.baseAddr, text.size, data.baseAddr, data.size,
|
||||
bss.baseAddr, bss.size);
|
||||
}
|
||||
|
||||
bool
|
||||
RawObject::loadGlobalSymbols(SymbolTable *symtab)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
RawObject::loadLocalSymbols(SymbolTable *symtab)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
53
src/base/loader/raw_object.hh
Normal file
53
src/base/loader/raw_object.hh
Normal file
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* Copyright (c) 2006 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: Ali Saidi
|
||||
*/
|
||||
|
||||
#ifndef __BASE_LOADER_RAW_OBJECT_HH__
|
||||
#define __BASE_LOADER_RAW_OBJECT_HH__
|
||||
|
||||
#include "base/loader/object_file.hh"
|
||||
|
||||
class RawObject: public ObjectFile
|
||||
{
|
||||
protected:
|
||||
RawObject(const std::string &_filename, int _fd, size_t _len,
|
||||
uint8_t *_data, Arch _arch, OpSys _opSys);
|
||||
public:
|
||||
virtual ~RawObject() {}
|
||||
|
||||
virtual bool loadGlobalSymbols(SymbolTable *symtab);
|
||||
virtual bool loadLocalSymbols(SymbolTable *symtab);
|
||||
|
||||
static ObjectFile *tryFile(const std::string &fname, int fd, size_t len,
|
||||
uint8_t *data);
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif // __BASE_LOADER_RAW_OBJECT_HH__
|
||||
Reference in New Issue
Block a user