Merge zizzer.eecs.umich.edu:/bk/newmem

into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86 src/arch/mips/utility.hh: src/arch/x86/SConscript: Hand merge --HG-- extra : convert_revision : 0ba457aab52bf6ffc9191fd1fe1006ca7704b5b0
2007-03-15 02:52:51 +00:00
parent ff90b8c1aa a2b56088fb
commit 32368a2bd6
20 changed files with 1035 additions and 104 deletions
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -51,6 +51,7 @@ isa_switch_hdrs = Split('''
        locked_mem.hh
        mmaped_ipr.hh
 	process.hh
+	predecoder.hh
 	regfile.hh
 	remote_gdb.hh
 	stacktrace.hh