Changeset 4656

Timestamp:

Jul 10, 2015, 10:38:46 AM (4 years ago)

Author:

nmedfort

Message:

Temporary check-in.

Location:

icGREP/icgrep-devel/icgrep

Files:

• icgrep-devel.files (modified) (1 diff)
• pablo/function.cpp (added)
• pablo/function.h (added)
• pablo/optimizers/pablo_bddminimization.cpp (modified) (1 diff)
• pablo/pabloAST.cpp (modified) (1 diff)
• pablo/pabloAST.h (modified) (5 diffs)
• pablo/pe_ones.h (modified) (1 diff)
• pablo/pe_zeroes.h (modified) (1 diff)

icGREP/icgrep-devel/icgrep/icgrep-devel.files

@@ -331 +331 @@
 pablo/carry_manager.h
 pablo/carry_data.cpp
+pablo/function.h
+pablo/function.cpp

icGREP/icgrep-devel/icgrep/pablo/optimizers/pablo_bddminimization.cpp

@@ -1000 +1000 @@
 
                     // Gather the original users to this advance. We'll be manipulating it shortly.
-                    Statement::Users U(adv->users());
+                    Statement::Vector U(adv->users());
 
                     // Add s to V and sort the list; it'll be closer to being in topological order.

icGREP/icgrep-devel/icgrep/pablo/pabloAST.cpp

@@ -87 +87 @@
 void PabloAST::replaceAllUsesWith(PabloAST * expr) {    
     Statement * user[mUsers.size()];
-    Users::size_type users = 0;
+    Vector::size_type users = 0;
     for (PabloAST * u : mUsers) {
         if (isa<Statement>(u)) {

icGREP/icgrep-devel/icgrep/pablo/pabloAST.h

@@ -25 +25 @@
     friend class Statement;
     friend class Var;
-    friend class If;
+    friend class If;    
     friend class While;
     friend class PabloBlock;
+    friend class Function;
     friend class SymbolGenerator;
 public:
@@ -33 +34 @@
     using Allocator = SlabAllocator<u_int8_t>;
     using VectorAllocator = SlabAllocator<PabloAST *>;
-    using Users = std::vector<PabloAST*, VectorAllocator>;
-    using user_iterator = Users::iterator;
-    using const_user_iterator = Users::const_iterator;
-
+    using Vector = std::vector<PabloAST*, VectorAllocator>;
+    using user_iterator = Vector::iterator;
+    using const_user_iterator = Vector::const_iterator;
 
     enum class ClassTypeId : unsigned {
-        Advance
+        // Constants
+        Zeroes
+        , Ones
+        // Boolean operations
         , And
+        , Or
+        , Not
+        , Xor
+        , Sel
+        // Stream operations
+        , Advance
+        , ScanThru
+        , MatchStar
+        // Variable assignments
         , Assign
+        , Next
         , Call
+        , Var
+        // Scope blocks
         , If
+        , While
+        , Block
+        , Function
+        // Internal variables
         , Integer
-        , MatchStar
-        , Next
-        , Not
-        , Ones
-        , Or
-        , ScanThru
-        , Sel
         , String
-        , Var
-        , While
-        , Xor
-        , Zeroes
-        , Block
     };
     inline ClassTypeId getClassTypeId() const {
@@ -79 +86 @@
     }
 
-    inline Users & users() {
+    inline Vector & users() {
         return mUsers;
     }
 
-    inline const Users & users() const {
+    inline const Vector & users() const {
         return mUsers;
     }
@@ -89 +96 @@
     void replaceAllUsesWith(PabloAST * expr);
 
-    inline Users::size_type getNumUses() const {
+    inline Vector::size_type getNumUses() const {
         return mUsers.size();
     }
@@ -128 +135 @@
 private:
     const ClassTypeId       mClassTypeId;
-    Users                   mUsers;
+    Vector                   mUsers;
     static VectorAllocator  mVectorAllocator;
 };

icGREP/icgrep-devel/icgrep/pablo/pe_ones.h

@@ -24 +24 @@
     virtual ~Ones() {
     }
-    inline bool operator==(const Ones & other) const {
+    inline bool operator==(const Ones &) const {
         return true;
     }

icGREP/icgrep-devel/icgrep/pablo/pe_zeroes.h

@@ -24 +24 @@
     }
     virtual ~Zeroes() {
-
     }
-//    virtual PabloAST * getOperand(const unsigned) const {
-//        assert (false);
-//        return nullptr;
-//    }
-//    virtual unsigned getNumOperands() const {
-//        return 0;
-//    }
-//    virtual void setOperand(const unsigned, PabloAST *) {
-//        assert (false);
-//    }
-    inline bool operator==(const Zeroes & other) const {
+    inline bool operator==(const Zeroes &) const {
         return true;
     }