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

Some more Py1k fixes, and added Py3k support

Browse Source
This commit is contained in:
Michael Hansen
2009-07-25 00:02:31 +00:00
parent b11b69c9de
commit 47b3a24c29
7 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bytecode.cpp
View File

@@ -171,11 +171,6 @@ bool Py1k::IsVarNameArg(int opcode)
(opcode == Py1k::STORE_FAST); (opcode == Py1k::STORE_FAST);
} }
bool Py1k::IsCellArg(int opcode)
{
return false;
}
bool Py2k::IsConstArg(int opcode) bool Py2k::IsConstArg(int opcode)
{ {
return (opcode == Py2k::LOAD_CONST); return (opcode == Py2k::LOAD_CONST);
@@ -231,7 +226,7 @@ bool Py3k::IsCellArg(int opcode)
} }
static void print_const(PycRef<PycObject> obj) static void print_const(PycRef<PycObject> obj, PycModule* mod)
{ {
switch (obj->type()) { switch (obj->type()) {
case PycObject::TYPE_STRING: case PycObject::TYPE_STRING:
@@ -241,16 +236,24 @@ static void print_const(PycRef<PycObject> obj)
OutputString(obj.cast<PycString>(), QS_Double); OutputString(obj.cast<PycString>(), QS_Double);
printf("\""); printf("\"");
break; break;
case PycObject::TYPE_UNICODE:
if (mod->majorVer() == 3)
printf("\"");
else
printf("u\"");
OutputString(obj.cast<PycString>(), QS_Double);
printf("\"");
break;
case PycObject::TYPE_TUPLE: case PycObject::TYPE_TUPLE:
{ {
printf("("); printf("(");
PycTuple::value_t values = obj.cast<PycTuple>()->values(); PycTuple::value_t values = obj.cast<PycTuple>()->values();
PycTuple::value_t::iterator it = values.begin(); PycTuple::value_t::iterator it = values.begin();
if (it != values.end()) { if (it != values.end()) {
print_const(*it); print_const(*it, mod);
while (++it != values.end()) { while (++it != values.end()) {
printf(", "); printf(", ");
print_const(*it); print_const(*it, mod);
} }
} }
printf(")"); printf(")");
@@ -262,10 +265,10 @@ static void print_const(PycRef<PycObject> obj)
PycList::value_t values = obj.cast<PycList>()->values(); PycList::value_t values = obj.cast<PycList>()->values();
PycList::value_t::iterator it = values.begin(); PycList::value_t::iterator it = values.begin();
if (it != values.end()) { if (it != values.end()) {
print_const(*it); print_const(*it, mod);
while (++it != values.end()) { while (++it != values.end()) {
printf(", "); printf(", ");
print_const(*it); print_const(*it, mod);
} }
} }
printf("]"); printf("]");
@@ -279,15 +282,15 @@ static void print_const(PycRef<PycObject> obj)
PycDict::key_t::iterator ki = keys.begin(); PycDict::key_t::iterator ki = keys.begin();
PycDict::value_t::iterator vi = values.begin(); PycDict::value_t::iterator vi = values.begin();
if (ki != keys.end()) { if (ki != keys.end()) {
print_const(*ki); print_const(*ki, mod);
printf(": "); printf(": ");
print_const(*vi); print_const(*vi, mod);
while (++ki != keys.end()) { while (++ki != keys.end()) {
++vi; ++vi;
printf(", "); printf(", ");
print_const(*ki); print_const(*ki, mod);
printf(": "); printf(": ");
print_const(*vi); print_const(*vi, mod);
} }
} }
printf("}"); printf("}");
@@ -353,8 +356,9 @@ void bc_disasm(PycRef<PycCode> code, PycModule* mod, int indent)
(mod->majorVer() == 2 && Py2k::IsConstArg(opcode)) || (mod->majorVer() == 2 && Py2k::IsConstArg(opcode)) ||
(mod->majorVer() == 3 && Py3k::IsConstArg(opcode))) { (mod->majorVer() == 3 && Py3k::IsConstArg(opcode))) {
printf("%d: ", operand); printf("%d: ", operand);
print_const(code->getConst(operand)); print_const(code->getConst(operand), mod);
} else if ((mod->majorVer() == 1 && Py1k::IsNameArg(opcode)) || } else if ((mod->majorVer() == 1 && Py1k::IsNameArg(opcode)) ||
(mod->majorVer() == 1 && mod->minorVer() < 4 && Py1k::IsVarNameArg(opcode)) ||
(mod->majorVer() == 2 && Py2k::IsNameArg(opcode)) || (mod->majorVer() == 2 && Py2k::IsNameArg(opcode)) ||
(mod->majorVer() == 3 && Py3k::IsNameArg(opcode))) { (mod->majorVer() == 3 && Py3k::IsNameArg(opcode))) {
printf("%d: %s", operand, code->getName(operand)->value()); printf("%d: %s", operand, code->getName(operand)->value());
@@ -362,11 +366,10 @@ void bc_disasm(PycRef<PycCode> code, PycModule* mod, int indent)
(mod->majorVer() == 2 && Py2k::IsVarNameArg(opcode)) || (mod->majorVer() == 2 && Py2k::IsVarNameArg(opcode)) ||
(mod->majorVer() == 3 && Py3k::IsVarNameArg(opcode))) { (mod->majorVer() == 3 && Py3k::IsVarNameArg(opcode))) {
printf("%d: %s", operand, code->getVarName(operand)->value()); printf("%d: %s", operand, code->getVarName(operand)->value());
} else if ((mod->majorVer() == 1 && Py1k::IsCellArg(opcode)) || } else if ((mod->majorVer() == 2 && Py2k::IsCellArg(opcode)) ||
(mod->majorVer() == 2 && Py2k::IsCellArg(opcode)) ||
(mod->majorVer() == 3 && Py3k::IsCellArg(opcode))) { (mod->majorVer() == 3 && Py3k::IsCellArg(opcode))) {
printf("%d: ", operand); printf("%d: ", operand);
print_const(code->getConst(operand)); print_const(code->getConst(operand), mod);
} else { } else {
printf("%d", operand); printf("%d", operand);
} }

1
bytecode.h
View File

@@ -38,7 +38,6 @@ extern const char* OpcodeNames[256];
bool IsConstArg(int opcode); bool IsConstArg(int opcode);
bool IsNameArg(int opcode); bool IsNameArg(int opcode);
bool IsVarNameArg(int opcode); bool IsVarNameArg(int opcode);
bool IsCellArg(int opcode);
} }

4
object.cpp
View File

@@ -57,8 +57,8 @@ PycRef<PycObject> CreateObject(int type)
case PycObject::TYPE_CODE: case PycObject::TYPE_CODE:
case PycObject::TYPE_CODE2: case PycObject::TYPE_CODE2:
return new PycCode(); return new PycCode();
//case PycObject::TYPE_UNICODE: case PycObject::TYPE_UNICODE:
// ... return new PycUnicode();
//case PycObject::TYPE_SET: //case PycObject::TYPE_SET:
// ... // ...
//case PycObject::TYPE_FROZENSET: //case PycObject::TYPE_FROZENSET:

1
object.h
View File

@@ -1,7 +1,6 @@
#ifndef _PYC_OBJECT_H #ifndef _PYC_OBJECT_H
#define _PYC_OBJECT_H #define _PYC_OBJECT_H
template <class _Obj> template <class _Obj>
class PycRef { class PycRef {
public: public:

15
pycdas.cpp
View File

@@ -74,6 +74,14 @@ void output_object(PycRef<PycObject> obj, PycModule* mod, int indent)
OutputString(obj.cast<PycString>(), QS_Double); OutputString(obj.cast<PycString>(), QS_Double);
printf("\"\n"); printf("\"\n");
break; break;
case PycObject::TYPE_UNICODE:
if (mod->majorVer() == 3)
iprintf(indent, "\"");
else
iprintf(indent, "u\"");
OutputString(obj.cast<PycString>(), QS_Double);
printf("\"\n");
break;
case PycObject::TYPE_TUPLE: case PycObject::TYPE_TUPLE:
{ {
iprintf(indent, "(\n"); iprintf(indent, "(\n");
@@ -102,6 +110,7 @@ void output_object(PycRef<PycObject> obj, PycModule* mod, int indent)
while (ki != keys.end()) { while (ki != keys.end()) {
output_object(*ki, mod, indent + 1); output_object(*ki, mod, indent + 1);
output_object(*vi, mod, indent + 2); output_object(*vi, mod, indent + 2);
++ki, ++vi;
} }
iprintf(indent, "}\n"); iprintf(indent, "}\n");
} }
@@ -109,6 +118,12 @@ void output_object(PycRef<PycObject> obj, PycModule* mod, int indent)
case PycObject::TYPE_NONE: case PycObject::TYPE_NONE:
iprintf(indent, "None\n"); iprintf(indent, "None\n");
break; break;
case PycObject::TYPE_FALSE:
iprintf(indent, "False\n");
break;
case PycObject::TYPE_TRUE:
iprintf(indent, "True\n");
break;
case PycObject::TYPE_INT: case PycObject::TYPE_INT:
iprintf(indent, "%d\n", obj.cast<PycInt>()->value()); iprintf(indent, "%d\n", obj.cast<PycInt>()->value());
break; break;

14
string.cpp
View File

@@ -45,10 +45,11 @@ bool PycString::isEqual(PycRef<PycObject> obj) const
void OutputString(PycRef<PycString> str, QuoteStyle style, FILE* F) void OutputString(PycRef<PycString> str, QuoteStyle style, FILE* F)
{ {
const char* ch = str->value(); const char* ch = str->value();
int len = str->length();
if (ch == 0) if (ch == 0)
return; return;
while (*ch != 0) { while (len--) {
if (*ch < 0x20) { if (*ch < 0x20 || *ch == 0x7F) {
if (*ch == '\r') { if (*ch == '\r') {
fprintf(F, "\\r"); fprintf(F, "\\r");
} else if (*ch == '\n') { } else if (*ch == '\n') {
@@ -61,8 +62,13 @@ void OutputString(PycRef<PycString> str, QuoteStyle style, FILE* F)
} else { } else {
fprintf(F, "\\x%x", *ch); fprintf(F, "\\x%x", *ch);
} }
} else if (*ch >= 0x7F) { } else if (*ch >= 0x80) {
fprintf(F, "\\x%x", *ch); if (str->type() == PycObject::TYPE_UNICODE) {
// Unicode stored as UTF-8... Let the stream interpret it
fputc(*ch, F);
} else {
fprintf(F, "\\x%x", *ch);
}
} else { } else {
if (style == QS_Single && *ch == '\'') if (style == QS_Single && *ch == '\'')
fprintf(F, "\\'"); fprintf(F, "\\'");

10
string.h
View File

@@ -33,6 +33,16 @@ private:
int m_length; int m_length;
}; };
class PycUnicode : public PycString {
public:
PycUnicode(int type = TYPE_UNICODE) : PycString(type) { }
bool isType(int type) const
{
return (type == TYPE_UNICODE) || PycString::isType(type);
}
};
void OutputString(PycRef<PycString> str, QuoteStyle style, FILE* F = stdout); void OutputString(PycRef<PycString> str, QuoteStyle style, FILE* F = stdout);
#endif #endif