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

diff --cc src/arch/SConscript
Simple merge

diff --cc src/arch/alpha/utility.hh
Simple merge

diff --cc src/arch/mips/utility.hh
index b5c1e31e19d02f50ea123bdcbd046f5cc2c4080e,609f4b071becb482388518580382fa6c2598c20e..12db1de57ba38549ff3c1cb64c5026e1a9fd80ef
--- 1/src/arch/mips/utility.hh
--- 2/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@@ -87,24 -87,6 +87,11 @@@ namespace MipsISA 
          panic("makeRegisterCopy not implemented");
          return 0;
      }
-     static inline ExtMachInst
-     makeExtMI(MachInst inst, ThreadContext * xc) {
- #if FULL_SYSTEM
-         ExtMachInst ext_inst = inst;
-         if (xc->readPC() && 0x1)
-             return ext_inst|=(static_cast<ExtMachInst>(xc->readPC() & 0x1) << 32);
-         else
-             return ext_inst;
- #else
-         return ExtMachInst(inst);
- #endif
-     }
- 
 +
 +    inline void startupCPU(ThreadContext *tc, int cpuId)
 +    {
 +        tc->activate(0);
 +    }
  };
  
  

diff --cc src/arch/sparc/utility.hh
Simple merge

diff --cc src/arch/x86/SConscript
index f49225758859cca81537327d833dbfd9a3c835e2,8be59e0c00c848adcdcefaad00ad517bdc3faeea..f693caf6f866e58d3eb17ae6625587c611af8609
--- 1/src/arch/x86/SConscript
--- 2/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@@ -83,28 -83,56 +83,28 @@@
  #
  # Authors: Gabe Black
  
 -import os
 -import sys
 -from os.path import isdir
 +Import('*')
- 
 +if env['TARGET_ISA'] == 'x86':
 +    Source('floatregfile.cc')
 +    Source('intregfile.cc')
 +    Source('miscregfile.cc')
++    Source('predecoder_tables.cc')
 +    Source('regfile.cc')
 +    Source('remote_gdb.cc')
  
 -# Import build environment variable from SConstruct.
 -Import('env')
 +    if env['FULL_SYSTEM']:
 +        # Full-system sources
 +        pass
 +    else:
 +        Source('process.cc')
  
 -###################################################
 -#
 -# Define needed sources.
 -#
 -###################################################
 -
 -# Base sources used by all configurations.
 -base_sources = Split('''
 -      floatregfile.cc
 -      intregfile.cc
 -      miscregfile.cc
 -      regfile.cc
 -      remote_gdb.cc
 -      predecoder_tables.cc
 -      ''')
 -
 -# Full-system sources
 -full_system_sources = Split('''
 -      ''')
 -
 -# Syscall emulation (non-full-system) sources
 -syscall_emulation_sources = Split('''
 -      linux/linux.cc
 -      linux/process.cc
 -      linux/syscalls.cc
 -      process.cc
 -      ''')
 -
 -sources = base_sources
 -
 -if env['FULL_SYSTEM']:
 -    sources += full_system_sources
 -else:
 -    sources += syscall_emulation_sources
 -
 -# Convert file names to SCons File objects.  This takes care of the
 -# path relative to the top of the directory tree.
 -sources = [File(s) for s in sources]
 -
 -# Add in files generated by the ISA description.
 -isa_desc_files = env.ISADesc('isa/main.isa')
 -# Only non-header files need to be compiled.
 -isa_desc_sources = [f for f in isa_desc_files if not f.path.endswith('.hh')]
 -sources += isa_desc_sources
 +        Source('linux/linux.cc')
 +        Source('linux/process.cc')
 +        Source('linux/syscalls.cc')
  
 -Return('sources')
 +    # Add in files generated by the ISA description.
 +    isa_desc_files = env.ISADesc('isa/main.isa')
 +    # Only non-header files need to be compiled.
 +    for f in isa_desc_files:
 +        if not f.path.endswith('.hh'):
 +            Source(f)

diff --cc src/arch/x86/utility.hh
Simple merge

diff --cc src/cpu/base.hh
Simple merge

diff --cc src/cpu/simple/atomic.cc
Simple merge

diff --cc src/cpu/simple/base.cc
Simple merge

diff --cc src/cpu/simple/base.hh
Simple merge