From 0d139d3d2ee2ccca6c2c162e169a227d76147612 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Mar 2011 17:12:28 +0100 Subject: Oops, use #if instead of #ifdef --- .../source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx | 20 ++++++------- .../source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx | 8 ++--- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 +-- bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx | 2 +- bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 18 ++++++------ bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx | 4 +-- bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 32 ++++++++++---------- bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx | 34 +++++++++++----------- bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 12 ++++---- bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx | 6 ++-- .../cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 32 ++++++++++---------- .../cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 26 ++++++++--------- bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 4 +-- bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2 +- .../source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 20 ++++++------- .../source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx | 8 ++--- 16 files changed, 116 insertions(+), 116 deletions(-) (limited to 'bridges') diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index 680b741db40b..d4f304f77841 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -58,7 +58,7 @@ static typelib_TypeClass cpp2uno_call( void ** gpreg, void ** fpreg, void ** ovrflw, sal_Int64 * pRegisterReturn /* space for register return */ ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "as far as cpp2uno_call\n"); #endif int nregs = 0; //number of words passed in registers @@ -115,13 +115,13 @@ static typelib_TypeClass cpp2uno_call( typelib_TypeDescription * pParamTypeDescr = 0; TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "arg %d of %d\n", nPos, nParams); #endif if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) // value { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple type is %d\n", pParamTypeDescr->eTypeClass); #endif @@ -216,7 +216,7 @@ static typelib_TypeClass cpp2uno_call( } else // ptr to complex value | ref { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex, nregs is %d\n", nregs); #endif @@ -262,7 +262,7 @@ static typelib_TypeClass cpp2uno_call( } } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of params\n"); #endif @@ -348,11 +348,11 @@ static typelib_TypeClass cpp_mediate( sal_Int32 nVtableOffset = (nOffsetAndIndex >> 32); sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFFFFFF); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "nVTableOffset, nFunctionIndex are %x %x\n", nVtableOffset, nFunctionIndex); #endif -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "= cpp_mediate () =\nGPR's (%d): ", 6 ); @@ -524,7 +524,7 @@ long cpp_vtable_call(long r16, long r17, long r18, long r19, long r20, long r21, register double f21 asm("$f21"); fpreg[5] = f21; volatile long nRegReturn[1]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "before mediate with %lx\n",nOffsetAndIndex); fprintf(stderr, "non-doubles are %x %x %x %x %x %x\n", gpreg[0], gpreg[1], gpreg[2], gpreg[3], gpreg[4], gpreg[5]); fprintf(stderr, "doubles are %f %f %f %f %f %f\n", fpreg[0], fpreg[1], fpreg[2], fpreg[3], fpreg[4], fpreg[5]); @@ -532,7 +532,7 @@ long cpp_vtable_call(long r16, long r17, long r18, long r19, long r20, long r21, typelib_TypeClass aType = cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp, (sal_Int64*)nRegReturn ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "after mediate ret is %lx %ld\n", nRegReturn[0], nRegReturn[0]); #endif @@ -625,7 +625,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( { (*slots) -= functionCount; Slot * s = *slots; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset); fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index 32e7d005a34a..db6d18800c4f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -53,7 +53,7 @@ void MapReturn(long r0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterRetur register float fret asm("$f0"); register double dret asm("$f0"); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr,"Mapping Return with %lx %ld %f\n", r0, r0, dret); #endif switch (eTypeClass) @@ -85,7 +85,7 @@ void MapReturn(long r0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterRetur default: break; } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of MapReturn with %x\n", pRegisterReturn ? *pRegisterReturn : 0); #endif } @@ -146,7 +146,7 @@ void callVirtualMethod( if ( nGPR > axp::MAX_GPR_REGS ) nGPR = axp::MAX_GPR_REGS; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "= nStack is %d\n", nStack ); @@ -406,7 +406,7 @@ void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "unoInterfaceProxyDispatch\n"); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 68bb1cc6ccb8..5b02678b8fbf 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -394,7 +394,7 @@ static void cpp_call( { case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]); #endif INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, pStackStart, bOverFlow ); @@ -402,7 +402,7 @@ static void cpp_call( case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "long is %x\n", pCppArgs[nPos]); #endif INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx index 071170190397..f434b7e0ba91 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 OSL_DEBUG_LEVEL > 2 +#if 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 9e31fbc6a8bb..e96217495ddb 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 OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp2uno_call\n"); #endif // return @@ -81,14 +81,14 @@ namespace { if (hppa::isRegisterReturn(pReturnTypeRef)) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple return\n"); #endif pUnoReturn = pRegisterReturn; // direct way for simple types } else { -#ifdef OSL_DEBUG_LEVEL > 2 +#if 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 OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "before dispatch\n"); #endif // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "after dispatch\n"); #endif @@ -384,7 +384,7 @@ namespace { void ** ovrflw = (void**)(sp); -#ifdef OSL_DEBUG_LEVEL > 2 +#if 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 OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[1]\n"); #endif } else { pThis = gpreg[0]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if 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 OSL_DEBUG_LEVEL > 2 +#if 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 d8c36c386667..6c3b25c387fa 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 OSL_DEBUG_LEVEL > 2 +#if 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 OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "long is %x\n", pCppArgs[nPos]); #endif INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow ); diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index d7764e562007..e897397ce76b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -56,7 +56,7 @@ static typelib_TypeClass cpp2uno_call( void ** gpreg, void ** fpreg, void ** ovrflw, sal_Int64 * pRegisterReturn /* space for register return */ ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "as far as cpp2uno_call\n"); #endif @@ -121,14 +121,14 @@ static typelib_TypeClass cpp2uno_call( typelib_TypeDescription * pParamTypeDescr = 0; TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "arg %d of %d\n", nPos, nParams); #endif //I think it is impossible to get UNO to pass structs as parameters by copy if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple\n"); #endif @@ -194,7 +194,7 @@ static typelib_TypeClass cpp2uno_call( } else // ptr to complex value | ref { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex, ng is %d\n", ng); #endif void *pCppStack; //temporary stack pointer @@ -238,7 +238,7 @@ static typelib_TypeClass cpp2uno_call( } } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of params\n"); #endif @@ -336,25 +336,25 @@ static typelib_TypeClass cpp_mediate( { nFunctionIndex &= 0x7fffffff; pThis = gpreg[1]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[1]\n"); #endif } else { pThis = gpreg[0]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[0]\n"); #endif } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is %p\n", pThis); #endif pThis = static_cast< char * >(pThis) - nVtableOffset; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is now %p\n", pThis); #endif @@ -364,7 +364,7 @@ static typelib_TypeClass cpp_mediate( typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr(); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex); #endif @@ -380,7 +380,7 @@ static typelib_TypeClass cpp_mediate( sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex]; OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "members are %d %d\n", nMemberPos, pTypeDescr->nAllMembers); #endif @@ -468,7 +468,7 @@ static typelib_TypeClass cpp_mediate( } default: { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "screwed\n"); #endif @@ -480,7 +480,7 @@ static typelib_TypeClass cpp_mediate( } } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of cpp_mediate\n"); #endif return eRet; @@ -520,7 +520,7 @@ extern "C" ia64::RegReturn cpp_vtable_call( register double f14 asm("f14"); fpreg[6] = f14; register double f15 asm("f15"); fpreg[7] = f15; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp_vtable_call called with %lx\n", nOffsetAndIndex); fprintf(stderr, "adump is %lx %lx %lx %lx %lx %lx %lx %lx\n", in0, in1, in2, in3, in4, in5, in6, in7); fprintf(stderr, "bdump is %f %f %f %f %f %f %f %f\n", f8, f9, f10, f11, f12, f13, f14, f15); @@ -576,7 +576,7 @@ const int codeSnippetSize = 40; bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, bool bHasHiddenParam ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "size is %d\n", codeSnippetSize); fprintf(stderr,"in codeSnippet functionIndex is %x\n", nFunctionIndex); fprintf(stderr,"in codeSnippet vtableOffset is %x\n", nVtableOffset); @@ -632,7 +632,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( { (*in_slots) -= functionCount; Slot * slots = *in_slots; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset); fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index c2317e27a5c2..19b586b557f2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -177,7 +177,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, if ( nGPR > ia64::MAX_GPR_REGS ) nGPR = ia64::MAX_GPR_REGS; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR ); @@ -337,7 +337,7 @@ static void cpp_call( bool bSimpleReturn = true; if (pReturnTypeDescr) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass); #endif if ( ia64::return_in_hidden_param(pReturnTypeRef) || ia64::return_via_r8_buffer(pReturnTypeRef) ) @@ -346,7 +346,7 @@ static void cpp_call( if ( bSimpleReturn ) { pCppReturn = pUnoReturn; // direct way for simple types -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple return\n"); #endif } @@ -355,7 +355,7 @@ static void cpp_call( // complex return via ptr pCppReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr ) ? alloca( pReturnTypeDescr->nSize ) : pUnoReturn); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pCppReturn/pUnoReturn is %lx/%lx", pCppReturn, pUnoReturn); #endif if (!ia64::return_via_r8_buffer(pReturnTypeRef)) @@ -365,7 +365,7 @@ static void cpp_call( // push "this" pointer void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "this pointer is %p\n", pAdjustedThisPtr); #endif INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow ); @@ -379,7 +379,7 @@ static void cpp_call( sal_Int32 nTempIndizes = 0; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "n params is %d\n", nParams); #endif @@ -389,7 +389,7 @@ static void cpp_call( typelib_TypeDescription * pParamTypeDescr = 0; TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "param %d is %d %d %d\n", nPos, rParam.bOut, bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ), pParamTypeDescr->eTypeClass); #endif @@ -403,7 +403,7 @@ static void cpp_call( { case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "hyper is %lx\n", *(unsigned long*)(pCppArgs[nPos])); #endif INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); @@ -411,7 +411,7 @@ static void cpp_call( case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "long is %lx\n", *(unsigned int*)(pCppArgs[nPos])); #endif INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); @@ -419,27 +419,27 @@ static void cpp_call( case typelib_TypeClass_SHORT: case typelib_TypeClass_CHAR: case typelib_TypeClass_UNSIGNED_SHORT: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "short is %x\n", *(unsigned short*)(pCppArgs[nPos])); #endif INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); break; case typelib_TypeClass_BOOLEAN: case typelib_TypeClass_BYTE: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "byte is %x\n", *(unsigned char*)(pCppArgs[nPos])); #endif INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); break; case typelib_TypeClass_FLOAT: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "a float is %f\n", *(float*)(pCppArgs[nPos])); fprintf(stderr, "b float is %f\n", *(double*)(pCppArgs[nPos])); #endif INSERT_FLOAT( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverFlow ); break; case typelib_TypeClass_DOUBLE: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "double is %f\n", *(double*)(pCppArgs[nPos])); #endif INSERT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverFlow ); @@ -454,12 +454,12 @@ static void cpp_call( } else // ptr to complex value | ref { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex type again %d\n", rParam.bIn); #endif if (! rParam.bIn) // is pure out { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex size is %d\n", pParamTypeDescr->nSize ); #endif // cpp out is constructed mem, uno out is not! @@ -473,7 +473,7 @@ static void cpp_call( // is in/inout else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr )) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "this one\n"); #endif uno_copyAndConvertData( @@ -486,7 +486,7 @@ static void cpp_call( } else // direct way { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "that one, passing %lx through\n", pUnoArgs[nPos]); #endif pCppArgs[nPos] = pUnoArgs[nPos]; diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index 24acf38d6201..7c46d1a0b408 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -65,7 +65,7 @@ namespace // pCallStack: ret, [return ptr], this, params char * pTopStack = (char *)(pCallStack + 0); char * pCppStack = pTopStack; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp2uno_call\n"); #endif // return @@ -81,14 +81,14 @@ namespace { if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple return\n"); #endif pUnoReturn = pRegisterReturn; // direct way for simple types } else // complex return via ptr (pCppReturn) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex return\n"); #endif pCppReturn = (void *)r8; @@ -190,14 +190,14 @@ namespace uno_Any aUnoExc; // Any will be constructed by callee uno_Any * pUnoExc = &aUnoExc; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "before dispatch\n"); #endif // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "after dispatch\n"); #endif @@ -277,7 +277,7 @@ namespace sal_Int64 * pRegisterReturn /* space for register return */ ) { void ** pCallStack = (void**)(sp); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp_mediate with\n"); fprintf(stderr, "%x %x\n", nFunctionIndex, nVtableOffset); fprintf(stderr, "and %x %x\n", pCallStack, pRegisterReturn); diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index 3e059b9e91a6..0d0fd27678eb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -110,7 +110,7 @@ void callVirtualMethod( memcpy( stack, pStack, nStackBytes ); } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "\nStack (%d): ", nStack ); @@ -229,7 +229,7 @@ static void cpp_call( { case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]); #endif INSERT_INT64( pCppArgs[nPos], pStack ); @@ -237,7 +237,7 @@ static void cpp_call( case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "long is %x\n", pCppArgs[nPos]); #endif INSERT_INT32( pCppArgs[nPos], pStack ); diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index a8702cdd60ab..e9a5e8c6bb8b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -57,7 +57,7 @@ static typelib_TypeClass cpp2uno_call( void ** gpreg, void ** fpreg, void ** ovrflw, sal_Int64 * pRegisterReturn /* space for register return */ ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "as far as cpp2uno_call\n"); #endif @@ -115,13 +115,13 @@ static typelib_TypeClass cpp2uno_call( typelib_TypeDescription * pParamTypeDescr = 0; TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "arg %d of %d\n", nPos, nParams); #endif if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple\n"); #endif @@ -213,7 +213,7 @@ static typelib_TypeClass cpp2uno_call( } else // ptr to complex value | ref { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex, ng is %d\n", ng); #endif void *pCppStack; //temporary stack pointer @@ -257,7 +257,7 @@ static typelib_TypeClass cpp2uno_call( } } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of params\n"); #endif @@ -356,25 +356,25 @@ static typelib_TypeClass cpp_mediate( { nFunctionIndex &= 0x7fffffff; pThis = gpreg[1]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[1]\n"); #endif } else { pThis = gpreg[0]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[0]\n"); #endif } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is %lx\n", pThis); #endif pThis = static_cast< char * >(pThis) - nVtableOffset; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is now %lx\n", pThis); #endif @@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate( typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr(); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex); #endif @@ -400,7 +400,7 @@ static typelib_TypeClass cpp_mediate( sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex]; OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "members are %d %d\n", nMemberPos, pTypeDescr->nAllMembers); #endif @@ -488,7 +488,7 @@ static typelib_TypeClass cpp_mediate( } default: { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "screwed\n"); #endif @@ -500,7 +500,7 @@ static typelib_TypeClass cpp_mediate( } } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of cpp_mediate\n"); #endif return eRet; @@ -605,7 +605,7 @@ const int codeSnippetSize = 24; unsigned char * codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, bool simpleRetType) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr,"in codeSnippet functionIndex is %x\n", nFunctionIndex); fprintf(stderr,"in codeSnippet vtableOffset is %x\n", nVtableOffset); #endif @@ -618,7 +618,7 @@ unsigned char * codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sa void ** raw = (void **)&code[0]; memcpy(raw, (char*) privateSnippetExecutor, 16); raw[2] = (void*) nOffsetAndIndex; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "in: offset/index is %x %x %d, %lx\n", nFunctionIndex, nVtableOffset, !simpleRetType, raw[2]); #endif @@ -671,7 +671,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( { (*slots) -= functionCount; Slot * s = *slots; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset); fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index 48a4a1f1e4e6..66db74288cb3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -100,7 +100,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, if ( nGPR > ppc64::MAX_GPR_REGS ) nGPR = ppc64::MAX_GPR_REGS; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR ); @@ -267,13 +267,13 @@ static void cpp_call( if (pReturnTypeDescr) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass); #endif if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) { pCppReturn = pUnoReturn; // direct way for simple types -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple return\n"); #endif } @@ -282,7 +282,7 @@ static void cpp_call( // complex return via ptr pCppReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr ) ? alloca( pReturnTypeDescr->nSize ) : pUnoReturn); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pCppReturn/pUnoReturn is %lx/%lx", pCppReturn, pUnoReturn); #endif INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack, bOverFlow ); @@ -290,7 +290,7 @@ static void cpp_call( } // push "this" pointer void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "this pointer is %p\n", pAdjustedThisPtr); #endif INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow ); @@ -304,7 +304,7 @@ static void cpp_call( sal_Int32 nTempIndizes = 0; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "n params is %d\n", nParams); #endif @@ -314,7 +314,7 @@ static void cpp_call( typelib_TypeDescription * pParamTypeDescr = 0; TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "param %d is %d %d %d\n", nPos, rParam.bOut, bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ), pParamTypeDescr->eTypeClass); #endif @@ -328,7 +328,7 @@ static void cpp_call( { case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]); #endif INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); @@ -336,7 +336,7 @@ static void cpp_call( case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "long is %x\n", pCppArgs[nPos]); #endif INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow ); @@ -364,12 +364,12 @@ static void cpp_call( } else // ptr to complex value | ref { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex type again %d\n", rParam.bIn); #endif if (! rParam.bIn) // is pure out { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex size is %d\n", pParamTypeDescr->nSize ); #endif // cpp out is constructed mem, uno out is not! @@ -383,7 +383,7 @@ static void cpp_call( // is in/inout else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr )) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "this one\n"); #endif uno_copyAndConvertData( @@ -396,7 +396,7 @@ static void cpp_call( } else // direct way { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "that one, passing %lx through\n", pUnoArgs[nPos]); #endif pCppArgs[nPos] = pUnoArgs[nPos]; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index 68ee11772c29..a29b7c38dba7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -471,7 +471,7 @@ static typelib_TypeClass cpp_mediate( */ static void privateSnippetExecutor( sal_uInt32 nOffsetAndIndex, void** gpregptr, void** fpregptr, void** ovrflw) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "privateSnippetExecutor\n"); #endif @@ -644,7 +644,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( { (*slots) -= functionCount; Slot * s = *slots; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset); fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index 78c9c481bef6..ddaf1f368413 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -508,7 +508,7 @@ void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "unoInterfaceProxyDispatch\n"); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index 9fc884f6728f..fa3bd5fb687a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -53,7 +53,7 @@ static typelib_TypeClass cpp2uno_call( void ** gpreg, void ** fpreg, void ** ovrflw, sal_Int64 * pRegisterReturn /* space for register return */ ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "as far as cpp2uno_call\n"); #endif int ng = 0; //number of gpr registers used @@ -109,13 +109,13 @@ static typelib_TypeClass cpp2uno_call( typelib_TypeDescription * pParamTypeDescr = 0; TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "arg %d of %d\n", nPos, nParams); #endif if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) // value { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple\n"); #endif @@ -203,7 +203,7 @@ static typelib_TypeClass cpp2uno_call( } else // ptr to complex value | ref { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex, ng is %d\n", ng); #endif @@ -247,7 +247,7 @@ static typelib_TypeClass cpp2uno_call( } } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of params\n"); #endif @@ -333,11 +333,11 @@ static typelib_TypeClass cpp_mediate( sal_Int32 nVtableOffset = (nOffsetAndIndex >> 32); sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFFFFFF); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "nVTableOffset, nFunctionIndex are %x %x\n", nVtableOffset, nFunctionIndex); #endif -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "= cpp_mediate () =\nGPR's (%d): ", 5 ); @@ -506,14 +506,14 @@ long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long fi register double f6 asm("f6"); fpreg[3] = f6; volatile long nRegReturn[1]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "before mediate with %lx\n",nOffsetAndIndex); fprintf(stderr, "doubles are %f %f %f %f\n", fpreg[0], fpreg[1], fpreg[2], fpreg[3]); #endif typelib_TypeClass aType = cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp, (sal_Int64*)nRegReturn ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "after mediate ret is %lx %ld\n", nRegReturn[0], nRegReturn[0]); #endif @@ -606,7 +606,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( { (*slots) -= functionCount; Slot * s = *slots; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset); fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset); #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index abb1ef554ed1..379d086ce85a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno; void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterReturn) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr,"Mapping Return with %lx %ld %f\n", r2, r2, f0); #endif switch (eTypeClass) @@ -82,7 +82,7 @@ void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRe default: break; } -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "end of MapReturn with %x\n", pRegisterReturn ? *pRegisterReturn : 0); #endif } @@ -143,7 +143,7 @@ void callVirtualMethod( if ( nGPR > s390x::MAX_GPR_REGS ) nGPR = s390x::MAX_GPR_REGS; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 // Let's figure out what is really going on here { fprintf( stderr, "= nStack is %d\n", nStack ); @@ -411,7 +411,7 @@ void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException ) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "unoInterfaceProxyDispatch\n"); #endif -- cgit v1.2.3