diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-21 14:38:28 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-21 14:38:28 +0000 |
| commit | 5198a42ce95ba8b8514eeb650fed3ef3130e96a9 (patch) | |
| tree | 10938f5230c2ec9251f27fea4a8d7ea75d821e93 /bridges | |
| parent | 193ac27dd372a02a1b21ede97b13d7e3e8756c48 (diff) | |
INTEGRATION: CWS unxlngs04 (1.8.6); FILE MERGED
2005/09/23 11:40:28 sparcmoz 1.8.6.1: #51545#:GNU/Linux Sparc bridges gcc4 assembler error memory input 0 is not directly addressable
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index 2f66eec10925..e10c9fda2b48 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cpp2uno.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-07 22:25:05 $ + * last change: $Author: obo $ $Date: 2005-12-21 15:38:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -371,11 +371,13 @@ static typelib_TypeClass cpp_mediate( */ static void cpp_vtable_call() { - volatile sal_Int64 nRegReturn; + sal_Int64 nRegReturn; int nFunctionIndex; void** pCallStack; int vTableOffset; +void * pRegReturn = &nRegReturn; + __asm__( "st %%i0, %0\n\t" "st %%i1, %1\n\t" "st %%i2, %2\n\t" @@ -394,41 +396,40 @@ static void cpp_vtable_call() case typelib_TypeClass_BYTE: __asm__( "ld %0, %%l0\n\t" "ldsb [%%l0], %%i0\n" - : : "m"(&nRegReturn) ); + : : "m"(pRegReturn) ); break; case typelib_TypeClass_CHAR: case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: __asm__( "ld %0, %%l0\n\t" "ldsh [%%l0], %%i0\n" - : : "m"(&nRegReturn) ); + : : "m"(pRegReturn) ); break; case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: - __asm__( "ld %0, %%l0\n\t" "ld [%%l0], %%i0\n\t" - "ld %1, %%l0\n\t" + "add %%l0, 4, %%l0\n\t" "ld [%%l0], %%i1\n\t" - : : "m"(&nRegReturn), "m"(((long*)&nRegReturn) +1) ); + : : "m"(pRegReturn) ); break; case typelib_TypeClass_FLOAT: __asm__( "ld %0, %%l0\n\t" "ld [%%l0], %%f0\n" - : : "m"(&nRegReturn) ); + : : "m"(pRegReturn) ); break; case typelib_TypeClass_DOUBLE: __asm__( "ld %0, %%l0\n\t" "ldd [%%l0], %%f0\n" - : : "m"(&nRegReturn) ); + : : "m"(pRegReturn) ); break; case typelib_TypeClass_VOID: break; default: __asm__( "ld %0, %%l0\n\t" "ld [%%l0], %%i0\n" - : : "m"(&nRegReturn) ); + : : "m"(pRegReturn) ); break; } |