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

changes that affect post checkpoint runs.

Browse Source 
cpu/exec_context.cc:
    you can't delete an element of an array that you newed.  oops.
kern/tru64/tru64_events.cc:
    changes to reflect .ini changes, and also b/c es_intr and ipintr can happen at ANY point, even within a current calling path being tracked.
sim/system.cc:
    can't delete an element of a newed array.  must new them separately.

--HG--
extra : convert_revision : 21573327b7b7f20bf9a3fcfb5854526433e17e17
This commit is contained in:
Lisa Hsu
2004-03-05 08:16:33 -05:00
parent d9689c58d3
commit 34576de15a
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpu/exec_context.cc
View File

@@ -147,14 +147,18 @@ ExecContext::unserialize(Checkpoint *cp, const std::string &section)
UNSERIALIZE_SCALAR(swCtx->calls);
int size;
UNSERIALIZE_SCALAR(size);
fnCall *call = new fnCall[size];
vector<fnCall *> calls;
fnCall *call;
for (int i=0; i<size; ++i) {
paramIn(cp, section, csprintf("stackpos[%d]",i), call[i].name);
call[i].myBin = system->getBin(call[i].name);
call = new fnCall;
paramIn(cp, section, csprintf("stackpos[%d]",i), call->name);
call->myBin = system->getBin(call->name);
calls.push_back(call);
}
for (int i=size-1; i>=0; --i) {
swCtx->callStack.push(&(call[i]));
swCtx->callStack.push(calls[i]);
}
}

4
kern/tru64/tru64_events.cc
View File

@@ -130,7 +130,9 @@ FnEvent::process(ExecContext *xc)
if (last->name == "idle_thread")
ctx->calls++;
if (!xc->system->findCaller(myname(), last->name)) {
if (!xc->system->findCaller(myname(), "" ) &&
!xc->system->findCaller(myname(), last->name)) {
DPRINTF(TCPIP, "but can't find parent %s\n", last->name);
return;
}

19
sim/system.cc
View File

@@ -164,26 +164,31 @@ System::unserialize(Checkpoint *cp, const std::string &section)
int numCtxs;
UNSERIALIZE_SCALAR(numCtxs);
SWContext *ctxs = new SWContext[numCtxs];
SWContext *ctx;
Addr addr;
int size;
for(int i = 0; i < numCtxs; ++i) {
ctx = new SWContext;
paramIn(cp, section, csprintf("Addr[%d]",i), addr);
paramIn(cp, section, csprintf("calls[%d]",i), ctxs[i].calls);
paramIn(cp, section, csprintf("calls[%d]",i), ctx->calls);
paramIn(cp, section, csprintf("stacksize[%d]",i), size);
fnCall *call = new fnCall[size];
vector<fnCall *> calls;
fnCall *call;
for (int j = 0; j < size; ++j) {
call = new fnCall;
paramIn(cp, section, csprintf("ctx[%d].stackpos[%d]",i,j),
call[j].name);
call[j].myBin = getBin(call[j].name);
call->name);
call->myBin = getBin(call->name);
calls.push_back(call);
}
for (int j=size-1; j>=0; --j) {
ctxs[i].callStack.push(&(call[j]));
ctx->callStack.push(calls[j]);
}
addContext(addr, &(ctxs[i]));
addContext(addr, ctx);
}
}
}