Fix SWIG generation for maps

still, we can't do anything with the resulting iterators untill the
%template stuff works

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cf17e0a99b5d826eee7d744e6e1dc26ab1911e..49f09e09c952819805dd43fba9ab0b8f08c8d50c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
 #####################
 
 SET(CMAKE_SWIG_FLAGS -Linkage passive)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DSWIGWORDSIZE64)
+endif()
 #FIND_PACKAGE(PythonLibs)
 #INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 SET_SOURCE_FILES_PROPERTIES(src/bindings/guile/frida.i PROPERTIES CPLUSPLUS ON)

diff --git a/src/bindings/guile/frida.i b/src/bindings/guile/frida.i
index c8b80b6cbc8b4a7ee618a82a069365aecc3c0666..bc3bff434abbb53dccabde1d42d9e6b64cf31852 100644 (file)
--- a/src/bindings/guile/frida.i
+++ b/src/bindings/guile/frida.i
@@ -8,12 +8,6 @@
 %include <std_map.i>
 %include <stl.i>
 
- // noone knows how to get these working
-%ignore beginFunctions();
-%ignore endFunctions();
-%ignore beginBasicBlocks();
-%ignore endBasicBlocks();
-
 %{
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
@@ -24,9 +18,9 @@
 %}
 
 namespace std {
-       %template(BasicBlockMap) map<unsigned long, BasicBlock*>;
-       %template(FunctionMap) map<unsigned long, Function*>;
-       %template(InterpreterMap) map<std::string, Interpreter*>;
+       /* %template(wearethepeople) map<uint64_t, BasicBlock*>; */
+       /* %template(FunctionMap) map<uint64_t, Function*>; */
+       /* %template(InterpreterMap) map<std::string, Interpreter*>; */
 }
 
 %inline %{