[Libreoffice-commits] core.git: bridges/source include/sal

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx |   30 +++++++++++--------
 include/sal/log-areas.dox                            |    7 +++-
 2 files changed, 24 insertions(+), 13 deletions(-)

New commits:
commit 86a372ade0b7d416d4ff97a94ea350f56610da61
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Dec 23 21:12:05 2013 +0200

    More informative logging in codeSnippet()
    
    Change-Id: I6909ed60b39a65e6a6464427b2f839aa2bff3863

diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
index 4fe5377..52911af 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
@@ -361,6 +361,8 @@ extern "C" typedef void (*PrivateSnippetExecutor)();
 int const codeSnippetSize = 16;
 
 unsigned char * codeSnippet(
+    const typelib_InterfaceTypeDescription *type,
+    const typelib_TypeDescription *member,
     unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
     typelib_TypeDescriptionReference * pReturnTypeRef)
 {
@@ -427,18 +429,19 @@ unsigned char * codeSnippet(
         = ((unsigned char *) exec) - p - sizeof (sal_Int32);
     p += sizeof (sal_Int32);
     OSL_ASSERT(p - code <= codeSnippetSize);
-#if OSL_DEBUG_LEVEL > 1
-    fprintf(stderr,
-            "==> codeSnippet to %s, functionIndex=%lu%s, vtableOffset=%"SAL_PRIdINT32"\n",
-            (exec == privateSnippetExecutorGeneral ? "General" :
-             (exec == privateSnippetExecutorVoid ? "Void" :
-              (exec == privateSnippetExecutorHyper ? "Hyper" :
-               (exec == privateSnippetExecutorFloat ? "Float" :
-                (exec == privateSnippetExecutorDouble ? "Double" :
-                 (exec == privateSnippetExecutorClass ? "Class" :
-                  "???")))))),
-            (functionIndex & ~0x80000000), (functionIndex & 0x80000000) ? "|0x80000000":"", vtableOffset);
-#endif
+
+    SAL_INFO( "bridges.osx", "codeSnippet("
+              << OUString(type->aBase.pTypeName) << "::" << OUString(member->pTypeName) << "): ["
+              << (functionIndex & ~0x80000000) << ((functionIndex & 0x80000000) ? "|0x80000000":"") << "," << vtableOffset << ","
+              << (exec == privateSnippetExecutorGeneral ? "General" :
+                  (exec == privateSnippetExecutorVoid ? "Void" :
+                   (exec == privateSnippetExecutorHyper ? "Hyper" :
+                    (exec == privateSnippetExecutorFloat ? "Float" :
+                     (exec == privateSnippetExecutorDouble ? "Double" :
+                      (exec == privateSnippetExecutorClass ? "Class" :
+                       "???"))))))
+              << "]=" << (void *)(code + codeSnippetSize) );
+
     return code + codeSnippetSize;
 }
 
@@ -484,6 +487,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
             // Getter:
             (s++)->fn = code;
             code = codeSnippet(
+                type, member,
                 code, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
                     member)->pAttributeTypeRef);
@@ -494,6 +498,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
             {
                 (s++)->fn = code;
                 code = codeSnippet(
+                    type, member,
                     code, functionOffset++, vtableOffset,
                     0 /* indicates VOID */);
             }
@@ -502,6 +507,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
         case typelib_TypeClass_INTERFACE_METHOD:
             (s++)->fn = code;
             code = codeSnippet(
+                type, member,
                 code, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
                     member)->pReturnTypeRef);
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 5168e81..a53727b 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -40,6 +40,12 @@ certain functionality.
 @li @c basic
 @li @c basic.sbx
 
+ at section bridges
+
+ at li @c bridges
+ at li @c bridges.ios
+ at li @c bridges.osx
+
 @section canvas
 
 @li @c canvas
@@ -426,7 +432,6 @@ certain functionality.
 @li @c avmedia
 @li @c basebmp
 @li @c binaryurp
- at li @c bridges
 @li @c configmgr
 @li @c cppcanvas
 @li @c cppcanvas.emf