X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fretrace.py;h=d09d72aa2ca46aff0c10380463b51cfcb455c1c7;hb=37007777c37b1d28abfe1ac07901d1e13e12b113;hp=9828cfbaa831d20c242bc2da89cf7f2d33c7d79d;hpb=7c7c9061a2862dd9238607df2693ff9451412dce;p=apitrace diff --git a/retrace/retrace.py b/retrace/retrace.py index 9828cfb..d09d72a 100644 --- a/retrace/retrace.py +++ b/retrace/retrace.py @@ -34,7 +34,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) import specs.stdapi as stdapi -import specs.glapi as glapi class UnsupportedType(Exception): @@ -67,10 +66,10 @@ class ValueAllocator(stdapi.Visitor): pass def visitArray(self, array, lvalue, rvalue): - print ' %s = _allocator.alloc<%s>(&%s);' % (lvalue, array.type, rvalue) + print ' %s = static_cast<%s *>(_allocator.alloc(&%s, sizeof *%s));' % (lvalue, array.type, rvalue, lvalue) def visitPointer(self, pointer, lvalue, rvalue): - print ' %s = _allocator.alloc<%s>(&%s);' % (lvalue, pointer.type, rvalue) + print ' %s = static_cast<%s *>(_allocator.alloc(&%s, sizeof *%s));' % (lvalue, pointer.type, rvalue, lvalue) def visitIntPointer(self, pointer, lvalue, rvalue): pass @@ -97,13 +96,14 @@ class ValueAllocator(stdapi.Visitor): pass def visitPolymorphic(self, polymorphic, lvalue, rvalue): + assert polymorphic.defaultType is not None self.visit(polymorphic.defaultType, lvalue, rvalue) def visitOpaque(self, opaque, lvalue, rvalue): pass -class ValueDeserializer(stdapi.Visitor): +class ValueDeserializer(stdapi.Visitor, stdapi.ExpanderMixin): def visitLiteral(self, literal, lvalue, rvalue): print ' %s = (%s).to%s();' % (lvalue, rvalue, literal.kind) @@ -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(call, %s));' % (lvalue, pointer, rvalue) def visitLinearPointer(self, pointer, lvalue, rvalue): print ' %s = static_cast<%s>(retrace::toPointer(%s));' % (lvalue, pointer, rvalue) @@ -171,7 +166,14 @@ class ValueDeserializer(stdapi.Visitor): print ' if (retrace::verbosity >= 2) {' print ' std::cout << "%s " << size_t(%s) << " <- " << size_t(%s) << "\\n";' % (handle.name, lvalue, new_lvalue) print ' }' - print ' %s = %s;' % (lvalue, new_lvalue) + if (new_lvalue.startswith('_program_map') or new_lvalue.startswith('_shader_map')): + print 'if (glretrace::supportsARBShaderObjects) {' + print ' %s = _handleARB_map[%s];' % (lvalue, lvalue) + print '} else {' + print ' %s = %s;' % (lvalue, new_lvalue) + print '}' + else: + print ' %s = %s;' % (lvalue, new_lvalue) def visitBlob(self, blob, lvalue, rvalue): print ' %s = static_cast<%s>((%s).toPointer());' % (lvalue, blob, rvalue) @@ -188,11 +190,32 @@ class ValueDeserializer(stdapi.Visitor): print ' const trace::Struct *%s = dynamic_cast(&%s);' % (tmp, rvalue) print ' assert(%s);' % (tmp) for i in range(len(struct.members)): - member_type, member_name = struct.members[i] - self.visit(member_type, '%s.%s' % (lvalue, member_name), '*%s->members[%s]' % (tmp, i)) + member = struct.members[i] + self.visitMember(member, lvalue, '*%s->members[%s]' % (tmp, i)) def visitPolymorphic(self, polymorphic, lvalue, rvalue): - self.visit(polymorphic.defaultType, lvalue, rvalue) + if polymorphic.defaultType is None: + switchExpr = self.expand(polymorphic.switchExpr) + print r' switch (%s) {' % switchExpr + for cases, type in polymorphic.iterSwitch(): + for case in cases: + print r' %s:' % case + caseLvalue = lvalue + if type.expr is not None: + caseLvalue = 'static_cast<%s>(%s)' % (type, caseLvalue) + print r' {' + try: + self.visit(type, caseLvalue, rvalue) + finally: + print r' }' + print r' break;' + if polymorphic.defaultType is None: + print r' default:' + print r' retrace::warning(call) << "unexpected polymorphic case" << %s << "\n";' % (switchExpr,) + print r' break;' + print r' }' + else: + self.visit(polymorphic.defaultType, lvalue, rvalue) def visitOpaque(self, opaque, lvalue, rvalue): raise UnsupportedType @@ -208,7 +231,7 @@ class OpaqueValueDeserializer(ValueDeserializer): print ' %s = static_cast<%s>(retrace::toPointer(%s));' % (lvalue, opaque, rvalue) -class SwizzledValueRegistrator(stdapi.Visitor): +class SwizzledValueRegistrator(stdapi.Visitor, stdapi.ExpanderMixin): '''Type visitor which will register (un)swizzled value pairs, to later be swizzled.''' @@ -248,7 +271,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(call, %s, %s);' % (rvalue, lvalue) def visitLinearPointer(self, pointer, lvalue, rvalue): assert pointer.size is not None @@ -263,8 +286,15 @@ class SwizzledValueRegistrator(stdapi.Visitor): OpaqueValueDeserializer().visit(handle.type, '_origResult', rvalue); if handle.range is None: rvalue = "_origResult" - entry = lookupHandle(handle, rvalue) - print " %s = %s;" % (entry, lvalue) + entry = lookupHandle(handle, rvalue) + if (entry.startswith('_program_map') or entry.startswith('_shader_map')): + print 'if (glretrace::supportsARBShaderObjects) {' + print ' _handleARB_map[%s] = %s;' % (rvalue, lvalue) + print '} else {' + print ' %s = %s;' % (entry, lvalue) + print '}' + else: + print " %s = %s;" % (entry, lvalue) print ' if (retrace::verbosity >= 2) {' print ' std::cout << "{handle.name} " << {rvalue} << " -> " << {lvalue} << "\\n";'.format(**locals()) print ' }' @@ -296,10 +326,11 @@ class SwizzledValueRegistrator(stdapi.Visitor): print ' assert(%s);' % (tmp,) print ' (void)%s;' % (tmp,) for i in range(len(struct.members)): - member_type, member_name = struct.members[i] - self.visit(member_type, '%s.%s' % (lvalue, member_name), '*%s->members[%s]' % (tmp, i)) + member = struct.members[i] + self.visitMember(member, lvalue, '*%s->members[%s]' % (tmp, i)) def visitPolymorphic(self, polymorphic, lvalue, rvalue): + assert polymorphic.defaultType is not None self.visit(polymorphic.defaultType, lvalue, rvalue) def visitOpaque(self, opaque, lvalue, rvalue): @@ -328,6 +359,7 @@ class Retracer: self.deserializeArgs(function) + self.declareRet(function) self.invokeFunction(function) self.swizzleValues(function) @@ -342,6 +374,7 @@ class Retracer: self.deserializeArgs(method) + self.declareRet(method) self.invokeInterfaceMethod(interface, method) self.swizzleValues(method) @@ -360,9 +393,8 @@ 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, call.arg(0)));' % (interface.name,) print r' if (!_this) {' - print r' retrace::warning(call) << "NULL this pointer\n";' print r' return;' print r' }' @@ -385,8 +417,7 @@ class Retracer: if not success: print ' if (1) {' self.failFunction(function) - if function.name[-1].islower(): - sys.stderr.write('warning: unsupported %s call\n' % function.name) + sys.stderr.write('warning: unsupported %s call\n' % function.name) print ' }' def swizzleValues(self, function): @@ -430,12 +461,16 @@ class Retracer: visitor = SwizzledValueRegistrator() visitor.visit(type, lvalue, rvalue) + def declareRet(self, function): + if function.type is not stdapi.Void: + print ' %s _result;' % (function.type) + def invokeFunction(self, function): arg_names = ", ".join(function.argNames()) if function.type is not stdapi.Void: - print ' %s _result;' % (function.type) print ' _result = %s(%s);' % (function.name, arg_names) print ' (void)_result;' + self.checkResult(function.type) else: print ' %s(%s);' % (function.name, arg_names) @@ -446,16 +481,22 @@ 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: - print ' %s _result;' % (method.type) print ' _result = _this->%s(%s);' % (method.name, arg_names) print ' (void)_result;' + self.checkResult(method.type) else: print ' _this->%s(%s);' % (method.name, arg_names) + def checkResult(self, resultType): + if str(resultType) == 'HRESULT': + print r' if (FAILED(_result)) {' + print r' retrace::warning(call) << "failed\n";' + print r' }' + def filterFunction(self, function): return True @@ -466,6 +507,7 @@ class Retracer: print '#include "os_time.hpp"' print '#include "trace_parser.hpp"' print '#include "retrace.hpp"' + print '#include "retrace_swizzle.hpp"' print types = api.getAllTypes() @@ -481,25 +523,23 @@ class Retracer: handle_names.add(handle.name) print - print 'static std::map _obj_map;' - print - - functions = filter(self.filterFunction, api.functions) + functions = filter(self.filterFunction, api.getAllFunctions()) for function in functions: - if function.sideeffects: + if function.sideeffects and not function.internal: self.retraceFunction(function) interfaces = api.getAllInterfaces() for interface in interfaces: for method in interface.iterMethods(): - if method.sideeffects: + if method.sideeffects and not method.internal: self.retraceInterfaceMethod(interface, method) print 'const retrace::Entry %s[] = {' % self.table_name for function in functions: - if function.sideeffects: - print ' {"%s", &retrace_%s},' % (function.name, function.name) - else: - print ' {"%s", &retrace::ignore},' % (function.name,) + if not function.internal: + if function.sideeffects: + print ' {"%s", &retrace_%s},' % (function.name, function.name) + else: + print ' {"%s", &retrace::ignore},' % (function.name,) for interface in interfaces: for method in interface.iterMethods(): if method.sideeffects: