Changeset 134 for trunk/IPs/systemC/Environment

Timestamp:

Jul 15, 2009, 10:41:01 AM (15 years ago)

Author:

rosiere

Message:

1) valgrind fix
2) debug file on/off

Location:

trunk/IPs/systemC/Environment

Files:

• Data/include/Segment.h (modified) (1 diff)
• Data/selftest/main.cpp (modified) (2 diffs)
• Data/src/Data_read.cpp (modified) (1 diff)
• Data/src/Segment.cpp (modified) (2 diffs)
• Data/src/Segment_read.cpp (modified) (2 diffs)
• Data/src/loadexec.c (modified) (1 diff)
• src/Environment_transition.cpp (modified) (1 diff)

trunk/IPs/systemC/Environment/Data/include/Segment.h

@@ -23 +23 @@
   protected : type_target_t type;
 
-  public :  Segment (void);
+//public :  Segment (void);
   public :  Segment (SEGMENT_TABLE_ENTRY * segment);
   public : ~Segment (void);

trunk/IPs/systemC/Environment/Data/selftest/main.cpp

@@ -31 +31 @@
 
   {
-    Segment * seg1 = new Segment ();
+//     Segment * seg1 = new Segment ();
     
-    TEST(seg1->getType     (), TYPE_TARGET_MEMORY);
-    TEST(seg1->getIndex    (), 0);
-    TEST(seg1->getBase     (), 0);
-    TEST(seg1->getSize     (), 0);
-    TEST(seg1->getUncached (), false);
+//     TEST(seg1->getType     (), TYPE_TARGET_MEMORY);
+//     TEST(seg1->getIndex    (), 0);
+//     TEST(seg1->getBase     (), 0);
+//     TEST(seg1->getSize     (), 0);
+//     TEST(seg1->getUncached (), false);
     
-    seg1->define_target(TYPE_TARGET_SIM2OS,4);
-    TEST(seg1->getType     (), TYPE_TARGET_SIM2OS);
-    TEST(seg1->getIndex    (), 4);
+//     seg1->define_target(TYPE_TARGET_SIM2OS,4);
+//     TEST(seg1->getType     (), TYPE_TARGET_SIM2OS);
+//     TEST(seg1->getIndex    (), 4);
     
-    cout << *seg1 << endl;
+//     cout << *seg1 << endl;
     
     SEGMENT_TABLE_ENTRY * entry = new SEGMENT_TABLE_ENTRY("entry", 0x100, 0x1024, 21, 7, true);
@@ -104 +104 @@
     delete    seg2;
     delete    entry;
-    delete    seg1;
+//     delete    seg1;
   }
 

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

@@ -6 +6 @@
   bool Data::read (uint32_t address, uint32_t size, char * & data_dest)
   {
+//     for (uint32_t i=0; i<size; ++i)
+//       data_dest[i] = '\0';
+    
     uint32_t num_seg = 0;
-    bool     res     = false;
-
+    
     // Scan all segment
-    for (num_seg = 0; num_seg < nb_seg; num_seg ++)
+    for (; num_seg < nb_seg; num_seg ++)
       if (segment[num_seg]->test (address,size) == true)
         {
           segment[num_seg]->read (address,size,data_dest);
-          res = true;
           break;
         }
     
-    return res;
+    return (num_seg < nb_seg);
   }
 

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

@@ -4 +4 @@
 namespace data {
   
-  Segment::Segment (void)
-  {
-    name     = "";
-    base     = 0;
-    size     = 0;
-    uncached = false;
-    data     = NULL;
-    type     = TYPE_TARGET_MEMORY;
-    index    = 0;
-  }
+//   Segment::Segment (void)
+//   {
+//     name     = "";
+//     base     = 0;
+//     size     = 0;
+//     uncached = false;
+//     data     = NULL;
+//     type     = TYPE_TARGET_MEMORY;
+//     index    = 0;
+//   }
 
   Segment::Segment (SEGMENT_TABLE_ENTRY * segment)
@@ -25 +25 @@
     type     = TYPE_TARGET_MEMORY;
     index    = 0;
+    memset((void*)data,0,size * sizeof(char));
   }
 

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

@@ -1 +1 @@
 #include "../include/Segment.h"
+#include "../../Common/include/Debug.h"
 
 namespace environment {
@@ -6 +7 @@
   void Segment::read (uint32_t address, uint32_t size, char * & data_dest)
   {
+//     _cout(true,"  * kane\n");
+//     _cout(true,"    * address : %.8x\n",address);
     for (uint32_t it = 0; it < size ; it ++)
-      data_dest [it] = data[address-base+it];
+      {
+        data_dest [it] = data[address-base+it];
+//      _cout(true,"    * [%d] : %.8x\n",address-base+it,static_cast<uint32_t>(data_dest [it]));
+      }
   }
   

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

@@ -142 +142 @@
    *eoffset       = ringo.ladr;
    ringo.mem      = malloc(*esize * sizeof(char));
+
+   memset((void *)ringo.mem,0,*esize * sizeof(char));
+   
    /* Start over again from the start of the memory */
    bfd_map_over_sections(exec, bindsection, &ringo);

trunk/IPs/systemC/Environment/src/Environment_transition.cpp

@@ -105 +105 @@
 
                             bus_error |= !component_data->read(addr,size,read_iram[k]);
-
+                            
                             // Swap if endienness is different
                             if (endianness::isSameEndianness(context) == false)