[Libreoffice-commits] .: 2 commits - bridges/source

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |    6 ++++++
 bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx |   12 ++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 7e8e85adbee73346403c364326544487677cd5c6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 12 22:06:41 2011 +0300

    Add codeSnippet debugging output when dbglevel>1

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index c9b5185..264e1e9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -434,6 +434,12 @@ unsigned char * codeSnippet( unsigned char * code,
     // jmpq *%r11
     *reinterpret_cast<sal_uInt32 *>( code + 20 ) = 0x00e3ff49;
 
+#if OSL_DEBUG_LEVEL > 1
+    fprintf(stderr,
+            "==> codeSnippet, functionIndex=%d%s, vtableOffset=%d\n",
+            nFunctionIndex), (bHasHiddenParam ? "|0x80000000":""), nVtableOffset);
+#endif
+
     return code + codeSnippetSize;
 }
 
commit 6a208b6c6c4e297ecd7402d2d813a2372e97ae7d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 12 22:05:57 2011 +0300

    Add codeSnippet debugging output when dbglevel>1

diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
index 2ceb0bb..64f27ba 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
@@ -438,6 +438,18 @@ 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=%d%s, vtableOffset=%d\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
     return code + codeSnippetSize;
 }