Filled out the object file loader so it can load object files for several OSs and architectures.
SConscript: Added ./libelf as an include search directory. There might be a better spot for this than where I put it. arch/SConscript: Combined the linux_process.h and tru64_process.h into process.h. This allows each ISA to support processes from arbitrary OSs. arch/alpha/SConscript: Added process.cc as a source file. It provides an implementation of createProcess, which takes an object_file object and creates the appropriate process object, or dies. base/loader/elf_object.cc: Actually extract the OS and architecture from the elf file, rather than always guessing Alpha and Linux. base/loader/object_file.hh: Added constants for SPARC, MIPS, and Solaris, and changed the include for the Addr type. sim/process.cc: Pushed creation of specific process objects into the ISA specific code. --HG-- extra : convert_revision : b4754e7ca8328672d07e1394c4d162e199606b53
This commit is contained in:
parent
dd0d8e6287
commit
7c4c623302
|
@ -374,6 +374,7 @@ def make_objs(sources, env):
|
||||||
# the corresponding build directory to pick up generated include
|
# the corresponding build directory to pick up generated include
|
||||||
# files.
|
# files.
|
||||||
env.Append(CPPPATH='.')
|
env.Append(CPPPATH='.')
|
||||||
|
env.Append(CPPPATH='./libelf')
|
||||||
|
|
||||||
# Debug binary
|
# Debug binary
|
||||||
debugEnv = env.Copy(OBJSUFFIX='.do')
|
debugEnv = env.Copy(OBJSUFFIX='.do')
|
||||||
|
|
|
@ -46,9 +46,8 @@ sources = []
|
||||||
# List of headers to generate
|
# List of headers to generate
|
||||||
isa_switch_hdrs = Split('''
|
isa_switch_hdrs = Split('''
|
||||||
isa_traits.hh
|
isa_traits.hh
|
||||||
linux_process.hh
|
|
||||||
tru64_process.hh
|
|
||||||
tlb.hh
|
tlb.hh
|
||||||
|
process.hh
|
||||||
aout_machdep.h
|
aout_machdep.h
|
||||||
ecoff_machdep.h
|
ecoff_machdep.h
|
||||||
arguments.hh
|
arguments.hh
|
||||||
|
|
|
@ -64,6 +64,7 @@ syscall_emulation_sources = Split('''
|
||||||
common_syscall_emul.cc
|
common_syscall_emul.cc
|
||||||
linux_process.cc
|
linux_process.cc
|
||||||
tru64_process.cc
|
tru64_process.cc
|
||||||
|
process.cc
|
||||||
''')
|
''')
|
||||||
|
|
||||||
# Set up complete list of sources based on configuration.
|
# Set up complete list of sources based on configuration.
|
||||||
|
|
61
arch/alpha/process.cc
Normal file
61
arch/alpha/process.cc
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2003-2004 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "arch/alpha/process.hh"
|
||||||
|
|
||||||
|
namespace AlphaISA
|
||||||
|
{
|
||||||
|
|
||||||
|
LiveProcess *
|
||||||
|
createProcess(const std::string &nm, ObjectFile * objFile,
|
||||||
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
||||||
|
std::vector<std::string> &argv, std::vector<std::string> &envp)
|
||||||
|
{
|
||||||
|
LiveProcess * process = NULL;
|
||||||
|
if (objFile->getArch() != ObjectFile::Alpha)
|
||||||
|
fatal("Object file does not match architecture.");
|
||||||
|
switch (objFile->getOpSys()) {
|
||||||
|
case ObjectFile::Tru64:
|
||||||
|
process = new AlphaTru64Process(nm, objFile,
|
||||||
|
stdin_fd, stdout_fd, stderr_fd,
|
||||||
|
argv, envp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ObjectFile::Linux:
|
||||||
|
process = new AlphaLinuxProcess(nm, objFile,
|
||||||
|
stdin_fd, stdout_fd, stderr_fd,
|
||||||
|
argv, envp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
fatal("Unknown/unsupported operating system.");
|
||||||
|
}
|
||||||
|
return process;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace AlphaISA
|
48
arch/alpha/process.hh
Normal file
48
arch/alpha/process.hh
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2003-2004 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __ALPHA_PROCESS_HH__
|
||||||
|
#define __ALPHA_PROCESS_HH__
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "arch/alpha/linux_process.hh"
|
||||||
|
#include "arch/alpha/tru64_process.hh"
|
||||||
|
#include "base/loader/object_file.hh"
|
||||||
|
|
||||||
|
namespace AlphaISA
|
||||||
|
{
|
||||||
|
|
||||||
|
LiveProcess *
|
||||||
|
createProcess(const std::string &nm, ObjectFile * objFile,
|
||||||
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
||||||
|
std::vector<std::string> &argv, std::vector<std::string> &envp);
|
||||||
|
|
||||||
|
} // namespace AlphaISA
|
||||||
|
|
||||||
|
#endif // __ALPHA_PROCESS_HH__
|
56
arch/mips/process.cc
Normal file
56
arch/mips/process.cc
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2003-2004 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "arch/mips/process.hh"
|
||||||
|
|
||||||
|
namespace MipsISA
|
||||||
|
{
|
||||||
|
|
||||||
|
LiveProcess *
|
||||||
|
createProcess(const string &nm, ObjectFile * objFile,
|
||||||
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
||||||
|
vector<string> &argv, vector<string> &envp)
|
||||||
|
{
|
||||||
|
LiveProcess * process = NULL;
|
||||||
|
if (objFile->getArch() != ObjectFile::MIPS)
|
||||||
|
fatal("Object file does not match architecture.");
|
||||||
|
switch (objFile->getOpSys()) {
|
||||||
|
case ObjectFile::Linux:
|
||||||
|
process = new MipsLinuxProcess(nm, objFile,
|
||||||
|
stdin_fd, stdout_fd, stderr_fd,
|
||||||
|
argv, envp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
fatal("Unknown/unsupported operating system.");
|
||||||
|
}
|
||||||
|
return process;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace MipsISA
|
||||||
|
|
45
arch/mips/process.hh
Normal file
45
arch/mips/process.hh
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2003-2004 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __MIPS_PROCESS_HH__
|
||||||
|
#define __MIPS_PROCESS_HH__
|
||||||
|
|
||||||
|
#include "arch/mips/linux_process.hh"
|
||||||
|
#include "base/loader/object_file.hh"
|
||||||
|
|
||||||
|
namespace MipsISA
|
||||||
|
{
|
||||||
|
|
||||||
|
LiveProcess *
|
||||||
|
createProcess(const string &nm, ObjectFile * objFile,
|
||||||
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
||||||
|
vector<string> &argv, vector<string> &envp);
|
||||||
|
|
||||||
|
} // namespace MipsISA
|
||||||
|
|
||||||
|
#endif // __MIPS_PROCESS_HH__
|
56
arch/sparc/process.cc
Normal file
56
arch/sparc/process.cc
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2003-2004 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "arch/sparc/process.hh"
|
||||||
|
|
||||||
|
namespace SparcISA
|
||||||
|
{
|
||||||
|
|
||||||
|
LiveProcess *
|
||||||
|
createProcess(const string &nm, ObjectFile * objFile,
|
||||||
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
||||||
|
vector<string> &argv, vector<string> &envp)
|
||||||
|
{
|
||||||
|
LiveProcess * process = NULL;
|
||||||
|
if (objFile->getArch() != ObjectFile::SPARC)
|
||||||
|
fatal("Object file does not match architecture.");
|
||||||
|
switch (objFile->getOpSys()) {
|
||||||
|
case ObjectFile::Linux:
|
||||||
|
process = new SparcLinuxProcess(nm, objFile,
|
||||||
|
stdin_fd, stdout_fd, stderr_fd,
|
||||||
|
argv, envp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ObjectFile::Solaris:
|
||||||
|
default:
|
||||||
|
fatal("Unknown/unsupported operating system.");
|
||||||
|
}
|
||||||
|
return process;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace SparcISA
|
45
arch/sparc/process.hh
Normal file
45
arch/sparc/process.hh
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2003-2004 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __SPARC_PROCESS_HH__
|
||||||
|
#define __SPARC_PROCESS_HH__
|
||||||
|
|
||||||
|
#include "arch/sparc/linux_process.hh"
|
||||||
|
#include "base/loader/object_file.hh"
|
||||||
|
|
||||||
|
namespace SparcISA
|
||||||
|
{
|
||||||
|
|
||||||
|
LiveProcess *
|
||||||
|
createProcess(const string &nm, ObjectFile * objFile,
|
||||||
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
||||||
|
vector<string> &argv, vector<string> &envp);
|
||||||
|
|
||||||
|
} // namespace SparcISA
|
||||||
|
|
||||||
|
#endif // __SPARC_PROCESS_HH__
|
|
@ -56,6 +56,8 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data)
|
||||||
{
|
{
|
||||||
Elf *elf;
|
Elf *elf;
|
||||||
GElf_Ehdr ehdr;
|
GElf_Ehdr ehdr;
|
||||||
|
Arch arch = UnknownArch;
|
||||||
|
OpSys opSys = UnknownOpSys;
|
||||||
|
|
||||||
// check that header matches library version
|
// check that header matches library version
|
||||||
if (elf_version(EV_CURRENT) == EV_NONE)
|
if (elf_version(EV_CURRENT) == EV_NONE)
|
||||||
|
@ -73,8 +75,8 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (ehdr.e_ident[EI_CLASS] == ELFCLASS32)
|
// if (ehdr.e_ident[EI_CLASS] == ELFCLASS32)
|
||||||
panic("32 bit ELF Binary, Not Supported");
|
// panic("32 bit ELF Binary, Not Supported");
|
||||||
/* @todo this emachine value isn't offical yet.
|
/* @todo this emachine value isn't offical yet.
|
||||||
* so we probably shouldn't check it. */
|
* so we probably shouldn't check it. */
|
||||||
// if (ehdr.e_machine != EM_ALPHA)
|
// if (ehdr.e_machine != EM_ALPHA)
|
||||||
|
@ -82,8 +84,43 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data)
|
||||||
|
|
||||||
elf_end(elf);
|
elf_end(elf);
|
||||||
|
|
||||||
return new ElfObject(fname, fd, len, data,
|
//Detect the architecture
|
||||||
ObjectFile::Alpha, ObjectFile::Linux);
|
//Versioning issues in libelf need to be resolved to get the correct
|
||||||
|
//SPARC constants.
|
||||||
|
//If MIPS supports 32 bit executables, this may need to be changed.
|
||||||
|
//Also, there are other MIPS constants which may be used, like
|
||||||
|
//EM_MIPS_RS3_LE and EM_MIPS_X
|
||||||
|
//Since we don't know how to check for alpha right now, we'll
|
||||||
|
//just assume if it wasn't something else and it's 64 bit, that's
|
||||||
|
//what it must be.
|
||||||
|
if (ehdr.e_machine == EM_SPARC64 ||
|
||||||
|
ehdr.e_machine == EM_SPARC ||
|
||||||
|
ehdr.e_machine == EM_SPARCV9) {
|
||||||
|
arch = ObjectFile::SPARC;
|
||||||
|
} else if (ehdr.e_machine == EM_MIPS
|
||||||
|
&& ehdr.e_ident[EI_CLASS] == ELFCLASS32) {
|
||||||
|
arch = ObjectFile::MIPS;
|
||||||
|
} else if (ehdr.e_ident[EI_CLASS] == ELFCLASS64) {
|
||||||
|
arch = ObjectFile::Alpha;
|
||||||
|
} else {
|
||||||
|
arch = ObjectFile::UnknownArch;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Detect the operating system
|
||||||
|
switch (ehdr.e_ident[EI_OSABI])
|
||||||
|
{
|
||||||
|
case ELFOSABI_LINUX:
|
||||||
|
opSys = ObjectFile::Linux;
|
||||||
|
break;
|
||||||
|
case ELFOSABI_SOLARIS:
|
||||||
|
opSys = ObjectFile::Solaris;
|
||||||
|
case ELFOSABI_TRU64:
|
||||||
|
opSys = ObjectFile::Tru64;
|
||||||
|
default:
|
||||||
|
opSys = ObjectFile::UnknownOpSys;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new ElfObject(fname, fd, len, data, arch, opSys);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,9 @@
|
||||||
#ifndef __OBJECT_FILE_HH__
|
#ifndef __OBJECT_FILE_HH__
|
||||||
#define __OBJECT_FILE_HH__
|
#define __OBJECT_FILE_HH__
|
||||||
|
|
||||||
#include "arch/isa_traits.hh" // for Addr
|
#include <string>
|
||||||
|
|
||||||
|
#include "sim/host.hh" // for Addr
|
||||||
|
|
||||||
class FunctionalMemory;
|
class FunctionalMemory;
|
||||||
class SymbolTable;
|
class SymbolTable;
|
||||||
|
@ -40,13 +42,16 @@ class ObjectFile
|
||||||
|
|
||||||
enum Arch {
|
enum Arch {
|
||||||
UnknownArch,
|
UnknownArch,
|
||||||
Alpha
|
Alpha,
|
||||||
|
SPARC,
|
||||||
|
MIPS
|
||||||
};
|
};
|
||||||
|
|
||||||
enum OpSys {
|
enum OpSys {
|
||||||
UnknownOpSys,
|
UnknownOpSys,
|
||||||
Tru64,
|
Tru64,
|
||||||
Linux
|
Linux,
|
||||||
|
Solaris
|
||||||
};
|
};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -48,8 +48,7 @@
|
||||||
#include "sim/stats.hh"
|
#include "sim/stats.hh"
|
||||||
#include "sim/syscall_emul.hh"
|
#include "sim/syscall_emul.hh"
|
||||||
|
|
||||||
#include "arch/tru64_process.hh"
|
#include "arch/process.hh"
|
||||||
#include "arch/linux_process.hh"
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace TheISA;
|
using namespace TheISA;
|
||||||
|
@ -376,27 +375,10 @@ LiveProcess::create(const string &nm,
|
||||||
fatal("Can't load object file %s", executable);
|
fatal("Can't load object file %s", executable);
|
||||||
}
|
}
|
||||||
|
|
||||||
// check object type & set up syscall emulation pointer
|
// set up syscall emulation pointer for the current ISA
|
||||||
if (objFile->getArch() == ObjectFile::Alpha) {
|
process = createProcess(nm, objFile,
|
||||||
switch (objFile->getOpSys()) {
|
stdin_fd, stdout_fd, stderr_fd,
|
||||||
case ObjectFile::Tru64:
|
argv, envp);
|
||||||
process = new AlphaTru64Process(nm, objFile,
|
|
||||||
stdin_fd, stdout_fd, stderr_fd,
|
|
||||||
argv, envp);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ObjectFile::Linux:
|
|
||||||
process = new AlphaLinuxProcess(nm, objFile,
|
|
||||||
stdin_fd, stdout_fd, stderr_fd,
|
|
||||||
argv, envp);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
fatal("Unknown/unsupported operating system.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fatal("Unknown object file architecture.");
|
|
||||||
}
|
|
||||||
|
|
||||||
delete objFile;
|
delete objFile;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue