Added back memory callbacks

Ayuto · Ayuto · commit 6a9c28451e79 · 2015-04-25T00:43:40.000+02:00
Updated DynamicHooks
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -260,14 +260,14 @@ Set(SOURCEPYTHON_MEMORY_MODULE_HEADERS
     core/modules/memory/memory_tools.h
     core/modules/memory/memory_scanner.h
     core/modules/memory/memory_hooks.h
-    #core/modules/memory/memory_callback.h
+    core/modules/memory/memory_callback.h
 )
 
 Set(SOURCEPYTHON_MEMORY_MODULE_SOURCES
     core/modules/memory/memory_scanner.cpp
     core/modules/memory/memory_tools.cpp
     core/modules/memory/memory_hooks.cpp
-    #core/modules/memory/memory_callback.cpp
+    core/modules/memory/memory_callback.cpp
     core/modules/memory/memory_wrap_python.cpp
 )
 
diff --git a/src/core/modules/memory/memory_callback.cpp b/src/core/modules/memory/memory_callback.cpp
@@ -136,7 +136,10 @@ int CCallback::GetPopSize()
 
 	int size = 0;
 	for(; i < len(m_Args); i++)
-		size += GetTypeSize(extract<DataType_t>(m_Args[i]));
+	{
+		// TODO: Add alignment
+		size += GetDataTypeSize(extract<DataType_t>(m_Args[i]));
+	}
 
 	return size;
 #endif
@@ -151,7 +154,8 @@ int CCallback::GetArgumentOffset(int iIndex)
 
 	for(int i=0; i <= iIndex - 1; i++)
 	{
-		offset += GetTypeSize(extract<DataType_t>(m_Args[i]));
+		// TODO: Add alignment
+		offset += GetDataTypeSize(extract<DataType_t>(m_Args[i]));
 	}
 
 	// Subtract the this pointer on Windows
diff --git a/src/core/modules/memory/memory_hooks.h b/src/core/modules/memory/memory_hooks.h
@@ -10,8 +10,6 @@
 #include "boost/python.hpp"
 using namespace boost::python;
 
-#include "memory_tools.h"
-
 // DynamicHooks
 #include "hook.h"
 
diff --git a/src/core/modules/memory/memory_wrap_python.cpp b/src/core/modules/memory/memory_wrap_python.cpp
@@ -31,6 +31,7 @@
 #include "memory_scanner.h"
 #include "memory_tools.h"
 #include "memory_hooks.h"
+#include "memory_callback.h"
 
 #include "dyncall.h"
 
@@ -432,14 +433,12 @@ void export_dynamichooks()
 //-----------------------------------------------------------------------------
 void export_callbacks()
 {
-	/*
 	class_< CCallback, bases< CFunction >, boost::noncopyable >("Callback", init< object, Convention_t, tuple, object, optional<bool> >())
         .def_readwrite("callback",
             &CCallback::m_oCallback,
             "The Python function that gets called by the C++ callback"
         )
     ;
-	*/
 }
 
 
diff --git a/src/thirdparty/DynamicHooks/include/hook.h b/src/thirdparty/DynamicHooks/include/hook.h
@@ -68,7 +68,11 @@ typedef bool (*HookHandlerFn)(HookType_t, CHook*);
 // ============================================================================
 // >> CLASSES
 // ============================================================================
-class Assembler;
+namespace AsmJit {
+	struct Assembler;
+}
+using namespace AsmJit;
+
 class CHook
 {
 private:
diff --git a/src/thirdparty/DynamicHooks/lib/DynamicHooks.lib b/src/thirdparty/DynamicHooks/lib/DynamicHooks.lib

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "memory_scanner.h"`
`32`	`32`	`#include "memory_tools.h"`
`33`	`33`	`#include "memory_hooks.h"`
	`34`	`+#include "memory_callback.h"`
`34`	`35`
`35`	`36`	`#include "dyncall.h"`
`36`	`37`
`@@ -432,14 +433,12 @@ void export_dynamichooks()`
`432`	`433`	`//-----------------------------------------------------------------------------`
`433`	`434`	`void export_callbacks()`
`434`	`435`	`{`
`435`		`- /*`
`436`	`436`	`class_< CCallback, bases< CFunction >, boost::noncopyable >("Callback", init< object, Convention_t, tuple, object, optional<bool> >())`
`437`	`437`	`.def_readwrite("callback",`
`438`	`438`	`&CCallback::m_oCallback,`
`439`	`439`	`"The Python function that gets called by the C++ callback"`
`440`	`440`	`)`
`441`	`441`	`;`
`442`		`- */`
`443`	`442`	`}`
`444`	`443`
`445`	`444`