Changeset 88 for trunk/IPs/systemC/Environment/Data

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

Location:

trunk/IPs/systemC/Environment/Data

Files:

• Makefile (modified) (2 diffs)
• include/Segment.h (modified) (1 diff)
• src/Segment_init.cpp (modified) (2 diffs)
• src/Segment_print.cpp (modified) (1 diff)

trunk/IPs/systemC/Environment/Data/Makefile

@@ -4 +4 @@
 
 #-----[ Variable ]-----------------------------------------
+
+ENTITY                         ?= Data
 
 # OBJECTS_DEPS                  = $(patsubst $(DIR_ENDIANNESS)/$(DIR_SRC)/%.cpp,$(DIR_ENDIANNESS)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_ENDIANNESS)/$(DIR_SRC)/*.cpp))
@@ -21 +23 @@
 #                               $(MAKE) --directory=$(DIR_ENDIANNESS) clean; \
 
+clean_all                       : clean
+
 help                            :
                                 @$(MAKE) environment_help

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

@@ -39 +39 @@
   public : void                 read          (uint32_t address, uint32_t size, char * & data_dest);
   public : void                 write         (uint32_t address, uint32_t size, char * & data_src);
+  public : std::string          print         (uint32_t depth);
   public : friend std::ostream& operator<<    (std::ostream& output, Segment & x);
   };

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

@@ -1 +1 @@
 #include "../include/Segment.h"
+#include "../../Common/include/Debug.h"
 
 namespace environment {
@@ -22 +23 @@
     
     memcpy(data, ptab, size);
-    
+
     free  (ptab);
+      
+
+//     {
+//       _cout(DATA,"Segment Init\n");
+//       _cout(DATA," * size : %d\n",size);
+//       _cout(DATA," * size : %d\n",this->size);
+//       _cout(DATA,"%s\n",print(0).c_str());
+      
+//       uint32_t addr = base;
+//       uint32_t step1 = 4;
+//       uint32_t step2 = step1*8;
+
+//       for (int32_t i=0; i<size; ++i)
+//         {
+//           if ((i%step1) == 0)
+//             _cout(DATA," ");
+//           if ((i%step2) ==0)
+//             {
+//               _cout(DATA,"\n%.8x : ",addr);
+//               addr += step2;
+//             }
+//           _cout(DATA,"%.2x",0xff&static_cast<uint32_t>(data[i]));
+//         }
+//       _cout(DATA,"\n");
+//     }
     
     return true;

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

@@ -1 +1 @@
 #include "../include/Segment.h"
+#include <sstream>
 
 namespace environment {
 namespace data {
+
+  std::string Segment::print(uint32_t depth)
+  {
+    std::ostringstream out("");
+    std::string tab = std::string(depth,'\t');
+
+
+    out << tab << "Segment \"" << name << "\""     << std::endl
+        << std::hex
+        << tab << "  * base     : " << std::setw(8) << std::setfill('0') << base << std::endl
+        << tab << "  * size     : " << std::setw(8) << std::setfill('0') << size << std::endl
+        << std::dec
+        << tab << "  * uncached : " << uncached    << std::endl
+        << tab << "  * type     : " << type;
+
+    return out.str();
+  }
   
   std::ostream& operator<< (std::ostream& output, Segment & x)
   {
-    output << "Segment \"" << x.name << "\""     << std::endl
-           << std::hex
-           << "  * base     : " << std::setw(8) << std::setfill('0') << x.base << std::endl
-           << "  * size     : " << std::setw(8) << std::setfill('0') << x.size << std::endl
-           << std::dec
-           << "  * uncached : " << x.uncached    << std::endl
-           << "  * type     : " << x.type;
+    output << x.print(0);
         
     return output;