monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move getInstruction() to DotNetUtils.cs

Browse Source
This commit is contained in:
de4dot 2011-11-09 11:28:09 +01:00
parent ca232b521a
commit 1302608470
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
blocks/DotNetUtils.cs
View File

@ -807,5 +807,22 @@ namespace de4dot.blocks {
return type;
}
public static Instruction getInstruction(IList<Instruction> instructions, ref int index) {
for (int i = 0; i < 10; i++) {
if (index < 0 || index >= instructions.Count)
return null;
var instr = instructions[index++];
if (instr.OpCode.Code == Code.Nop)
continue;
if (instr == null || (instr.OpCode.Code != Code.Br && instr.OpCode.Code != Code.Br_S))
return instr;
instr = instr.Operand as Instruction;
if (instr == null)
return null;
index = instructions.IndexOf(instr);
}
return null;
}
}
}

25
blocks/cflow/MethodCallInliner.cs
View File

@ -66,7 +66,7 @@ namespace de4dot.blocks.cflow {
return false;
int index = 0;
var instr = getInstruction(body.Instructions, ref index);
var instr = DotNetUtils.getInstruction(body.Instructions, ref index);
if (instr == null)
return false;
@ -109,7 +109,7 @@ namespace de4dot.blocks.cflow {
}
bool inlineLoadMethod(int patchIndex, MethodDefinition method, Instruction loadInstr, int instrIndex) {
var instr = getInstruction(method.Body.Instructions, ref instrIndex);
var instr = DotNetUtils.getInstruction(method.Body.Instructions, ref instrIndex);
if (instr == null || instr.OpCode.Code != Code.Ret)
return false;
@ -135,7 +135,7 @@ namespace de4dot.blocks.cflow {
if (DotNetUtils.getArgIndex(method, instr) != loadIndex)
return false;
loadIndex++;
instr = getInstruction(method.Body.Instructions, ref instrIndex);
instr = DotNetUtils.getInstruction(method.Body.Instructions, ref instrIndex);
continue;
}
break;
@ -161,7 +161,7 @@ namespace de4dot.blocks.cflow {
return false;
}
instr = getInstruction(method.Body.Instructions, ref instrIndex);
instr = DotNetUtils.getInstruction(method.Body.Instructions, ref instrIndex);
if (instr == null || instr.OpCode.Code != Code.Ret)
return false;
@ -176,22 +176,5 @@ namespace de4dot.blocks.cflow {
return false;
return newType.FullName == "System.Object";
}
static Instruction getInstruction(IList<Instruction> instructions, ref int index) {
for (int i = 0; i < 10; i++) {
if (index < 0 || index >= instructions.Count)
return null;
var instr = instructions[index++];
if (instr.OpCode.Code == Code.Nop)
continue;
if (instr == null || (instr.OpCode.Code != Code.Br && instr.OpCode.Code != Code.Br_S))
return instr;
instr = instr.Operand as Instruction;
if (instr == null)
return null;
index = instructions.IndexOf(instr);
}
return null;
}
}
}