Fix some memory leaks

[satune.git] / src / ASTAnalyses / Encoding / subgraph.h

diff --git a/src/ASTAnalyses/Encoding/subgraph.h b/src/ASTAnalyses/Encoding/subgraph.h
index 5520709be9360f6cfa61685d09ff89a117d00d0b..88a129129a8c3de1e8b005469727ba1656218e61 100644 (file)
--- a/src/ASTAnalyses/Encoding/subgraph.h
+++ b/src/ASTAnalyses/Encoding/subgraph.h
@@ -5,42 +5,65 @@
 #include "graphstructs.h"
 
 class NodeValuePair {
 #include "graphstructs.h"
 
 class NodeValuePair {

- public:
- NodeValuePair(EncodingNode *n, uint64_t val) : node(n), value(val) {}
+public:
+       NodeValuePair(EncodingNode *n, uint64_t val) : node(n), value(val) {}

        EncodingNode *node;
        uint64_t value;
 };
 
        EncodingNode *node;
        uint64_t value;
 };
 

+class EncodingValue;
+
+typedef Hashset<EncodingValue *, uintptr_t, PTRSHIFT> HashsetEncodingValue;
+typedef SetIterator<EncodingValue *, uintptr_t, PTRSHIFT> SetIteratorEncodingValue;
+

 class EncodingValue {
 class EncodingValue {

- public:
+public:
+       EncodingValue(uint64_t _val) : value(_val), encoding(0), inComparison(false), assigned(false) {}

        void merge(EncodingValue *value);
        uint64_t value;
        void merge(EncodingValue *value);
        uint64_t value;

+       uint encoding;
+       bool inComparison;
+       bool assigned;

        HashsetEncodingNode nodes;
        HashsetEncodingNode nodes;

+       HashsetEncodingValue larger;
+       HashsetEncodingValue notequals;

 };
 
 uint hashNodeValuePair(NodeValuePair *nvp);
 bool equalsNodeValuePair(NodeValuePair *nvp1, NodeValuePair *nvp2);
 
 };
 
 uint hashNodeValuePair(NodeValuePair *nvp);
 bool equalsNodeValuePair(NodeValuePair *nvp1, NodeValuePair *nvp2);
 

-typedef Hashtable<NodeValuePair *, EncodingValue *, uintptr_t, 4, hashNodeValuePair, equalsNodeValuePair> NVPMap;
+typedef Hashtable<NodeValuePair *, EncodingValue *, uintptr_t, 0, hashNodeValuePair, equalsNodeValuePair> NVPMap;

 
 class EncodingSubGraph {
 
 class EncodingSubGraph {

- public:
+public:

        EncodingSubGraph();
        EncodingSubGraph();

+       ~EncodingSubGraph();

        void addNode(EncodingNode *n);
        void addNode(EncodingNode *n);

-       SetIteratorEncodingNode * nodeIterator();
+       SetIteratorEncodingNode *nodeIterator();

        void encode();
        void encode();

-       
+       uint getEncoding(EncodingNode *n, uint64_t val);
+       uint getEncodingMaxVal(EncodingNode *n) { return maxEncodingVal;}
+

        CMEMALLOC;
        CMEMALLOC;

- private:
+private:

        uint estimateNewSize(EncodingNode *n);
        uint estimateNewSize(EncodingSubGraph *sg);
        void traverseValue(EncodingNode *node, uint64_t value);
        uint estimateNewSize(EncodingNode *n);
        uint estimateNewSize(EncodingSubGraph *sg);
        void traverseValue(EncodingNode *node, uint64_t value);

+       void computeEncodingValue();
+       void computeComparisons();
+       void computeEqualities();
+       void solveComparisons();
+       void solveEquals();
+       void generateComparison(EncodingNode *left, EncodingNode *right);
+       void generateEquals(EncodingNode *left, EncodingNode *right);
+       void orderEV(EncodingValue *smaller, EncodingValue *larger);

 
 

-       
+       HashsetEncodingValue values;

        HashsetEncodingNode nodes;
        NVPMap map;
        uint encodingSize;
        uint numElements;
        HashsetEncodingNode nodes;
        NVPMap map;
        uint encodingSize;
        uint numElements;

+       uint maxEncodingVal;

 
        friend class EncodingGraph;
 };
 
        friend class EncodingGraph;
 };