WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort method body ids

This commit is contained in:
LoveSy 2023-01-11 16:56:58 +08:00 committed by LoveSy
parent cd88218865
commit 5c499e6c02
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/jni/src/jni/dex_parser.cpp
View File

@ -705,6 +705,11 @@ namespace lspd {
if (body_visitor && code != nullptr) { if (body_visitor && code != nullptr) {
auto body = dex.method_bodies[method_idx]; auto body = dex.method_bodies[method_idx];
if (!body.loaded) { if (!body.loaded) {
std::set<jint> referred_strings;
std::set<jint> assigned_fields;
std::set<jint> accessed_fields;
std::set<jint> invoked_methods;
const dex::u2 *inst = code->insns; const dex::u2 *inst = code->insns;
const dex::u2 *end = inst + code->insns_size; const dex::u2 *end = inst + code->insns_size;
while (inst < end) { while (inst < end) {
@ -712,28 +717,28 @@ namespace lspd {
body.opcodes.push_back(static_cast<jbyte>(opcode)); body.opcodes.push_back(static_cast<jbyte>(opcode));
if (opcode == kOpcodeConstString) { if (opcode == kOpcodeConstString) {
auto str_idx = inst[1]; auto str_idx = inst[1];
body.referred_strings.push_back(str_idx); referred_strings.emplace(str_idx);
} }
if (opcode == kOpcodeConstStringJumbo) { if (opcode == kOpcodeConstStringJumbo) {
auto str_idx = *reinterpret_cast<const dex::u4 *>(&inst[1]); auto str_idx = *reinterpret_cast<const dex::u4 *>(&inst[1]);
body.referred_strings.push_back(static_cast<jint>(str_idx)); referred_strings.emplace(static_cast<jint>(str_idx));
} }
if ((opcode >= kOpcodeIGetStart && opcode <= kOpcodeIGetEnd) || if ((opcode >= kOpcodeIGetStart && opcode <= kOpcodeIGetEnd) ||
(opcode >= kOpcodeSGetStart && opcode <= kOpcodeSGetEnd)) { (opcode >= kOpcodeSGetStart && opcode <= kOpcodeSGetEnd)) {
auto field_idx = inst[1]; auto field_idx = inst[1];
body.accessed_fields.push_back(field_idx); accessed_fields.emplace(field_idx);
} }
if ((opcode >= kOpcodeIPutStart && opcode <= kOpcodeIPutEnd) || if ((opcode >= kOpcodeIPutStart && opcode <= kOpcodeIPutEnd) ||
(opcode >= kOpcodeSPutStart && opcode <= kOpcodeSPutEnd)) { (opcode >= kOpcodeSPutStart && opcode <= kOpcodeSPutEnd)) {
auto field_idx = inst[1]; auto field_idx = inst[1];
body.assigned_fields.push_back(field_idx); assigned_fields.emplace(field_idx);
} }
if ((opcode >= kOpcodeInvokeStart && if ((opcode >= kOpcodeInvokeStart &&
opcode <= kOpcodeInvokeEnd) || opcode <= kOpcodeInvokeEnd) ||
(opcode >= kOpcodeInvokeRangeStart && (opcode >= kOpcodeInvokeRangeStart &&
opcode <= kOpcodeInvokeRangeEnd)) { opcode <= kOpcodeInvokeRangeEnd)) {
auto callee = inst[1]; auto callee = inst[1];
body.invoked_methods.push_back(callee); invoked_methods.emplace(callee);
} }
if (opcode == kOpcodeNoOp) { if (opcode == kOpcodeNoOp) {
if (*inst == kInstPackedSwitchPlayLoad) { if (*inst == kInstPackedSwitchPlayLoad) {
@ -748,6 +753,18 @@ namespace lspd {
} }
inst += dex::opcode_len[opcode]; inst += dex::opcode_len[opcode];
} }
body.referred_strings.insert(body.referred_strings.end(),
referred_strings.begin(),
referred_strings.end());
body.assigned_fields.insert(body.assigned_fields.end(),
assigned_fields.begin(),
assigned_fields.end());
body.accessed_fields.insert(body.accessed_fields.end(),
accessed_fields.begin(),
accessed_fields.end());
body.invoked_methods.insert(body.invoked_methods.end(),
invoked_methods.begin(),
invoked_methods.end());
body.loaded = true; body.loaded = true;
} }
auto referred_strings = env->NewIntArray( auto referred_strings = env->NewIntArray(