Factor out object swizzling.

diff --git a/retrace/retrace.py b/retrace/retrace.py
index 7ee4a0666cefaa71a511532967a984bd7cb43480..f9b800ca5b9eb061ddd4d00df92332dd9de1f5f1 100644 (file)
--- a/retrace/retrace.py
+++ b/retrace/retrace.py
@@ -151,12 +151,7 @@ class ValueDeserializer(stdapi.Visitor):
         print '    %s = static_cast<%s>((%s).toPointer());' % (lvalue, pointer, rvalue)
 
     def visitObjPointer(self, pointer, lvalue, rvalue):
-        old_lvalue = '(%s).toUIntPtr()' % (rvalue,)
-        new_lvalue = '_obj_map[%s]' % (old_lvalue,)
-        print '    if (retrace::verbosity >= 2) {'
-        print '        std::cout << std::hex << "obj 0x" << size_t(%s) << " <- 0x" << size_t(%s) << std::dec <<"\\n";' % (old_lvalue, new_lvalue)
-        print '    }'
-        print '    %s = static_cast<%s>(%s);' % (lvalue, pointer, new_lvalue)
+        print '    %s = static_cast<%s>(retrace::toObjPointer(%s));' % (lvalue, pointer, rvalue)
 
     def visitLinearPointer(self, pointer, lvalue, rvalue):
         print '    %s = static_cast<%s>(retrace::toPointer(%s));' % (lvalue, pointer, rvalue)
@@ -248,7 +243,7 @@ class SwizzledValueRegistrator(stdapi.Visitor):
         pass
     
     def visitObjPointer(self, pointer, lvalue, rvalue):
-        print r'    _obj_map[(%s).toUIntPtr()] = %s;' % (rvalue, lvalue)
+        print r'    retrace::addObj(%s, %s);' % (rvalue, lvalue)
     
     def visitLinearPointer(self, pointer, lvalue, rvalue):
         assert pointer.size is not None
@@ -362,7 +357,7 @@ class Retracer:
 
     def deserializeThisPointer(self, interface):
         print r'    %s *_this;' % (interface.name,)
-        print r'    _this = static_cast<%s *>(_obj_map[call.arg(0).toUIntPtr()]);' % (interface.name,)
+        print r'    _this = static_cast<%s *>(retrace::toObjPointer(call.arg(0)));' % (interface.name,)
         print r'    if (!_this) {'
         print r'        retrace::warning(call) << "NULL this pointer\n";'
         print r'        return;'
@@ -451,7 +446,7 @@ class Retracer:
             print '    if (call.ret->toUInt()) {'
             print '        return;'
             print '    }'
-            print '    _obj_map.erase(call.arg(0).toUIntPtr());'
+            print '    retrace::delObj(call.arg(0));'
 
         arg_names = ", ".join(method.argNames())
         if method.type is not stdapi.Void:
@@ -486,9 +481,6 @@ class Retracer:
                 handle_names.add(handle.name)
         print
 
-        print 'static std::map<unsigned long long, void *> _obj_map;'
-        print
-
         functions = filter(self.filterFunction, api.functions)
         for function in functions:
             if function.sideeffects and not function.internal:

diff --git a/retrace/retrace_swizzle.cpp b/retrace/retrace_swizzle.cpp
index 52dfad29b69c33158324eb4288cadd58ba5e792f..52d1d74dfd251eeb20cc9ce8c462a4f81a970313 100644 (file)
--- a/retrace/retrace_swizzle.cpp
+++ b/retrace/retrace_swizzle.cpp
@@ -239,4 +239,36 @@ toPointer(trace::Value &value, bool bind) {
 }
 
 
+
+static std::map<unsigned long long, void *> _obj_map;
+
+void
+addObj(trace::Value &value, void *obj) {
+    unsigned long long address = value.toUIntPtr();
+    _obj_map[address] = obj;
+    
+    if (retrace::verbosity >= 2) {
+        std::cout << std::hex << "obj 0x" << address << " -> 0x" << size_t(obj) << std::dec << "\n";
+    }
+}
+
+void
+delObj(trace::Value &value) {
+    unsigned long long address = value.toUIntPtr();
+    _obj_map.erase(address);
+}
+
+void *
+toObjPointer(trace::Value &value) {
+    unsigned long long address = value.toUIntPtr();
+    void *obj = address ? _obj_map[address] : NULL;
+
+    if (retrace::verbosity >= 2) {
+        std::cout << std::hex << "obj 0x" << address << " <- 0x" << size_t(obj) << std::dec << "\n";
+    }
+
+    return obj;
+}
+
+
 } /* retrace */

diff --git a/retrace/retrace_swizzle.hpp b/retrace/retrace_swizzle.hpp
index fa5e008ab44fadb3ae42927ec6dd5aa3b7c99ee3..66c2962f87d4e05fde4b9660ebaca32704c488cc 100644 (file)
--- a/retrace/retrace_swizzle.hpp
+++ b/retrace/retrace_swizzle.hpp
@@ -87,6 +87,16 @@ void *
 toPointer(trace::Value &value, bool bind = false);
 
 
+void
+addObj(trace::Value &value, void *obj);
+
+void
+delObj(trace::Value &value);
+
+void *
+toObjPointer(trace::Value &value);
+
+
 } /* namespace retrace */
 
 #endif /* _RETRACE_SWIZZLE_HPP_ */