diff options
| author | Marc Orr <marc.orr@gmail.com> | 2012-08-06 16:52:40 -0700 |
|---|---|---|
| committer | Marc Orr <marc.orr@gmail.com> | 2012-08-06 16:52:40 -0700 |
| commit | d55115936e0711422c6d708572b391e15432bec1 (patch) | |
| tree | 13c179e67d6aff1273a56edc8bcc20cddef6b380 /src/arch/alpha | |
| parent | 62425b7a0724033bbd50170400ad2ff83ad57429 (diff) | |
| download | gem5-d55115936e0711422c6d708572b391e15432bec1.tar.xz | |
syscall emulation: Clean up ioctl handling, and implement for x86.
Enable different whitelists for different OS/arch combinations,
since some use the generic Linux definitions only, and others
use definitions inherited from earlier Unix flavors on those
architectures.
Also update x86 function pointers so ioctl is no longer
unimplemented on that platform.
This patch is a revised version of Vince Weaver's earlier patch.
Diffstat (limited to 'src/arch/alpha')
| -rw-r--r-- | src/arch/alpha/linux/linux.hh | 37 | ||||
| -rw-r--r-- | src/arch/alpha/tru64/tru64.hh | 40 |
2 files changed, 57 insertions, 20 deletions
diff --git a/src/arch/alpha/linux/linux.hh b/src/arch/alpha/linux/linux.hh index 6197b8d45..443f70d81 100644 --- a/src/arch/alpha/linux/linux.hh +++ b/src/arch/alpha/linux/linux.hh @@ -97,18 +97,35 @@ class AlphaLinux : public Linux //@{ /// ioctl() command codes. - static const unsigned TIOCGETP_ = 0x40067408; - static const unsigned TIOCSETP_ = 0x80067409; - static const unsigned TIOCSETN_ = 0x8006740a; - static const unsigned TIOCSETC_ = 0x80067411; - static const unsigned TIOCGETC_ = 0x40067412; - static const unsigned FIONREAD_ = 0x4004667f; - static const unsigned TIOCISATTY_ = 0x2000745e; - static const unsigned TIOCGETS_ = 0x402c7413; - static const unsigned TIOCGETA_ = 0x40127417; - static const unsigned TCSETAW_ = 0x80147419; // 2.6.15 kernel + static const unsigned TGT_TIOCGETP = 0x40067408; + static const unsigned TGT_TIOCSETP = 0x80067409; + static const unsigned TGT_TIOCSETN = 0x8006740a; + static const unsigned TGT_TIOCSETC = 0x80067411; + static const unsigned TGT_TIOCGETC = 0x40067412; + static const unsigned TGT_FIONREAD = 0x4004667f; + static const unsigned TGT_TCGETS = 0x402c7413; + static const unsigned TGT_TCGETA = 0x40127417; + static const unsigned TGT_TCSETAW = 0x80147419; // 2.6.15 kernel //@} + static bool + isTtyReq(unsigned req) + { + switch (req) { + case TGT_TIOCGETP: + case TGT_TIOCSETP: + case TGT_TIOCSETN: + case TGT_TIOCSETC: + case TGT_TIOCGETC: + case TGT_TCGETS: + case TGT_TCGETA: + case TGT_TCSETAW: + return true; + default: + return false; + } + } + /// For table(). static const int TBL_SYSINFO = 12; diff --git a/src/arch/alpha/tru64/tru64.hh b/src/arch/alpha/tru64/tru64.hh index f0cad8289..5751da8d4 100644 --- a/src/arch/alpha/tru64/tru64.hh +++ b/src/arch/alpha/tru64/tru64.hh @@ -91,18 +91,38 @@ class AlphaTru64 : public Tru64 //@{ /// ioctl() command codes. - static const unsigned TIOCGETP_ = 0x40067408; - static const unsigned TIOCSETP_ = 0x80067409; - static const unsigned TIOCSETN_ = 0x8006740a; - static const unsigned TIOCSETC_ = 0x80067411; - static const unsigned TIOCGETC_ = 0x40067412; - static const unsigned FIONREAD_ = 0x4004667f; - static const unsigned TIOCISATTY_ = 0x2000745e; - static const unsigned TIOCGETS_ = 0x402c7413; - static const unsigned TIOCGETA_ = 0x40127417; - static const unsigned TCSETAW_ = 0x80147419; + static const unsigned TGT_TIOCGETP = 0x40067408; + static const unsigned TGT_TIOCSETP = 0x80067409; + static const unsigned TGT_TIOCSETN = 0x8006740a; + static const unsigned TGT_TIOCSETC = 0x80067411; + static const unsigned TGT_TIOCGETC = 0x40067412; + static const unsigned TGT_FIONREAD = 0x4004667f; + static const unsigned TGT_TIOCISATTY = 0x2000745e; + static const unsigned TGT_TCGETS = 0x402c7413; + static const unsigned TGT_TCGETA = 0x40127417; + static const unsigned TGT_TCSETAW = 0x80147419; // 2.6.15 kernel //@} + static bool + isTtyReq(unsigned req) + { + switch (req) { + case TGT_TIOCGETP: + case TGT_TIOCSETP: + case TGT_TIOCSETN: + case TGT_TIOCSETC: + case TGT_TIOCGETC: + case TGT_FIONREAD: + case TGT_TIOCISATTY: + case TGT_TCGETS: + case TGT_TCGETA: + case TGT_TCSETAW: + return true; + default: + return false; + } + } + //@{ /// For table(). static const int TBL_SYSINFO = 12; |