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

Reduce unnecessary uses of std::list

Browse Source
This commit is contained in:
Michael Hansen
2022-12-01 11:35:14 -08:00
parent 863e09e9e7
commit 93495c3bfb
7 changed files with 54 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyc_code.h
View File

@@ -3,10 +3,11 @@
#include "pyc_sequence.h"
#include "pyc_string.h"
#include <set>
class PycCode : public PycObject {
public:
typedef std::list<PycRef<PycString> > globals_t;
typedef std::set<PycRef<PycString>> globals_t;
enum CodeFlags {
CO_OPTIMIZED = 0x1,
CO_NEWLOCALS = 0x2,
@@ -76,8 +77,7 @@ public:
void markGlobal(PycRef<PycString> varname)
{
m_globalsUsed.push_back(varname);
m_globalsUsed.unique();
m_globalsUsed.emplace(std::move(varname));
}
private:

20
pyc_module.cpp
View File

@@ -235,26 +235,14 @@ void PycModule::loadFromMarshalledFile(const char* filename, int major, int mino
PycRef<PycString> PycModule::getIntern(int ref) const
{
if (ref < 0)
if (ref < 0 || (size_t)ref >= m_interns.size())
throw std::out_of_range("Intern index out of range");
auto it = m_interns.cbegin();
while (ref-- && it != m_interns.cend())
++it;
if (it == m_interns.cend())
throw std::out_of_range("Intern index out of range");
return *it;
return m_interns[(size_t)ref];
}
PycRef<PycObject> PycModule::getRef(int ref) const
{
if (ref < 0)
if (ref < 0 || (size_t)ref >= m_refs.size())
throw std::out_of_range("Ref index out of range");
auto it = m_refs.cbegin();
while (ref-- && it != m_refs.cend())
++it;
if (it == m_refs.cend())
throw std::out_of_range("Ref index out of range");
return *it;
return m_refs[(size_t)ref];
}

10
pyc_module.h
View File

@@ -2,7 +2,7 @@
#define _PYC_MODULE_H
#include "pyc_code.h"
#include <list>
#include <vector>
enum PycMagic {
MAGIC_1_0 = 0x00999902,
@@ -64,10 +64,10 @@ public:
PycRef<PycCode> code() const { return m_code; }
void intern(PycRef<PycString> str) { m_interns.push_back(str); }
void intern(PycRef<PycString> str) { m_interns.emplace_back(std::move(str)); }
PycRef<PycString> getIntern(int ref) const;
void refObject(PycRef<PycObject> str) { m_refs.push_back(str); }
void refObject(PycRef<PycObject> obj) { m_refs.emplace_back(std::move(obj)); }
PycRef<PycObject> getRef(int ref) const;
static bool isSupportedVersion(int major, int minor);
@@ -80,8 +80,8 @@ private:
bool m_unicode;
PycRef<PycCode> m_code;
std::list<PycRef<PycString> > m_interns;
std::list<PycRef<PycObject> > m_refs;
std::vector<PycRef<PycString>> m_interns;
std::vector<PycRef<PycObject>> m_refs;
};
#endif

13
pyc_numeric.cpp
View File

@@ -18,6 +18,7 @@ void PycInt::load(PycData* stream, PycModule*)
void PycLong::load(PycData* stream, PycModule*)
{
if (type() == TYPE_INT64) {
m_value.reserve(4);
int lo = stream->get32();
int hi = stream->get32();
m_value.push_back((lo ) & 0xFFFF);
@@ -28,6 +29,7 @@ void PycLong::load(PycData* stream, PycModule*)
} else {
m_size = stream->get32();
int actualSize = m_size >= 0 ? m_size : -m_size;
m_value.reserve(actualSize);
for (int i=0; i<actualSize; i++)
m_value.push_back(stream->get16());
}
@@ -41,9 +43,9 @@ bool PycLong::isEqual(PycRef<PycObject> obj) const
PycRef<PycLong> longObj = obj.cast<PycLong>();
if (m_size != longObj->m_size)
return false;
std::list<int>::const_iterator it1 = m_value.begin();
std::list<int>::const_iterator it2 = longObj->m_value.begin();
while (it1 != m_value.end()) {
auto it1 = m_value.cbegin();
auto it2 = longObj->m_value.cbegin();
while (it1 != m_value.cend()) {
if (*it1 != *it2)
return false;
++it1, ++it2;
@@ -60,7 +62,8 @@ std::string PycLong::repr() const
return "0x0L";
// Realign to 32 bits, since Python uses only 15
std::list<unsigned> bits;
std::vector<unsigned> bits;
bits.reserve((m_value.size() + 1) / 2);
int shift = 0, temp = 0;
for (auto bit : m_value) {
temp |= unsigned(bit & 0xFFFF) << shift;
@@ -83,7 +86,7 @@ std::string PycLong::repr() const
*aptr++ = '0';
*aptr++ = 'x';
std::list<unsigned>::const_reverse_iterator iter = bits.rbegin();
auto iter = bits.crbegin();
aptr += snprintf(aptr, 9, "%X", *iter++);
while (iter != bits.rend())
aptr += snprintf(aptr, 9, "%08X", *iter++);

6
pyc_numeric.h
View File

@@ -3,7 +3,7 @@
#include "pyc_object.h"
#include "data.h"
#include <list>
#include <vector>
#include <string>
class PycInt : public PycObject {
@@ -35,13 +35,13 @@ public:
void load(class PycData* stream, class PycModule* mod) override;
int size() const { return m_size; }
const std::list<int>& value() const { return m_value; }
const std::vector<int>& value() const { return m_value; }
std::string repr() const;
private:
int m_size;
std::list<int> m_value;
std::vector<int> m_value;
};
class PycFloat : public PycObject {

64
pyc_sequence.cpp
View File

@@ -24,9 +24,9 @@ bool PycTuple::isEqual(PycRef<PycObject> obj) const
PycRef<PycTuple> tupleObj = obj.cast<PycTuple>();
if (m_size != tupleObj->m_size)
return false;
value_t::const_iterator it1 = m_values.begin();
value_t::const_iterator it2 = tupleObj->m_values.begin();
while (it1 != m_values.end()) {
auto it1 = m_values.cbegin();
auto it2 = tupleObj->m_values.cbegin();
while (it1 != m_values.cend()) {
if (!(*it1)->isEqual(*it2))
return false;
++it1, ++it2;
@@ -51,9 +51,9 @@ bool PycList::isEqual(PycRef<PycObject> obj) const
PycRef<PycList> listObj = obj.cast<PycList>();
if (m_size != listObj->m_size)
return false;
value_t::const_iterator it1 = m_values.begin();
value_t::const_iterator it2 = listObj->m_values.begin();
while (it1 != m_values.end()) {
auto it1 = m_values.cbegin();
auto it2 = listObj->m_values.cbegin();
while (it1 != m_values.cend()) {
if (!(*it1)->isEqual(*it2))
return false;
++it1, ++it2;
@@ -61,20 +61,6 @@ bool PycList::isEqual(PycRef<PycObject> obj) const
return true;
}
PycRef<PycObject> PycList::get(int idx) const
{
if (idx < 0)
throw std::out_of_range("List index out of range");
value_t::const_iterator it = m_values.begin();
while (idx-- && it != m_values.end())
++it;
if (it == m_values.end())
throw std::out_of_range("List index out of range");
return *it;
}
/* PycDict */
void PycDict::load(PycData* stream, PycModule* mod)
@@ -99,17 +85,17 @@ bool PycDict::isEqual(PycRef<PycObject> obj) const
if (m_size != dictObj->m_size)
return false;
key_t::const_iterator ki1 = m_keys.begin();
key_t::const_iterator ki2 = dictObj->m_keys.begin();
while (ki1 != m_keys.end()) {
auto ki1 = m_keys.cbegin();
auto ki2 = dictObj->m_keys.cbegin();
while (ki1 != m_keys.cend()) {
if (!(*ki1)->isEqual(*ki2))
return false;
++ki1, ++ki2;
}
value_t::const_iterator vi1 = m_values.begin();
value_t::const_iterator vi2 = dictObj->m_values.begin();
while (vi1 != m_values.end()) {
auto vi1 = m_values.cbegin();
auto vi2 = dictObj->m_values.cbegin();
while (vi1 != m_values.cend()) {
if (!(*vi1)->isEqual(*vi2))
return false;
++vi1, ++vi2;
@@ -119,14 +105,14 @@ bool PycDict::isEqual(PycRef<PycObject> obj) const
PycRef<PycObject> PycDict::get(PycRef<PycObject> key) const
{
key_t::const_iterator ki = m_keys.begin();
value_t::const_iterator vi = m_values.begin();
while (ki != m_keys.end()) {
auto ki = m_keys.cbegin();
auto vi = m_values.cbegin();
while (ki != m_keys.cend()) {
if ((*ki)->isEqual(key))
return *vi;
++ki, ++vi;
}
return NULL; // Disassembly shouldn't get non-existant keys
return NULL; // Disassembly shouldn't get non-existent keys
}
PycRef<PycObject> PycDict::get(int idx) const
@@ -134,10 +120,10 @@ PycRef<PycObject> PycDict::get(int idx) const
if (idx < 0)
throw std::out_of_range("Dict index out of range");
value_t::const_iterator it = m_values.begin();
while (idx-- && it != m_values.end())
auto it = m_values.cbegin();
while (idx-- && it != m_values.cend())
++it;
if (it == m_values.end())
if (it == m_values.cend())
throw std::out_of_range("Dict index out of range");
return *it;
}
@@ -159,9 +145,9 @@ bool PycSet::isEqual(PycRef<PycObject> obj) const
PycRef<PycSet> setObj = obj.cast<PycSet>();
if (m_size != setObj->m_size)
return false;
value_t::const_iterator it1 = m_values.begin();
value_t::const_iterator it2 = setObj->m_values.begin();
while (it1 != m_values.end()) {
auto it1 = m_values.cbegin();
auto it2 = setObj->m_values.cbegin();
while (it1 != m_values.cend()) {
if (!(*it1)->isEqual(*it2))
return false;
++it1, ++it2;
@@ -174,10 +160,10 @@ PycRef<PycObject> PycSet::get(int idx) const
if (idx < 0)
throw std::out_of_range("Set index out of range");
value_t::const_iterator it = m_values.begin();
while (idx-- && it != m_values.end())
auto it = m_values.cbegin();
while (idx-- && it != m_values.cend())
++it;
if (it == m_values.end())
if (it == m_values.cend())
throw std::out_of_range("Set index out of range");
return *it;
}

13
pyc_sequence.h
View File

@@ -3,7 +3,6 @@
#include "pyc_object.h"
#include <vector>
#include <list>
#include <set>
class PycSequence : public PycObject {
@@ -19,7 +18,7 @@ protected:
class PycTuple : public PycSequence {
public:
typedef std::vector<PycRef<PycObject> > value_t;
typedef std::vector<PycRef<PycObject>> value_t;
PycTuple(int type = TYPE_TUPLE) : PycSequence(type) { }
@@ -36,7 +35,7 @@ private:
class PycList : public PycSequence {
public:
typedef std::list<PycRef<PycObject> > value_t;
typedef std::vector<PycRef<PycObject>> value_t;
PycList(int type = TYPE_LIST) : PycSequence(type) { }
@@ -45,7 +44,7 @@ public:
void load(class PycData* stream, class PycModule* mod) override;
const value_t& values() const { return m_values; }
PycRef<PycObject> get(int idx) const override;
PycRef<PycObject> get(int idx) const override { return m_values.at(idx); }
private:
value_t m_values;
@@ -53,8 +52,8 @@ private:
class PycDict : public PycSequence {
public:
typedef std::list<PycRef<PycObject> > key_t;
typedef std::list<PycRef<PycObject> > value_t;
typedef std::vector<PycRef<PycObject>> key_t;
typedef std::vector<PycRef<PycObject>> value_t;
PycDict(int type = TYPE_DICT) : PycSequence(type) { }
@@ -75,7 +74,7 @@ private:
class PycSet : public PycSequence {
public:
typedef std::set<PycRef<PycObject> > value_t;
typedef std::set<PycRef<PycObject>> value_t;
PycSet(int type = TYPE_SET) : PycSequence(type) { }