From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 19 Feb 2006 07:34:52 +0000 (-0500)
Subject: Merge gblack@m5.eecs.umich.edu:/bk/multiarch
X-Git-Tag: m5_2.0_beta1~87^2~91
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e4a80df1a471671b6ef7003e29124b6835ade42;p=gem5.git

Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
---

0e4a80df1a471671b6ef7003e29124b6835ade42
diff --cc cpu/exec_context.hh
index 845f9264b,7e905e7d3..f11d69273
--- a/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