From 5b5e2fd6cdc4249fe31a1b7b45a224bbf2a88678 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 1 Aug 2007 14:34:59 -0700 Subject: [PATCH 1/7] X86: Hide the irrelevant portions of the address components for load and store microops. --HG-- extra : convert_revision : a5ac6fefa09882f0833537e23f1ac0477bc89bb9 --- src/arch/x86/insts/microldstop.cc | 36 +++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc index 9628256e4..9638a2ae3 100644 --- a/src/arch/x86/insts/microldstop.cc +++ b/src/arch/x86/insts/microldstop.cc @@ -64,16 +64,40 @@ namespace X86ISA const SymbolTable *symtab) const { std::stringstream response; + bool someAddr = false; printMnemonic(response, instMnem, mnemonic); - printDestReg(response, 0, dataSize); + if(flags[IsLoad]) + printDestReg(response, 0, dataSize); + else + printSrcReg(response, 2, dataSize); response << ", "; printSegment(response, segment); - ccprintf(response, ":[%d*", scale); - printSrcReg(response, 0, addressSize); - response << " + "; - printSrcReg(response, 1, addressSize); - ccprintf(response, " + %#x]", disp); + response << ":["; + if(scale != 0 && _srcRegIdx[0] != ZeroReg) + { + if(scale != 1) + ccprintf(response, "%d*", scale); + printSrcReg(response, 0, addressSize); + someAddr = true; + } + if(_srcRegIdx[1] != ZeroReg) + { + if(someAddr) + response << " + "; + printSrcReg(response, 1, addressSize); + someAddr = true; + } + if(disp != 0) + { + if(someAddr) + response << " + "; + ccprintf(response, "%#x", disp); + someAddr = true; + } + if(!someAddr) + response << "0"; + response << "]"; return response.str(); } } From a88f01c2002bd670f124c5a39b018813d18443c0 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 1 Aug 2007 15:40:41 -0700 Subject: [PATCH 2/7] Statetrace: Make sure all the info block strings are printed. --HG-- extra : convert_revision : 534b4f5cee3fd1a6d3638d9a910d22ad1aa81fde --- util/statetrace/arch/tracechild_amd64.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/statetrace/arch/tracechild_amd64.cc b/util/statetrace/arch/tracechild_amd64.cc index 088e547e4..222923972 100644 --- a/util/statetrace/arch/tracechild_amd64.cc +++ b/util/statetrace/arch/tracechild_amd64.cc @@ -160,6 +160,7 @@ ostream & AMD64TraceChild::outputStartState(ostream & os) { uint64_t sp = getSP(); uint64_t pc = getPC(); + uint64_t highestInfo = 0; char obuf[1024]; sprintf(obuf, "Initial stack pointer = 0x%016llx\n", sp); os << obuf; @@ -180,6 +181,9 @@ ostream & AMD64TraceChild::outputStartState(ostream & os) cargv = ptrace(PTRACE_PEEKDATA, pid, sp, 0); sprintf(obuf, "0x%016llx: argv[%d] = 0x%016llx\n", sp, argCount++, cargv); + if(cargv) + if(highestInfo < cargv) + highestInfo = cargv; os << obuf; sp += 8; } while(cargv); @@ -230,7 +234,7 @@ ostream & AMD64TraceChild::outputStartState(ostream & os) } sp += 8; clearedInitialPadding = clearedInitialPadding || buf != 0; - } while(!clearedInitialPadding || buf != 0); + } while(!clearedInitialPadding || buf != 0 || sp <= highestInfo); return os; } From c032a535ab651f216ef0620915ab90338ca24929 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 1 Aug 2007 15:53:39 -0700 Subject: [PATCH 3/7] MIPS: Files which are needed for the MIPS fix. --HG-- extra : convert_revision : ae710fa8e4e9f57c19cd7277b1b59efd0af40b6a --- src/arch/mips/regfile/int_regfile.cc | 48 +++++++++++++++++ src/arch/mips/regfile/regfile.cc | 77 ++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 src/arch/mips/regfile/int_regfile.cc create mode 100644 src/arch/mips/regfile/regfile.cc diff --git a/src/arch/mips/regfile/int_regfile.cc b/src/arch/mips/regfile/int_regfile.cc new file mode 100644 index 000000000..70c71fa24 --- /dev/null +++ b/src/arch/mips/regfile/int_regfile.cc @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2003-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: Gabe Black + * Korey Sewell + */ + +#include "arch/mips/regfile/int_regfile.hh" +#include "sim/serialize.hh" + +using namespace MipsISA; +using namespace std; + +void +IntRegFile::serialize(std::ostream &os) +{ + SERIALIZE_ARRAY(regs, NumIntRegs); +} + +void +IntRegFile::unserialize(Checkpoint *cp, const std::string §ion) +{ + UNSERIALIZE_ARRAY(regs, NumIntRegs); +} diff --git a/src/arch/mips/regfile/regfile.cc b/src/arch/mips/regfile/regfile.cc new file mode 100644 index 000000000..2b778e6f8 --- /dev/null +++ b/src/arch/mips/regfile/regfile.cc @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2003-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: Gabe Black + * Korey Sewell + */ + +#include "arch/mips/regfile/regfile.hh" +#include "sim/serialize.hh" + +using namespace MipsISA; +using namespace std; + +void +RegFile::serialize(std::ostream &os) +{ + intRegFile.serialize(os); + //SERIALIZE_ARRAY(floatRegFile, NumFloatRegs); + //SERIALZE_ARRAY(miscRegFile); + //SERIALIZE_SCALAR(miscRegs.fpcr); + //SERIALIZE_SCALAR(miscRegs.lock_flag); + //SERIALIZE_SCALAR(miscRegs.lock_addr); + SERIALIZE_SCALAR(pc); + SERIALIZE_SCALAR(npc); + SERIALIZE_SCALAR(nnpc); +} + +void +RegFile::unserialize(Checkpoint *cp, const std::string §ion) +{ + intRegFile.unserialize(cp, section); + //UNSERIALIZE_ARRAY(floatRegFile); + //UNSERIALZE_ARRAY(miscRegFile); + //UNSERIALIZE_SCALAR(miscRegs.fpcr); + //UNSERIALIZE_SCALAR(miscRegs.lock_flag); + //UNSERIALIZE_SCALAR(miscRegs.lock_addr); + UNSERIALIZE_SCALAR(pc); + UNSERIALIZE_SCALAR(npc); + UNSERIALIZE_SCALAR(nnpc); + +} + +void +MipsISA::copyRegs(ThreadContext *src, ThreadContext *dest) +{ + panic("Copy Regs Not Implemented Yet\n"); +} + +void +MipsISA::copyMiscRegs(ThreadContext *src, ThreadContext *dest) +{ + panic("Copy Misc. Regs Not Implemented Yet\n"); +} From a3e70f495749334670e9fa392c4212794707d0d8 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Wed, 1 Aug 2007 16:57:29 -0700 Subject: [PATCH 4/7] mips: make getArgument inline so mips will link properly --HG-- extra : convert_revision : 7fdbf1f35a5fcbd8704bf02aafcb3ea069626ce3 --- src/arch/mips/utility.hh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh index 300761c93..5cf38afbc 100644 --- a/src/arch/mips/utility.hh +++ b/src/arch/mips/utility.hh @@ -48,7 +48,9 @@ class ThreadContext; namespace MipsISA { - uint64_t getArgument(ThreadContext *tc, bool fp) { + inline uint64_t + getArgument(ThreadContext *tc, bool fp) + { panic("getArgument() not implemented for MIPS\n"); } From e719a3e4c058920fb5913a38fbe4976d53a0e6e2 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 1 Aug 2007 18:19:23 -0700 Subject: [PATCH 5/7] Fix how the "cmd" parameter is set in se.py and remove hack in x86 process initialization code. --HG-- extra : convert_revision : 1fc741eea956ebfa4cef488eef4333d1f50617a6 --- configs/example/se.py | 2 +- src/arch/x86/process.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/example/se.py b/configs/example/se.py index b294480f6..20fe75a21 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -64,7 +64,7 @@ if args: process = LiveProcess() process.executable = options.cmd -process.cmd = options.cmd + " " + options.options +process.cmd = [options.cmd] + options.options.split() if options.input != "": process.input = options.input diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index 17904cb33..afe41cdeb 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -290,18 +290,19 @@ X86LiveProcess::argsInit(int intSize, int pageSize) //This is the name of the file which is present on the initial stack //It's purpose is to let the user space linker examine the original file. - int file_name_size = filename.size(); + int file_name_size = filename.size() + 1; string platform = "x86_64"; int aux_data_size = platform.size() + 1; int env_data_size = 0; for (int i = 0; i < envp.size(); ++i) { - env_data_size += envp[i].size(); + env_data_size += envp[i].size() + 1; } int arg_data_size = 0; for (int i = 0; i < argv.size(); ++i) { - arg_data_size += argv[i].size(); + warn("Argv[%d] size is %d\n", i, argv[i].size() + 1); + arg_data_size += argv[i].size() + 1; } //The auxiliary vector data needs to be padded so it's size is a multiple From 5682f4f7f98f3ea98ea0b0290f859f55ed0ff45f Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 2 Aug 2007 11:59:02 -0700 Subject: [PATCH 6/7] main: expose the build information as a simple command line parameter --HG-- extra : convert_revision : 69189c4a2e9fa9290fe51a2a43a2b08e712c395d --- src/python/m5/main.py | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/python/m5/main.py b/src/python/m5/main.py index 1695ed75f..96f017cb0 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -26,9 +26,15 @@ # # Authors: Nathan Binkert -import code, optparse, os, socket, sys -from datetime import datetime +import code +import datetime +import optparse +import os +import socket +import sys + from attrdict import attrdict +import defines import traceflags __all__ = [ 'options', 'arguments', 'main' ] @@ -116,6 +122,8 @@ def bool_option(name, default, help): # Help options add_option('-A', "--authors", action="store_true", default=False, help="Show author information") +add_option('-B', "--build-info", action="store_true", default=False, + help="Show build information") add_option('-C', "--copyright", action="store_true", default=False, help="Show full copyright information") add_option('-R', "--readme", action="store_true", default=False, @@ -195,6 +203,22 @@ def main(): parse_args() done = False + + if options.build_info: + done = True + print 'Build information:' + print + print 'compiled %s' % internal.core.cvar.compileDate; + print 'started %s' % datetime.datetime.now().ctime() + print 'executing on %s' % socket.gethostname() + print 'build options:' + keys = defines.m5_build_env.keys() + keys.sort() + for key in keys: + val = defines.m5_build_env[key] + print ' %s = %s' % (key, val) + print + if options.copyright: done = True print info.LICENSE @@ -242,7 +266,7 @@ def main(): print brief_copyright print print "M5 compiled %s" % internal.core.cvar.compileDate; - print "M5 started %s" % datetime.now().ctime() + print "M5 started %s" % datetime.datetime.now().ctime() print "M5 executing on %s" % socket.gethostname() print "command line:", for argv in sys.argv: From dfa147a70ac87cdc5804993a0b39dfb8bb4cfa1b Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 2 Aug 2007 12:03:35 -0700 Subject: [PATCH 7/7] python: need to import objects to make some calls work --HG-- extra : convert_revision : b5eec971d76626b2f42448052ab2cb2acb652d1b --- src/python/m5/simulate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py index 1ef78d6cb..ba9fb7899 100644 --- a/src/python/m5/simulate.py +++ b/src/python/m5/simulate.py @@ -36,6 +36,7 @@ import internal from main import options import SimObject import ticks +import objects # The final hook to generate .ini files. Called from the user script # once the config is built.