[project @ 2005-02-09 15:25:12 by simonmar]

[ghc-hetmet.git] / ghc / driver / mangler / ghc-asm.lprl

diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl
index 886ada8..5d5676c 100644 (file)
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/ghc/driver/mangler/ghc-asm.lprl
@@ -146,7 +146,7 @@ sub init_TARGET_STUFF {
     $T_X86_PRE_LLBL        = 'L';
     $T_X86_BADJMP   = '^\tjmp [^L\*]';
 
-    $T_MOVE_DIRVS   = '^(\s*(\.(p2)?align\s+\d+(,0x90)?|\.globl\s+\S+|\.text|\.data|\.stab[^n].*|\.type\s+.*|\.size\s+.*|\.lcomm.*)\n)';
+    $T_MOVE_DIRVS   = '^(\s*(\.(p2)?align\s.*|\.globl\s+\S+|\.text|\.data|\.stab[^n].*|\.type\s+.*|\.size\s+.*|\.lcomm.*)\n)';
     $T_COPY_DIRVS   = '\.(globl|stab|lcomm)';
     $T_DOT_WORD            = '\.(long|word|value|byte|space)';
     $T_DOT_GLOBAL   = '\.globl';
@@ -172,7 +172,7 @@ sub init_TARGET_STUFF {
     $T_X86_PRE_LLBL        = '.L';
     $T_X86_BADJMP   = '^\tjmp\s+[^\.\*]';
 
-    $T_MOVE_DIRVS   = '^(\s*(\.(p2)?align\s+\d+(,\s*0x90)?|\.globl\s+\S+|\.text|\.data|\.section\s+.*|\.type\s+.*|\.size\s+\S+\s*,\s*\d+|\.ident.*|\.local.*)\n)';
+    $T_MOVE_DIRVS   = '^(\s*(\.(p2)?align\s.*|\.globl\s+\S+|\.text|\.data|\.section\s+.*|\.type\s+.*|\.size\s+\S+\s*,\s*\d+|\.ident.*|\.local.*)\n)';
     $T_COPY_DIRVS   = '^\s*\.(globl|type|size|local)';
 
     $T_DOT_WORD            = '\.(long|value|word|byte|zero)';
@@ -293,11 +293,12 @@ sub init_TARGET_STUFF {
     $T_DOT_WORD            = '\.(long|short|byte|fill|space)';
     $T_DOT_GLOBAL   = '\.globl';
     $T_HDR_toc      = "\.toc\n";
-    $T_HDR_literal  = "\t\.const_data\n\t\.align 2\n";
+    $T_HDR_literal  = "\t\.const\n\t\.align 2\n";
     $T_HDR_misc            = "\t\.text\n\t\.align 2\n";
     $T_HDR_data            = "\t\.data\n\t\.align 2\n";
-    $T_HDR_rodata   = "\t\.const_data\n\t\.align 2\n";
-    $T_HDR_closure  = "\t\.const_data\n\t\.align 2\n";
+    $T_HDR_rodata   = "\t\.const\n\t\.align 2\n";
+    $T_HDR_relrodata= "\t\.const_data\n\t\.align 2\n";
+    $T_HDR_closure  = "\t\.data\n\t\.align 2\n";
     $T_HDR_info            = "\t\.text\n\t\.align 2\n";
     $T_HDR_entry    = "\t\.text\n\t\.align 2\n";
     $T_HDR_vector   = "\t\.text\n\t\.align 2\n";
@@ -425,6 +426,12 @@ sub init_TARGET_STUFF {
        exit 1;
     }
 
+    if($T_HDR_relrodata eq "") {
+            # default values:
+            # relrodata defaults to rodata.
+        $T_HDR_relrodata = $T_HDR_rodata;
+    }
+
 if ( 0 ) {
 print STDERR "T_STABBY: $T_STABBY\n";
 print STDERR "T_US: $T_US\n";
@@ -533,7 +540,12 @@ sub mangle_asm {
        } elsif ( /\.\.ng:$/ && $TargetPlatform =~ /^alpha-/ ) {
            # Alphas: Local labels not to be confused with new chunks
            $chk[$i] .= $_;
-  
+        } elsif ( $TargetPlatform =~ /-darwin/
+                && /^\t\.subsections_via_symbols/) {
+            # Don't allow Apple's linker to do any dead-stripping of symbols
+            # in this file, because it will mess up info-tables in mangled
+            # code.
+
        # NB: all the rest start with a non-space
 
        } elsif ( $TargetPlatform =~ /^mips-/
@@ -665,7 +677,7 @@ sub mangle_asm {
                    || /^${T_US}.*_closure_tbl${T_POST_LBL}$/o  # closure tables
                 )
             {
-                $chkcat[$i] = 'rodata';
+                $chkcat[$i] = 'relrodata';
             } else
             {
                print STDERR "Warning: retaining unknown function \`$thing' in output from C compiler\n";
@@ -1180,7 +1192,7 @@ sub mangle_asm {
 
            # SRT
            if ( defined($srtchk{$symb}) ) {
-               print OUTASM $T_HDR_rodata;
+               print OUTASM $T_HDR_relrodata;
                print OUTASM $chk[$srtchk{$symb}];
                $chkcat[$srtchk{$symb}] = 'DONE ALREADY';
            }
@@ -1204,8 +1216,23 @@ sub mangle_asm {
                # If this is an entry point with an info table,
                 # eliminate the entry symbol and all directives involving it.
                if (defined($infochk{$symb}) && $TargetPlatform !~ /^ia64-/) {
-                       $c =~ s/^.*$symb_(entry|ret)${T_POST_LBL}\n//;
-                       $c =~ s/^\s*\..*$symb.*\n//g;
+                       @o = ();
+                       foreach $l (split(/\n/,$c)) {
+                           next if $l =~ /^.*$symb_(entry|ret)${T_POST_LBL}/;
+
+                           # If we have .type/.size direrctives involving foo_entry,
+                           # then make them refer to foo_info instead.  The information
+                           # in these directives is used by the cachegrind annotator,
+                           # so it is worthwhile keeping.
+                           if ($l =~ /^\s*\.(type|size).*$symb_(entry|ret)/) {
+                               $l =~ s/$symb(_entry|_ret)/${symb}_info/g;
+                               push(@o,$l);
+                               next;
+                           }
+                           next if $l =~ /^\s*\..*$symb.*\n/;
+                           push(@o,$l);
+                       }
+                       $c = join("\n",@o) . "\n";
                }
 
                print OUTASM $T_HDR_entry;
@@ -1240,7 +1267,10 @@ sub mangle_asm {
                print OUTASM $T_HDR_rodata;
                print OUTASM $chk[$i];
                $chkcat[$i] = 'DONE ALREADY';
-
+       } elsif ( $chkcat[$i] eq 'relrodata' ) {
+               print OUTASM $T_HDR_relrodata;
+               print OUTASM $chk[$i];
+               $chkcat[$i] = 'DONE ALREADY';
        } elsif ( $chkcat[$i] eq 'toc' ) {
             # silly optimisation to print tocs, since they come in groups...
            print OUTASM $T_HDR_toc;
@@ -1347,8 +1377,16 @@ sub print_doctored {
     #   movl $_blah,<bad-reg>
     #   jmp  *<bad-reg>
     #
+    s/^\tmovl\s+\$${T_US}(.*),\s*(\%e[acd]x)\n\tjmp\s+\*\2/\tjmp $T_US$1/g;
 
-    s/^\tmovl\s+\$${T_US}(.*),\s*(\%e[abcd]x)\n\tjmp\s+\*\2/\tjmp $T_US$1/g;
+    # Catch things like
+    #
+    #    movl -4(%ebx), %eax
+    #    jmp  *%eax
+    # 
+    # and optimise:
+    #
+    s/^\tmovl\s+(-?\d*\(\%e(bx|si)\)),\s*(\%e[acd]x)\n\tjmp\s+\*\3/\tjmp\t\*$1/g;
 
     if ($StolenX86Regs <= 2 ) { # YURGH! spurious uses of esi?
        s/^\tmovl\s+(.*),\s*\%esi\n\tjmp\s+\*%esi\n/\tmovl $1,\%eax\n\tjmp \*\%eax\n/g;