Move RLIMIT constants to OS/ISA specific files instead of generic OS container classes

Update MIPS/Linux constants

arch/alpha/linux/linux.hh:
    move RLIMIT constants to ALPHA/Linux class
arch/alpha/tru64/tru64.hh:
    move RLIMIT constants to ALPHA/Tru64 class
arch/mips/mips_linux.hh:
    update MIPS constants for MIPS/Linux
kern/linux/linux.hh:
    remove RLIMIT constants from generic Linux class... these are now in ISA specific / OS specific classes
kern/tru64/tru64.hh:
    remove RLIMIT constants from generic Tru64 class... these are now in ISA specific / OS specific classes

--HG--
extra : convert_revision : 2e2743d73ab18fcd558a5765cb4ef0e9671bd1d7

diff --git a/arch/alpha/linux/linux.hh b/arch/alpha/linux/linux.hh
index 9a1d59e8341caebae7255d0ab35f208bb378d86a..f04e2bfa8791db6522629d90005fb20cfd2a11f3 100644 (file)
--- a/arch/alpha/linux/linux.hh
+++ b/arch/alpha/linux/linux.hh
@@ -77,6 +77,7 @@ class AlphaLinux : public Linux
     static const unsigned GSI_CPUS_IN_BOX   = 55;   //!< number of CPUs in system
     static const unsigned GSI_PHYSMEM       = 19;   //!< Physical memory in KB
     static const unsigned GSI_CLK_TCK       = 42;   //!< clock freq in Hz
+    static const unsigned GSI_IEEE_FP_CONTROL = 45;
     //@}
 
     //@{
@@ -106,6 +107,22 @@ class AlphaLinux : public Linux
 
     /// For table().
     static const int TBL_SYSINFO = 12;
+
+    /// Resource enumeration for getrlimit().
+    enum rlimit_resources {
+        TGT_RLIMIT_CPU = 0,
+        TGT_RLIMIT_FSIZE = 1,
+        TGT_RLIMIT_DATA = 2,
+        TGT_RLIMIT_STACK = 3,
+        TGT_RLIMIT_CORE = 4,
+        TGT_RLIMIT_RSS = 5,
+        TGT_RLIMIT_NOFILE = 6,
+        TGT_RLIMIT_AS = 7,
+        TGT_RLIMIT_VMEM = 7,
+        TGT_RLIMIT_NPROC = 8,
+        TGT_RLIMIT_MEMLOCK = 9,
+        TGT_RLIMIT_LOCKS = 10
+    };
 };
 
 #endif

diff --git a/arch/alpha/tru64/tru64.hh b/arch/alpha/tru64/tru64.hh
index 63eff656b916d22d84e510a468a6c6f2e6ff0487..19343ba23c1f68c9a5378761a9ca471c545fe3f8 100644 (file)
--- a/arch/alpha/tru64/tru64.hh
+++ b/arch/alpha/tru64/tru64.hh
@@ -104,6 +104,22 @@ class AlphaTru64 : public Tru64
     /// For table().
     static const int TBL_SYSINFO = 12;
     //@}
+
+    /// Resource enumeration for getrlimit().
+    enum rlimit_resources {
+        TGT_RLIMIT_CPU = 0,
+        TGT_RLIMIT_FSIZE = 1,
+        TGT_RLIMIT_DATA = 2,
+        TGT_RLIMIT_STACK = 3,
+        TGT_RLIMIT_CORE = 4,
+        TGT_RLIMIT_RSS = 5,
+        TGT_RLIMIT_NOFILE = 6,
+        TGT_RLIMIT_AS = 7,
+        TGT_RLIMIT_VMEM = 7,
+        TGT_RLIMIT_NPROC = 8,
+        TGT_RLIMIT_MEMLOCK = 9,
+        TGT_RLIMIT_LOCKS = 10
+    };
 };
 
 

diff --git a/arch/mips/mips_linux.hh b/arch/mips/mips_linux.hh
index b142a779664db7f5335876ced930d4a4a9d7e911..fd08e8c874706fd21c8e288f60fb7e28f4d3f34c 100644 (file)
--- a/arch/mips/mips_linux.hh
+++ b/arch/mips/mips_linux.hh
@@ -44,25 +44,25 @@ class MipsLinux : public Linux
 
     //@{
     /// open(2) flag values.
-    static const int TGT_O_RDONLY      = 00000000;     //!< O_RDONLY
-    static const int TGT_O_WRONLY      = 00000001;     //!< O_WRONLY
-    static const int TGT_O_RDWR        = 00000002;     //!< O_RDWR
-    static const int TGT_O_NONBLOCK = 00000004;        //!< O_NONBLOCK
-    static const int TGT_O_APPEND      = 00000010;     //!< O_APPEND
-    static const int TGT_O_CREAT       = 00001000;     //!< O_CREAT
-    static const int TGT_O_TRUNC       = 00002000;     //!< O_TRUNC
-    static const int TGT_O_EXCL        = 00004000;     //!< O_EXCL
-    static const int TGT_O_NOCTTY      = 00010000;     //!< O_NOCTTY
-    static const int TGT_O_SYNC        = 00040000;     //!< O_SYNC
-    static const int TGT_O_DRD = 00100000;     //!< O_DRD
-    static const int TGT_O_DIRECTIO = 00200000;        //!< O_DIRECTIO
-    static const int TGT_O_CACHE       = 00400000;     //!< O_CACHE
-    static const int TGT_O_DSYNC       = 02000000;     //!< O_DSYNC
-    static const int TGT_O_RSYNC       = 04000000;     //!< O_RSYNC
+    static const int TGT_O_RDONLY      = 0x00000000;   //!< O_RDONLY
+    static const int TGT_O_WRONLY      = 0x00000001;   //!< O_WRONLY
+    static const int TGT_O_RDWR                = 0x00000002;   //!< O_RDWR
+    static const int TGT_O_NONBLOCK     = 0x00000080;  //!< O_NONBLOCK
+    static const int TGT_O_APPEND      = 0x00000008;   //!< O_APPEND
+    static const int TGT_O_CREAT       = 0x00000100;   //!< O_CREAT
+    static const int TGT_O_TRUNC       = 0x00000200;   //!< O_TRUNC
+    static const int TGT_O_EXCL                = 0x00000400;   //!< O_EXCL
+    static const int TGT_O_NOCTTY      = 0x00000800;   //!< O_NOCTTY
+    static const int TGT_O_SYNC                = 0x00000010;   //!< O_SYNC
+    static const int TGT_O_DRD         = 0x00010000;   //!< O_DRD
+    static const int TGT_O_DIRECTIO     = 0x00020000;  //!< O_DIRECTIO
+    static const int TGT_O_CACHE       = 0x00002000;   //!< O_CACHE
+    static const int TGT_O_DSYNC       = 0x00008000;   //!< O_DSYNC
+    static const int TGT_O_RSYNC       = 0x00040000;   //!< O_RSYNC
     //@}
 
     /// For mmap().
-    static const unsigned TGT_MAP_ANONYMOUS = 0x10;
+    static const unsigned TGT_MAP_ANONYMOUS = 0x800;
 
     //@{
     /// For getsysinfo().
@@ -89,19 +89,36 @@ class MipsLinux : 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 TIOCGETP   = 0x7408;
+    static const unsigned TIOCSETP   = 0x7409;
+    static const unsigned TIOCSETN   = 0x740a;
+    static const unsigned TIOCSETC   = 0x7411;
+    static const unsigned TIOCGETC   = 0x7412;
+    static const unsigned FIONREAD   = 0x467f;
+    static const unsigned TIOCISATTY = 0x5480;
+    static const unsigned TIOCGETS   = 0x7413;
+    static const unsigned TIOCGETA   = 0x7417;
     //@}
 
     /// For table().
     static const int TBL_SYSINFO = 12;
+
+    /// Resource enumeration for getrlimit().
+    enum rlimit_resources {
+        TGT_RLIMIT_CPU = 0,
+        TGT_RLIMIT_FSIZE = 1,
+        TGT_RLIMIT_DATA = 2,
+        TGT_RLIMIT_STACK = 3,
+        TGT_RLIMIT_CORE = 4,
+        TGT_RLIMIT_NOFILE = 5,
+        TGT_RLIMIT_AS = 6,
+        TGT_RLIMIT_RSS = 7,
+        TGT_RLIMIT_VMEM = 7,
+        TGT_RLIMIT_NPROC = 8,
+        TGT_RLIMIT_MEMLOCK = 9,
+        TGT_RLIMIT_LOCKS = 10
+    };
+
 };
 
 #endif

diff --git a/kern/linux/linux.hh b/kern/linux/linux.hh
index bab460333d771421562f4b88b8c034cabba8c5db..63e0dd5cad01b0e3064d6e629cde409276917013 100644 (file)
--- a/kern/linux/linux.hh
+++ b/kern/linux/linux.hh
@@ -132,23 +132,6 @@ class Linux {
         char machine[_SYS_NMLN];       //!< Machine type.
     };
 
-
-    /// Resource enumeration for getrlimit().
-    enum rlimit_resources {
-        TGT_RLIMIT_CPU = 0,
-        TGT_RLIMIT_FSIZE = 1,
-        TGT_RLIMIT_DATA = 2,
-        TGT_RLIMIT_STACK = 3,
-        TGT_RLIMIT_CORE = 4,
-        TGT_RLIMIT_RSS = 5,
-        TGT_RLIMIT_NOFILE = 6,
-        TGT_RLIMIT_AS = 7,
-        TGT_RLIMIT_VMEM = 7,
-        TGT_RLIMIT_NPROC = 8,
-        TGT_RLIMIT_MEMLOCK = 9,
-        TGT_RLIMIT_LOCKS = 10
-    };
-
     /// Limit struct for getrlimit/setrlimit.
     struct rlimit {
         uint64_t  rlim_cur;    //!< soft limit

diff --git a/kern/tru64/tru64.hh b/kern/tru64/tru64.hh
index 3bd0f39f0d93e4ec62c7a85bb846dab6806167ab..91db5bb84abded25941967385fd9cbd44b4a541a 100644 (file)
--- a/kern/tru64/tru64.hh
+++ b/kern/tru64/tru64.hh
@@ -220,19 +220,6 @@ class Tru64 {
         char machine[_SYS_NMLN];        //!< Machine type.
     };
 
-    /// Resource enumeration for getrlimit().
-    enum rlimit_resources {
-        TGT_RLIMIT_CPU = 0,
-        TGT_RLIMIT_FSIZE = 1,
-        TGT_RLIMIT_DATA = 2,
-        TGT_RLIMIT_STACK = 3,
-        TGT_RLIMIT_CORE = 4,
-        TGT_RLIMIT_RSS = 5,
-        TGT_RLIMIT_NOFILE = 6,
-        TGT_RLIMIT_AS = 7,
-        TGT_RLIMIT_VMEM = 7
-    };
-
     /// Limit struct for getrlimit/setrlimit.
     struct rlimit {
         uint64_t  rlim_cur;    //!< soft limit