Merge gblack@m5.eecs.umich.edu:/bk/multiarch

into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348

diff --cc arch/isa_parser.py
Simple merge

diff --cc cpu/base.hh
Simple merge

diff --cc cpu/exec_context.hh
index 845f9264badc4a52645aeeaf12f89bed9c22b049,7e905e7d35aa9f3601e526b98aced36907b6fff0..f11d692736d68e61154e7d1aa95b9bcd9ac92f0a
--- 1/cpu/exec_context.hh
--- 2/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@@ -430,12 -434,12 +436,12 @@@ class ExecContex
       *  @todo How to do this properly so it's dependent upon ISA only?
       */
  
 -    void trap(Fault * fault);
 +    void trap(Fault fault);
  
  #if !FULL_SYSTEM
-     IntReg getSyscallArg(int i)
+     TheISA::IntReg getSyscallArg(int i)
      {
-         return regs.intRegFile[ArgumentReg0 + i];
+         return regs.intRegFile[TheISA::ArgumentReg0 + i];
      }
  
      // used to shift args for indirect syscall

diff --cc cpu/static_inst.hh
Simple merge