static std::map<unsigned long long, void *> _obj_map;
void
-addObj(trace::Value &value, void *obj) {
+addObj(trace::Call &call, trace::Value &value, void *obj) {
unsigned long long address = value.toUIntPtr();
+
+ if (!address) {
+ if (obj) {
+ warning(call) << "unexpected non-null object\n";
+ }
+ return;
+ }
+
+ if (!obj) {
+ warning(call) << "got null for object 0x" << std::hex << address << std::dec << "\n";
+ }
+
_obj_map[address] = obj;
if (retrace::verbosity >= 2) {
}
void *
-toObjPointer(trace::Value &value) {
+toObjPointer(trace::Call &call, trace::Value &value) {
unsigned long long address = value.toUIntPtr();
- void *obj = address ? _obj_map[address] : NULL;
+
+ void *obj;
+ if (address) {
+ obj = _obj_map[address];
+ if (!obj) {
+ warning(call) << "unknown object 0x" << std::hex << address << std::dec << "\n";
+ }
+ } else {
+ obj = NULL;
+ }
if (retrace::verbosity >= 2) {
std::cout << std::hex << "obj 0x" << address << " <- 0x" << size_t(obj) << std::dec << "\n";