bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 81 ++++---------------
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 9 +-
3 files changed, 24 insertions(+), 68 deletions(-)
New commits:
commit 5411aafbfd8656f043bcf30588bc41b061f1b60b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 27 16:16:16 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jul 27 22:57:51 2021 +0200
Clean up bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
...without any intended functional changes, in preparation for actual fixes
for
tdf#143450 "Data corruption when returning small structs containing a double
from C++ via IPC".
Much of the code (apparently originally copied from some other project,
according to the comments) was too generic for our specific needs here.
Change-Id: Iddcb58fa0999d10dcf716dd2af7dab1620839bce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119570
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 584197c1a226..0f75b0616a37 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -54,6 +54,7 @@
#include "abi.hxx"
+#include <o3tl/unreachable.hxx>
#include <sal/log.hxx>
using namespace x86_64;
@@ -75,10 +76,6 @@ enum x86_64_reg_class
X86_64_INTEGERSI_CLASS,
X86_64_SSE_CLASS,
X86_64_SSESF_CLASS,
- X86_64_SSEDF_CLASS,
- X86_64_SSEUP_CLASS,
- X86_64_X87_CLASS,
- X86_64_X87UP_CLASS,
X86_64_MEMORY_CLASS
};
@@ -120,20 +117,14 @@ merge_classes (enum x86_64_reg_class class1, enum
x86_64_reg_class class2)
|| class2 == X86_64_INTEGER_CLASS || class2 ==
X86_64_INTEGERSI_CLASS)
return X86_64_INTEGER_CLASS;
- /* Rule #5: If one of the classes is X87 or X87UP class, MEMORY is used.
*/
- if (class1 == X86_64_X87_CLASS || class1 == X86_64_X87UP_CLASS
- || class2 == X86_64_X87_CLASS || class2 == X86_64_X87UP_CLASS)
- return X86_64_MEMORY_CLASS;
-
/* Rule #6: Otherwise class SSE is used. */
return X86_64_SSE_CLASS;
}
-/* Classify the argument of type TYPE and mode MODE.
+/* Classify a parameter/return type.
CLASSES will be filled by the register class used to pass each word
- of the operand. The number of words is returned. In case the parameter
- should be passed in memory, 0 is returned. As a special case for zero
- sized containers, classes[0] will be NO_CLASS and 1 is returned.
+ of the operand. The number of words is returned. In case the operand
+ should be passed in memory, 0 is returned.
See the x86-64 PS ABI for details.
*/
@@ -142,9 +133,6 @@ classify_argument( typelib_TypeDescriptionReference
*pTypeRef, enum x86_64_reg_c
{
switch ( pTypeRef->eTypeClass )
{
- case typelib_TypeClass_VOID:
- classes[0] = X86_64_NO_CLASS;
- return 1;
case typelib_TypeClass_CHAR:
case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE:
@@ -167,21 +155,15 @@ classify_argument( typelib_TypeDescriptionReference
*pTypeRef, enum x86_64_reg_c
classes[0] = X86_64_SSE_CLASS;
return 1;
case typelib_TypeClass_DOUBLE:
- classes[0] = X86_64_SSEDF_CLASS;
+ classes[0] = X86_64_SSE_CLASS;
return 1;
- /*case LONGDOUBLE:
- classes[0] = X86_64_X87_CLASS;
- classes[1] = X86_64_X87UP_CLASS;
- return 2;*/
case typelib_TypeClass_STRING:
case typelib_TypeClass_TYPE:
case typelib_TypeClass_ANY:
- case typelib_TypeClass_TYPEDEF:
case typelib_TypeClass_SEQUENCE:
case typelib_TypeClass_INTERFACE:
return 0;
case typelib_TypeClass_STRUCT:
- case typelib_TypeClass_EXCEPTION:
{
typelib_TypeDescription * pTypeDescr = nullptr;
TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
@@ -220,44 +202,26 @@ classify_argument( typelib_TypeDescriptionReference
*pTypeRef, enum x86_64_reg_c
{
int pos = offset / 8;
classes[i + pos] = merge_classes( subclasses[i],
classes[i + pos] );
+ if (classes[i + pos] == X86_64_MEMORY_CLASS) {
+ TYPELIB_DANGER_RELEASE( pTypeDescr );
+ return 0;
+ }
}
}
TYPELIB_DANGER_RELEASE( pTypeDescr );
- /* Final merger cleanup. */
- for ( int i = 0; i < words; i++ )
- {
- /* If one class is MEMORY, everything should be passed in
- memory. */
- if ( classes[i] == X86_64_MEMORY_CLASS )
- return 0;
-
- /* The X86_64_SSEUP_CLASS should be always preceded by
- X86_64_SSE_CLASS. */
- if ( classes[i] == X86_64_SSEUP_CLASS
- && ( i == 0 || classes[i - 1] != X86_64_SSE_CLASS
) )
- classes[i] = X86_64_SSE_CLASS;
-
- /* X86_64_X87UP_CLASS should be preceded by
X86_64_X87_CLASS. */
- if ( classes[i] == X86_64_X87UP_CLASS
- && ( i == 0 || classes[i - 1] != X86_64_X87_CLASS
) )
- classes[i] = X86_64_SSE_CLASS;
- }
return words;
}
default:
- SAL_WARN("bridges", "Unhandled case: pType->eTypeClass == "
- << pTypeRef->eTypeClass);
- assert(false);
+ O3TL_UNREACHABLE;
}
- return 0; /* Never reached. */
}
/* Examine the argument and return set number of register required in each
class. Return 0 iff parameter should be passed in memory. */
-bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef,
bool bInReturn, int &nUsedGPR, int &nUsedSSE ) noexcept
+bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, int
&nUsedGPR, int &nUsedSSE ) noexcept
{
enum x86_64_reg_class classes[MAX_CLASSES];
int n;
@@ -278,29 +242,21 @@ bool x86_64::examine_argument(
typelib_TypeDescriptionReference *pTypeRef, bool
break;
case X86_64_SSE_CLASS:
case X86_64_SSESF_CLASS:
- case X86_64_SSEDF_CLASS:
nUsedSSE++;
break;
- case X86_64_NO_CLASS:
- case X86_64_SSEUP_CLASS:
- break;
- case X86_64_X87_CLASS:
- case X86_64_X87UP_CLASS:
- if ( !bInReturn )
- return false;
- break;
default:
- SAL_WARN("bridges", "Unhandled case: classes[n] == " <<
classes[n]);
- assert(false);
+ O3TL_UNREACHABLE;
}
return true;
}
bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference
*pTypeRef ) noexcept
{
- int g, s;
-
- return !examine_argument( pTypeRef, true, g, s );
+ if (pTypeRef->eTypeClass == typelib_TypeClass_VOID) {
+ return false;
+ }
+ x86_64_reg_class classes[MAX_CLASSES];
+ return classify_argument(pTypeRef, classes, 0) == 0;
}
void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const
sal_uInt64 *pGPR, const double *pSSE, void *pStruct ) noexcept
@@ -320,11 +276,10 @@ void x86_64::fill_struct(
typelib_TypeDescriptionReference *pTypeRef, const sal_
break;
case X86_64_SSE_CLASS:
case X86_64_SSESF_CLASS:
- case X86_64_SSEDF_CLASS:
*pStructAlign++ = *reinterpret_cast<const sal_uInt64 *>(
pSSE++ );
break;
default:
- break;
+ O3TL_UNREACHABLE;
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index 20bfc7286b4d..962801f9da17 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -41,7 +41,7 @@ const sal_uInt32 MAX_SSE_REGS = 8;
Return false iff parameter should be passed in memory.
*/
-bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool
bInReturn, int &nUsedGPR, int &nUsedSSE ) noexcept;
+bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, int
&nUsedGPR, int &nUsedSSE ) noexcept;
/** Does function that returns this type use a hidden parameter, or registers?
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 29212988f78d..28f4d4ed9d8d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -107,11 +107,12 @@ static typelib_TypeClass cpp2uno_call(
{
const typelib_MethodParameter & rParam = pParams[nPos];
- int nUsedGPR = 0;
- int nUsedSSE = 0;
- bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef,
false, nUsedGPR, nUsedSSE );
if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType(
rParam.pTypeRef ) ) // value
{
+ int nUsedGPR = 0;
+ int nUsedSSE = 0;
+ bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef,
nUsedGPR, nUsedSSE );
+
// Simple types must fit exactly one register on x86_64
assert( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) ||
( nUsedSSE == 0 && nUsedGPR == 1 ) ) ); (void)bFitsRegisters;
@@ -136,7 +137,7 @@ static typelib_TypeClass cpp2uno_call(
pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw++;
}
}
- else // struct <= 16 bytes || ptr to complex value || ref
+ else // ref
{
typelib_TypeDescription * pParamTypeDescr = nullptr;
TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
