summaryrefslogtreecommitdiff
path: root/python/m5/convert.py
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-03-23 15:52:03 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-03-23 15:52:03 -0500
commit903c984770f05efccd6487aa90e26957c28907d5 (patch)
treee9a92385d5b06db63b202a27699f26996ab47974 /python/m5/convert.py
parent2be988074cfd2d55617fdd4256ea62e7a1b63f92 (diff)
parentd4e9175c24f205231b0e338ee1d4a8e636749f69 (diff)
downloadgem5-903c984770f05efccd6487aa90e26957c28907d5.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- extra : convert_revision : ed00a0f85ed796a19a3112d0dd5b775c1dbcf2b8
Diffstat (limited to 'python/m5/convert.py')
-rw-r--r--python/m5/convert.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/m5/convert.py b/python/m5/convert.py
index 2ebe93889..2f69645b9 100644
--- a/python/m5/convert.py
+++ b/python/m5/convert.py
@@ -60,7 +60,7 @@ def toInteger(value):
elif value.endswith('f'):
result = int(value[:-1]) * femto
else:
- result = int(value)
+ result = int(float(value))
return result