Merge pull request #2 from skiff/develop

Fix OPD generation for symbols

libpsutil/libpsutil.vcxproj

@@ -59,6 +59,7 @@
     <ClCompile Include="network\httpclient.cpp" />
     <ClCompile Include="network\socket.cpp" />
     <ClCompile Include="string.cpp" />
+    <ClCompile Include="symbol.cpp" />
     <ClCompile Include="system\filesystem.cpp" />
     <ClCompile Include="system\imports.cpp" />
     <ClCompile Include="system\memory.cpp" />

libpsutil/libpsutil.vcxproj.filters

@@ -35,6 +35,7 @@
       <Filter>network</Filter>
     </ClCompile>
     <ClCompile Include="string.cpp" />
+    <ClCompile Include="symbol.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="math.hpp" />

libpsutil/symbol.cpp

@@ -0,0 +1,31 @@
+#include "symbol.hpp"
+
+namespace libpsutil
+{
+    namespace symbol_helper
+    {
+        struct opd_s
+        {
+            unsigned int address;
+            unsigned int toc;
+        };
+
+        std::vector<opd_s> symbol_table;
+        void* get_symbol(unsigned int address)
+        {
+            for (auto i = 0; i < symbol_table.size(); i++)
+            {
+                opd_s* opd = &symbol_table[i];
+                if (opd->address == address)
+                    return opd;
+            }
+
+            symbol_table.push_back(opd_s());
+            opd_s* opd = &symbol_table[symbol_table.size() - 1];
+            opd->address = address;
+            opd->toc = memory::get_game_toc();
+
+            return opd;
+        }
+    }
+}

libpsutil/symbol.hpp

@@ -3,22 +3,18 @@
 
 namespace libpsutil
 {
-    template<typename T> class symbol
+    namespace symbol_helper
     {
-    private:
-        static int opd_table[10][2];
-        static int opd_table_id;
+        void* get_symbol(unsigned int address);
+    }
 
+    template<typename T> class symbol
+    {
     public:
         operator T* ()
         {
-            if (opd_table_id > 9) { opd_table_id = 0; }
-
-            opd_table[opd_table_id][0] = this->mp_object_;
-            opd_table[opd_table_id][1] = memory::get_game_toc();
-
             T* type = *reinterpret_cast<T*>(this->mp_object_);
-            return (decltype(type))opd_table[opd_table_id++];
+            return (decltype(type))symbol_helper::get_symbol(this->mp_object_);
         }
 
         T* get()
@@ -28,7 +24,4 @@ namespace libpsutil
 
         int mp_object_;
     };
-
-    template <typename T> int symbol<T>::opd_table[10][2];
-    template <typename T> int symbol<T>::opd_table_id;
 }

libpsutil/system/memory.cpp

@@ -102,7 +102,7 @@ namespace libpsutil
 			detour::force_stub_addr = address;
 		}
 
-		void detour::setup_detour(uint32_t address, void *destination)
+		void detour::setup_detour(uint32_t address, void *destination, uint32_t toc_override)
 		{
 			if (address == NULL) { return; }
 
@@ -131,7 +131,7 @@ namespace libpsutil
 			memory::jump(address, *reinterpret_cast<uint32_t*>(destination), false);
 
 			this->stub_opd[0] = reinterpret_cast<uint32_t>(stub_address);
-			this->stub_opd[1] = memory::get_game_toc();
+			this->stub_opd[1] = toc_override != 0 ? toc_override : memory::get_game_toc();
 		}
 
 		detour::~detour()

libpsutil/system/memory.hpp

@@ -75,12 +75,12 @@ namespace libpsutil
 
 			uint32_t allocate_stub();
 			uint32_t resolve_branch(uint32_t instruction, uint32_t branch_address);
-			void setup_detour(uint32_t address, void* destination);
+			void setup_detour(uint32_t address, void* destination, uint32_t toc_override);
 
 		public:
-			template<class T> detour(uint32_t address, T(*destination))
+			template<class T> detour(uint32_t address, T(*destination), uint32_t toc_override = 0)
 			{
-				this->setup_detour(address, reinterpret_cast<void*>(destination));
+				this->setup_detour(address, reinterpret_cast<void*>(destination), toc_override);
 			}
 
 			~detour();