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

Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem

Browse Source 
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 26118d0dce464405148d2693fee4561fa0ce10ff
This commit is contained in:
Gabe Black
2007-04-18 21:27:37 -04:00
parent dde2b11ae6 5825104982
commit f3a0abbecc
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/python/SConscript
View File

@@ -103,7 +103,6 @@ SimObject('m5/objects/Process.py')
SimObject('m5/objects/Repl.py')
SimObject('m5/objects/Root.py')
SimObject('m5/objects/Sampler.py')
SimObject('m5/objects/Scsi.py')
SimObject('m5/objects/SimConsole.py')
SimObject('m5/objects/SimpleCPU.py')
SimObject('m5/objects/SimpleDisk.py')
@@ -114,7 +113,3 @@ SimObject('m5/objects/T1000.py')
#SimObject('m5/objects/Tru64System.py')
SimObject('m5/objects/Tsunami.py')
SimObject('m5/objects/Uart.py')
if env['ALPHA_TLASER']:
SimObject('m5/objects/DmaEngine.py')
SimObject('m5/objects/Turbolaser.py')

3
src/sim/simulate.cc
View File

@@ -92,10 +92,9 @@ simulate(Tick num_cycles)
if (async_event) {
async_event = false;
if (async_statdump || async_statreset) {
Stats::StatEvent(async_statdump, async_statreset);
async_statdump = false;
async_statreset = false;
Stats::StatEvent(async_statdump, async_statreset);
}
if (async_exit) {