sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge vm1.(none):/home/stever/bk/newmem-head

Browse source 
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : e1ed5c8edb95e99200b4d26317f55f71338a96df
This commit is contained in:
Steve Reinhardt 2006-12-09 22:05:30 -08:00
commit cfc6710f63
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build_opts/SPARC_FS
View file

@ -1,2 +1,3 @@
TARGET_ISA = 'sparc' TARGET_ISA = 'sparc'
CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU'
FULL_SYSTEM = 1 FULL_SYSTEM = 1

1
build_opts/SPARC_SE
View file

@ -1,2 +1,3 @@
TARGET_ISA = 'sparc' TARGET_ISA = 'sparc'
CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU'
FULL_SYSTEM = 0 FULL_SYSTEM = 0

6
src/cpu/o3/commit_impl.hh
View file

@ -1197,16 +1197,16 @@ DefaultCommit<Impl>::getInsts()
rename_idx < fromRename->size; rename_idx < fromRename->size;
rename_idx++) { rename_idx++) {
DynInstPtr inst = fromRename->insts[rename_idx]; DynInstPtr inst = fromRename->insts[rename_idx];
int tid = inst->threadNumber;
if (!inst->isSquashed()) { if (!inst->isSquashed()) {
DPRINTF(Commit, "Inserting PC %#x [sn:%i] [tid:%i] into ", DPRINTF(Commit, "Inserting PC %#x [sn:%i] [tid:%i] into ",
"skidBuffer.\n", inst->readPC(), inst->seqNum, tid); "skidBuffer.\n", inst->readPC(), inst->seqNum,
inst->threadNumber);
skidBuffer.push(inst); skidBuffer.push(inst);
} else { } else {
DPRINTF(Commit, "Instruction PC %#x [sn:%i] [tid:%i] was " DPRINTF(Commit, "Instruction PC %#x [sn:%i] [tid:%i] was "
"squashed, skipping.\n", "squashed, skipping.\n",
inst->readPC(), inst->seqNum, tid); inst->readPC(), inst->seqNum, inst->threadNumber);
} }
} }
} }

2
util/regress
View file

@ -43,7 +43,7 @@ optparser.add_option('--builds', dest='builds',
help='comma-separated list of build targets to test ' help='comma-separated list of build targets to test '
" (default: '%default')" ) " (default: '%default')" )
optparser.add_option('--variants', dest='variants', optparser.add_option('--variants', dest='variants',
default='opt', default='fast',
help='comma-separated list of build variants to test ' help='comma-separated list of build variants to test '
" (default: '%default')" ) " (default: '%default')" )
optparser.add_option('--scons-opts', dest='scons_opts', default='', optparser.add_option('--scons-opts', dest='scons_opts', default='',