Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem src/cpu/o3/fetch_impl.hh: Hand merge. --HG-- extra : convert_revision : 820dab2bc921cbadecaca51cd069327f984f5c74
This commit is contained in:
commit
bbfe1db6b3
2 changed files with 20 additions and 4 deletions
|
@ -357,6 +357,8 @@ DefaultFetch<Impl>::processCacheCompletion(PacketPtr pkt)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
memcpy(cacheData[tid], pkt->getPtr<uint8_t *>(), cacheBlkSize);
|
||||||
|
|
||||||
if (!drainPending) {
|
if (!drainPending) {
|
||||||
// Wake up the CPU (if it went to sleep and was waiting on
|
// Wake up the CPU (if it went to sleep and was waiting on
|
||||||
// this completion event).
|
// this completion event).
|
||||||
|
@ -553,7 +555,7 @@ DefaultFetch<Impl>::fetchCacheLine(Addr fetch_PC, Fault &ret_fault, unsigned tid
|
||||||
// Build packet here.
|
// Build packet here.
|
||||||
PacketPtr data_pkt = new Packet(mem_req,
|
PacketPtr data_pkt = new Packet(mem_req,
|
||||||
Packet::ReadReq, Packet::Broadcast);
|
Packet::ReadReq, Packet::Broadcast);
|
||||||
data_pkt->dataStatic(cacheData[tid]);
|
data_pkt->dataDynamic(new uint8_t[cacheBlkSize]);
|
||||||
|
|
||||||
cacheDataPC[tid] = fetch_PC;
|
cacheDataPC[tid] = fetch_PC;
|
||||||
|
|
||||||
|
|
|
@ -119,6 +119,8 @@ add_option('-d', "--outdir", metavar="DIR", default=".",
|
||||||
help="Set the output directory to DIR [Default: %default]")
|
help="Set the output directory to DIR [Default: %default]")
|
||||||
add_option('-i', "--interactive", action="store_true", default=False,
|
add_option('-i', "--interactive", action="store_true", default=False,
|
||||||
help="Invoke the interactive interpreter after running the script")
|
help="Invoke the interactive interpreter after running the script")
|
||||||
|
add_option("--pdb", action="store_true", default=False,
|
||||||
|
help="Invoke the python debugger before running the script")
|
||||||
add_option('-p', "--path", metavar="PATH[:PATH]", action='append', split=':',
|
add_option('-p', "--path", metavar="PATH[:PATH]", action='append', split=':',
|
||||||
help="Prepend PATH to the system path when invoking the script")
|
help="Prepend PATH to the system path when invoking the script")
|
||||||
add_option('-q', "--quiet", action="count", default=0,
|
add_option('-q', "--quiet", action="count", default=0,
|
||||||
|
@ -283,11 +285,23 @@ def main():
|
||||||
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
|
||||||
|
|
||||||
scope = { '__file__' : sys.argv[0] }
|
|
||||||
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
|
||||||
exec("import readline", scope)
|
|
||||||
execfile(sys.argv[0], scope)
|
scope = { '__file__' : sys.argv[0] }
|
||||||
|
|
||||||
|
# we want readline if we're doing anything interactive
|
||||||
|
if options.interactive or options.pdb:
|
||||||
|
exec("import readline", scope)
|
||||||
|
|
||||||
|
# if pdb was requested, execfile the thing under pdb, otherwise,
|
||||||
|
# just do the execfile normally
|
||||||
|
if options.pdb:
|
||||||
|
from pdb import Pdb
|
||||||
|
debugger = Pdb()
|
||||||
|
debugger.run('execfile("%s")' % sys.argv[0], scope)
|
||||||
|
else:
|
||||||
|
execfile(sys.argv[0], scope)
|
||||||
|
|
||||||
# once the script is done
|
# once the script is done
|
||||||
if options.interactive:
|
if options.interactive:
|
||||||
|
|
Loading…
Reference in a new issue