Merge branch 'd3dretrace'

[apitrace] / retrace.hpp

diff --git a/retrace.hpp b/retrace.hpp
index 7357a703669e4d06a69eaed7f2b292b8345ecc88..c1e556a97fbb03d726be09de3cb92540de88e5fc 100644 (file)
--- a/retrace.hpp
+++ b/retrace.hpp
@@ -26,7 +26,9 @@
 #ifndef _RETRACE_HPP_
 #define _RETRACE_HPP_
 
+#include <assert.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <list>
 #include <map>
@@ -90,11 +92,11 @@ public:
 class ScopedAllocator
 {
 private:
-    void *next;
+    uintptr_t next;
 
 public:
     ScopedAllocator() :
-        next(NULL) {
+        next(0) {
     }
 
     inline void *
@@ -103,15 +105,16 @@ public:
             return NULL;
         }
 
-        void * * buf = static_cast<void **>(malloc(sizeof(void *) + size));
+        uintptr_t * buf = static_cast<uintptr_t *>(malloc(sizeof(uintptr_t) + size));
         if (!buf) {
             return NULL;
         }
 
         *buf = next;
-        next = buf;
+        next = reinterpret_cast<uintptr_t>(buf);
+        assert((next & 1) == 0);
 
-        return &buf[1];
+        return static_cast<void *>(&buf[1]);
     }
 
     template< class T >
@@ -138,11 +141,29 @@ public:
         return NULL;
     }
 
+    /**
+     * Prevent this pointer from being automatically freed.
+     */
+    template< class T >
+    inline void
+    bind(T *ptr) {
+        if (ptr) {
+            reinterpret_cast<uintptr_t *>(ptr)[-1] |= 1;
+        }
+    }
+
     inline
     ~ScopedAllocator() {
         while (next) {
-            void *temp = *static_cast<void **>(next);
-            free(next);
+            uintptr_t temp = *reinterpret_cast<uintptr_t *>(next);
+
+            bool bind = temp & 1;
+            temp &= ~1;
+
+            if (!bind) {
+                free(reinterpret_cast<void *>(next));
+            }
+
             next = temp;
         }
     }