summaryrefslogtreecommitdiff
path: root/bridges/source/cpp_uno/gcc3_linux_hppa
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-03-11 16:10:43 +0200
committerTor Lillqvist <tml@collabora.com>2014-03-11 17:17:39 +0200
commit45d09ea2712fc56802a639a15f2e4ae6cacbc099 (patch)
tree5ccb0de512ecab0c794b1a5108c059bdf71bc0c3 /bridges/source/cpp_uno/gcc3_linux_hppa
parent7b0b20bdd19bdf3903f5b3d623e8d8e110f6df3c (diff)
"overflow" is one word
Change-Id: Ib36c2c5d55f86aff27081a0da554f6e8a81474ee
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_hppa')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx30
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx54
2 files changed, 42 insertions, 42 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 99c4e5965982..06836d656233 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -107,7 +107,7 @@ namespace
(typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
sal_Int32 nTempIndices = 0;
- bool bOverFlowUsed = false;
+ bool bOverflowUsed = false;
for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
{
const typelib_MethodParameter & rParam = pParams[nPos];
@@ -138,9 +138,9 @@ namespace
if ((startovrflw-ovrflw) & 1)
ovrflw--;
pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw - 4);
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw-=2;
+ if (bOverflowUsed) ovrflw-=2;
break;
case typelib_TypeClass_FLOAT:
if (nregs < hppa::MAX_WORDS_IN_REGS)
@@ -153,9 +153,9 @@ namespace
else
{
pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw--;
+ if (bOverflowUsed) ovrflw--;
break;
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
@@ -177,9 +177,9 @@ namespace
if ((startovrflw-ovrflw) & 1)
ovrflw--;
pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw - 4);
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw-=2;
+ if (bOverflowUsed) ovrflw-=2;
break;
case typelib_TypeClass_BYTE:
case typelib_TypeClass_BOOLEAN:
@@ -193,9 +193,9 @@ namespace
else
{
pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw+3);
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw--;
+ if (bOverflowUsed) ovrflw--;
break;
case typelib_TypeClass_CHAR:
case typelib_TypeClass_SHORT:
@@ -210,9 +210,9 @@ namespace
else
{
pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw+2);
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw--;
+ if (bOverflowUsed) ovrflw--;
break;
case typelib_TypeClass_ENUM:
case typelib_TypeClass_LONG:
@@ -228,9 +228,9 @@ namespace
else
{
pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw--;
+ if (bOverflowUsed) ovrflw--;
break;
}
// no longer needed
@@ -250,9 +250,9 @@ namespace
else
{
pCppArgs[nPos] = pCppStack = *ovrflw;
- bOverFlowUsed = true;
+ bOverflowUsed = true;
}
- if (bOverFlowUsed) ovrflw--;
+ if (bOverflowUsed) ovrflw--;
if (! rParam.bIn) // is pure out
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index f0f20047cdd6..5907e71d92f9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -41,17 +41,17 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
void * pRegisterReturn, typelib_TypeDescription *pReturnTypeDescr, bool bRegisterReturn,
sal_uInt32 *pStack, sal_uInt32 nStack, sal_uInt32 *pGPR, double *pFPR);
-#define INSERT_INT32( pSV, nr, pGPR, pDS, bOverFlow )\
+#define INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow )\
if (nr < hppa::MAX_WORDS_IN_REGS) \
{ \
pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
} \
else \
- bOverFlow = true; \
- if (bOverFlow) \
+ bOverflow = true; \
+ if (bOverflow) \
*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverFlow )\
+#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverflow )\
if ( (nr < hppa::MAX_WORDS_IN_REGS) && (nr % 2) ) \
{ \
++nr; \
@@ -62,8 +62,8 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
pGPR[nr++] = *(reinterpret_cast<sal_uInt32 *>( pSV ) + 1); \
} \
else \
- bOverFlow = true; \
- if ( bOverFlow ) \
+ bOverflow = true; \
+ if ( bOverflow ) \
{ \
if ( (pDS - pStart) % 2) \
++pDS; \
@@ -71,18 +71,18 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
*pDS++ = reinterpret_cast<sal_uInt32 *>( pSV )[0]; \
}
-#define INSERT_FLOAT( pSV, nr, pFPR, pDS, bOverFlow ) \
+#define INSERT_FLOAT( pSV, nr, pFPR, pDS, bOverflow ) \
if (nr < hppa::MAX_WORDS_IN_REGS) \
{ \
sal_uInt32 *pDouble = (sal_uInt32 *)&(pFPR[nr++]); \
pDouble[0] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
} \
else \
- bOverFlow = true; \
- if (bOverFlow) \
+ bOverflow = true; \
+ if (bOverflow) \
*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-#define INSERT_DOUBLE( pSV, nr, pFPR, pDS, pStart, bOverFlow ) \
+#define INSERT_DOUBLE( pSV, nr, pFPR, pDS, pStart, bOverflow ) \
if ( (nr < hppa::MAX_WORDS_IN_REGS) && (nr % 2) ) \
{ \
++nr; \
@@ -95,8 +95,8 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
nr+=2; \
} \
else \
- bOverFlow = true; \
- if ( bOverFlow ) \
+ bOverflow = true; \
+ if ( bOverflow ) \
{ \
if ( (pDS - pStart) % 2) \
++pDS; \
@@ -104,20 +104,20 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
*pDS++ = reinterpret_cast<sal_uInt32 *>( pSV )[0]; \
}
-#define INSERT_INT16( pSV, nr, pGPR, pDS, bOverFlow ) \
+#define INSERT_INT16( pSV, nr, pGPR, pDS, bOverflow ) \
if ( nr < hppa::MAX_WORDS_IN_REGS ) \
pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
else \
- bOverFlow = true; \
- if (bOverFlow) \
+ bOverflow = true; \
+ if (bOverflow) \
*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
-#define INSERT_INT8( pSV, nr, pGPR, pDS, bOverFlow ) \
+#define INSERT_INT8( pSV, nr, pGPR, pDS, bOverflow ) \
if ( nr < hppa::MAX_WORDS_IN_REGS ) \
pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
else \
- bOverFlow = true; \
- if (bOverFlow) \
+ bOverflow = true; \
+ if (bOverflow) \
*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
namespace hppa
@@ -191,7 +191,7 @@ static void cpp_call(
OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
- bool bOverFlow = false;
+ bool bOverflow = false;
bool bRegisterReturn = true;
if (pReturnTypeDescr)
@@ -211,7 +211,7 @@ static void cpp_call(
// push this
void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
+ aVtableSlot.offset;
- INSERT_INT32( &pAdjustedThisPtr, nRegs, pGPR, pStack, bOverFlow );
+ INSERT_INT32( &pAdjustedThisPtr, nRegs, pGPR, pStack, bOverflow );
// stack space
OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
@@ -242,7 +242,7 @@ static void cpp_call(
#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 );
+ INSERT_INT64( pCppArgs[nPos], nRegs, pGPR, pStack, pStackStart, bOverflow );
break;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
@@ -250,22 +250,22 @@ static void cpp_call(
#if OSL_DEBUG_LEVEL > 2
fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
#endif
- INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
+ INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverflow );
break;
case typelib_TypeClass_SHORT:
case typelib_TypeClass_CHAR:
case typelib_TypeClass_UNSIGNED_SHORT:
- INSERT_INT16( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
+ INSERT_INT16( pCppArgs[nPos], nRegs, pGPR, pStack, bOverflow );
break;
case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE:
- INSERT_INT8( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
+ INSERT_INT8( pCppArgs[nPos], nRegs, pGPR, pStack, bOverflow );
break;
case typelib_TypeClass_FLOAT:
- INSERT_FLOAT( pCppArgs[nPos], nRegs, pFPR, pStack, bOverFlow );
+ INSERT_FLOAT( pCppArgs[nPos], nRegs, pFPR, pStack, bOverflow );
break;
case typelib_TypeClass_DOUBLE:
- INSERT_DOUBLE( pCppArgs[nPos], nRegs, pFPR, pStack, pStackStart, bOverFlow );
+ INSERT_DOUBLE( pCppArgs[nPos], nRegs, pFPR, pStack, pStackStart, bOverflow );
break;
default:
break;
@@ -302,7 +302,7 @@ static void cpp_call(
// no longer needed
TYPELIB_DANGER_RELEASE( pParamTypeDescr );
}
- INSERT_INT32( &(pCppArgs[nPos]), nRegs, pGPR, pStack, bOverFlow );
+ INSERT_INT32( &(pCppArgs[nPos]), nRegs, pGPR, pStack, bOverflow );
}
}