Rename d3dsize.hpp to d3d9size.hpp

[apitrace] / retrace / retrace_swizzle.cpp

diff --git a/retrace/retrace_swizzle.cpp b/retrace/retrace_swizzle.cpp
index 52dfad29b69c33158324eb4288cadd58ba5e792f..a7e777d45cba26e8da0abe4a6bf92900a1db5162 100644 (file)
--- a/retrace/retrace_swizzle.cpp
+++ b/retrace/retrace_swizzle.cpp
@@ -75,6 +75,12 @@ lowerBound(unsigned long long address) {
         }
     }
 
+#ifndef NDEBUG
+    if (it != regionMap.end()) {
+        assert(contains(it, address) || it->first > address);
+    }
+#endif
+
     return it;
 }
 
@@ -83,6 +89,12 @@ static RegionMap::iterator
 upperBound(unsigned long long address) {
     RegionMap::iterator it = regionMap.upper_bound(address);
 
+#ifndef NDEBUG
+    if (it != regionMap.end()) {
+        assert(it->first >= address);
+    }
+#endif
+
     return it;
 }
 
@@ -108,7 +120,7 @@ addRegion(unsigned long long address, void *buffer, unsigned long long size)
 
 #ifndef NDEBUG
     RegionMap::iterator start = lowerBound(address);
-    RegionMap::iterator stop = upperBound(address + size);
+    RegionMap::iterator stop = upperBound(address + size - 1);
     if (0) {
         // Forget all regions that intersect this new one.
         regionMap.erase(start, stop);
@@ -239,4 +251,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 */