"""C basic types"""
-import base
+import stdapi
all_types = {}
-class DumpDeclarator(base.OnceVisitor):
+class DumpDeclarator(stdapi.OnceVisitor):
'''Declare helper functions to dump complex types.'''
def visit_void(self, literal):
for type, name in struct.members:
self.visit(type)
print 'static void __traceStruct%s(const %s &value) {' % (struct.id, struct.expr)
- print ' Log::BeginStruct("%s");' % struct.name
+ print ' Trace::BeginStruct(%u);' % len(struct.members)
for type, name in struct.members:
- print ' Log::BeginMember("%s");' % (name,)
+ print ' Trace::BeginMember("%s");' % (name,)
dump_instance(type, 'value.%s' % (name,))
- print ' Log::EndMember();'
- print ' Log::EndStruct();'
+ print ' Trace::EndMember();'
+ print ' Trace::EndStruct();'
print '}'
print
def visit_enum(self, enum):
print 'static void __traceEnum%s(const %s value) {' % (enum.id, enum.expr)
+ n = len(enum.values)
+ for i in range(n):
+ value = enum.values[i]
+ print ' static const Trace::EnumSig sig%u = {%u, "%s", %s};' % (i, enum.vid + i, value, value)
+ print ' const Trace::EnumSig *sig;'
print ' switch(value) {'
- for value in enum.values:
+ for i in range(n):
+ value = enum.values[i]
print ' case %s:' % value
- print ' Log::LiteralNamedConstant("%s", %s);' % (value, value)
+ print ' sig = &sig%u;' % i
print ' break;'
print ' default:'
- print ' Log::LiteralSInt(value);'
- print ' break;'
+ print ' Trace::LiteralSInt(value);'
+ print ' return;'
print ' }'
+ print ' Trace::LiteralEnum(sig);'
print '}'
print
def visit_bitmask(self, bitmask):
- print 'static void __traceBitmask%s(%s value) {' % (bitmask.id, bitmask.type)
- print ' Log::BeginBitmask();'
+ print 'static const Trace::BitmaskVal __bitmask%s_vals[] = {' % (bitmask.id)
for value in bitmask.values:
- print ' if((value & %s) == %s) {' % (value, value)
- print ' Log::LiteralNamedConstant("%s", %s);' % (value, value)
- print ' value &= ~%s;' % value
- print ' }'
- print ' if(value) {'
- dump_instance(bitmask.type, "value");
- print ' }'
- print ' Log::EndBitmask();'
- print '}'
+ 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 '};'
print
def visit_pointer(self, pointer):
self.visit(pointer.type)
+ def visit_handle(self, handle):
+ self.visit(handle.type)
+
def visit_alias(self, alias):
self.visit(alias.type)
pass
-class DumpImplementer(base.Visitor):
+class DumpImplementer(stdapi.Visitor):
'''Dump an instance.'''
def visit_literal(self, literal, instance):
- print ' Log::Literal%s(%s);' % (literal.format, instance)
+ print ' Trace::Literal%s(%s);' % (literal.format, instance)
def visit_string(self, string, instance):
- print ' Log::LiteralString((const char *)%s);' % instance
+ if string.length is not None:
+ print ' Trace::LiteralString((const char *)%s, %s);' % (instance, string.length)
+ else:
+ print ' Trace::LiteralString((const char *)%s);' % instance
def visit_const(self, const, instance):
self.visit(const.type, instance)
def visit_array(self, array, instance):
print ' if(%s) {' % instance
index = '__i' + array.type.id
- print ' Log::BeginArray(%s);' % (array.length,)
+ print ' Trace::BeginArray(%s);' % (array.length,)
print ' for (int %s = 0; %s < %s; ++%s) {' % (index, index, array.length, index)
- print ' Log::BeginElement();'
+ print ' Trace::BeginElement();'
self.visit(array.type, '(%s)[%s]' % (instance, index))
- print ' Log::EndElement();'
+ print ' Trace::EndElement();'
print ' }'
- print ' Log::EndArray();'
+ print ' Trace::EndArray();'
print ' }'
print ' else'
- print ' Log::LiteralNull();'
+ print ' Trace::LiteralNull();'
def visit_blob(self, blob, instance):
- print ' Log::LiteralBlob(%s, %s);' % (instance, blob.size)
+ print ' Trace::LiteralBlob(%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 ' __traceBitmask%s(%s);' % (bitmask.id, instance)
+ print ' Trace::LiteralBitmask(__bitmask%s_sig, %s);' % (bitmask.id, instance)
def visit_pointer(self, pointer, instance):
print ' if(%s) {' % instance
- print ' Log::BeginPointer((const void *)%s);' % (instance,)
+ print ' Trace::BeginArray(1);'
+ print ' Trace::BeginElement();'
dump_instance(pointer.type, "*" + instance)
- print ' Log::EndPointer();'
+ print ' Trace::EndElement();'
+ print ' Trace::EndArray();'
print ' }'
print ' else'
- print ' Log::LiteralNull();'
+ print ' Trace::LiteralNull();'
+
+ def visit_handle(self, handle, instance):
+ self.visit(handle.type, instance)
def visit_alias(self, alias, instance):
self.visit(alias.type, instance)
def visit_opaque(self, opaque, instance):
- print ' Log::LiteralOpaque((const void *)%s);' % instance
+ print ' Trace::LiteralOpaque((const void *)%s);' % instance
def visit_interface(self, interface, instance):
- print ' Log::LiteralOpaque((const void *)%s);' % instance
+ print ' Trace::LiteralOpaque((const void *)%s);' % instance
dump_instance = DumpImplementer().visit
-class Wrapper(base.Visitor):
+class Wrapper(stdapi.Visitor):
'''Wrap an instance.'''
def visit_void(self, type, instance):
def visit_pointer(self, pointer, instance):
self.visit(pointer.type, "*" + instance)
+ def visit_handle(self, handle, instance):
+ self.visit(handle.type, instance)
+
def visit_alias(self, alias, instance):
self.visit(alias.type, instance)
# Includes
for header in api.headers:
- print '#include <%s>' % header
+ print header
print
# Type dumpers
+ types = api.all_types()
visitor = DumpDeclarator()
- map(visitor.visit, api.types)
+ map(visitor.visit, types)
print
# Interfaces wrapers
print 'typedef ' + function.prototype('* %s' % ptype) + ';'
print 'static %s %s = NULL;' % (ptype, pvalue)
print
+ print 'static const char * __%s_args[] = {' % (function.name)
+ for arg in function.args:
+ print ' "%s",' % (arg.name,)
+ print '};'
+ print
+ print 'static const Trace::FunctionSig __%s_sig = {' % (function.name)
+ print ' %u, "%s", %u, __%s_args' % (int(function.id), function.name, len(function.args), function.name)
+ print '};'
+ print
+
def trace_function_fail(self, function):
if function.fail is not None:
- if function.type is base.Void:
+ if function.type is stdapi.Void:
assert function.fail == ''
print ' return;'
else:
assert function.fail != ''
print ' return %s;' % function.fail
else:
- print ' Log::Abort();'
+ print ' Trace::Abort();'
def get_function_address(self, function):
raise NotImplementedError
def trace_function_impl(self, function):
pvalue = self.function_pointer_value(function)
print function.prototype() + ' {'
- if function.type is base.Void:
+ if function.type is stdapi.Void:
result = ''
else:
print ' %s __result;' % function.type
result = '__result = '
self._get_true_pointer(function)
- print ' Log::BeginCall("%s");' % (function.name)
+ print ' unsigned __call = Trace::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 ' %s%s(%s);' % (result, pvalue, ', '.join([str(arg.name) for arg in function.args]))
+ print ' Trace::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 base.Void:
+ if function.type is not stdapi.Void:
self.dump_ret(function, "__result")
- print ' Log::EndCall();'
- if function.type is not base.Void:
+ print ' Trace::EndLeave();'
+ if function.type is not stdapi.Void:
self.wrap_ret(function, "__result")
print ' return __result;'
print '}'
print
def dump_arg(self, function, arg):
- print ' Log::BeginArg("%s");' % (arg.name,)
+ print ' Trace::BeginArg(%u);' % (arg.index,)
dump_instance(arg.type, arg.name)
- print ' Log::EndArg();'
+ print ' Trace::EndArg();'
def wrap_arg(self, function, arg):
wrap_instance(arg.type, arg.name)
unwrap_instance(arg.type, arg.name)
def dump_ret(self, function, instance):
- print ' Log::BeginReturn();'
+ print ' Trace::BeginReturn();'
dump_instance(function.type, instance)
- print ' Log::EndReturn();'
+ print ' Trace::EndReturn();'
def wrap_ret(self, function, instance):
wrap_instance(function.type, instance)
else:
print ' %s __result;' % method.type
result = '__result = '
- print ' Log::BeginCall("%s");' % (interface.name + '::' + method.name)
- print ' Log::BeginArg("this");'
- print ' Log::LiteralOpaque((const void *)m_pInstance);'
- print ' Log::EndArg();'
+ print ' Trace::BeginCall("%s");' % (interface.name + '::' + method.name)
+ print ' Trace::BeginArg(0);'
+ print ' Trace::LiteralOpaque((const void *)m_pInstance);'
+ print ' Trace::EndArg();'
for arg in method.args:
if not arg.output:
self.unwrap_arg(method, arg)
self.dump_arg(method, arg)
self.wrap_arg(method, arg)
if method.type is not Void:
- print ' Log::BeginReturn("%s");' % method.type
+ print ' Trace::BeginReturn("%s");' % method.type
dump_instance(method.type, "__result")
- print ' Log::EndReturn();'
+ print ' Trace::EndReturn();'
wrap_instance(method.type, '__result')
- print ' Log::EndCall();'
+ print ' Trace::EndCall();'
if method.name == 'QueryInterface':
print ' if (*ppvObj == m_pInstance)'
print ' *ppvObj = this;'
projects / apitrace / blobdiff