From 30b87e90f8e3f6ffa16026f7776c6609fe3ada24 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 17 Sep 2006 03:00:55 -0400 Subject: Finished changing how stat structures are translated, fixed the handling of various ids as LiveProcess parameters. src/arch/alpha/linux/process.cc: src/arch/alpha/linux/process.hh: src/arch/alpha/process.cc: src/arch/alpha/process.hh: src/arch/alpha/tru64/process.cc: src/arch/alpha/tru64/process.hh: src/arch/mips/linux/process.cc: src/arch/mips/linux/process.hh: src/arch/mips/process.cc: src/arch/mips/process.hh: src/arch/sparc/linux/process.cc: src/arch/sparc/linux/process.hh: src/arch/sparc/process.cc: src/arch/sparc/process.hh: src/arch/sparc/solaris/process.cc: src/arch/sparc/solaris/process.hh: src/sim/process.cc: src/sim/process.hh: src/sim/syscall_emul.cc: src/sim/syscall_emul.hh: Changed Process to LiveProcess in syscall handlers and fixed the implementation of uid, euid, gid, egid, pid and ppid as LiveProcess parameters. src/kern/tru64/tru64.hh: Changed Process to LiveProcess in syscall handlers and fixed the implementation of uid, euid, gid, egid, pid and ppid as LiveProcess parameters. Also fit tru64 in with the new way to handle stat calls. --HG-- extra : convert_revision : 0198b838e5c09a730065dc6f018738145bc96269 --- src/arch/sparc/linux/process.cc | 12 ++++++++---- src/arch/sparc/linux/process.hh | 7 +++++-- src/arch/sparc/process.cc | 14 ++++++++------ src/arch/sparc/process.hh | 5 ++++- src/arch/sparc/solaris/process.cc | 13 ++++++++++--- src/arch/sparc/solaris/process.hh | 5 ++++- 6 files changed, 39 insertions(+), 17 deletions(-) (limited to 'src/arch/sparc') diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc index 8c2de8ca3..44c893f2b 100644 --- a/src/arch/sparc/linux/process.cc +++ b/src/arch/sparc/linux/process.cc @@ -47,7 +47,7 @@ using namespace SparcISA; /// Target uname() handler. static SyscallReturn -unameFunc(SyscallDesc *desc, int callnum, Process *process, +unameFunc(SyscallDesc *desc, int callnum, LiveProcess *process, ThreadContext *tc) { TypedBufferArg name(tc->getSyscallArg(0)); @@ -65,7 +65,7 @@ unameFunc(SyscallDesc *desc, int callnum, Process *process, SyscallReturn SparcISA::getresuidFunc(SyscallDesc *desc, int num, - Process *p, ThreadContext *tc) + LiveProcess *p, ThreadContext *tc) { const IntReg id = htog(100); Addr ruid = tc->getSyscallArg(0); @@ -390,9 +390,13 @@ SparcLinuxProcess::SparcLinuxProcess(const std::string &name, int stdout_fd, int stderr_fd, std::vector &argv, - std::vector &envp) + std::vector &envp, + uint64_t _uid, uint64_t _euid, + uint64_t _gid, uint64_t _egid, + uint64_t _pid, uint64_t _ppid) : SparcLiveProcess(name, objFile, system, - stdin_fd, stdout_fd, stderr_fd, argv, envp), + stdin_fd, stdout_fd, stderr_fd, argv, envp, + _uid, _euid, _gid, _egid, _pid, _ppid), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { // The sparc syscall table must be <= 284 entries because that is all there diff --git a/src/arch/sparc/linux/process.hh b/src/arch/sparc/linux/process.hh index 4af8f0f75..c758d5433 100644 --- a/src/arch/sparc/linux/process.hh +++ b/src/arch/sparc/linux/process.hh @@ -48,7 +48,10 @@ class SparcLinuxProcess : public SparcLiveProcess System * system, int stdin_fd, int stdout_fd, int stderr_fd, std::vector &argv, - std::vector &envp); + std::vector &envp, + uint64_t _uid, uint64_t _euid, + uint64_t _gid, uint64_t _egid, + uint64_t _pid, uint64_t _ppid); virtual SyscallDesc* getDesc(int callnum); @@ -62,7 +65,7 @@ class SparcLinuxProcess : public SparcLiveProcess }; SyscallReturn getresuidFunc(SyscallDesc *desc, int num, - Process *p, ThreadContext *tc); + LiveProcess *p, ThreadContext *tc); } // namespace SparcISA #endif // __ALPHA_LINUX_PROCESS_HH__ diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc index a3bb0eb1a..3323ba7a0 100644 --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -45,9 +45,11 @@ using namespace SparcISA; SparcLiveProcess::SparcLiveProcess(const std::string &nm, ObjectFile *objFile, System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector &argv, std::vector &envp) + std::vector &argv, std::vector &envp, + uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, + uint64_t _pid, uint64_t _ppid) : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd, - argv, envp) + argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid) { // XXX all the below need to be updated for SPARC - Ali @@ -190,10 +192,10 @@ SparcLiveProcess::argsInit(int intSize, int pageSize) //The entry point to the program auxv.push_back(buildAuxVect(SPARC_AT_ENTRY, objFile->entryPoint())); //Different user and group IDs - auxv.push_back(buildAuxVect(SPARC_AT_UID, uid)); - auxv.push_back(buildAuxVect(SPARC_AT_EUID, euid)); - auxv.push_back(buildAuxVect(SPARC_AT_GID, gid)); - auxv.push_back(buildAuxVect(SPARC_AT_EGID, egid)); + auxv.push_back(buildAuxVect(SPARC_AT_UID, uid())); + auxv.push_back(buildAuxVect(SPARC_AT_EUID, euid())); + auxv.push_back(buildAuxVect(SPARC_AT_GID, gid())); + auxv.push_back(buildAuxVect(SPARC_AT_EGID, egid())); //Whether to enable "secure mode" in the executable auxv.push_back(buildAuxVect(SPARC_AT_SECURE, 0)); } diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh index 7ba8d7109..7cc52e241 100644 --- a/src/arch/sparc/process.hh +++ b/src/arch/sparc/process.hh @@ -60,7 +60,10 @@ class SparcLiveProcess : public LiveProcess SparcLiveProcess(const std::string &nm, ObjectFile *objFile, System *_system, int stdin_fd, int stdout_fd, int stderr_fd, std::vector &argv, - std::vector &envp); + std::vector &envp, + uint64_t _uid, uint64_t _euid, + uint64_t _gid, uint64_t _egid, + uint64_t _pid, uint64_t _ppid); void startup(); diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc index af0550910..ff466c8e6 100644 --- a/src/arch/sparc/solaris/process.cc +++ b/src/arch/sparc/solaris/process.cc @@ -45,7 +45,7 @@ using namespace SparcISA; /// Target uname() handler. static SyscallReturn -unameFunc(SyscallDesc *desc, int callnum, Process *process, +unameFunc(SyscallDesc *desc, int callnum, LiveProcess *process, ThreadContext *tc) { TypedBufferArg name(tc->getSyscallArg(0)); @@ -328,9 +328,16 @@ SparcSolarisProcess::SparcSolarisProcess(const std::string &name, int stdout_fd, int stderr_fd, std::vector &argv, - std::vector &envp) + std::vector &envp, + uint64_t _uid, + uint64_t _euid, + uint64_t _gid, + uint64_t _egid, + uint64_t _pid, + uint64_t _ppid) : SparcLiveProcess(name, objFile, system, - stdin_fd, stdout_fd, stderr_fd, argv, envp), + stdin_fd, stdout_fd, stderr_fd, argv, envp, + _uid, _euid, _gid, _egid, _pid, _ppid), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { // The sparc syscall table must be <= 284 entries because that is all there diff --git a/src/arch/sparc/solaris/process.hh b/src/arch/sparc/solaris/process.hh index 3c0d7eba7..2cf329211 100644 --- a/src/arch/sparc/solaris/process.hh +++ b/src/arch/sparc/solaris/process.hh @@ -47,7 +47,10 @@ class SparcSolarisProcess : public SparcLiveProcess System * system, int stdin_fd, int stdout_fd, int stderr_fd, std::vector &argv, - std::vector &envp); + std::vector &envp, + uint64_t _uid, uint64_t _euid, + uint64_t _gid, uint64_t _egid, + uint64_t _pid, uint64_t _ppid); virtual SyscallDesc* getDesc(int callnum); -- cgit v1.2.3