diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-04-12 03:51:09 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-04-12 03:51:09 -0400 |
| commit | f69801d9e0abacf4ce6e75eab8b68298670ac743 (patch) | |
| tree | 1b748162a4ad95a251c3ef7310a025dd65f93323 /sim/syscall_emul.hh | |
| parent | 08d9e0ea7ad5f6a0addd711bc4ff14cff2789170 (diff) | |
| parent | 4fe89f7232202040b8b8fcea2461e5ae6be2d739 (diff) | |
| download | gem5-f69801d9e0abacf4ce6e75eab8b68298670ac743.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision : 4eff6e7ee7a25b8f5fdad7342b195a869cf528d6
Diffstat (limited to 'sim/syscall_emul.hh')
| -rw-r--r-- | sim/syscall_emul.hh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 58db2469e..bab29ca6a 100644 --- a/sim/syscall_emul.hh +++ b/sim/syscall_emul.hh @@ -348,14 +348,14 @@ ioctlFunc(SyscallDesc *desc, int callnum, Process *process, } switch (req) { - case OS::TIOCISATTY: - case OS::TIOCGETP: - case OS::TIOCSETP: - case OS::TIOCSETN: - case OS::TIOCSETC: - case OS::TIOCGETC: - case OS::TIOCGETS: - case OS::TIOCGETA: + case OS::OSFlags::TIOCISATTY: + case OS::OSFlags::TIOCGETP: + case OS::OSFlags::TIOCSETP: + case OS::OSFlags::TIOCSETN: + case OS::OSFlags::TIOCSETC: + case OS::OSFlags::TIOCGETC: + case OS::OSFlags::TIOCGETS: + case OS::OSFlags::TIOCGETA: return -ENOTTY; default: @@ -719,7 +719,7 @@ mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc) p->pTable->allocate(start, length); p->mmap_end += length; - if (!(flags & OS::TGT_MAP_ANONYMOUS)) { + if (!(flags & OS::OSFlags::TGT_MAP_ANONYMOUS)) { warn("allowing mmap of file @ fd %d. " "This will break if not /dev/zero.", xc->getSyscallArg(4)); } @@ -810,7 +810,7 @@ getrusageFunc(SyscallDesc *desc, int callnum, Process *process, int who = xc->getSyscallArg(0); // THREAD, SELF, or CHILDREN TypedBufferArg<typename OS::rusage> rup(xc->getSyscallArg(1)); - if (who != OS::TGT_RUSAGE_SELF) { + if (who != OS::OSFlags::TGT_RUSAGE_SELF) { // don't really handle THREAD or CHILDREN, but just warn and // plow ahead warn("getrusage() only supports RUSAGE_SELF. Parameter %d ignored.", |