diff options
author | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-10 14:53:34 -0500 |
---|---|---|
committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-10 14:53:34 -0500 |
commit | aa8c9db159422a313f6dfc9a76fd827515b32126 (patch) | |
tree | b849e53e6bbdcec0c48a3030d1c4ffbb204e5c6b /arch/alpha/alpha_linux_process.cc | |
parent | e51850f1d2c7c754ee11612c9b663d8af0a54400 (diff) | |
parent | de63edb7520a8ec0280b275d98aa141879243c47 (diff) | |
download | gem5-aa8c9db159422a313f6dfc9a76fd827515b32126.tar.xz |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : b75a46439477b3f21333a3cc9f1721923839d14c
Diffstat (limited to 'arch/alpha/alpha_linux_process.cc')
-rw-r--r-- | arch/alpha/alpha_linux_process.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/alpha/alpha_linux_process.cc b/arch/alpha/alpha_linux_process.cc index e65852a28..600de4447 100644 --- a/arch/alpha/alpha_linux_process.cc +++ b/arch/alpha/alpha_linux_process.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2003-2005 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -245,7 +245,7 @@ class Linux { strcpy(name->machine, "alpha"); name.copyOut(xc->mem); - return SyscallReturn(0); + return 0; } /// Target osf_getsysyinfo() handler. Even though this call is @@ -265,7 +265,7 @@ class Linux { // I don't think this exactly matches the HW FPCR *fpcr = 0; fpcr.copyOut(xc->mem); - return SyscallReturn(0); + return 0; } default: @@ -274,7 +274,7 @@ class Linux { break; } - return SyscallReturn(1); + return 1; } /// Target osf_setsysinfo() handler. @@ -293,7 +293,7 @@ class Linux { fpcr.copyIn(xc->mem); DPRINTFR(SyscallVerbose, "osf_setsysinfo(SSI_IEEE_FP_CONTROL): " " setting FPCR to 0x%x\n", *(uint64_t*)fpcr); - return SyscallReturn(0); + return 0; } default: @@ -302,7 +302,7 @@ class Linux { break; } - return SyscallReturn(1); + return 1; } /// Target fnctl() handler. @@ -313,7 +313,7 @@ class Linux { int fd = xc->getSyscallArg(0); if (fd < 0 || process->sim_fd(fd) < 0) - return SyscallReturn(-EBADF); + return -EBADF; int cmd = xc->getSyscallArg(1); switch (cmd) { @@ -321,18 +321,18 @@ class Linux { // if we really wanted to support this, we'd need to do it // in the target fd space. warn("fcntl(%d, F_DUPFD) not supported, error returned\n", fd); - return SyscallReturn(-EMFILE); + return -EMFILE; case 1: // F_GETFD (get close-on-exec flag) case 2: // F_SETFD (set close-on-exec flag) - return SyscallReturn(0); + return 0; case 3: // F_GETFL (get file flags) case 4: // F_SETFL (set file flags) // not sure if this is totally valid, but we'll pass it through // to the underlying OS warn("fcntl(%d, %d) passed through to host\n", fd, cmd); - return SyscallReturn(fcntl(process->sim_fd(fd), cmd)); + return fcntl(process->sim_fd(fd), cmd); // return 0; case 7: // F_GETLK (get lock) @@ -340,11 +340,11 @@ class Linux { case 9: // F_SETLKW (set lock and wait) // don't mess with file locking... just act like it's OK warn("File lock call (fcntl(%d, %d)) ignored.\n", fd, cmd); - return SyscallReturn(0); + return 0; default: warn("Unknown fcntl command %d\n", cmd); - return SyscallReturn(0); + return 0; } } |