x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

lazy load mnemonic data and save 3MB memory

This commit is contained in:
torusrxxx 2017-11-05 22:11:12 +08:00 committed by Duncan Ogilvie
parent 990bccfffc
commit 79e335277e
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/dbg/mnemonichelp.cpp
View File

@ -1,15 +1,38 @@
#include "mnemonichelp.h"
#include "threading.h"
#include <atomic>
#include "jansson/jansson_x64dbg.h"
#include "debugger.h"
#include "filehelper.h"
static std::unordered_map<String, String> MnemonicMap;
static std::unordered_map<String, String> MnemonicBriefMap;
static std::atomic<bool> isMnemonicLoaded(false);
static bool loadFromText();
bool MnemonicHelp::loadFromText(const char* json)
static inline void loadMnemonicHelp()
{
EXCLUSIVE_ACQUIRE(LockMnemonicHelp);
if(isMnemonicLoaded.load())
return;
else
// Load mnemonic help database
loadFromText();
}
static bool loadFromText()
{
EXCLUSIVE_ACQUIRE(LockMnemonicHelp); //Protect the following code in a critical section
if(isMnemonicLoaded.load())
return true;
isMnemonicLoaded.store(true); //Don't retry failed load(and spam log).
String json;
if(!FileHelper::ReadAllText(StringUtils::sprintf("%s\\..\\mnemdb.json", szProgramDir), json))
{
dputs(QT_TRANSLATE_NOOP("DBG", "Failed to read mnemonic help database..."));
return false;
}
MnemonicMap.clear();
auto root = json_loads(json, 0, 0);
auto root = json_loads(json.c_str(), 0, 0);
if(root)
{
// Get a handle to the root object -> x86-64 subtree
@ -50,7 +73,11 @@ bool MnemonicHelp::loadFromText(const char* json)
json_decref(root);
}
else
{
dputs(QT_TRANSLATE_NOOP("DBG", "Failed to load mnemonic help database..."));
return false;
}
dputs(QT_TRANSLATE_NOOP("DBG", "Mnemonic help database loaded!"));
return true;
}
@ -86,6 +113,7 @@ String MnemonicHelp::getDescription(const char* mnem, int depth)
return GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Invalid mnemonic!"));
if(depth == 10)
return GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Too many redirections..."));
loadMnemonicHelp();
SHARED_ACQUIRE(LockMnemonicHelp);
auto mnemuni = getUniversalMnemonic(mnem);
auto found = MnemonicMap.find(mnemuni);
@ -110,6 +138,7 @@ String MnemonicHelp::getBriefDescription(const char* mnem)
{
if(mnem == nullptr)
return GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Invalid mnemonic!"));
loadMnemonicHelp();
SHARED_ACQUIRE(LockMnemonicHelp);
auto mnemLower = StringUtils::ToLower(mnem);
if(mnemLower == "???")

1
src/dbg/mnemonichelp.h
View File

@ -5,7 +5,6 @@
class MnemonicHelp
{
public:
static bool loadFromText(const char* json);
static String getUniversalMnemonic(const String & mnem);
static String getDescription(const char* mnem, int depth = 0);
static String getBriefDescription(const char* mnem);

12
src/dbg/x64dbg.cpp
View File

@ -554,18 +554,6 @@ static bool DbgScriptDllExec(const char* dll)
static DWORD WINAPI loadDbThread(LPVOID)
{
// Load mnemonic help database
String mnemonicHelpData;
if(FileHelper::ReadAllText(StringUtils::sprintf("%s\\..\\mnemdb.json", szProgramDir), mnemonicHelpData))
{
if(MnemonicHelp::loadFromText(mnemonicHelpData.c_str()))
dputs(QT_TRANSLATE_NOOP("DBG", "Mnemonic help database loaded!"));
else
dputs(QT_TRANSLATE_NOOP("DBG", "Failed to load mnemonic help database..."));
}
else
dputs(QT_TRANSLATE_NOOP("DBG", "Failed to read mnemonic help database..."));
// Load error codes
if(ErrorCodeInit(StringUtils::sprintf("%s\\..\\errordb.txt", szProgramDir)))
dputs(QT_TRANSLATE_NOOP("DBG", "Error codes database loaded!"));