diff options
| -rw-r--r-- | src/cpu/exetrace.cc | 2 | ||||
| -rw-r--r-- | src/cpu/o3/rename_impl.hh | 2 | ||||
| -rw-r--r-- | src/sim/process.cc | 8 | ||||
| -rwxr-xr-x | util/make_release.py | 17 |
4 files changed, 22 insertions, 7 deletions
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index c568b1439..3e2b0f03e 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -652,7 +652,7 @@ Trace::InstRecord::dump() predecoder.setTC(thread); predecoder.moreBytes(m5Pc, 0, shared_data->instruction); - assert(predecoder.extMachInstRead()); + assert(predecoder.extMachInstReady()); StaticInstPtr legionInst = StaticInst::decode(predecoder.getExtMachInst()); diff --git a/src/cpu/o3/rename_impl.hh b/src/cpu/o3/rename_impl.hh index 6b7fb1e08..431705e19 100644 --- a/src/cpu/o3/rename_impl.hh +++ b/src/cpu/o3/rename_impl.hh @@ -692,7 +692,7 @@ DefaultRename<Impl>::renameInsts(unsigned tid) DPRINTF(Rename, "Blocking due to lack of free " "physical registers to rename to.\n"); blockThisCycle = true; - + insts_to_rename.push_front(inst); ++renameFullRegistersEvents; break; diff --git a/src/sim/process.cc b/src/sim/process.cc index 2b283c9d1..68239fa52 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -157,12 +157,12 @@ Process::registerThreadContext(ThreadContext *tc) int myIndex = threadContexts.size(); threadContexts.push_back(tc); - RemoteGDB *rgdb = new RemoteGDB(system, tc); - GDBListener *gdbl = new GDBListener(rgdb, 7000 + myIndex); - gdbl->listen(); +// RemoteGDB *rgdb = new RemoteGDB(system, tc); +// GDBListener *gdbl = new GDBListener(rgdb, 7000 + myIndex); +// gdbl->listen(); //gdbl->accept(); - remoteGDB.push_back(rgdb); +// remoteGDB.push_back(rgdb); // return CPU number to caller return myIndex; diff --git a/util/make_release.py b/util/make_release.py index f07bafe3b..8d69614dc 100755 --- a/util/make_release.py +++ b/util/make_release.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2006 The Regents of The University of Michigan +# Copyright (c) 2006-2007 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -127,6 +127,7 @@ rmtree(release_dir, 'configs/test') rmtree(release_dir, 'configs/splash2') rmtree(release_dir, 'tests/long/*/ref') rmtree(release_dir, 'tests/old') +rmtree(release_dir, 'src/dev/i8*') # get rid of some of private scripts remove(release_dir, 'util/chgcopyright') @@ -143,6 +144,20 @@ for line in inscript: outscript.write(line) outscript.close() +# fix up the SConscript to deal with files we've removed +mem_expr = re.compile('.*i8254xGBe.*') +inscript = file(joinpath(release_dir, 'src', 'dev', 'SConscript'), 'r').readlines() +outscript = file(joinpath(release_dir, 'src', 'dev', 'SConscript'), 'w') +for line in inscript: + if mem_expr.match(line): + continue + + outscript.write(line) +outscript.close() + + + + benches = [ 'bzip2', 'eon', 'gzip', 'mcf', 'parser', 'perlbmk', 'twolf', 'vortex' ] for bench in benches: |