Hand merge

base/traceflags.py:
    Include new flags

--HG--
extra : convert_revision : 8017cbe256860dce8b1efc1b4e1e81e883895b90

1 files changed, 6 insertions, 4 deletions

diff --git a/python/m5/config.py b/python/m5/config.py
index a791bbebf..e260c57a7 100644
--- a/python/m5/config.py
+++ b/python/m5/config.py
@@ -1140,10 +1140,12 @@ class UInt32(CheckedInt):   cppname = 'uint32_t'; size = 32; unsigned = True
 class Int64(CheckedInt):    cppname =  'int64_t'; size = 64; unsigned = False
 class UInt64(CheckedInt):   cppname = 'uint64_t'; size = 64; unsigned = True
 
-class Counter(CheckedInt): cppname = 'Counter'; size = 64; unsigned = True
-class Tick(CheckedInt):    cppname = 'Tick';    size = 64; unsigned = True
+class Counter(CheckedInt):  cppname = 'Counter';  size = 64; unsigned = True
+class Tick(CheckedInt):     cppname = 'Tick';     size = 64; unsigned = True
+class TcpPort(CheckedInt):  cppname = 'uint16_t'; size = 16; unsigned = True
+class UdpPort(CheckedInt):  cppname = 'uint16_t'; size = 16; unsigned = True
 
-class Percent(CheckedInt): cppname = 'int'; min = 0; max = 100
+class Percent(CheckedInt):  cppname = 'int'; min = 0; max = 100
 
 class MemorySize(CheckedInt):
     cppname = 'uint64_t'
@@ -1283,7 +1285,7 @@ class NullSimObject(object):
         pass
 
     def _convert(cls, value):
-        if value == Nxone:
+        if value == None:
             return
 
         if isinstance(value, cls):