Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up the ASTree code a bit

Browse Source
This commit is contained in:
Darryl Pogue
2010-12-24 23:34:05 -08:00
parent 345544d7da
commit bc0b93c632
2 changed files with 5 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ASTNode.h
View File

@@ -315,23 +315,6 @@ private:
};
class ASTJump : public ASTNode {
public:
enum Condition { JUMP, JMP_FALSE, JMP_TRUE };
ASTJump(int dest, Condition jtype, PycRef<ASTNode> cond)
: ASTNode(NODE_JUMP), m_dest(dest), m_jtype(jtype), m_cond(cond) {}
int dest() const { return m_dest; }
Condition jtype() const { return m_jtype; }
PycRef<ASTNode> cond() const { return m_cond; }
private:
int m_dest;
Condition m_jtype;
PycRef<ASTNode> m_cond;
};
class ASTBlock : public ASTNode {
public:
typedef std::list<PycRef<ASTNode> > list_t;
@@ -341,11 +324,11 @@ public:
BLK_FINALLY, BLK_WHILE, BLK_FOR
};
ASTBlock(BlkType blktype, unsigned int end = 0)
ASTBlock(BlkType blktype, int end = 0)
: ASTNode(NODE_BLOCK), m_blktype(blktype), m_end(end) { }
BlkType blktype() const { return m_blktype; }
unsigned int end() const { return m_end; }
int end() const { return m_end; }
const list_t& nodes() const { return m_nodes; }
list_t::size_type size() const { return m_nodes.size(); }
void removeFirst();
@@ -355,7 +338,7 @@ public:
private:
BlkType m_blktype;
unsigned int m_end;
int m_end;
list_t m_nodes;
};

38
ASTree.cpp
View File

@@ -13,7 +13,6 @@ static bool inPrint;
PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
{
PycBuffer source(code->code()->value(), code->code()->length());
std::stack<ASTNodeList::list_t> lines;
FastStack stack((mod->majorVer() == 1) ? 20 : code->stackSize());
stackhist_t stack_hist;
@@ -23,14 +22,8 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
PycRef<ASTBlock>& curblock = defblock;
blocks.push(defblock);
std::stack<int> jumps;
int opcode, operand;
int pos = 0;
bool startBlock = false;
ASTNodeList::list_t l;
lines.push(l);
while (!source.atEof()) {
bc_next(source, mod, opcode, operand, pos);
@@ -265,7 +258,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
{
PycRef<ASTNode> import = stack.top();
stack.pop();
lines.top().push_back(new ASTStore(import, Node_NULL));
curblock->append(new ASTStore(import, Node_NULL));
}
break;
@@ -292,7 +284,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
case Pyc::JUMP_IF_FALSE_A:
{
stack_hist.push(stack);
//stack = FastStack(stack_hist.top());
PycRef<ASTNode> cond = stack.top();
// Do not pop the condition off the stack!
@@ -311,7 +302,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
case Pyc::JUMP_IF_TRUE_A:
{
stack_hist.push(stack);
//stack = FastStack(stack_hist.top());
PycRef<ASTNode> cond = stack.top();
// Do not pop the condition off the stack!
@@ -340,6 +330,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
if (operand > 1 && (prev->blktype() == ASTBlock::BLK_IF
|| prev->blktype() == ASTBlock::BLK_ELIF))
{
stack_hist.push(stack);
PycRef<ASTBlock> next = new ASTBlock(ASTBlock::BLK_ELSE, pos+operand);
blocks.push(next.cast<ASTBlock>());
}
@@ -417,25 +408,21 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
PycRef<ASTNode> value = stack.top();
stack.pop();
if (value->type() == ASTNode::NODE_CALL) {
lines.top().push_back(value);
curblock->append(value);
}
}
break;
case Pyc::PRINT_ITEM:
lines.top().push_back(new ASTPrint(stack.top()));
curblock->append(new ASTPrint(stack.top()));
stack.pop();
break;
case Pyc::PRINT_NEWLINE:
lines.top().push_back(new ASTPrint(Node_NULL));
curblock->append(new ASTPrint(Node_NULL));
break;
case Pyc::RETURN_VALUE:
{
PycRef<ASTNode> value = stack.top();
stack.pop();
lines.top().push_back(new ASTReturn(value));
curblock->append(new ASTReturn(value));
}
break;
@@ -487,7 +474,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
PycRef<ASTNode> value = stack.top();
stack.pop();
PycRef<ASTNode> attr = new ASTBinary(name, new ASTName(code->getName(operand)), ASTBinary::BIN_ATTR);
lines.top().push_back(new ASTStore(value, attr));
curblock->append(new ASTStore(value, attr));
}
break;
@@ -500,7 +486,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
name = new ASTName(code->getName(operand));
else
name = new ASTName(code->getVarName(operand));
lines.top().push_back(new ASTStore(value, name));
curblock->append(new ASTStore(value, name));
}
break;
@@ -509,7 +494,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
PycRef<ASTNode> value = stack.top();
stack.pop();
PycRef<ASTNode> name = new ASTName(code->getName(operand));
lines.top().push_back(new ASTStore(value, name));
curblock->append(new ASTStore(value, name));
}
break;
@@ -518,7 +502,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
PycRef<ASTNode> value = stack.top();
stack.pop();
PycRef<ASTNode> name = new ASTName(code->getName(operand));
lines.top().push_back(new ASTStore(value, name));
curblock->append(new ASTStore(value, name));
}
break;
@@ -533,7 +516,6 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
if (dest->type() == ASTNode::NODE_MAP) {
dest.cast<ASTMap>()->add(subscr, src);
} else {
lines.top().push_back(new ASTStore(src, new ASTSubscr(dest, subscr)));
curblock->append(new ASTStore(src, new ASTSubscr(dest, subscr)));
}
}
@@ -579,7 +561,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
return new ASTNodeList(defblock->nodes());
}
if (curblock->end() && curblock->end() < pos) {
if (curblock->end() == pos) {
//stack = FastStack(stack_hist.top());
stack_hist.pop();
@@ -958,22 +940,6 @@ void print_src(PycRef<ASTNode> node, PycModule* mod)
printf(")");
}
break;
case ASTNode::NODE_JUMP:
{
ASTJump::Condition jtype = node.cast<ASTJump>()->jtype();
if (jtype != ASTJump::JUMP) {
printf("if ");
if (jtype == ASTJump::JMP_TRUE)
printf("not ");
print_src(node.cast<ASTJump>()->cond(), mod);
printf(":");
} else {
if (node.cast<ASTJump>()->dest() != 1) {
printf("else:"); /* HAX! */
}
}
}
break;
default:
printf("<NODE:%d>", node->type());
fprintf(stderr, "Unsupported Node type: %d\n", node->type());