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, 5 insertions, 5 deletions

diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc
index 793c0c6cb..00168b025 100644
--- a/sim/syscall_emul.cc
+++ b/sim/syscall_emul.cc
@@ -341,7 +341,7 @@ pipePseudoFunc(SyscallDesc *desc, int callnum, Process *process,
 
     // Alpha Linux convention for pipe() is that fd[0] is returned as
     // the return value of the function, and fd[1] is returned in r20.
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = sim_fds[1];
+    xc->setIntReg(SyscallPseudoReturnReg, sim_fds[1]);
     return sim_fds[0];
 }
 
@@ -354,7 +354,7 @@ getpidPseudoFunc(SyscallDesc *desc, int callnum, Process *process,
     // fake_syscall mode, so there's no way for a process to know it's
     // not getting a unique value.
 
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 99;
+    xc->setIntReg(SyscallPseudoReturnReg, 99);
     return 100;
 }
 
@@ -367,7 +367,7 @@ getuidPseudoFunc(SyscallDesc *desc, int callnum, Process *process,
     // simulation to be deterministic.
 
     // EUID goes in r20.
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 100;	// EUID
+    xc->setIntReg(SyscallPseudoReturnReg, 100); //EUID
     return 100;		// UID
 }
 
@@ -377,7 +377,7 @@ getgidPseudoFunc(SyscallDesc *desc, int callnum, Process *process,
            ExecContext *xc)
 {
     // Get current group ID.  EGID goes in r20.
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 100;
+    xc->setIntReg(SyscallPseudoReturnReg, 100); //EGID
     return 100;
 }
 
@@ -399,7 +399,7 @@ getpidFunc(SyscallDesc *desc, int callnum, Process *process,
     // fake_syscall mode, so there's no way for a process to know it's
     // not getting a unique value.
 
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 99;
+    xc->setIntReg(SyscallPseudoReturnReg, 99); //PID
     return 100;
 }