Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to support IDA 7.6 & 7.7 #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to support IDA 7.6 & 7.7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions xdeobf/InsnMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <memory>

// WIP implementation of instruction pattern matching

constexpr mcode_t m_any = (mcode_t)m_max;
Expand Down
5 changes: 3 additions & 2 deletions xdeobf/InsnOptimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include <stdexcept>

int InsnOptimizer::func(mblock_t *blk, minsn_t *ins) {
int idaapi InsnOptimizer::func(mblock_t *blk, minsn_t *ins, int optflags) {
this->mba = blk->mba;
this->blk = blk;
this->topins = ins;
Expand All @@ -18,7 +19,7 @@ int InsnOptimizer::func(mblock_t *blk, minsn_t *ins) {
}

// Callback for for_all_insns
int InsnOptimizer::visit_minsn() {
int idaapi InsnOptimizer::visit_minsn() {
int changes = processHints(curins->l) + processHints(curins->r);
if (changes > 0) {
return changes;
Expand Down
4 changes: 2 additions & 2 deletions xdeobf/InsnOptimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

struct InsnOptimizer : public optinsn_t, public minsn_visitor_t {
int func(mblock_t *blk, minsn_t *ins);
int visit_minsn();
int idaapi func(mblock_t *blk, minsn_t *ins, int optflags);
int idaapi visit_minsn();

int processHints(mop_t &op);
int applyPatterns(minsn_t *insn);
Expand Down
Binary file modified xdeobf/main.cpp
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions xdeobf/xdeobf.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='IDA64|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnabled>false</VcpkgEnabled>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='IDA64|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand All @@ -43,17 +46,17 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;XDEOBF_EXPORTS;_WINDOWS;_USRDLL;__NT__;__IDP__;__X64__;__EA64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Program Files\IDA 7.2\ida_sdk\include;C:\Program Files\IDA 7.2\plugins\hexrays_sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\Program Files\IDA 7.7\ida_sdk\include;C:\Program Files\IDA 7.7\plugins\hexrays_sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>C:\Program Files\IDA 7.2\ida_sdk\lib\x64_win_vc_64\ida.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>C:\Program Files\IDA 7.7\ida_sdk\lib\x64_win_vc_64\ida.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy /Y "$(TargetDir)$(TargetName).dll" "C:\Program Files\IDA 7.2\plugins\$(TargetName)64.dll"</Command>
<Command>copy /Y "$(TargetDir)$(TargetName).dll" "C:\Program Files\IDA 7.7\plugins\$(TargetName)64.dll"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down