Added support for struct_create.

Orvid · Dec 1, 2015 · 9542319 · 9542319
1 parent bcb6be4
commit 9542319
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 1 deletion.
diff --git a/Decompiler/Node/NodeComparer.cpp b/Decompiler/Node/NodeComparer.cpp
@@ -124,6 +124,14 @@ void Node::NodeComparer::visit(Node::PropertyAccess *node)
     m_Reference->visit(& m_Visitor);
 }
 
+void Node::NodeComparer::visit(Node::StructCreate *node)
+{
+    m_Visitor << (DynamicVisitor::LambdaArrayCreate)[&](ArrayCreate* ref, DynamicVisitor*) {
+        m_Result = ref->getType() == node->getType();
+    };
+    m_Reference->visit(&m_Visitor);
+}
+
 void Node::NodeComparer::visit(Node::ArrayCreate *node)
 {
     m_Visitor << (DynamicVisitor::LambdaArrayCreate)[&](ArrayCreate* ref, DynamicVisitor*) {

diff --git a/Decompiler/Node/NodeComparer.hpp b/Decompiler/Node/NodeComparer.hpp
@@ -30,6 +30,7 @@ class NodeComparer final : public Visitor
     void visit(Node::Params* node) override;
     void visit(Node::Return* node) override;
     void visit(Node::PropertyAccess* node) override;
+    void visit(Node::StructCreate* node) override;
     void visit(Node::ArrayCreate* node) override;
     void visit(Node::ArrayLength* node) override;
     void visit(Node::ArrayAccess* node) override;

diff --git a/Decompiler/Node/Nodes.hpp b/Decompiler/Node/Nodes.hpp
@@ -20,6 +20,7 @@
 #include "ArrayLength.hpp"
 #include "ArrayAccess.hpp"
 
+#include "StructCreate.hpp"
 
 #include "Constant.hpp"
 #include "IdentifierString.hpp"

diff --git a/Decompiler/Node/StructCreate.hpp b/Decompiler/Node/StructCreate.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <cassert>
+#include <cstdint>
+
+#include "Base.hpp"
+#include "Visitor.hpp"
+
+namespace Node {
+
+class StructCreate final : public Base
+{
+public:
+    StructCreate(size_t ip, const Pex::StringTable::Index& result, const Pex::StringTable::Index& type) :
+        Base(0, ip, 0, result),
+        m_Type(type)
+    {
+    }
+    virtual ~StructCreate() = default;
+
+    void visit(Visitor* visitor) override
+    {
+        assert(visitor);
+        visitor->visit(this);
+    }
+
+    const Pex::StringTable::Index& getType() const { return m_Type; }
+
+private:
+    const Pex::StringTable::Index& m_Type;
+};
+
+}
diff --git a/Decompiler/Node/Visitor.hpp b/Decompiler/Node/Visitor.hpp
@@ -27,6 +27,7 @@ namespace Node {
     DO_NODE(While) \
     DO_NODE(IfElse) \
     DO_NODE(Declare) \
+    DO_NODE(StructCreate) \
 
 #define DO_NODE(NODE) class NODE;
 FOR_EACH_NODE_CLASS()

diff --git a/Decompiler/PscCodeGenerator.cpp b/Decompiler/PscCodeGenerator.cpp
@@ -199,6 +199,11 @@ void Decompiler::PscCodeGenerator::visit(Node::PropertyAccess *node)
     m_Result << "." << node->getProperty();
 }
 
+void Decompiler::PscCodeGenerator::visit(Node::StructCreate* node)
+{
+    m_Result << "new " << node->getType().asString() << "()";
+}
+
 void Decompiler::PscCodeGenerator::visit(Node::ArrayCreate* node)
 {
     std::string type = node->getType().asString();

diff --git a/Decompiler/PscCodeGenerator.hpp b/Decompiler/PscCodeGenerator.hpp
@@ -33,6 +33,7 @@ class PscCodeGenerator : public Node::Visitor
     virtual void visit(Node::Params* node);
     virtual void visit(Node::Return* node);
     virtual void visit(Node::PropertyAccess* node);
+    virtual void visit(Node::StructCreate* node);
     virtual void visit(Node::ArrayCreate* node);
     virtual void visit(Node::ArrayLength* node);
     virtual void visit(Node::ArrayAccess* node);

diff --git a/Decompiler/PscDecompiler.cpp b/Decompiler/PscDecompiler.cpp
@@ -569,7 +569,7 @@ void Decompiler::PscDecompiler::createNodesForBlocks(size_t block)
             }
             case Pex::OpCode::STRUCT_CREATE:
             {
-                node = std::make_shared<Node::Assign>(ip, fromValue(ip, args[0]), std::make_shared<Node::IdentifierString>(ip, "parent"));
+                node = std::make_shared<Node::StructCreate>(ip, args[0].getId(), typeOfVar(args[0].getId()));
                 break;
             }
             case Pex::OpCode::STRUCT_GET: