Changeset 935 for branches

Timestamp:

Jan 27, 2015, 5:58:10 PM (10 years ago)

Author:

cfuguet

Message:

reconf: the ELF file for the external ROM is now optional in the
tsar_generic_iob platform.

File:

• branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (modified) (3 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -933 +933 @@
    //      Loader
    ////////////////////////////
+   soclib::common::Loader *loader;
 
 #if USE_ALMOS
-   soclib::common::Loader loader(almos_bootloader_pathname,
-                                 almos_archinfo_pathname,
-                                 almos_kernel_pathname);
+   loader = new soclib::common::Loader (almos_bootloader_pathname,
+                                        almos_archinfo_pathname,
+                                        almos_kernel_pathname);
 #else
-   soclib::common::Loader loader(soft_name, dsoft_name);
+   if (strcmp(soft_name, "") == 0)
+   {
+      loader = new soclib::common::Loader (dsoft_name);
+   }
+   else
+   {
+      loader = new soclib::common::Loader (soft_name, dsoft_name);
+   }
 #endif
 
    // initialize memory with a value different than 0 (expose software errors
    // dues to uninitialized data)
-   loader.memory_default(0xA0);
+   loader->memory_default(0xA0);
 
    typedef soclib::common::GdbServer<soclib::common::Mips32ElIss> proc_iss;
@@ -1037 +1045 @@
                                           IntTab(0, IOX_ROM_TGT_ID),
                                           maptab_iox,
-                                          loader,
+                                          *loader,
                                           X_WIDTH + Y_WIDTH );
 
@@ -1134 +1142 @@
                 distributed_boot,
 
-                loader,
+                *loader,
 
                 frozen_cycles,