X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace.py;h=1cdb10a8fd5d6c3de4e621d4e376718418dda231;hb=e17455750b302f1cb0750c501ab7593a8846d34e;hp=b1e72fd01a869b7cef73c9b6765bc7f205993e02;hpb=3d245f4281cc9e3184237907a9c0723e6a6ccda3;p=apitrace

diff --git a/retrace.py b/retrace.py
index b1e72fd..1cdb10a 100644
--- a/retrace.py
+++ b/retrace.py
@@ -24,6 +24,8 @@
 ##########################################################################/
 
 
+"""Generic retracing code generator."""
+
 import stdapi
 import glapi
 from codegen import *
@@ -41,6 +43,14 @@ class ConstRemover(stdapi.Rebuilder):
         return stdapi.Opaque(expr)
 
 
+def handle_entry(handle, value):
+    if handle.key is None:
+        return "__%s_map[%s]" % (handle.name, value)
+    else:
+        key_name, key_type = handle.key
+        return "__%s_map[%s][%s]" % (handle.name, key_name, value)
+
+
 class ValueExtractor(stdapi.Visitor):
 
     def visit_literal(self, literal, lvalue, rvalue):
@@ -88,7 +98,7 @@ class ValueExtractor(stdapi.Visitor):
             print '    }'
 
     def visit_handle(self, handle, lvalue, rvalue):
-        self.visit(handle.type, lvalue, "__%s_map[%s]" %(handle.name, rvalue));
+        self.visit(handle.type, lvalue, handle_entry(handle, rvalue));
         print '    if (verbosity >= 2)'
         print '        std::cout << "%s " << static_cast<%s>(%s) << " <- " << %s << "\\n";' % (handle.name, handle.type, rvalue, lvalue)
     
@@ -137,15 +147,20 @@ class ValueWrapper(stdapi.Visitor):
 
     def visit_handle(self, handle, lvalue, rvalue):
         if handle.range is None:
-            print "    __{handle.name}_map[static_cast<{handle.type}>({rvalue})] = {lvalue};".format(**locals())
+            rvalue = "static_cast<%s>(%s)" % (handle.type, rvalue)
+            entry = handle_entry(handle, rvalue) 
+            print "    %s = %s;" % (entry, lvalue)
             print '    if (verbosity >= 2)'
-            print '        std::cout << "{handle.name} " << static_cast<{handle.type}>({rvalue}) << " -> " << {lvalue} << "\\n";'.format(**locals())
+            print '        std::cout << "{handle.name} " << {rvalue} << " -> " << {lvalue} << "\\n";'.format(**locals())
         else:
             i = '__h' + handle.id
+            lvalue = "%s + %s" % (lvalue, i)
+            rvalue = "static_cast<%s>(%s) + %s" % (handle.type, rvalue, i)
+            entry = handle_entry(handle, rvalue) 
             print '    for({handle.type} {i} = 0; {i} < {handle.range}; ++{i}) {{'.format(**locals())
-            print '        __{handle.name}_map[static_cast<{handle.type}>({rvalue}) + {i}] = {lvalue} + {i};'.format(**locals())
+            print '        {entry} = {lvalue};'.format(**locals())
             print '        if (verbosity >= 2)'
-            print '            std::cout << "{handle.name} " << (static_cast<{handle.type}>({rvalue}) + {i}) << " -> " << ({lvalue} + {i}) << "\\n";'.format(**locals())
+            print '            std::cout << "{handle.name} " << ({rvalue}) << " -> " << ({lvalue}) << "\\n";'.format(**locals())
             print '    }'
     
     def visit_blob(self, blob, lvalue, rvalue):
@@ -155,11 +170,15 @@ class ValueWrapper(stdapi.Visitor):
         pass
 
 
-
 class Retracer:
 
     def retrace_function(self, function):
         print 'static void retrace_%s(Trace::Call &call) {' % function.name
+        self.retrace_function_body(function)
+        print '}'
+        print
+
+    def retrace_function_body(self, function):
         success = True
         for arg in function.args:
             arg_type = ConstRemover().visit(arg.type)
@@ -191,11 +210,10 @@ class Retracer:
                 ValueWrapper().visit(function.type, lvalue, rvalue)
             except NotImplementedError:
                 print '   // FIXME: result'
-        print '}'
-        print
 
     def fail_function(self, function):
-        print '    std::cerr << "warning: unsupported call %s\\n";' % function.name
+        print '    if (verbosity >= 0)'
+        print '        std::cerr << "warning: unsupported call %s\\n";' % function.name
         print '    return;'
 
     def extract_arg(self, function, arg, arg_type, lvalue, rvalue):
@@ -222,7 +240,7 @@ class Retracer:
         print 'static bool retrace_call(Trace::Call &call) {'
         print '    const char *name = call.name().c_str();'
         print
-        print '    if (verbosity >=1 ) {'
+        print '    if (verbosity >= 1) {'
         print '        std::cout << call;'
         print '        std::cout.flush();'
         print '    };'
@@ -238,7 +256,8 @@ class Retracer:
     
         string_switch('name', func_dict.keys(), handle_case)
 
-        print '    std::cerr << "warning: unknown call " << call.name() << "\\n";'
+        print '    if (verbosity >= 0)'
+        print '        std::cerr << "warning: unknown call " << call.name() << "\\n";'
         print '    return false;'
         print '}'
         print
@@ -247,6 +266,7 @@ class Retracer:
     def retrace_api(self, api):
 
         print '#include "trace_parser.hpp"'
+        print '#include "retrace.hpp"'
         print
 
         types = api.all_types()
@@ -254,11 +274,15 @@ class Retracer:
         handle_names = set()
         for handle in handles:
             if handle.name not in handle_names:
-                print 'static std::map<%s, %s> __%s_map;' % (handle.type, handle.type, handle.name)
+                if handle.key is None:
+                    print 'static retrace::map<%s> __%s_map;' % (handle.type, handle.name)
+                else:
+                    key_name, key_type = handle.key
+                    print 'static std::map<%s, retrace::map<%s> > __%s_map;' % (key_type, handle.type, handle.name)
                 handle_names.add(handle.name)
         print
 
-        print 'unsigned verbosity = 0;'
+        print 'int verbosity = 0;'
         print
 
         self.retrace_functions(api.functions)