Adds core inference logic to TypeAnalyzer

Issue: #17
0x7CFE · May 21, 2016 · 7caca94 · 7caca94
1 parent 479fb29
commit 7caca94
Show file tree

Hide file tree

Showing 2 changed files with 310 additions and 38 deletions.
diff --git a/include/inference.h b/include/inference.h
@@ -252,35 +252,55 @@ class CallContext {
 
 class TypeSystem {
 public:
-    CallContext* newCallContext(TMethod* method, const Type& arguments = Type(Type::tkPolytype));
+    TypeSystem(SmalltalkVM& vm) : m_vm(vm), m_lastContextIndex(0) {}
 
-    CallContext* getCallContext(std::size_t index);
+    typedef TSymbol* TSelector;
+    CallContext* findCallContext(TSelector selector, const Type& arguments);
+
+    CallContext* analyzeCall(TSelector selector, const Type& arguments);
+    ControlGraph* getControlGraph(TMethod* method);
+
+private:
+    typedef std::pair<ParsedBytecode*, ControlGraph*> TGraphEntry;
+    typedef std::map<TMethod*, TGraphEntry> TGraphCache;
+
+    typedef std::map<Type, CallContext*> TContextMap;
+    typedef std::map<TSelector, TContextMap> TContextCache;
+
+private:
+    SmalltalkVM&  m_vm; // TODO Image must be enough
+
+    TGraphCache   m_graphCache;
+    TContextCache m_contextCache;
+    std::size_t   m_lastContextIndex;
 };
 
 class TypeAnalyzer {
 public:
-    TypeAnalyzer(ControlGraph& graph, CallContext& context)
-        : m_graph(graph), m_context(context), m_walker(*this) {}
+    TypeAnalyzer(TypeSystem& system, ControlGraph& graph, CallContext& context)
+        : m_system(system), m_graph(graph), m_context(context), m_walker(*this) {}
 
-    void run() {
-        if (m_graph.isEmpty())
-            return;
-
-        m_walker.run(*m_graph.nodes_begin(), Walker::wdForward);
-    }
+    void run();
 
 private:
     void processInstruction(const InstructionNode& instruction);
     void processPhi(const PhiNode& phi);
     void processTau(const TauNode& tau);
     void walkComplete();
 
-    void doMarkArguments(const InstructionNode& instruction);
     void doPushConstant(const InstructionNode& instruction);
     void doPushLiteral(const InstructionNode& instruction);
+
+    void doPushTemporary(const InstructionNode& instruction);
+    void doAssignTemporary(const InstructionNode& instruction);
+
     void doSendUnary(const InstructionNode& instruction);
     void doSendBinary(const InstructionNode& instruction);
 
+    void doMarkArguments(const InstructionNode& instruction);
+    void doSendMessage(const InstructionNode& instruction);
+    void doPrimitive(const InstructionNode& instruction);
+
 private:
 
     class Walker : public GraphWalker {
@@ -315,9 +335,13 @@ class TypeAnalyzer {
     };
 
 private:
+    TypeSystem&   m_system;
     ControlGraph& m_graph;
     CallContext&  m_context;
     Walker        m_walker;
+
+    bool m_baseRun;
+    bool m_literalBranch;
 };
 
 } // namespace type