bridges,iOS removed suport for x86 and arm.

Only arm64 is supported, code is more readable

Change-Id: I6940b0d03dc26c9c8f10c1cb105a7564471f2ca5

2 files changed, 0 insertions, 473 deletions

diff --git a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
index a8548836fef3..3a3b0a3fbb1a 100755
--- a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
+++ b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
@@ -13,45 +13,15 @@ my $nVtableOffsets = 4;
 sub gen_arm ($$)
 {
     my ($funIndex, $vtableOffset) = @_;
-    if ($funIndex & 0x80000000) {
-        printf ("#ifndef __arm64\n");
-    }
     printf ("codeSnippet_%08x_%d:\n", $funIndex, $vtableOffset);
-    printf ("#ifdef __arm\n");
-    # Note: pc is the address of instruction being executed plus 8
-    printf ("    mov ip, pc\n");
-    printf ("#else\n");
     printf ("    adr x15, .+8\n");
-    printf ("#endif\n");
     printf ("    b _privateSnippetExecutor\n");
     printf ("    .long %#08x\n", $funIndex);
     printf ("    .long %d\n", $vtableOffset);
-    if ($funIndex & 0x80000000) {
-        printf ("#endif\n");
-    }
-}
-
-sub gen_x86 ($$$)
-{
-    my ($funIndex, $vtableOffset, $executor) = @_;
-    printf ("codeSnippet_%08x_%d_%s:\n", $funIndex, $vtableOffset, $executor);
-    printf ("    movl \$%#08x, %%eax\n", $funIndex);
-    printf ("    movl \$%d, %%edx\n", $vtableOffset);
-    printf ("    jmp _privateSnippetExecutor%s\n", $executor);
 }
 
 printf (".text\n");
-
-printf ("#if defined(__arm) || defined(__arm64)\n");
-
 printf ("\n");
-printf ("// Each codeSnippetX function stores into ip (arm64: x15) an address and branches to _privateSnippetExecutor\n");
-printf ("// The address is that following the branch instruction, containing two 32-bit ints:\n");
-printf ("// - the function index, which for 32-bit can have the 0x80000000 bit set\n");
-printf ("//   to indicate that a hidden parameter is used for returning large values\n");
-printf ("// - the vtable offset\n");
-printf ("\n");
-
 printf ("    .align 4\n");
 printf ("\n");
 
@@ -60,27 +30,9 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
    foreach my $vtableOffset (0 .. $nVtableOffsets-1)
    {
        gen_arm ($funIndex, $vtableOffset);
-       gen_arm ($funIndex|0x80000000, $vtableOffset);
    }
 }
 
-printf ("#else\n");
-printf ("    .align 1, 0x90\n");
-
-foreach my $funIndex (0 .. $nFunIndexes-1)
-{
-    foreach my $vtableOffset (0 .. $nVtableOffsets-1)
-    {
-        foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 'Class')
-        {
-            gen_x86 ($funIndex, $vtableOffset, $executor);
-            gen_x86 ($funIndex|0x80000000, $vtableOffset, $executor);
-        }
-    }
-  }
-
-printf ("#endif\n");
-
 printf ("    .globl _nFunIndexes\n");
 printf ("_nFunIndexes:\n");
 printf ("    .long %d\n", $nFunIndexes);
@@ -96,18 +48,7 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 {
     foreach my $vtableOffset (0 .. $nVtableOffsets-1)
     {
-        printf ("#if defined(__arm) || defined(__arm64)\n");
         printf ("    .long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex, $vtableOffset);
-        printf ("#ifndef __arm64\n");
-        printf ("    .long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex|0x80000000, $vtableOffset);
-        printf ("#endif\n");
-        printf ("#else\n");
-        foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 'Class')
-        {
-            printf ("    .long codeSnippet_%08x_%d_%s - _codeSnippets\n", $funIndex, $vtableOffset, $executor);
-            printf ("    .long codeSnippet_%08x_%d_%s - _codeSnippets\n", $funIndex|0x80000000, $vtableOffset, $executor);
-        }
-        printf ("#endif\n");
     }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 7461cbccc4e7..51e4d160dafe 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -19,31 +19,6 @@
 
 #include "codesnippets.S"
 
-#if defined(__arm)
-// ARM support code for LibreOffice C++/UNO bridging
-//
-// Written by Peter Naulls <peter@chocky.org>
-// Modified by Caolan McNamara <caolanm@redhat.com>
-// Fixed by Michael Casadevall <mcasadevall@kubuntu.org>
-// Modified for iOS by Tor Lillqvist <tml@iki.fi>
-
-    .text
-    .align 4
-
-_privateSnippetExecutor:
-    stmfd   sp!, {r0-r3}    // follow other parameters on stack
-    mov     r0, ip          // r0 points to functionoffset/vtable
-    mov     r1, sp          // r1 points to this and params
-                            // (see cpp2uno.cxx:codeSnippet())
-    stmfd   sp!, {r4, lr}   // save return address
-                            // (r4 pushed to preserve stack alignment)
-    bl      _cpp_vtable_call
-
-    add     sp, sp, #4      // no need to restore r4 (we didn't touch it)
-    ldr     pc, [sp], #20   // return, discarding function arguments
-
-#elif defined(__arm64)
-
     .text
     .align 4
 
@@ -79,393 +54,4 @@ _privateSnippetExecutor:
     ret     lr
     .cfi_endproc
 
-#elif defined(__i386)
-    // i386 code, for the simulator
-    .text
-
-.align 1, 0x90
-_privateSnippetExecutorGeneral:
-LFBg:
-    movl    %esp,%ecx
-    pushl   %ebp              // proper stack frame needed for exception handling
-LCFIg0:
-    movl    %esp,%ebp
-LCFIg1:
-    subl    $0x8,%esp         // padding + 32bit returnValue
-    pushl   %esp              // 32bit &returnValue
-    pushl   %ecx              // 32bit pCallStack
-    pushl   %edx              // 32bit nVtableOffset
-    pushl   %eax              // 32bit nFunctionIndex
-    call    L_cpp_vtable_call$stub
-    movl    16(%esp),%eax     // 32bit returnValue
-    leave
-    ret
-LFEg:
-    .long   .-_privateSnippetExecutorGeneral
-
-.align 1, 0x90
-_privateSnippetExecutorVoid:
-LFBv:
-    movl    %esp,%ecx
-    pushl   %ebp              // proper stack frame needed for exception handling
-LCFIv0:
-    movl    %esp,%ebp
-LCFIv1:
-    sub     $8,%esp           // padding
-    pushl   $0                // 32bit null pointer (returnValue not used)
-    pushl   %ecx              // 32bit pCallStack
-    pushl   %edx              // 32bit nVtableOffset
-    pushl   %eax              // 32bit nFunctionIndex
-    call    L_cpp_vtable_call$stub
-    leave
-    ret
-LFEv:
-    .long   .-_privateSnippetExecutorVoid
-
-.align 1, 0x90
-_privateSnippetExecutorHyper:
-LFBh:
-    movl    %esp,%ecx
-    pushl   %ebp              // proper stack frame needed for exception handling
-LCFIh0:
-    movl    %esp,%ebp
-LCFIh1:
-    subl    $0x8,%esp         // 64bit returnValue
-    pushl   %esp              // 32bit &returnValue
-    pushl   %ecx              // 32bit pCallStack
-    pushl   %edx              // 32bit nVtableOffset
-    pushl   %eax              // 32bit nFunctionIndex
-    call    L_cpp_vtable_call$stub
-    movl    16(%esp),%eax     // 64bit returnValue, lower half
-    movl    20(%esp),%edx     // 64bit returnValue, upper half
-    leave
-    ret
-LFEh:
-    .long   .-_privateSnippetExecutorHyper
-
-.align 1, 0x90
-_privateSnippetExecutorFloat:
-LFBf:
-    movl    %esp,%ecx
-    pushl   %ebp              // proper stack frame needed for exception handling
-LCFIf0:
-    movl    %esp,%ebp
-LCFIf1:
-    subl    $0x8,%esp         // padding + 32bit returnValue
-    pushl   %esp              // 32bit &returnValue
-    pushl   %ecx              // 32bit pCallStack
-    pushl   %edx              // 32bit nVtableOffset
-    pushl   %eax              // 32bit nFunctionIndex
-    call    L_cpp_vtable_call$stub
-    flds    16(%esp)          // 32bit returnValue
-    leave
-    ret
-LFEf:
-    .long   .-_privateSnippetExecutorFloat
-
-.align 1, 0x90
-_privateSnippetExecutorDouble:
-LFBd:
-    movl    %esp,%ecx
-    pushl   %ebp              // proper stack frame needed for exception handling
-LCFId0:
-    movl    %esp,%ebp
-LCFId1:
-    subl    $0x8,%esp         // 64bit returnValue
-    pushl   %esp              // 32bit &returnValue
-    pushl   %ecx              // 32bit pCallStack
-    pushl   %edx              // 32bit nVtableOffset
-    pushl   %eax              // 32bit nFunctionIndex
-    call    L_cpp_vtable_call$stub
-    fldl    16(%esp)          // 64bit returnValue
-    leave
-    ret
-LFEd:
-    .long   .-_privateSnippetExecutorDouble
-
-.align 1, 0x90
-_privateSnippetExecutorClass:
-LFBc:
-    movl    %esp,%ecx
-    pushl   %ebp              // proper stack frame needed for exception handling
-LCFIc0:
-    movl    %esp,%ebp
-LCFIc1:
-    subl    $0x8,%esp         // padding + 32bit returnValue
-    pushl   %esp              // 32bit &returnValue
-    pushl   %ecx              // 32bit pCallStack
-    pushl   %edx              // 32bit nVtableOffset
-    pushl   %eax              // 32bit nFunctionIndex
-    call    L_cpp_vtable_call$stub
-    movl    16(%esp),%eax     // 32bit returnValue
-    leave
-    ret     $4
-LFEc:
-    .long   .-_privateSnippetExecutorClass
-
-    .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
-EH_frame1:
-    .set L$set$frame1,LECIE1-LSCIE1
-    .long   L$set$frame1      // length
-LSCIE1:
-    .long   0                 // CIE_ID
-    .byte   1                 // version
-    .ascii  "zPR\0"           // augmentation
-    .byte   1                 // code_alignment_factor (.uleb128 1)
-    .byte   0x7c              // data_alignment_factor (.sleb128 -4)
-    .byte   8                 // return_address_register
-    .byte   0x6               // augmentation size 7:
-    .byte   0x9b              //  ???
-    .long   L___gxx_personality_v0$non_lazy_ptr-.
-    .byte   0x10
-                              // initial_instructions:
-    .byte   0x0C              //  DW_CFA_def_cfa %esp, 4
-    .byte   5
-    .byte   4
-    .byte   0x88              //  DW_CFA_offset ret, 1
-    .byte   1
-    .align 2
-LECIE1:
-_privateSnippetExecutorGeneral.eh:
-LSFDEg:
-    .set L$set$g1,LEFDEg-LASFDEg
-    .long   L$set$g1          // length
-LASFDEg:
-    .long   LASFDEg-EH_frame1 // CIE_pointer
-    .long   LFBg-.            // initial_location
-    .long   LFEg-LFBg         // address_range
-    .byte   0                 // augmentation size 0
-                              // instructions:
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIg0-LFBg
-    .byte   0x0E              //  DW_CFA_def_cfa_offset 8
-    .byte   8
-    .byte   0x84              //  DW_CFA_offset %ebp, 2
-    .byte   2
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIg1-LCFIg0
-    .byte   0x0D              //  DW_CFA_def_cfa_register %ebp
-    .byte   4
-    .align 2
-LEFDEg:
-_privateSnippetExecutorVoid.eh:
-LSFDEv:
-    .set L$set$v1,LEFDEv-LASFDEv
-    .long   L$set$v1          // length
-LASFDEv:
-    .long   LASFDEv-EH_frame1 // CIE_pointer
-    .long   LFBv-.            // initial_location
-    .long   LFEv-LFBv         // address_range
-    .byte   0                 // augmentation size 0
-                              // instructions:
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIv0-LFBv
-    .byte   0x0E              //  DW_CFA_def_cfa_offset 8
-    .byte   8
-    .byte   0x84              //  DW_CFA_offset %ebp, 2
-    .byte   2
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIv1-LCFIv0
-    .byte   0x0D              //  DW_CFA_def_cfa_register %ebp
-    .byte   4
-    .align 2
-LEFDEv:
-_privateSnippetExecutorHyper.eh:
-LSFDEh:
-    .set L$set$h1,LEFDEh-LASFDEh
-    .long   L$set$h1          // length
-LASFDEh:
-    .long   LASFDEh-EH_frame1 // CIE_pointer
-    .long   LFBh-.            // initial_location
-    .long   LFEh-LFBh         // address_range
-    .byte   0                 // augmentation size 0
-                              // instructions:
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIh0-LFBh
-    .byte   0x0E              //  DW_CFA_def_cfa_offset 8
-    .byte   8
-    .byte   0x84              //  DW_CFA_offset %ebp, 2
-    .byte   2
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIh1-LCFIh0
-    .byte   0x0D              //  DW_CFA_def_cfa_register %ebp
-    .byte   4
-    .align 2
-LEFDEh:
-_privateSnippetExecutorFloat.eh:
-LSFDEf:
-    .set L$set$f1,LEFDEf-LASFDEf
-    .long   L$set$f1          // length
-LASFDEf:
-    .long   LASFDEf-EH_frame1 // CIE_pointer
-    .long   LFBf-.            // initial_location
-    .long   LFEf-LFBf         // address_range
-    .byte   0                 // augmentation size 0
-                              // instructions:
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIf0-LFBf
-    .byte   0x0E              //  DW_CFA_def_cfa_offset 8
-    .byte   8
-    .byte   0x84              //  DW_CFA_offset %ebp, 2
-    .byte   2
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIf1-LCFIf0
-    .byte   0x0D              //  DW_CFA_def_cfa_register %ebp
-    .byte   4
-    .align 2
-LEFDEf:
-_privateSnippetExecutorDouble.eh:
-LSFDEd:
-    .set L$set$d1,LEFDEd-LASFDEd
-    .long   L$set$d1          // length
-LASFDEd:
-    .long   LASFDEd-EH_frame1 // CIE_pointer
-    .long   LFBd-.            // initial_location
-    .long   LFEd-LFBd         // address_range
-    .byte   0                 // augmentation size 0
-                              // instructions:
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFId0-LFBd
-    .byte   0x0E              //  DW_CFA_def_cfa_offset 8
-    .byte   8
-    .byte   0x84              //  DW_CFA_offset %ebp, 2
-    .byte   2
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFId1-LCFId0
-    .byte   0x0D              //  DW_CFA_def_cfa_register %ebp
-    .byte   4
-    .align 2
-LEFDEd:
-_privateSnippetExecutorClass.eh:
-LSFDEc:
-    .set L$set$c1,LEFDEc-LASFDEc
-    .long   L$set$c1          // length
-LASFDEc:
-    .long   LASFDEc-EH_frame1 // CIE_pointer
-    .long   LFBc-.            // initial_location
-    .long   LFEc-LFBc         // address_range
-    .byte   0                 // augmentation size 0
-                              // instructions:
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIc0-LFBc
-    .byte   0x0E              //  DW_CFA_def_cfa_offset 8
-    .byte   8
-    .byte   0x84              //  DW_CFA_offset %ebp, 2
-    .byte   2
-    .byte   0x04              //  DW_CFA_advance_loc4
-    .long   LCFIc1-LCFIc0
-    .byte   0x0D              //  DW_CFA_def_cfa_register %ebp
-    .byte   4
-    .align 2
-LEFDEc:
-    .section __IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5
-L_cpp_vtable_call$stub:
-    .indirect_symbol _cpp_vtable_call
-    hlt ; hlt ; hlt ; hlt ; hlt
-    .section __IMPORT,__pointers,non_lazy_symbol_pointers
-L___gxx_personality_v0$non_lazy_ptr:
-    .indirect_symbol ___gxx_personality_v0
-    .long 0
-    .constructor
-    .destructor
-    .align 1
-#else
-
-	.text
-	.align 2
-.globl privateSnippetExecutor
-_privateSnippetExecutor:
-.LFB3:
-	pushq	%rbp
-.LCFI0:
-	movq	%rsp, %rbp
-.LCFI1:
-	subq	$160, %rsp
-.LCFI2:
-	movq	%r10, -152(%rbp)		# Save (nVtableOffset << 32) + nFunctionIndex
-
-	movq	%rdi, -112(%rbp)		# Save GP registers
-	movq	%rsi, -104(%rbp)
-	movq	%rdx, -96(%rbp)
-	movq	%rcx, -88(%rbp)
-	movq	%r8 , -80(%rbp)
-	movq	%r9 , -72(%rbp)
-	
-	movsd	%xmm0, -64(%rbp)		# Save FP registers
-	movsd	%xmm1, -56(%rbp)
-	movsd	%xmm2, -48(%rbp)
-	movsd	%xmm3, -40(%rbp)
-	movsd	%xmm4, -32(%rbp)
-	movsd	%xmm5, -24(%rbp)
-	movsd	%xmm6, -16(%rbp)
-	movsd	%xmm7, -8(%rbp)
-
-	leaq	-144(%rbp), %r9			# 6th param: sal_uInt64 * pRegisterReturn
-	leaq	16(%rbp), %r8			# 5rd param: void ** ovrflw
-	leaq	-64(%rbp), %rcx			# 4th param: void ** fpreg
-	leaq	-112(%rbp), %rdx		# 3rd param: void ** gpreg
-	movl	-148(%rbp), %esi		# 2nd param: sal_int32 nVtableOffset
-	movl	-152(%rbp), %edi		# 1st param: sal_int32 nFunctionIndex
-	
-	call	cpp_vtable_call
-
-	cmp	$10, %rax					# typelib_TypeClass_FLOAT
-	je	.Lfloat
-	cmp	$11, %rax					# typelib_TypeClass_DOUBLE
-	je	.Lfloat
-
-	movq	-144(%rbp), %rax		# Return value (int case)
-	movq	-136(%rbp), %rdx		# Return value (int case)
-	movq	-144(%rbp), %xmm0		# Return value (int case)
-	movq	-136(%rbp), %xmm1		# Return value (int case)
-	jmp	.Lfinish
-.Lfloat:
-	movlpd	-144(%rbp), %xmm0		# Return value (float/double case)
-
-.Lfinish:
-	leave
-	ret
-.LFE3:
-	# see http://refspecs.linuxfoundation.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html
-	# for details of the .eh_frame, the "Common Information Entry" and "Frame Description Entry" formats
-	# and http://mentorembedded.github.io/cxx-abi/exceptions.pdf for more info
-.Lframe1:
-	.long	.LECIE1-.LSCIE1
-.LSCIE1:
-	.long	0x0
-	.byte	0x1
-	.string	"zR"
-	.uleb128 0x1
-	.sleb128 -8
-	.byte	0x10
-	.uleb128 0x1
-	.byte	0x1b
-	.byte	0xc
-	.uleb128 0x7
-	.uleb128 0x8
-	.byte	0x90
-	.uleb128 0x1
-	.align 8
-.LECIE1:
-.LSFDE1:
-	.long	.LEFDE1-.LASFDE1
-.LASFDE1:
-	.long	.LASFDE1-.Lframe1
-	.long	.LFB3-.
-	.long	.LFE3-.LFB3
-	.uleb128 0x0
-	.byte	0x4
-	.long	.LCFI0-.LFB3
-	.byte	0xe
-	.uleb128 0x10
-	.byte	0x86
-	.uleb128 0x2
-	.byte	0x4
-	.long	.LCFI1-.LCFI0
-	.byte	0xd
-	.uleb128 0x6
-	.align 8
-.LEFDE1:
-#endif
-
 // vim:set shiftwidth=4 softtabstop=4 expandtab: