From 3d99b4a5447abb1ccca552cee281137e2b11a674 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 18 Apr 2006 09:27:22 -0400
Subject: Fixes to SPARC syscall emulation mode.

arch/sparc/isa/base.isa:
    Added a set of abbreviations for the different condition tests.
arch/sparc/isa/decoder.isa:
    Fixes and additions to get syscall emulation closer to working.
arch/sparc/isa/formats/branch.isa:
    Fixed branches so that the immediate version actually uses the immediate value
arch/sparc/isa/formats/integerop.isa:
    Compute the condition codes -before- writing to the state of the machine.
arch/sparc/isa/formats/mem.isa:
    An attempt to fix up the output of the disassembly of loads and stores.
arch/sparc/isa/formats/trap.isa:
    Added code to disassemble a trap instruction. This probably needs to be fixed up so there are immediate and register versions.
arch/sparc/isa/operands.isa:
    Added an R1 operand, and fixed up the numbering
arch/sparc/isa_traits.hh:
    SyscallNumReg is no longer needed, the max number of sources and destinations are fixed up, and the syscall return uses xcc instead of icc.
arch/sparc/linux/process.cc:
arch/sparc/linux/process.hh:
    Added a getresuidFunc syscall implementation. This isn't actually used, but I thought it was and will leave it in.
arch/sparc/process.cc:
arch/sparc/process.hh:
    Fixed up how the initial stack frame is set up.
arch/sparc/regfile.hh:
    Changed the number of windows from 6 to 32 so we don't have to worry about spill and fill traps for now, and commented out the register file setting itself up.
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.hh:
sim/process.cc:
sim/process.hh:
    Changed the syscall mechanism to pass down the syscall number directly.

--HG--
extra : convert_revision : 15723b949a0ddb3d24e68c079343b4dba2439f43
---
 sim/process.cc |  6 ++----
 sim/process.hh | 10 +++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'sim')

diff --git a/sim/process.cc b/sim/process.cc
index 4e4a54572..1f2e8d0fd 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -240,7 +240,7 @@ DEFINE_SIM_OBJECT_CLASS_NAME("Process", Process)
 ////////////////////////////////////////////////////////////////////////
 
 
-static void
+void
 copyStringArray(vector<string> &strings, Addr array_ptr, Addr data_ptr,
                 TranslatingPort* memPort)
 {
@@ -348,12 +348,10 @@ LiveProcess::argsInit(int intSize, int pageSize)
 }
 
 void
-LiveProcess::syscall(ExecContext *xc)
+LiveProcess::syscall(int64_t callnum, ExecContext *xc)
 {
     num_syscalls++;
 
-    int64_t callnum = xc->readIntReg(SyscallNumReg);
-
     SyscallDesc *desc = getDesc(callnum);
     if (desc == NULL)
         fatal("Syscall %d out of range", callnum);
diff --git a/sim/process.hh b/sim/process.hh
index b5b9d18b3..807bf330f 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -50,6 +50,10 @@ class PageTable;
 class TranslatingPort;
 class System;
 
+void
+copyStringArray(std::vector<std::string> &strings, Addr array_ptr,
+        Addr data_ptr, TranslatingPort* memPort);
+
 class Process : public SimObject
 {
   public:
@@ -155,7 +159,7 @@ class Process : public SimObject
     // look up simulator fd for given target fd
     int sim_fd(int tgt_fd);
 
-    virtual void syscall(ExecContext *xc) = 0;
+    virtual void syscall(int64_t callnum, ExecContext *xc) = 0;
 };
 
 //
@@ -174,10 +178,10 @@ class LiveProcess : public Process
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp);
 
-    void argsInit(int intSize, int pageSize);
+    virtual void argsInit(int intSize, int pageSize);
 
   public:
-    virtual void syscall(ExecContext *xc);
+    virtual void syscall(int64_t callnum, ExecContext *xc);
 
     virtual SyscallDesc* getDesc(int callnum) = 0;
 };
-- 
cgit v1.2.3