Fix crasher and generate PIC for iOS simulator

Had an embarrassing thinko in the assembler generation for the iOS
simulator, had forgotten the $ for a literal number. While at it, make
also the simulator read-only code snippet data structures
position-independent. Some minor comment improvements. Bridge seems to
work now on simulator.

1 files changed, 6 insertions, 3 deletions

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
index b6bd0e9ffd7f..2e6d6fefaead 100755
--- a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
@@ -42,11 +42,13 @@ sub gen_x86 ($$$)
 {
     my ($funIndex, $vtableOffset, $executor) = @_;
     printf ("codeSnippet%08x%d%s:\n", $funIndex, $vtableOffset, $executor);
-    printf ("\tmovl %#08x, %%eax\n", $funIndex);
+    printf ("\tmovl \$%#08x, %%eax\n", $funIndex);
     printf ("\tmovl \$%d, %%edx\n", $vtableOffset);
     printf ("\tjmp _privateSnippetExecutor%s\n", $executor);
 }
 
+printf (".text\n");
+
 printf ("#ifdef __arm\n");
 printf ("\t.align 4\n");
 
@@ -60,6 +62,7 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 }
 
 printf ("#else\n");
+printf ("\t.align 1, 0x90\n");
 
 foreach my $funIndex (0 .. $nFunIndexes-1)
 {
@@ -96,8 +99,8 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 	printf ("#else\n");
 	foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 'Class')
 	{
-	    printf ("\t.long codeSnippet%08x%d%s\n", $funIndex, $vtableOffset, $executor);
-	    printf ("\t.long codeSnippet%08x%d%s\n", $funIndex|0x80000000, $vtableOffset, $executor);
+	    printf ("\t.long codeSnippet%08x%d%s - _codeSnippets\n", $funIndex, $vtableOffset, $executor);
+	    printf ("\t.long codeSnippet%08x%d%s - _codeSnippets\n", $funIndex|0x80000000, $vtableOffset, $executor);
 	}
 	printf ("#endif\n");
     }