derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include option for disabling PC symbols.

Browse Source 
cpu/inst_seq.hh:
cpu/o3/cpu.cc:
cpu/ozone/cpu_builder.cc:
cpu/ozone/thread_state.hh:
    SE build fixes.

--HG--
extra : convert_revision : a4df6128533105f849b5469f62d83dffe299b7df
This commit is contained in:
Kevin Lim
2006-04-24 17:11:31 -04:00
parent e704960c80
commit 31e09892d7
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/inst_seq.hh
View File

@@ -29,6 +29,8 @@
#ifndef __STD_TYPES_HH__
#define __STD_TYPES_HH__
#include <stdint.h>
// inst sequence type, used to order instructions in the ready list,
// if this rolls over the ready list order temporarily will get messed
// up, but execution will continue and complete correctly

10
cpu/o3/cpu.cc
View File

@@ -123,7 +123,7 @@ FullO3CPU<Impl>::FullO3CPU(Params *params)
physmem(system->physmem),
mem(params->mem),
#else
pTable(params->pTable),
// pTable(params->pTable),
#endif // FULL_SYSTEM
icacheInterface(params->icacheInterface),
@@ -238,8 +238,8 @@ FullO3CPU<Impl>::FullO3CPU(Params *params)
// Setup the page table for whichever stages need it.
#if !FULL_SYSTEM
fetch.setPageTable(pTable);
iew.setPageTable(pTable);
// fetch.setPageTable(pTable);
// iew.setPageTable(pTable);
#endif
// Setup the ROB for whichever stages need it.
@@ -885,11 +885,9 @@ template <class Impl>
void
FullO3CPU<Impl>::removeFrontInst(DynInstPtr &inst)
{
unsigned tid = inst->threadNumber;
DPRINTF(FullCPU, "FullCPU: Removing committed instruction [tid:%i] PC %#x "
"[sn:%lli]\n",
tid, inst->readPC(), inst->seqNum);
inst->threadNumber, inst->readPC(), inst->seqNum);
removeInstsThisCycle = true;

12
cpu/ozone/cpu_builder.cc
View File

@@ -45,7 +45,7 @@ SimObjectParam<AlphaITB *> itb;
SimObjectParam<AlphaDTB *> dtb;
#else
SimObjectVectorParam<Process *> workload;
SimObjectParam<PageTable *> page_table;
//SimObjectParam<PageTable *> page_table;
#endif // FULL_SYSTEM
SimObjectParam<FunctionalMemory *> mem;
@@ -159,7 +159,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(DerivOzoneCPU)
INIT_PARAM(dtb, "Data translation buffer"),
#else
INIT_PARAM(workload, "Processes to run"),
INIT_PARAM(page_table, "Page table"),
// INIT_PARAM(page_table, "Page table"),
#endif // FULL_SYSTEM
INIT_PARAM_DFLT(mem, "Memory", NULL),
@@ -310,7 +310,7 @@ CREATE_SIM_OBJECT(DerivOzoneCPU)
params->dtb = dtb;
#else
params->workload = workload;
params->pTable = page_table;
// params->pTable = page_table;
#endif // FULL_SYSTEM
params->mem = mem;
@@ -440,7 +440,7 @@ SimObjectParam<AlphaITB *> itb;
SimObjectParam<AlphaDTB *> dtb;
#else
SimObjectVectorParam<Process *> workload;
SimObjectParam<PageTable *> page_table;
//SimObjectParam<PageTable *> page_table;
#endif // FULL_SYSTEM
SimObjectParam<FunctionalMemory *> mem;
@@ -554,7 +554,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleOzoneCPU)
INIT_PARAM(dtb, "Data translation buffer"),
#else
INIT_PARAM(workload, "Processes to run"),
INIT_PARAM(page_table, "Page table"),
// INIT_PARAM(page_table, "Page table"),
#endif // FULL_SYSTEM
INIT_PARAM_DFLT(mem, "Memory", NULL),
@@ -705,7 +705,7 @@ CREATE_SIM_OBJECT(SimpleOzoneCPU)
params->dtb = dtb;
#else
params->workload = workload;
params->pTable = page_table;
// params->pTable = page_table;
#endif // FULL_SYSTEM
params->mem = mem;

5
cpu/ozone/thread_state.hh
View File

@@ -6,9 +6,10 @@
#include "arch/isa_traits.hh"
#include "cpu/exec_context.hh"
#include "cpu/thread_state.hh"
#include "sim/process.hh"
class Event;
class Process;
//class Process;
#if FULL_SYSTEM
class EndQuiesceEvent;
@@ -40,7 +41,7 @@ struct OzoneThreadState : public ThreadState {
}
#else
OzoneThreadState(FullCPU *_cpu, int _thread_num, Process *_process, int _asid)
: ThreadState(-1, _thread_num, NULL, _process, _asid),
: ThreadState(-1, _thread_num, _process->getMemory(), _process, _asid),
cpu(_cpu), inSyscall(0), trapPending(0)
{
memset(&regs, 0, sizeof(TheISA::RegFile));