derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configs: Remove Python 2.7 glue code

Browse Source 
Remove uses of six and from __future__ imports as they are no longer
needed.

Change-Id: I6e2f270557d7343bbad30c8e6d743e363c43715a
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39755
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Andreas Sandberg
2021-01-26 12:32:39 +00:00
parent 9d6bf74c47
commit 40c581be44
70 changed files with 16 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configs/common/FSConfig.py
View File

@@ -38,20 +38,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import six
import m5
from m5.objects import *
from m5.util import *
from common.Benchmarks import *
from common import ObjectList
if six.PY3:
long = int
# Populate to reflect supported os types per target ISA
os_types = { 'mips' : [ 'linux' ],
'riscv' : [ 'linux' ], # TODO that's a lie
@@ -228,11 +220,11 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
pci_devices.append(self.pci_ide)
self.mem_ranges = []
size_remain = long(Addr(mdesc.mem()))
size_remain = int(Addr(mdesc.mem()))
for region in self.realview._mem_regions:
if size_remain > long(region.size()):
if size_remain > int(region.size()):
self.mem_ranges.append(region)
size_remain = size_remain - long(region.size())
size_remain = size_remain - int(region.size())
else:
self.mem_ranges.append(AddrRange(region.start, size=size_remain))
size_remain = 0