Move CMC_DEBUG to OSL_DEBUG_LEVEL 3

This level means 'ultra-verbose'.

3 files changed, 12 insertions, 12 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
index 4974bf3f0e82..071170190397 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
@@ -106,7 +106,7 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     pMethod += 4 * nVtableIndex;
     pMethod = *((sal_uInt32 *)pMethod);
 
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "this is %p\n", pGPR[0]);
     for (int i = 0; i < hppa::MAX_GPR_REGS ; ++i)
         fprintf(stderr, "normal reg %d is %d %x\n", i, pGPR[i], pGPR[i]);
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 89c85c4201da..9e31fbc6a8bb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -65,7 +65,7 @@ namespace
         void ** startovrflw = ovrflw;
         int nregs = 0; //number of words passed in registers
 
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp2uno_call\n");
 #endif
         // return
@@ -81,14 +81,14 @@ namespace
         {
             if (hppa::isRegisterReturn(pReturnTypeRef))
             {
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "simple return\n");
 #endif
                 pUnoReturn = pRegisterReturn; // direct way for simple types
             }
             else
             {
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "complex return via r8\n");
 #endif
                 pCppReturn = (void *)r8;
@@ -295,14 +295,14 @@ namespace
         uno_Any aUnoExc; // Any will be constructed by callee
         uno_Any * pUnoExc = &aUnoExc;
 
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "before dispatch\n");
 #endif
         // invoke uno dispatch call
         (*pThis->getUnoI()->pDispatcher)(
           pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "after dispatch\n");
 #endif
 
@@ -384,7 +384,7 @@ namespace
 
     {
     void ** ovrflw = (void**)(sp);
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp_mediate with\n");
     fprintf(stderr, "%x %x\n", nFunctionIndex, nVtableOffset);
     fprintf(stderr, "and %x %x\n", (long)(ovrflw[0]), (long)(ovrflw[-1]));
@@ -407,14 +407,14 @@ namespace
         {
         nFunctionIndex &= 0x7fffffff;
         pThis = gpreg[1];
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "pThis is gpreg[1]\n");
 #endif
         }
         else
         {
         pThis = gpreg[0];
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "pThis is gpreg[0]\n");
 #endif
         }
@@ -578,7 +578,7 @@ sal_Int64 cpp_vtable_call( sal_uInt32 in0, sal_uInt32 in1, sal_uInt32 in2, sal_u
     register double d3 asm("fr7"); dpreg[3] = d3;
 
 
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "got to cpp_vtable_call with %x %x\n", functionIndex, vtableOffset);
     for (int i = 0; i < hppa::MAX_GPR_REGS; ++i)
     fprintf(stderr, "reg %d is %d %x\n", i, gpreg[i], gpreg[i]);
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index deddfcfed517..d8c36c386667 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -248,7 +248,7 @@ static void cpp_call(
             {
                 case typelib_TypeClass_HYPER:
                 case typelib_TypeClass_UNSIGNED_HYPER:
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
                     fprintf(stderr, "hyper is %llx\n", *((long long*)pCppArgs[nPos]));
 #endif
                     INSERT_INT64( pCppArgs[nPos], nRegs, pGPR, pStack, pStackStart, bOverFlow );
@@ -256,7 +256,7 @@ static void cpp_call(
                 case typelib_TypeClass_LONG:
                 case typelib_TypeClass_UNSIGNED_LONG:
                 case typelib_TypeClass_ENUM:
-#ifdef CMC_DEBUG
+#ifdef OSL_DEBUG_LEVEL > 2
                     fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
                     INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );