X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace.py;h=626f2ddf767ca577549de2887d83eb9ec933ef80;hb=ed40bc699e44f810d27c7e50d396f7749c8cc9c2;hp=368462a917579a90c16989fef5a84dff0c6aa159;hpb=bb8760bc379ec3c37db0d18c9972b3c4c3df1179;p=apitrace diff --git a/trace.py b/trace.py index 368462a..626f2dd 100644 --- a/trace.py +++ b/trace.py @@ -60,10 +60,10 @@ class DumpDeclarator(stdapi.OnceVisitor): print ' static const Trace::StructSig sig = {' print ' %u, "%s", %u, members' % (int(struct.id), struct.name, len(struct.members)) print ' };' - print ' Trace::BeginStruct(&sig);' + print ' Trace::localWriter.beginStruct(&sig);' for type, name in struct.members: dump_instance(type, 'value.%s' % (name,)) - print ' Trace::EndStruct();' + print ' Trace::localWriter.endStruct();' print '}' print @@ -90,21 +90,21 @@ class DumpDeclarator(stdapi.OnceVisitor): print ' sig = &sig%u;' % i print ' break;' print ' default:' - print ' Trace::LiteralSInt(value);' + print ' Trace::localWriter.writeSInt(value);' print ' return;' print ' }' - print ' Trace::LiteralEnum(sig);' + print ' Trace::localWriter.writeEnum(sig);' print '}' print def visit_bitmask(self, bitmask): - print 'static const Trace::BitmaskVal __bitmask%s_vals[] = {' % (bitmask.id) + print 'static const Trace::BitmaskFlag __bitmask%s_flags[] = {' % (bitmask.id) for value in bitmask.values: print ' {"%s", %s},' % (value, value) print '};' print print 'static const Trace::BitmaskSig __bitmask%s_sig = {' % (bitmask.id) - print ' %u, %u, __bitmask%s_vals' % (int(bitmask.id), len(bitmask.values), bitmask.id) + print ' %u, %u, __bitmask%s_flags' % (int(bitmask.id), len(bitmask.values), bitmask.id) print '};' print @@ -140,13 +140,13 @@ class DumpImplementer(stdapi.Visitor): '''Dump an instance.''' def visit_literal(self, literal, instance): - print ' Trace::Literal%s(%s);' % (literal.format, instance) + print ' Trace::localWriter.write%s(%s);' % (literal.format, instance) def visit_string(self, string, instance): if string.length is not None: - print ' Trace::LiteralString((const char *)%s, %s);' % (instance, string.length) + print ' Trace::localWriter.writeString((const char *)%s, %s);' % (instance, string.length) else: - print ' Trace::LiteralString((const char *)%s);' % instance + print ' Trace::localWriter.writeString((const char *)%s);' % instance def visit_const(self, const, instance): self.visit(const.type, instance) @@ -155,38 +155,40 @@ class DumpImplementer(stdapi.Visitor): print ' __traceStruct%s(%s);' % (struct.id, instance) def visit_array(self, array, instance): - print ' if (%s) {' % instance + length = '__c' + array.type.id index = '__i' + array.type.id - print ' Trace::BeginArray(%s);' % (array.length,) - print ' for (int %s = 0; %s < %s; ++%s) {' % (index, index, array.length, index) - print ' Trace::BeginElement();' + print ' if (%s) {' % instance + print ' size_t %s = %s;' % (length, array.length) + print ' Trace::localWriter.beginArray(%s);' % length + print ' for (size_t %s = 0; %s < %s; ++%s) {' % (index, index, length, index) + print ' Trace::localWriter.beginElement();' self.visit(array.type, '(%s)[%s]' % (instance, index)) - print ' Trace::EndElement();' + print ' Trace::localWriter.endElement();' print ' }' - print ' Trace::EndArray();' + print ' Trace::localWriter.endArray();' + print ' } else {' + print ' Trace::localWriter.writeNull();' print ' }' - print ' else' - print ' Trace::LiteralNull();' def visit_blob(self, blob, instance): - print ' Trace::LiteralBlob(%s, %s);' % (instance, blob.size) + print ' Trace::localWriter.writeBlob(%s, %s);' % (instance, blob.size) def visit_enum(self, enum, instance): print ' __traceEnum%s(%s);' % (enum.id, instance) def visit_bitmask(self, bitmask, instance): - print ' Trace::LiteralBitmask(__bitmask%s_sig, %s);' % (bitmask.id, instance) + print ' Trace::localWriter.writeBitmask(&__bitmask%s_sig, %s);' % (bitmask.id, instance) def visit_pointer(self, pointer, instance): print ' if (%s) {' % instance - print ' Trace::BeginArray(1);' - print ' Trace::BeginElement();' + print ' Trace::localWriter.beginArray(1);' + print ' Trace::localWriter.beginElement();' dump_instance(pointer.type, "*" + instance) - print ' Trace::EndElement();' - print ' Trace::EndArray();' + print ' Trace::localWriter.endElement();' + print ' Trace::localWriter.endArray();' + print ' } else {' + print ' Trace::localWriter.writeNull();' print ' }' - print ' else' - print ' Trace::LiteralNull();' def visit_handle(self, handle, instance): self.visit(handle.type, instance) @@ -195,10 +197,10 @@ class DumpImplementer(stdapi.Visitor): self.visit(alias.type, instance) def visit_opaque(self, opaque, instance): - print ' Trace::LiteralOpaque((const void *)%s);' % instance + print ' Trace::localWriter.writeOpaque((const void *)%s);' % instance def visit_interface(self, interface, instance): - print ' Trace::LiteralOpaque((const void *)&%s);' % instance + print ' Trace::localWriter.writeOpaque((const void *)&%s);' % instance dump_instance = DumpImplementer().visit @@ -238,7 +240,9 @@ class Wrapper(stdapi.Visitor): pass def visit_pointer(self, pointer, instance): + print " if (%s) {" % instance self.visit(pointer.type, "*" + instance) + print " }" def visit_handle(self, handle, instance): self.visit(handle.type, instance) @@ -252,8 +256,9 @@ class Wrapper(stdapi.Visitor): def visit_interface(self, interface, instance): assert instance.startswith('*') instance = instance[1:] - print " if (%s)" % instance + print " if (%s) {" % instance print " %s = new %s(%s);" % (instance, interface_wrap_name(interface), instance) + print " }" class Unwrapper(Wrapper): @@ -261,8 +266,9 @@ class Unwrapper(Wrapper): def visit_interface(self, interface, instance): assert instance.startswith('*') instance = instance[1:] - print " if (%s)" % instance + print " if (%s) {" % instance print " %s = static_cast<%s *>(%s)->m_pInstance;" % (instance, interface_wrap_name(interface), instance) + print " }" wrap_instance = Wrapper().visit @@ -318,9 +324,6 @@ class Tracer: print 'static const Trace::FunctionSig __%s_sig = {%u, "%s", %u, __%s_args};' % (function.name, int(function.id), function.name, len(function.args), function.name) print - def get_dispatch_function(self, function): - return '__' + function.name - def is_public_function(self, function): return True @@ -340,34 +343,34 @@ class Tracer: print def trace_function_impl_body(self, function): - print ' unsigned __call = Trace::BeginEnter(__%s_sig);' % (function.name,) + print ' unsigned __call = Trace::localWriter.beginEnter(&__%s_sig);' % (function.name,) for arg in function.args: if not arg.output: self.unwrap_arg(function, arg) self.dump_arg(function, arg) - print ' Trace::EndEnter();' + print ' Trace::localWriter.endEnter();' self.dispatch_function(function) - print ' Trace::BeginLeave(__call);' + print ' Trace::localWriter.beginLeave(__call);' for arg in function.args: if arg.output: self.dump_arg(function, arg) self.wrap_arg(function, arg) if function.type is not stdapi.Void: self.dump_ret(function, "__result") - print ' Trace::EndLeave();' + print ' Trace::localWriter.endLeave();' - def dispatch_function(self, function): + def dispatch_function(self, function, prefix='__', suffix=''): if function.type is stdapi.Void: result = '' else: result = '__result = ' - dispatch = self.get_dispatch_function(function) + dispatch = prefix + function.name + suffix print ' %s%s(%s);' % (result, dispatch, ', '.join([str(arg.name) for arg in function.args])) def dump_arg(self, function, arg): - print ' Trace::BeginArg(%u);' % (arg.index,) + print ' Trace::localWriter.beginArg(%u);' % (arg.index,) self.dump_arg_instance(function, arg) - print ' Trace::EndArg();' + print ' Trace::localWriter.endArg();' def dump_arg_instance(self, function, arg): dump_instance(arg.type, arg.name) @@ -379,9 +382,9 @@ class Tracer: unwrap_instance(arg.type, arg.name) def dump_ret(self, function, instance): - print ' Trace::BeginReturn();' + print ' Trace::localWriter.beginReturn();' dump_instance(function.type, instance) - print ' Trace::EndReturn();' + print ' Trace::localWriter.endReturn();' def wrap_ret(self, function, instance): wrap_instance(function.type, instance) @@ -405,10 +408,10 @@ class Tracer: print method.prototype(interface_wrap_name(interface) + '::' + method.name) + ' {' print ' static const char * __args[%u] = {%s};' % (len(method.args) + 1, ', '.join(['"this"'] + ['"%s"' % arg.name for arg in method.args])) print ' static const Trace::FunctionSig __sig = {%u, "%s", %u, __args};' % (int(method.id), interface.name + '::' + method.name, len(method.args) + 1) - print ' unsigned __call = Trace::BeginEnter(__sig);' - print ' Trace::BeginArg(0);' - print ' Trace::LiteralOpaque((const void *)m_pInstance);' - print ' Trace::EndArg();' + print ' unsigned __call = Trace::localWriter.beginEnter(&__sig);' + print ' Trace::localWriter.beginArg(0);' + print ' Trace::localWriter.writeOpaque((const void *)m_pInstance);' + print ' Trace::localWriter.endArg();' for arg in method.args: if not arg.output: self.unwrap_arg(method, arg) @@ -418,19 +421,19 @@ class Tracer: else: print ' %s __result;' % method.type result = '__result = ' - print ' Trace::EndEnter();' + print ' Trace::localWriter.endEnter();' print ' %sm_pInstance->%s(%s);' % (result, method.name, ', '.join([str(arg.name) for arg in method.args])) - print ' Trace::BeginLeave(__call);' + print ' Trace::localWriter.beginLeave(__call);' for arg in method.args: if arg.output: self.dump_arg(method, arg) self.wrap_arg(method, arg) if method.type is not stdapi.Void: - print ' Trace::BeginReturn();' + print ' Trace::localWriter.beginReturn();' dump_instance(method.type, "__result") - print ' Trace::EndReturn();' + print ' Trace::localWriter.endReturn();' wrap_instance(method.type, '__result') - print ' Trace::EndLeave();' + print ' Trace::localWriter.endLeave();' if method.name == 'QueryInterface': print ' if (ppvObj && *ppvObj) {' print ' if (*ppvObj == m_pInstance) {' @@ -481,7 +484,6 @@ __getPublicProcAddress(LPCSTR lpProcName) return GetProcAddress(g_hDll, lpProcName); } -#define __abort() OS::Abort() ''' % self.dllname dispatcher = Dispatcher()