Softcode import

Author: mandolaerik

lib/1.2/dml-builtins.dml

@@ -14,6 +14,7 @@ header %{
     #include <simics/dmllib.h>
 %}
 
+import "simics/device-api.dml";
 import "simics-api.dml";
 import "simics/devs/io-memory.dml";
 import "simics/model-iface/bank-instrumentation.dml";

lib/1.4/dml-builtins.dml

@@ -13,6 +13,7 @@ header %{
     #include <simics/dmllib.h>
 %}
 
+import "simics/device-api.dml";
 import "simics/devs/io-memory.dml";
 import "simics/model-iface/bank-instrumentation.dml";
 import "simics/model-iface/int-register.dml";

py/dml/toplevel.py

@@ -373,8 +373,7 @@ def parse_main_file(inputfilename, explicit_import_path):
             dml.globals.enabled_compat.discard(feature)
 
     implicit_imports = [
-        ast.import_(site, "dml-builtins.dml"),
-        ast.import_(site, "simics/device-api.dml")]
+        ast.import_(site, "dml-builtins.dml")]
 
     (unimported, headers, footers, global_defs, spec_asts) = scan_statements(
         inputfilename, site, implicit_imports + stmts)