Backed out prior changeset f9fb64a72259

Back out use of importlib to avoid implicitly creating
dependency on Python 2.7.
This commit is contained in:
Steve Reinhardt 2014-11-23 18:00:47 -08:00
parent 12243a3835
commit 252a463b6b

View file

@ -39,7 +39,6 @@
# #
# Authors: Brad Beckmann # Authors: Brad Beckmann
import importlib
import math import math
import m5 import m5
from m5.objects import * from m5.objects import *
@ -183,15 +182,15 @@ def create_system(options, full_system, system, piobus = None, dma_ports = []):
routers = [], ext_links = [], int_links = [], netifs = []) routers = [], ext_links = [], int_links = [], netifs = [])
ruby.network = network ruby.network = network
protocol_name = buildEnv['PROTOCOL'] protocol = buildEnv['PROTOCOL']
protocol = importlib.import_module(protocol_name) exec "import %s" % protocol
try: try:
(cpu_sequencers, dir_cntrls, topology) = \ (cpu_sequencers, dir_cntrls, topology) = \
protocol.create_system(options, full_system, system, dma_ports, eval("%s.create_system(options, full_system, system, dma_ports,\
ruby) ruby)"
% protocol)
except: except:
print "Error: could not create sytem for ruby protocol %s" % \ print "Error: could not create sytem for ruby protocol %s" % protocol
protocol_name
raise raise
# Create a port proxy for connecting the system port. This is # Create a port proxy for connecting the system port. This is