X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=base.py;h=615549a5da416f0bdbeff44799b331e28ff36eb5;hb=2419e3a33c383284062417e27cefe81dffcbc4de;hp=1632bc0d1c0c2a480ab6e53fcdeceacd6eeb3c1c;hpb=4856d392cf047ab6ab16d7de9021d48d21f621fb;p=apitrace

diff --git a/base.py b/base.py
index 1632bc0..615549a 100644
--- a/base.py
+++ b/base.py
@@ -1,21 +1,27 @@
-#############################################################################
+##########################################################################
 #
-# Copyright 2008 Tungsten Graphics, Inc.
+# Copyright 2008-2009 VMware, Inc.
+# All Rights Reserved.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-#############################################################################
+##########################################################################/
 
 """C basic types"""
 
@@ -25,19 +31,122 @@ import debug
 
 all_types = {}
 
+
+class Visitor:
+
+    def visit(self, type, *args, **kwargs):
+        return type.visit(self, *args, **kwargs)
+
+    __call__ = visit
+
+    def visit_void(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_literal(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_string(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_const(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_struct(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_array(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_blob(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_enum(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_bitmask(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_pointer(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_alias(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+    def visit_opaque(self, type, *args, **kwargs):
+        raise NotImplementedError
+
+
+class Rebuilder(Visitor):
+
+    def visit_void(self, void):
+        return void
+
+    def visit_literal(self, literal):
+        return literal
+
+    def visit_string(self, string):
+        return string
+
+    def visit_const(self, const):
+        return Const(const.type)
+
+    def visit_struct(self, struct):
+        members = [self.visit(member) for member in struct.members]
+        return Struct(struct.name, members)
+
+    def visit_array(self, array):
+        type = self.visit(array.type)
+        return Array(type, array.length)
+
+    def visit_blob(self, blob):
+        type = self.visit(blob.type)
+        return Blob(type, blob.size)
+
+    def visit_enum(self, enum):
+        return enum
+
+    def visit_bitmask(self, bitmask):
+        type = self.visit(bitmask.type)
+        return Bitmask(type, bitmask.values)
+
+    def visit_pointer(self, pointer):
+        type = self.visit(pointer.type)
+        return Pointer(type)
+
+    def visit_alias(self, alias):
+        type = self.visit(alias.type)
+        return Alias(alias.expr, type)
+
+    def visit_opaque(self, opaque):
+        return opaque
+
+
 class Type:
 
-    def __init__(self, name):
-        self.name = name
+    __seq = 0
 
-    def __str__(self):
-        return self.name
+    def __init__(self, expr, id = ''):
+        self.expr = expr
+        
+        for char in id:
+            assert char.isalnum() or char in '_ '
+
+        id = id.replace(' ', '_')
+        
+        if id in all_types:
+            Type.__seq += 1
+            id += str(Type.__seq)
+        
+        assert id not in all_types
+        all_types[id] = self
+
+        self.id = id
 
-    def identifier(self):
-        return self.name.replace(' ', '_')
+    def __str__(self):
+        return self.expr
 
-    def isoutput(self):
-        return False
+    def visit(self, visitor, *args, **kwargs):
+        raise NotImplementedError
 
     def decl(self):
         pass
@@ -60,26 +169,19 @@ class _Void(Type):
     def __init__(self):
         Type.__init__(self, "void")
 
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_void(self, *args, **kwargs)
+
 Void = _Void()
 
 
 class Concrete(Type):
 
-    def __init__(self, name):
-        for char in name:
-            assert char.isalnum() or char in '_ '
-
-        Type.__init__(self, name)
-        
-        assert self.name not in all_types
-        if self.name not in all_types:
-            all_types[self.name] = self
-
     def decl(self):
-        print 'void Dump%s(const %s &value);' % (self.identifier(), str(self))
+        print 'static void Dump%s(const %s &value);' % (self.id, self.expr)
     
     def impl(self):
-        print 'void Dump%s(const %s &value) {' % (self.identifier(), str(self))
+        print 'static void Dump%s(const %s &value) {' % (self.id, self.expr)
         self._dump("value");
         print '}'
         print
@@ -88,58 +190,59 @@ class Concrete(Type):
         raise NotImplementedError
     
     def dump(self, instance):
-        print '    Dump%s(%s);' % (self.identifier(), instance)
+        print '    Dump%s(%s);' % (self.id, instance)
     
 
-class Intrinsic(Concrete):
+class Literal(Concrete):
 
-    def __init__(self, expr, format, name = None):
-        if name is None:
-            name = expr
-        Concrete.__init__(self, name)
-        self.expr = expr
+    def __init__(self, expr, format, base=10):
+        Concrete.__init__(self, expr)
         self.format = format
 
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_literal(self, *args, **kwargs)
+
     def _dump(self, instance):
-        print '    Log::TextF("%s", %s);' % (self.format, instance)
-        
-    def __str__(self):
-        return self.expr
+        print '    Log::Literal%s(%s);' % (self.format, instance)
 
 
 class Const(Type):
 
     def __init__(self, type):
-        Type.__init__(self, 'C' + type.name)
+
+        if type.expr.startswith("const "):
+            expr = type.expr + " const"
+        else:
+            expr = "const " + type.expr
+
+        Type.__init__(self, expr, 'C' + type.id)
+
         self.type = type
 
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_const(self, *args, **kwargs)
+
     def dump(self, instance):
         self.type.dump(instance)
 
-    def __str__(self):
-        return "const " + str(self.type)
-
 
 class Pointer(Type):
 
     def __init__(self, type):
-        Type.__init__(self, 'P' + type.name)
+        Type.__init__(self, type.expr + " *", 'P' + type.id)
         self.type = type
 
-    def __str__(self):
-        return str(self.type) + " *"
-    
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_pointer(self, *args, **kwargs)
+
     def dump(self, instance):
         print '    if(%s) {' % instance
-        print '        Log::BeginReference("%s", %s);' % (self.type, instance)
-        try:
-            self.type.dump("*" + instance)
-        except NotImplementedError:
-            pass
-        print '        Log::EndReference();'
+        print '        Log::BeginPointer("%s", (const void *)%s);' % (self.type, instance)
+        self.type.dump("*" + instance)
+        print '        Log::EndPointer();'
         print '    }'
         print '    else'
-        print '        Log::Text("NULL");'
+        print '        Log::LiteralNull();'
 
     def wrap_instance(self, instance):
         self.type.wrap_instance("*" + instance)
@@ -152,83 +255,166 @@ def ConstPointer(type):
     return Pointer(Const(type))
 
 
-class OutPointer(Pointer):
-
-    def isoutput(self):
-        return True
-
-
 class Enum(Concrete):
 
     def __init__(self, name, values):
         Concrete.__init__(self, name)
         self.values = values
     
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_enum(self, *args, **kwargs)
+
     def _dump(self, instance):
         print '    switch(%s) {' % instance
         for value in self.values:
             print '    case %s:' % value
-            print '        Log::Text("%s");' % value
+            print '        Log::LiteralNamedConstant("%s", %s);' % (value, value)
             print '        break;'
         print '    default:'
-        print '        Log::TextF("%%i", %s);' % instance
+        print '        Log::LiteralSInt(%s);' % instance
         print '        break;'
         print '    }'
 
 
-class Flags(Concrete):
+def FakeEnum(type, values):
+    return Enum(type.expr, values)
+
+
+class Bitmask(Concrete):
 
-    __seq = 0
-    
     def __init__(self, type, values):
-        Flags.__seq += 1
-        Concrete.__init__(self, type.name + str(Flags.__seq))
+        Concrete.__init__(self, type.expr)
         self.type = type
         self.values = values
 
-    def __str__(self):
-        return str(self.type)
-    
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_bitmask(self, *args, **kwargs)
+
     def _dump(self, instance):
         print '    %s l_Value = %s;' % (self.type, instance)
+        print '    Log::BeginBitmask("%s");' % (self.type,)
         for value in self.values:
             print '    if((l_Value & %s) == %s) {' % (value, value)
-            print '        Log::Text("%s | ");' % value
+            print '        Log::LiteralNamedConstant("%s", %s);' % (value, value)
             print '        l_Value &= ~%s;' % value
             print '    }'
+        print '    if(l_Value) {'
         self.type.dump("l_Value");
+        print '    }'
+        print '    Log::EndBitmask();'
+
+Flags = Bitmask
+
+
+class Array(Type):
+
+    def __init__(self, type, length):
+        Type.__init__(self, type.expr + " *")
+        self.type = type
+        self.length = length
+
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_array(self, *args, **kwargs)
+
+    def dump(self, instance):
+        print '    if(%s) {' % instance
+        index = '__i' + self.type.id
+        print '        Log::BeginArray("%s", %s);' % (self.type, self.length)
+        print '        for (int %s = 0; %s < %s; ++%s) {' % (index, index, self.length, index)
+        print '            Log::BeginElement("%s");' % (self.type,)
+        self.type.dump('(%s)[%s]' % (instance, index))
+        print '            Log::EndElement();'
+        print '        }'
+        print '        Log::EndArray();'
+        print '    }'
+        print '    else'
+        print '        Log::LiteralNull();'
+
+    def wrap_instance(self, instance):
+        self.type.wrap_instance("*" + instance)
+
+    def unwrap_instance(self, instance):
+        self.type.wrap_instance("*" + instance)
+
+
+class Blob(Type):
+
+    def __init__(self, type, size):
+        Type.__init__(self, type.expr + ' *')
+        self.type = type
+        self.size = size
+
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_blob(self, *args, **kwargs)
+
+    def dump(self, instance):
+        print '    Log::LiteralBlob(%s, %s);' % (instance, self.size)
 
 
 class Struct(Concrete):
 
     def __init__(self, name, members):
         Concrete.__init__(self, name)
+        self.name = name
         self.members = members
 
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_struct(self, *args, **kwargs)
+
     def _dump(self, instance):
+        print '    Log::BeginStruct("%s");' % (self.name,)
         for type, name in self.members:
-            print '    Log::BeginElement("%s", "%s");' % (type, name)
+            print '    Log::BeginMember("%s", "%s");' % (type, name)
             type.dump('(%s).%s' % (instance, name))
-            print '    Log::EndElement();'
+            print '    Log::EndMember();'
+        print '    Log::EndStruct();'
 
 
 class Alias(Type):
 
-    def __init__(self, name, type):
-        Type.__init__(self, name)
+    def __init__(self, expr, type):
+        Type.__init__(self, expr)
         self.type = type
 
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_alias(self, *args, **kwargs)
+
     def dump(self, instance):
         self.type.dump(instance)
 
 
+def Out(type, name):
+    arg = Arg(type, name, output=True)
+    return arg
+
+
+class Arg:
+
+    def __init__(self, type, name, output=False):
+        self.type = type
+        self.name = name
+        self.output = output
+
+    def __str__(self):
+        return '%s %s' % (self.type, self.name)
+
+
 class Function:
 
-    def __init__(self, type, name, args, call = '__stdcall'):
+    def __init__(self, type, name, args, call = '__stdcall', fail = None, sideeffects=True):
         self.type = type
         self.name = name
-        self.args = args
+
+        self.args = []
+        for arg in args:
+            if isinstance(arg, tuple):
+                arg_type, arg_name = arg
+                arg = Arg(arg_type, arg_name)
+            self.args.append(arg)
+
         self.call = call
+        self.fail = fail
+        self.sideeffects = sideeffects
 
     def prototype(self, name=None):
         if name is not None:
@@ -240,23 +426,100 @@ class Function:
             s = self.call + ' ' + s
         if name.startswith('*'):
             s = '(' + s + ')'
-        s = str(self.type) + ' ' + s
+        s = self.type.expr + ' ' + s
         s += "("
         if self.args:
-            s += ", ".join(["%s %s" % (type, name) for type, name in self.args])
+            s += ", ".join(["%s %s" % (arg.type, arg.name) for arg in self.args])
         else:
             s += "void"
         s += ")"
         return s
 
+    def pointer_type(self):
+        return 'P' + self.name
+
+    def pointer_value(self):
+        return 'p' + self.name
+
+    def wrap_decl(self):
+        ptype = self.pointer_type()
+        pvalue = self.pointer_value()
+        print 'typedef ' + self.prototype('* %s' % ptype) + ';'
+        print 'static %s %s = NULL;' % (ptype, pvalue)
+        print
+
+    def get_true_pointer(self):
+        raise NotImplementedError
+
+    def exit_impl(self):
+        print '            Log::Abort();'
+
+    def fail_impl(self):
+        if self.fail is not None:
+            if self.type is Void:
+                assert self.fail == ''
+                print '            return;' 
+            else:
+                assert self.fail != ''
+                print '            return %s;' % self.fail
+        else:
+            self.exit_impl()
+
+    def wrap_impl(self):
+        pvalue = self.pointer_value()
+        print self.prototype() + ' {'
+        if self.type is Void:
+            result = ''
+        else:
+            print '    %s result;' % self.type
+            result = 'result = '
+        self.get_true_pointer()
+        print '    Log::BeginCall("%s");' % (self.name)
+        for arg in self.args:
+            if not arg.output:
+                arg.type.unwrap_instance(arg.name)
+                print '    Log::BeginArg("%s", "%s");' % (arg.type, arg.name)
+                arg.type.dump(arg.name)
+                print '    Log::EndArg();'
+        print '    %s%s(%s);' % (result, pvalue, ', '.join([str(arg.name) for arg in self.args]))
+        for arg in self.args:
+            if arg.output:
+                print '    Log::BeginArg("%s", "%s");' % (arg.type, arg.name)
+                arg.type.dump(arg.name)
+                print '    Log::EndArg();'
+                arg.type.wrap_instance(arg.name)
+        if self.type is not Void:
+            print '    Log::BeginReturn("%s");' % self.type
+            self.type.dump("result")
+            print '    Log::EndReturn();'
+            self.type.wrap_instance('result')
+        print '    Log::EndCall();'
+        self.post_call_impl()
+        if self.type is not Void:
+            print '    return result;'
+        print '}'
+        print
+
+    def post_call_impl(self):
+        pass
+
+
+def FunctionPointer(type, name, args, **kwargs):
+    # XXX
+    return Opaque(name)
+
 
 class Interface(Type):
 
     def __init__(self, name, base=None):
         Type.__init__(self, name)
+        self.name = name
         self.base = base
         self.methods = []
 
+    def dump(self, instance):
+        print '    Log::LiteralOpaque((const void *)%s);' % instance
+
     def itermethods(self):
         if self.base is not None:
             for method in self.base.itermethods():
@@ -266,7 +529,7 @@ class Interface(Type):
         raise StopIteration
 
     def wrap_name(self):
-        return "Wrap" + self.name
+        return "Wrap" + self.expr
 
     def wrap_pre_decl(self):
         print "class %s;" % self.wrap_name()
@@ -303,22 +566,22 @@ class Interface(Type):
                 result = 'result = '
             print '    Log::BeginCall("%s");' % (self.name + '::' + method.name)
             print '    Log::BeginArg("%s *", "this");' % self.name
-            print '    Log::BeginReference("%s", m_pInstance);' % self.name
-            print '    Log::EndReference();'
+            print '    Log::BeginPointer("%s", (const void *)m_pInstance);' % self.name
+            print '    Log::EndPointer();'
             print '    Log::EndArg();'
-            for type, name in method.args:
-                if not type.isoutput():
-                    type.unwrap_instance(name)
-                    print '    Log::BeginArg("%s", "%s");' % (type, name)
-                    type.dump(name)
+            for arg in method.args:
+                if not arg.output:
+                    arg.type.unwrap_instance(arg.name)
+                    print '    Log::BeginArg("%s", "%s");' % (arg.type, arg.name)
+                    arg.type.dump(arg.name)
                     print '    Log::EndArg();'
-            print '    %sm_pInstance->%s(%s);' % (result, method.name, ', '.join([str(name) for type, name in method.args]))
-            for type, name in method.args:
-                if type.isoutput():
-                    print '    Log::BeginArg("%s", "%s");' % (type, name)
-                    type.dump(name)
+            print '    %sm_pInstance->%s(%s);' % (result, method.name, ', '.join([str(arg.name) for arg in method.args]))
+            for arg in method.args:
+                if arg.output:
+                    print '    Log::BeginArg("%s", "%s");' % (arg.type, arg.name)
+                    arg.type.dump(arg.name)
                     print '    Log::EndArg();'
-                    type.wrap_instance(name)
+                    arg.type.wrap_instance(arg.name)
             if method.type is not Void:
                 print '    Log::BeginReturn("%s");' % method.type
                 method.type.dump("result")
@@ -342,7 +605,7 @@ class Interface(Type):
 class Method(Function):
 
     def __init__(self, type, name, args):
-        Function.__init__(self, type, name, args)
+        Function.__init__(self, type, name, args, call = '__stdcall')
 
 
 towrap = []
@@ -366,27 +629,49 @@ class WrapPointer(Pointer):
 class _String(Type):
 
     def __init__(self):
-        Type.__init__(self, "String")
+        Type.__init__(self, "char *")
 
-    def __str__(self):
-        return "char *"
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_string(self, *args, **kwargs)
 
     def dump(self, instance):
-        print '    Log::DumpString((const char *)%s);' % instance
+        print '    Log::LiteralString((const char *)%s);' % instance
 
 String = _String()
 
 
-SChar = Intrinsic("signed char", "%i")
-UChar = Intrinsic("unsigned char", "%u")
-Short = Intrinsic("short", "%i")
-Int = Intrinsic("int", "%i")
-Long = Intrinsic("long", "%li")
-UShort = Intrinsic("unsigned short", "%u")
-UInt = Intrinsic("unsigned int", "%u")
-ULong = Intrinsic("unsigned long", "%lu")
-Float = Intrinsic("float", "%f")
-Double = Intrinsic("double", "%f")
+class Opaque(Type):
+    '''Opaque pointer.'''
+
+    def __init__(self, expr):
+        Type.__init__(self, expr)
+
+    def visit(self, visitor, *args, **kwargs):
+        return visitor.visit_opaque(self, *args, **kwargs)
+
+    def dump(self, instance):
+        print '    Log::LiteralOpaque((const void *)%s);' % instance
+
+
+def OpaquePointer(type):
+    return Opaque(type.expr + ' *')
+
+
+Bool = Literal("bool", "Bool")
+SChar = Literal("signed char", "SInt")
+UChar = Literal("unsigned char", "UInt")
+Short = Literal("short", "SInt")
+Int = Literal("int", "SInt")
+Long = Literal("long", "SInt")
+LongLong = Literal("long long", "SInt")
+UShort = Literal("unsigned short", "UInt")
+UInt = Literal("unsigned int", "UInt")
+ULong = Literal("unsigned long", "UInt")
+ULongLong = Literal("unsigned long long", "UInt")
+Float = Literal("float", "Float")
+Double = Literal("double", "Float")
+SizeT = Literal("size_t", "UInt")
+WString = Literal("wchar_t *", "WString")
 
 
 def wrap():