Changeset 81 for trunk/IPs/systemC/Environment/Queue

Timestamp:

Apr 15, 2008, 8:40:01 PM (17 years ago)

Author:

rosiere

Message:

• Finish Environment (and test)
• Continue predictor_unit
• Add external tools
• svn keyword "Id" set

Location:

trunk/IPs/systemC/Environment/Queue

Files:

• Makefile (modified) (1 prop)
• include/Parameters.h (modified) (1 prop)
• include/Queue.h (modified) (1 diff, 1 prop)
• include/Slot.h (modified) (1 prop)
• include/Sort_Queue.h (modified) (2 diffs, 1 prop)
• include/Sort_Queue_Dynamic.h (modified) (2 diffs, 1 prop)
• selftest/main.cpp (modified) (2 diffs, 1 prop)

trunk/IPs/systemC/Environment/Queue/include/Queue.h

@@ -61 +61 @@
       // *****[ pop ]*****
       // read the queue, and update the pointer
-    public : virtual T    pop  ()             {return T();};
+    public : virtual T    pop  ()             = 0;
 
       // *****[ pop ]*****
       // read the queue, and update the pointer
-    public : virtual T    pop  (uint32_t num) {return T();};
+    public : virtual T    pop  (uint32_t num) = 0;
 
       // *****[ push ]*****
       // Push a new value (they must have a slot free)
-    public : virtual bool push (T val)        {return false;};
+    public : virtual bool push (T val)        = 0;
   
     }; // Queue

trunk/IPs/systemC/Environment/Queue/include/Sort_Queue.h

@@ -25 +25 @@
                          Parameters * param) : Queue <T> (name,param->_size)
       {
+        _ptr_read  = 0;
+        _ptr_write = 0;
       };
       
@@ -104 +106 @@
       
       // *****[ push ]*****
+  public : bool push (T val)
+    {
+      return push (0, val);
+    }
+
       // Push a new value (they must have a slot free)
       // Is sort by delay

trunk/IPs/systemC/Environment/Queue/include/Sort_Queue_Dynamic.h

@@ -143 +143 @@
         // Reorganize the queue
 
-        for (uint32_t it = num; it < Queue <T>::_nb_slot; it ++)
+        for (uint32_t it = num; it+1 < Queue <T>::_nb_slot; it ++)
           {
             uint32_t ptr      = (it);
             uint32_t ptr_next = (it+1);
 
+//          std::cout << "ptr      : " << ptr << std::endl
+//                    << "ptr_next : " << ptr_next << std::endl
+//                    << "nb_slot  : " << Queue <T>::_nb_slot << std::endl;
+            
             Queue <T>::_slot [ptr] = Queue <T>::_slot [ptr_next];
           }
@@ -157 +161 @@
       
       // *****[ push ]*****
+    public : bool push (T val)
+      {
+        return push (0, val);
+      }
+      
       // Push a new value (they must have a slot free)
       // Is sort by delay

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

@@ -1 @@
-#include <iostream>
 #include "../include/Sort_Queue.h"
 #include "../include/Sort_Queue_Dynamic.h"
+#include <iostream>
 
 using namespace std;
@@ -52 +52 @@
 
 
-int main (void)
+#ifdef SYSTEMC
+int sc_main (int argc, char * argv[])
+#else
+int    main (int argc, char * argv[])
+#endif
 {
   cout << "<main> Begin" << endl;