DBG: added aliases in expressionfunctions + implemented gui selection functions

src/dbg/expressionfunctions.cpp

@@ -27,10 +27,15 @@ static T callFunc(const T* argv, T(*cbFunction)(Ts...), seq<S...>)
 template<typename... Ts>
 static bool RegisterEasy(const String & name, duint(*cbFunction)(Ts...))
 {
-    return ExpressionFunctions::Register(name, sizeof...(Ts), [cbFunction](int argc, duint * argv, void* userdata)
-    {
-        return callFunc(argv, cbFunction, typename gens<sizeof...(Ts)>::type());
-    });
+    auto aliases = StringUtils::Split(name, '\1');
+    if(!ExpressionFunctions::Register(aliases[0], sizeof...(Ts), [cbFunction](int argc, duint * argv, void* userdata)
+{
+    return callFunc(argv, cbFunction, typename gens<sizeof...(Ts)>::type());
+    }))
+    return false;
+    for(size_t i = 1; i < aliases.size(); i++)
+        ExpressionFunctions::RegisterAlias(aliases[0], aliases[i]);
+    return true;
 }
 
 void ExpressionFunctions::Init()
@@ -47,6 +52,10 @@ void ExpressionFunctions::Init()
     RegisterEasy("mod.size", ModSizeFromAddr);
     RegisterEasy("mod.hash", ModHashFromAddr);
     RegisterEasy("mod.entry", ModEntryFromAddr);
+
+    RegisterEasy("disasm.sel\1dis.sel", disasmsel);
+    RegisterEasy("dump.sel", dumpsel);
+    RegisterEasy("stack.sel", stacksel);
 }
 
 bool ExpressionFunctions::Register(const String & name, int argc, CBEXPRESSIONFUNCTION cbFunction, void* userdata)
@@ -65,13 +74,28 @@ bool ExpressionFunctions::Register(const String & name, int argc, CBEXPRESSIONFU
     return true;
 }
 
+bool ExpressionFunctions::RegisterAlias(const String & name, const String & alias)
+{
+    EXCLUSIVE_ACQUIRE(LockExpressionFunctions);
+    auto found = mFunctions.find(name);
+    if(found == mFunctions.end())
+        return false;
+    if(!Register(alias, found->second.argc, found->second.cbFunction, found->second.userdata))
+        return false;
+    found->second.aliases.push_back(alias);
+    return true;
+}
+
 bool ExpressionFunctions::Unregister(const String & name)
 {
     EXCLUSIVE_ACQUIRE(LockExpressionFunctions);
     auto found = mFunctions.find(name);
     if(found == mFunctions.end())
         return false;
+    auto aliases = found->second.aliases;
     mFunctions.erase(found);
+    for(const auto & alias : found->second.aliases)
+        Unregister(alias);
     return true;
 }
 

src/dbg/expressionfunctions.h

@@ -9,6 +9,7 @@ public:
 
     static void Init();
     static bool Register(const String & name, int argc, CBEXPRESSIONFUNCTION cbFunction, void* userdata = nullptr);
+    static bool RegisterAlias(const String & name, const String & alias);
     static bool Unregister(const String & name);
     static bool Call(const String & name, std::vector<duint> & argv, duint & result);
     static bool GetArgc(const String & name, int & argc);
@@ -20,6 +21,7 @@ private:
         int argc;
         CBEXPRESSIONFUNCTION cbFunction;
         void* userdata;
+        std::vector<String> aliases;
     };
 
     static bool isValidName(const String & name);

src/dbg/exprfunc.cpp

@@ -24,4 +24,26 @@ namespace Exprfunc
     {
         return ModGetParty(addr);
     }
+
+    static duint selstart(int hWindow)
+    {
+        SELECTIONDATA selection;
+        GuiSelectionGet(hWindow, &selection);
+        return selection.start;
+    }
+
+    duint disasmsel()
+    {
+        return selstart(GUI_DISASSEMBLY);
+    }
+
+    duint dumpsel()
+    {
+        return selstart(GUI_DUMP);
+    }
+
+    duint stacksel()
+    {
+        return selstart(GUI_STACK);
+    }
 }

src/dbg/exprfunc.h

@@ -8,4 +8,8 @@ namespace Exprfunc
     duint srcdisp(duint addr);
 
     duint modparty(duint addr);
+
+    duint disasmsel();
+    duint dumpsel();
+    duint stacksel();
 }