Backed out prior changeset f9fb64a72259
Back out use of importlib to avoid implicitly creating dependency on Python 2.7.
This commit is contained in:
parent
12243a3835
commit
252a463b6b
1 changed files with 6 additions and 7 deletions
|
@ -39,7 +39,6 @@
|
|||
#
|
||||
# Authors: Brad Beckmann
|
||||
|
||||
import importlib
|
||||
import math
|
||||
import m5
|
||||
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 = [])
|
||||
ruby.network = network
|
||||
|
||||
protocol_name = buildEnv['PROTOCOL']
|
||||
protocol = importlib.import_module(protocol_name)
|
||||
protocol = buildEnv['PROTOCOL']
|
||||
exec "import %s" % protocol
|
||||
try:
|
||||
(cpu_sequencers, dir_cntrls, topology) = \
|
||||
protocol.create_system(options, full_system, system, dma_ports,
|
||||
ruby)
|
||||
eval("%s.create_system(options, full_system, system, dma_ports,\
|
||||
ruby)"
|
||||
% protocol)
|
||||
except:
|
||||
print "Error: could not create sytem for ruby protocol %s" % \
|
||||
protocol_name
|
||||
print "Error: could not create sytem for ruby protocol %s" % protocol
|
||||
raise
|
||||
|
||||
# Create a port proxy for connecting the system port. This is
|
||||
|
|
Loading…
Reference in a new issue