fix merging issues

arch/alpha/isa_traits.hh:
arch/sparc/linux/process.cc:
    fix merging problem
sim/syscall_emul.cc:
    use setIntReg

--HG--
extra : convert_revision : e88d72e415493cd17d7b88c22c7e995f3199e396

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 6f6b11e62..0cf31cb50 100644
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -125,6 +125,7 @@ namespace AlphaISA
     const int ArgumentReg5 = 21;
     const int SyscallNumReg = ReturnValueReg;
     const int SyscallPseudoReturnReg = ArgumentReg4;
+    const int SyscallSuccessReg = 19;
 
 
 
@@ -341,6 +342,8 @@ extern const int reg_redir[NumIntRegs];
     template <class XC>
     void zeroRegisters(XC *xc);
 
+    const Addr MaxAddr = (Addr)-1;
+
     static inline void setSyscallReturn(SyscallReturn return_value, RegFile *regs)
     {
         // check for error condition.  Alpha syscall convention is to
@@ -356,6 +359,7 @@ extern const int reg_redir[NumIntRegs];
             regs->intRegFile[ReturnValueReg] = -return_value.value();
         }
     }
+};
 
 static inline AlphaISA::ExtMachInst
 AlphaISA::makeExtMI(AlphaISA::MachInst inst, const uint64_t &pc) {