summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--objects/BaseCPU.mpy2
-rw-r--r--objects/BaseCache.mpy16
-rw-r--r--objects/BaseSystem.mpy2
-rw-r--r--objects/CoherenceProtocol.mpy2
-rw-r--r--objects/DiskImage.mpy2
-rw-r--r--objects/Ethernet.mpy14
-rw-r--r--objects/Root.mpy2
-rw-r--r--objects/SimConsole.mpy2
-rw-r--r--sim/pyconfig/m5config.py14
-rw-r--r--util/stats/info.py2
10 files changed, 23 insertions, 35 deletions
diff --git a/objects/BaseCPU.mpy b/objects/BaseCPU.mpy
index 516509c1e..f6e6ff96c 100644
--- a/objects/BaseCPU.mpy
+++ b/objects/BaseCPU.mpy
@@ -19,7 +19,7 @@ simobj BaseCPU(SimObject):
max_loads_any_thread = Param.Counter(0,
"terminate when any thread reaches this load count")
- defer_registration = Param.Bool(false,
+ defer_registration = Param.Bool(False,
"defer registration with system (for sampling)")
def check(self):
diff --git a/objects/BaseCache.mpy b/objects/BaseCache.mpy
index 95a7f0b35..98a422e30 100644
--- a/objects/BaseCache.mpy
+++ b/objects/BaseCache.mpy
@@ -2,37 +2,37 @@ from BaseMem import BaseMem
simobj BaseCache(BaseMem):
type = 'BaseCache'
- adaptive_compression = Param.Bool(false,
+ adaptive_compression = Param.Bool(False,
"Use an adaptive compression scheme")
assoc = Param.Int("associativity")
block_size = Param.Int("block size in bytes")
- compressed_bus = Param.Bool(false,
+ compressed_bus = Param.Bool(False,
"This cache connects to a compressed memory")
compression_latency = Param.Int(0,
"Latency in cycles of compression algorithm")
- do_copy = Param.Bool(false, "perform fast copies in the cache")
+ do_copy = Param.Bool(False, "perform fast copies in the cache")
hash_delay = Param.Int(1, "time in cycles of hash access")
in_bus = Param.Bus(NULL, "incoming bus object")
- lifo = Param.Bool(false,
+ lifo = Param.Bool(False,
"whether this NIC partition should use LIFO repl. policy")
max_miss_count = Param.Counter(0,
"number of misses to handle before calling exit")
mshrs = Param.Int("number of MSHRs (max outstanding requests)")
out_bus = Param.Bus("outgoing bus object")
- prioritizeRequests = Param.Bool(false,
+ prioritizeRequests = Param.Bool(False,
"always service demand misses first")
protocol = Param.CoherenceProtocol(NULL, "coherence protocol to use")
repl = Param.Repl(NULL, "replacement policy")
size = Param.Int("capacity in bytes")
- split = Param.Bool(false, "whether or not this cache is split")
+ split = Param.Bool(False, "whether or not this cache is split")
split_size = Param.Int(0,
"How many ways of the cache belong to CPU/LRU partition")
- store_compressed = Param.Bool(false,
+ store_compressed = Param.Bool(False,
"Store compressed data in the cache")
subblock_size = Param.Int(0,
"Size of subblock in IIC used for compression")
tgts_per_mshr = Param.Int("max number of accesses per MSHR")
trace_addr = Param.Addr(0, "address to trace")
- two_queue = Param.Bool(false,
+ two_queue = Param.Bool(False,
"whether the lifo should have two queue replacement")
write_buffers = Param.Int(8, "number of write buffers")
diff --git a/objects/BaseSystem.mpy b/objects/BaseSystem.mpy
index 460bce736..1cbdf4e99 100644
--- a/objects/BaseSystem.mpy
+++ b/objects/BaseSystem.mpy
@@ -11,5 +11,5 @@ simobj BaseSystem(SimObject):
boot_osflags = Param.String("a", "boot flags to pass to the kernel")
system_type = Param.UInt64("Type of system we are emulating")
system_rev = Param.UInt64("Revision of system we are emulating")
- bin = Param.Bool(false, "is this system binned")
+ bin = Param.Bool(False, "is this system binned")
binned_fns = VectorParam.String([], "functions broken down and binned")
diff --git a/objects/CoherenceProtocol.mpy b/objects/CoherenceProtocol.mpy
index c77348f0a..ae041b638 100644
--- a/objects/CoherenceProtocol.mpy
+++ b/objects/CoherenceProtocol.mpy
@@ -2,5 +2,5 @@ Coherence = Enum('uni', 'msi', 'mesi', 'mosi', 'moesi')
simobj CoherenceProtocol(SimObject):
type = 'CoherenceProtocol'
- do_upgrades = Param.Bool(true, "use upgrade transactions?")
+ do_upgrades = Param.Bool(True, "use upgrade transactions?")
protocol = Param.Coherence("name of coherence protocol")
diff --git a/objects/DiskImage.mpy b/objects/DiskImage.mpy
index 908805ba0..80ef7b072 100644
--- a/objects/DiskImage.mpy
+++ b/objects/DiskImage.mpy
@@ -2,7 +2,7 @@ simobj DiskImage(SimObject):
type = 'DiskImage'
abstract = True
image_file = Param.String("disk image file")
- read_only = Param.Bool(false, "read only image")
+ read_only = Param.Bool(False, "read only image")
simobj RawDiskImage(DiskImage):
type = 'RawDiskImage'
diff --git a/objects/Ethernet.mpy b/objects/Ethernet.mpy
index f9479a5c2..088df4b93 100644
--- a/objects/Ethernet.mpy
+++ b/objects/Ethernet.mpy
@@ -16,7 +16,7 @@ simobj EtherLink(SimObject):
simobj EtherBus(SimObject):
type = 'EtherBus'
- loopback = Param.Bool(true,
+ loopback = Param.Bool(True,
"send packet back to the interface from which it came")
dump = Param.EtherDump(NULL, "dump object")
speed = Param.UInt64(100000000, "bus speed in bits per second")
@@ -36,14 +36,14 @@ simobj EtherDev(DmaDevice):
hardware_address = Param.EthernetAddr(NextEthernetAddr,
"Ethernet Hardware Address")
- dma_data_free = Param.Bool(false, "DMA of Data is free")
- dma_desc_free = Param.Bool(false, "DMA of Descriptors is free")
+ dma_data_free = Param.Bool(False, "DMA of Data is free")
+ dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
dma_read_delay = Param.Tick(0, "fixed delay for dma reads")
dma_read_factor = Param.Tick(0, "multiplier for dma reads")
dma_write_delay = Param.Tick(0, "fixed delay for dma writes")
dma_write_factor = Param.Tick(0, "multiplier for dma writes")
- rx_filter = Param.Bool(true, "Enable Receive Filter")
+ rx_filter = Param.Bool(True, "Enable Receive Filter")
rx_delay = Param.Tick(1000, "Receive Delay")
tx_delay = Param.Tick(1000, "Transmit Delay")
@@ -57,14 +57,14 @@ simobj NSGigE(PciDevice):
hardware_address = Param.EthernetAddr(NextEthernetAddr,
"Ethernet Hardware Address")
- dma_data_free = Param.Bool(false, "DMA of Data is free")
- dma_desc_free = Param.Bool(false, "DMA of Descriptors is free")
+ dma_data_free = Param.Bool(False, "DMA of Data is free")
+ dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
dma_read_delay = Param.Tick(0, "fixed delay for dma reads")
dma_read_factor = Param.Tick(0, "multiplier for dma reads")
dma_write_delay = Param.Tick(0, "fixed delay for dma writes")
dma_write_factor = Param.Tick(0, "multiplier for dma writes")
- rx_filter = Param.Bool(true, "Enable Receive Filter")
+ rx_filter = Param.Bool(True, "Enable Receive Filter")
rx_delay = Param.Tick(1000, "Receive Delay")
tx_delay = Param.Tick(1000, "Transmit Delay")
diff --git a/objects/Root.mpy b/objects/Root.mpy
index 5806ec826..b21396e36 100644
--- a/objects/Root.mpy
+++ b/objects/Root.mpy
@@ -7,5 +7,5 @@ simobj Root(SimObject):
config_output_file = Param.String('m5config.out',
"file to dump simulator config to")
full_system = Param.Bool("Full system simulation?")
- hier = HierParams(do_data = false, do_events = true)
+ hier = HierParams(do_data = False, do_events = True)
checkpoint = Param.String('', "Checkpoint file")
diff --git a/objects/SimConsole.mpy b/objects/SimConsole.mpy
index 1231e81dc..ab88db8c6 100644
--- a/objects/SimConsole.mpy
+++ b/objects/SimConsole.mpy
@@ -4,7 +4,7 @@ simobj ConsoleListener(SimObject):
simobj SimConsole(SimObject):
type = 'SimConsole'
- append_name = Param.Bool(true, "append name() to filename")
+ append_name = Param.Bool(True, "append name() to filename")
intr_control = Param.IntrControl(Super, "interrupt controller")
listener = Param.ConsoleListener("console listener")
number = Param.Int(0, "console number")
diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py
index 5ba7542a0..4e3a4103c 100644
--- a/sim/pyconfig/m5config.py
+++ b/sim/pyconfig/m5config.py
@@ -34,11 +34,6 @@ except:
env = {}
env.update(os.environ)
-def defined(key):
- return env.has_key(key)
-
-def define(key, value = True):
- env[key] = value
def panic(*args, **kwargs):
sys.exit(*args, **kwargs)
@@ -64,9 +59,6 @@ class Singleton(type):
cls._instance = super(Singleton, cls).__call__(*args, **kwargs)
return cls._instance
-if os.environ.has_key('FULL_SYSTEM'):
- FULL_SYSTEM = True
-
#####################################################################
#
# M5 Python Configuration Utility
@@ -670,7 +662,7 @@ class Node(object):
% (self.name, ptype, value._path)
found, done = obj.find(ptype, value._path)
if isinstance(found, Proxy):
- done = false
+ done = False
obj = obj.parent
return found
@@ -1267,10 +1259,6 @@ class Enum(type):
# "Constants"... handy aliases for various values.
#
-# For compatibility with C++ bool constants.
-false = False
-true = True
-
# Some memory range specifications use this as a default upper bound.
MAX_ADDR = Addr._max
MaxTick = Tick._max
diff --git a/util/stats/info.py b/util/stats/info.py
index fb46a2d55..01d7bdb0f 100644
--- a/util/stats/info.py
+++ b/util/stats/info.py
@@ -324,7 +324,7 @@ class Vector(Statistic,FormulaStat):
def __eq__(self, other):
if issequence(self.value) != issequence(other.value):
- return false
+ return False
if issequence(self.value):
if len(self.value) != len(other.value):
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 21:49:41 +0000