Changeset 138 for trunk/IPs/systemC/Environment/Data/src

Timestamp:

May 12, 2010, 7:34:01 PM (14 years ago)

Author:

rosiere

Message:

1) add counters_t type for interface
2) fix in check load in load_store_unit
3) add parameters (but not yet implemented)
4) change environment and add script (distcc_env.sh ...)
5) add warning if an unser change rename flag with l.mtspr instruction
6) ...

Location:

trunk/IPs/systemC/Environment/Data/src

Files:

• Segment_init.cpp (modified) (2 diffs)
• loadexec.c (modified) (6 diffs)

trunk/IPs/systemC/Environment/Data/src/Segment_init.cpp

@@ -9 +9 @@
     void * ptab;
     int    size   = this->size;
+//  int    size   = 0;
     int    offset = 0;
 
     loadexec(&ptab,&size,&offset,filename,sections);
 
-//     std::cout << "    - size         : " << size         << std::endl;
-//     std::cout << "    - offset       : " << offset       << std::endl;
+    // std::cout << "  - name           : " << name         << std::endl;
+    // std::cout << "    - size         : " << size         << std::endl;
+    // std::cout << "    - size         : " << this->size   << std::endl;
+    // std::cout << "    - offset       : " << offset       << std::endl;
     
     if (size > (int)this->size)
@@ -25 +28 @@
 
     free  (ptab);
-      
 
 //     {

trunk/IPs/systemC/Environment/Data/src/loadexec.c

@@ -73 +73 @@
       return;
 
-   if ((sect->flags & SEC_LOAD) && !(sect->flags & SEC_IN_MEMORY)) {
-      bfd_get_section_contents(exec, sect,
-                               rinfo->mem + (sect->lma - rinfo->ladr),
-                               0, bfd_section_size(exec, sect));
-      sect->contents = rinfo->mem;
+   if ((sect->flags & SEC_LOAD) && !(sect->flags & SEC_IN_MEMORY)) 
+     {
+/* #if 1 */
+/*        printf("  * bindsection : \n"); */
+/*        printf("    * exec         : %x\n",(int)exec); */
+/*        printf("    * sect         : %x\n",(int)sect); */
+/*        printf("    * size         : %d\n",(int)(rinfo->mem + (sect->lma - rinfo->ladr))); */
+/*        printf("      * mem        : %d\n",(int)rinfo->mem); */
+/*        printf("      * lma        : %d\n",(int)sect->lma); */
+/*        printf("      * ladr       : %d\n",(int)rinfo->ladr); */
+/*        fflush(stdout);        */
+/* #endif */
+
+       bfd_get_section_contents(exec,
+                                sect,
+                                rinfo->mem + (sect->lma - rinfo->ladr),
+                                0,
+                                bfd_section_size(exec, sect));
+       sect->contents = rinfo->mem;
    }
 }
@@ -92 +106 @@
       return;
 
+/* #if 1 */
+/*    printf("  * sectionsize : \n"); */
+/*    printf("    * name         : %s\n",rinfo->sections[i]); */
+/*    printf("    * size (before): %d (%x)\n",rinfo->size,rinfo->size); */
+/*    printf("    * ladr (before): %d (%x)\n",rinfo->ladr,rinfo->ladr); */
+/*    printf("    * hadr (before): %d (%x)\n",rinfo->hadr,rinfo->hadr); */
+/* #endif */
+
    rinfo->size += bfd_section_size(exec, sect);
    rinfo->ladr  = sect->lma < rinfo->ladr ? sect->lma : rinfo->ladr;
    rinfo->hadr  = sect->lma + rinfo->size > rinfo->hadr ?
                   sect->lma + rinfo->size : rinfo->hadr;
+
+/* #if 1 */
+/*    printf("    * size (after ): %d (%x)\n",rinfo->size,rinfo->size); */
+/*    printf("    * ladr (after ): %d (%x)\n",rinfo->ladr,rinfo->ladr); */
+/*    printf("    * hadr (after ): %d (%x)\n",rinfo->hadr,rinfo->hadr); */
+/* #endif */
+
 }
 
 void loadexec(void **emem, int *esize, int *eoffset, const char *file, const char **sections)
 {
-  bfd      *exec;
   static   int x;
   raminfo  ringo;
@@ -107 +135 @@
       bfd_init();
 
-   exec = bfd_openr(file, NULL);
+   bfd * exec = bfd_openr(file, NULL);
 
    if (!exec) {
@@ -120 +148 @@
    }
 
-#if 0
-   cout("Loading sections ");
-   for (i = 0; sections[i]; i++)
-     __cout("%s%s", sections[i], ((sections[i+1]!=NULL)?", ":" "));
-   __cout("from \"%s\"\n",bfd_get_filename(exec));
-   //cout("of executable '%s' for '%s' architecture in format '%s'\n",
-   //        bfd_get_filename(exec), bfd_printable_name(exec), exec->xvec->name);
-#endif
+/* #if 1 */
+/*    printf("  * Loading sections from \"%s\" :\n",bfd_get_filename(exec)); */
+/*    { */
+/*      int i; */
+/*      for (i = 0; sections[i]; i++) */
+/*        printf("    * %s\n", sections[i]); */
+/*    } */
+   
+/*    //cout("of executable '%s' for '%s' architecture in format '%s'\n", */
+/*    //        bfd_get_filename(exec), bfd_printable_name(exec), exec->xvec->name); */
+/* #endif */
 
    /* Set input parameters to bindsection */
@@ -135 +166 @@
    ringo.ladr     = ~0;
    ringo.hadr     = 0;
+   ringo.mem      = NULL;
+
    bfd_map_over_sections(exec, sectionssize, &ringo);
+
+/* #if 1 */
+/*    printf("  * Meminfo : \n"); */
+/*    printf("    * size         : %d (%x)\n",ringo.size,ringo.size); */
+/*    printf("    * esize        : %d (%x)\n",*esize,*esize); */
+/*    printf("    * ladr         : %d (%x)\n",ringo.ladr,ringo.ladr); */
+/*    printf("    * hadr         : %d (%x)\n",ringo.hadr,ringo.hadr); */
+/* #endif */
+
    /* Get output parameters from sectionssize */
    if (ringo.size < ringo.hadr - ringo.ladr)
@@ -146 +188 @@
    
    /* Start over again from the start of the memory */
-   bfd_map_over_sections(exec, bindsection, &ringo);
+   bfd_map_over_sections(exec,
+                         bindsection,
+                         &ringo);
    /* Get output parameters from bindsection */