Started adding a system to output data after every instruction.
src/arch/alpha/regfile.hh: src/arch/mips/regfile/float_regfile.hh: src/arch/mips/regfile/int_regfile.hh: src/arch/mips/regfile/misc_regfile.hh: src/cpu/exetrace.hh: Added functions to start to support dumping register values once per cycle. src/cpu/exetrace.cc: Added some code to support printing the value of registers after each cycle. src/python/m5/main.py: Options to turn on output after every instruction. They are commented out. --HG-- extra : convert_revision : 168a48a6b98ab6be412a96bdee831c71906958b0
This commit is contained in:
parent
800e6ecc07
commit
ec26f0bb3d
7 changed files with 76 additions and 2 deletions
|
@ -45,6 +45,21 @@ class ThreadContext;
|
||||||
namespace AlphaISA
|
namespace AlphaISA
|
||||||
{
|
{
|
||||||
|
|
||||||
|
static inline std::string getIntRegName(RegIndex)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline std::string getFloatRegName(RegIndex)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline std::string getMiscRegName(RegIndex)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
class IntRegFile
|
class IntRegFile
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -41,6 +41,11 @@ class Checkpoint;
|
||||||
|
|
||||||
namespace MipsISA
|
namespace MipsISA
|
||||||
{
|
{
|
||||||
|
static inline std::string getFloatRegName(RegIndex)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
const uint32_t MIPS32_QNAN = 0x7fbfffff;
|
const uint32_t MIPS32_QNAN = 0x7fbfffff;
|
||||||
const uint64_t MIPS64_QNAN = ULL(0x7fbfffffffffffff);
|
const uint64_t MIPS64_QNAN = ULL(0x7fbfffffffffffff);
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,11 @@ class ThreadContext;
|
||||||
|
|
||||||
namespace MipsISA
|
namespace MipsISA
|
||||||
{
|
{
|
||||||
|
static inline std::string getIntRegName(RegIndex)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
enum MiscIntRegNums {
|
enum MiscIntRegNums {
|
||||||
HI = NumIntArchRegs,
|
HI = NumIntArchRegs,
|
||||||
LO
|
LO
|
||||||
|
|
|
@ -39,6 +39,11 @@ class ThreadContext;
|
||||||
|
|
||||||
namespace MipsISA
|
namespace MipsISA
|
||||||
{
|
{
|
||||||
|
static inline std::string getMiscRegName(RegIndex)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
//Coprocessor 0 Register Names
|
//Coprocessor 0 Register Names
|
||||||
enum MiscRegTags {
|
enum MiscRegTags {
|
||||||
//Reference MIPS32 Arch. for Programmers, Vol. III, Ch.8
|
//Reference MIPS32 Arch. for Programmers, Vol. III, Ch.8
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
|
#include "arch/regfile.hh"
|
||||||
#include "base/loader/symtab.hh"
|
#include "base/loader/symtab.hh"
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "cpu/exetrace.hh"
|
#include "cpu/exetrace.hh"
|
||||||
|
@ -42,7 +43,7 @@
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
using namespace TheISA;
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
@ -53,7 +54,43 @@ using namespace std;
|
||||||
void
|
void
|
||||||
Trace::InstRecord::dump(ostream &outs)
|
Trace::InstRecord::dump(ostream &outs)
|
||||||
{
|
{
|
||||||
if (flags[INTEL_FORMAT]) {
|
if (flags[PRINT_REG_DELTA])
|
||||||
|
{
|
||||||
|
outs << "PC = 0x" << setbase(16)
|
||||||
|
<< setfill('0')
|
||||||
|
<< setw(16) << PC << endl;
|
||||||
|
outs << setbase(10)
|
||||||
|
<< setfill(' ')
|
||||||
|
<< setw(0);
|
||||||
|
/*
|
||||||
|
int numSources = staticInst->numSrcRegs();
|
||||||
|
int numDests = staticInst->numDestRegs();
|
||||||
|
outs << "Sources:";
|
||||||
|
for(int x = 0; x < numSources; x++)
|
||||||
|
{
|
||||||
|
int sourceNum = staticInst->srcRegIdx(x);
|
||||||
|
if(sourceNum < FP_Base_DepTag)
|
||||||
|
outs << " " << getIntRegName(sourceNum);
|
||||||
|
else if(sourceNum < Ctrl_Base_DepTag)
|
||||||
|
outs << " " << getFloatRegName(sourceNum - FP_Base_DepTag);
|
||||||
|
else
|
||||||
|
outs << " " << getMiscRegName(sourceNum - Ctrl_Base_DepTag);
|
||||||
|
}
|
||||||
|
outs << endl;
|
||||||
|
outs << "Destinations:";
|
||||||
|
for(int x = 0; x < numDests; x++)
|
||||||
|
{
|
||||||
|
int destNum = staticInst->destRegIdx(x);
|
||||||
|
if(destNum < FP_Base_DepTag)
|
||||||
|
outs << " " << getIntRegName(destNum);
|
||||||
|
else if(destNum < Ctrl_Base_DepTag)
|
||||||
|
outs << " " << getFloatRegName(destNum - FP_Base_DepTag);
|
||||||
|
else
|
||||||
|
outs << " " << getMiscRegName(destNum - Ctrl_Base_DepTag);
|
||||||
|
}
|
||||||
|
outs << endl;*/
|
||||||
|
}
|
||||||
|
else if (flags[INTEL_FORMAT]) {
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
bool is_trace_system = (cpu->system->name() == trace_system);
|
bool is_trace_system = (cpu->system->name() == trace_system);
|
||||||
#else
|
#else
|
||||||
|
@ -196,6 +233,8 @@ Param<bool> exe_trace_print_fetchseq(&exeTraceParams, "print_fetchseq",
|
||||||
"print fetch sequence number", false);
|
"print fetch sequence number", false);
|
||||||
Param<bool> exe_trace_print_cp_seq(&exeTraceParams, "print_cpseq",
|
Param<bool> exe_trace_print_cp_seq(&exeTraceParams, "print_cpseq",
|
||||||
"print correct-path sequence number", false);
|
"print correct-path sequence number", false);
|
||||||
|
Param<bool> exe_trace_print_reg_delta(&exeTraceParams, "print_reg_delta",
|
||||||
|
"print which registers changed to what", false);
|
||||||
Param<bool> exe_trace_pc_symbol(&exeTraceParams, "pc_symbol",
|
Param<bool> exe_trace_pc_symbol(&exeTraceParams, "pc_symbol",
|
||||||
"Use symbols for the PC if available", true);
|
"Use symbols for the PC if available", true);
|
||||||
Param<bool> exe_trace_intel_format(&exeTraceParams, "intel_format",
|
Param<bool> exe_trace_intel_format(&exeTraceParams, "intel_format",
|
||||||
|
@ -222,6 +261,7 @@ Trace::InstRecord::setParams()
|
||||||
flags[PRINT_INT_REGS] = exe_trace_print_iregs;
|
flags[PRINT_INT_REGS] = exe_trace_print_iregs;
|
||||||
flags[PRINT_FETCH_SEQ] = exe_trace_print_fetchseq;
|
flags[PRINT_FETCH_SEQ] = exe_trace_print_fetchseq;
|
||||||
flags[PRINT_CP_SEQ] = exe_trace_print_cp_seq;
|
flags[PRINT_CP_SEQ] = exe_trace_print_cp_seq;
|
||||||
|
flags[PRINT_REG_DELTA] = exe_trace_print_reg_delta;
|
||||||
flags[PC_SYMBOL] = exe_trace_pc_symbol;
|
flags[PC_SYMBOL] = exe_trace_pc_symbol;
|
||||||
flags[INTEL_FORMAT] = exe_trace_intel_format;
|
flags[INTEL_FORMAT] = exe_trace_intel_format;
|
||||||
trace_system = exe_trace_system;
|
trace_system = exe_trace_system;
|
||||||
|
|
|
@ -147,6 +147,7 @@ class InstRecord : public Record
|
||||||
PRINT_INT_REGS,
|
PRINT_INT_REGS,
|
||||||
PRINT_FETCH_SEQ,
|
PRINT_FETCH_SEQ,
|
||||||
PRINT_CP_SEQ,
|
PRINT_CP_SEQ,
|
||||||
|
PRINT_REG_DELTA,
|
||||||
PC_SYMBOL,
|
PC_SYMBOL,
|
||||||
INTEL_FORMAT,
|
INTEL_FORMAT,
|
||||||
NUM_BITS
|
NUM_BITS
|
||||||
|
|
|
@ -177,6 +177,8 @@ bool_option("print-fetch-seq", default=False,
|
||||||
help="Print fetch sequence numbers in trace output")
|
help="Print fetch sequence numbers in trace output")
|
||||||
bool_option("print-cpseq", default=False,
|
bool_option("print-cpseq", default=False,
|
||||||
help="Print correct path sequence numbers in trace output")
|
help="Print correct path sequence numbers in trace output")
|
||||||
|
#bool_option("print-reg-delta", default=False,
|
||||||
|
# help="Print which registers changed to what in trace output")
|
||||||
|
|
||||||
options = attrdict()
|
options = attrdict()
|
||||||
arguments = []
|
arguments = []
|
||||||
|
@ -290,6 +292,7 @@ def main():
|
||||||
objects.ExecutionTrace.print_iregs = options.print_iregs
|
objects.ExecutionTrace.print_iregs = options.print_iregs
|
||||||
objects.ExecutionTrace.print_fetchseq = options.print_fetch_seq
|
objects.ExecutionTrace.print_fetchseq = options.print_fetch_seq
|
||||||
objects.ExecutionTrace.print_cpseq = options.print_cpseq
|
objects.ExecutionTrace.print_cpseq = options.print_cpseq
|
||||||
|
#objects.ExecutionTrace.print_reg_delta = options.print_reg_delta
|
||||||
|
|
||||||
sys.argv = arguments
|
sys.argv = arguments
|
||||||
sys.path = [ os.path.dirname(sys.argv[0]) ] + sys.path
|
sys.path = [ os.path.dirname(sys.argv[0]) ] + sys.path
|
||||||
|
|
Loading…
Reference in a new issue