diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-03-15 19:56:49 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-03-15 19:57:32 +0100 |
| commit | aab3bffeb8d3a4ca6dcf75852e197eb754b1417c (patch) | |
| tree | 7ae0fd9df32bca6bf9286b67857420ad40906648 /bridges | |
| parent | d47749c76949515992b4144e59d7c51f7e976dda (diff) | |
iOS, move assembler constants to C++
Change-Id: Iad94a2e2e55bb158d2ac42e3a67a6d94f84ffedd
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx | 12 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios/ios64_helper.s | 6 |
2 files changed, 5 insertions, 13 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx index 7a927f6bc58c..748d276ac21b 100644 --- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx @@ -16,25 +16,23 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/uno/RuntimeException.hpp> #include <sal/log.hxx> #include <uno/data.h> #include <typelib/typedescription.hxx> - #include "bridge.hxx" #include "cppinterfaceproxy.hxx" #include "types.hxx" #include "vtablefactory.hxx" - #include "share.hxx" -extern "C" { - extern int nFunIndexes, nVtableOffsets; - extern int codeSnippets[]; -} +extern "C" int codeSnippets[]; +const int nFunIndexes = 8; +const int nVtableOffsets = 4; + + using namespace ::com::sun::star::uno; diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s index c5c02ea8149b..67620c38e426 100644 --- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s +++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s @@ -152,12 +152,6 @@ codeSnippet_7_3: mov x15, 3 b _privateSnippetExecutor - .globl _nFunIndexes -_nFunIndexes: - .long 8 - .globl _nVtableOffsets -_nVtableOffsets: - .long 4 .globl _codeSnippets _codeSnippets: .long codeSnippet_0_0 - _codeSnippets |