Changes between Version 7 and Version 8 of Soclib Cc/And Modelsim

Timestamp:

May 19, 2010, 10:44:42 PM (14 years ago)

Author:

Nicolas Pouillon

Comment:

--

Soclib Cc/And Modelsim

@@ -53 +53 @@
 # Definition of the compiler used for ModelSim-usable SoCLib components.
 # We use sccom for components compilation and linkage, gcc/g++ for utilities
-config.toolchain_sccom = Config(
-        base = config.toolchain,
+config.modelsim_toolchain = Toolchain(
+        parent = config.toolchain,
         # Must use this.
         tool_map = {
@@ -74 +74 @@
 # Definition of the ModelSim SystemC implementation. Must modify the
 # path according to the ModelSim current installation.
-config.systemc_sccom = Config(
-        base = config.systemc,
+config.libsystemc_modelsim = Library(
+        name = 'systemc',
         # This special vendor attributes enables some quirks in soclib-cc
-        vendor = 'sccom',
+        vendor = 'modelsim',
         # This is the path of the produced .o files when compiled with sccom.
         # You have to try it by hand, and adapt
         sc_workpath = "work/_sc/linux_gcc-4.1.2",
-        # Mandatory quirks
-        dir = "",
-        os = "",
+        # Empty useless variables
         libs = [],
         # cflags have to be deducted from actual invocation
         # Try using sccom -v by hand
         cflags = ['-I/users/soft/mentor/modelsim-6.5c/modeltech/include/systemc',
-                  '-I/users/soft/mentor/modelsim-6.5c/modeltech/include'],
+                  '-I/users/soft/mentor/modelsim-6.5c/modeltech/include',
+                  '-I'+config.path+'/soclib/lib/include'],
         )
 
 # Definition of a new build environment, which can be referenced with 'soclib-cc -t'
-config.sccom = Config(
-        base = config.build_env,
-        toolchain = config.toolchain_sccom,
-        systemc = config.systemc_sccom,
+config.modelsim = BuildEnv(
+        parent = config.build_env,
+        toolchain = config.modelsim_toolchain,
+        libraries = [config.libsystemc_modelsim],
         # Where temporary files lies, beware that if you set a global path,
         # you'll need a mechanism to make user-unique directories.
@@ -165 +164 @@
    `.sd` metadata are needed (even for the VHDL/SystemC wrapper), see in tarball.
 {{{
- $ soclib-cc -1 caba:system_driver -t sccom -v -o sccom-link.o
+ $ soclib-cc -1 caba:system_driver -t modelsim -v -o sccom-link.o
 }}}
  * Open modelsim with the platform