Changeset 795 for trunk/platforms

Timestamp:

Sep 9, 2014, 2:28:12 PM (10 years ago)

Author:

cfuguet

Message:

tsar_generic_leti: ramdisk file name is now automatically generated

• It is generated through the concatenation of the disk name (the one used by disk controllers) and the SEG_RDK_BASE address

File:

• trunk/platforms/tsar_generic_leti/top.cpp (modified) (5 diffs)

trunk/platforms/tsar_generic_leti/top.cpp

@@ -241 +241 @@
    char     soft_name[256]    = "soft.elf";
    char     disk_name[256]    = "disk.img";
-   char     ramdisk_name[256] = "disk.img@0x02000000:";
    struct   timeval t1,t2;
    uint64_t ms1,ms2;
@@ -289 +288 @@
             strcpy(disk_name, argv[n + 1]);
          }
-         else if ((strcmp(argv[n], "-RAMDISK") == 0) && ((n + 1) < argc))
-         {
-            strcpy(ramdisk_name, argv[n + 1]);
-         }
          else if ((strcmp(argv[n], "-THREADS") == 0) && ((n + 1) < argc))
          {
@@ -311 +306 @@
             std::cout << "     -SOFT path to soft" << std::endl;
             std::cout << "     -DISK path to disk image" << std::endl;
-            std::cout << "     -RAMDISK path to ramdisk image" << std::endl;
             std::cout << "     -THREADS simulator's threads number" << std::endl;
             std::cout << "     -FROZEN max_number_of_lines" << std::endl;
@@ -364 +358 @@
     std::cout << " - SOFT_FILENAME    = " << soft_name << std::endl;
     std::cout << " - DISK_IMAGENAME   = " << disk_name << std::endl;
-    std::cout << " - RAMDISK_FILENAME = " << ramdisk_name << std::endl;
     std::cout << " - OPENMP THREADS   = " << threads << std::endl;
 
@@ -609 +602 @@
 
 #if USE_RAMDISK
-   soclib::common::Loader loader( soft_name, ramdisk_name );
+   std::ostringstream ramdisk_name;
+   ramdisk_name << disk_name << "@" << std::hex << SEG_RDK_BASE << ":";
+   soclib::common::Loader loader( soft_name, ramdisk_name.str().c_str() );
 #else
    soclib::common::Loader loader( soft_name );