[project @ 2005-02-10 07:01:45 by wolfgang]
[ghc-hetmet.git] / ghc / driver / mangler / ghc-asm.lprl
index 06446e4..6e29279 100644 (file)
@@ -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)';
@@ -531,7 +531,14 @@ sub mangle_asm {
            $chk[++$i]   = $_;
            $chkcat[$i]  = 'rodata';
            $chksymb[$i] = '';
-
+        } elsif ( $TargetPlatform =~ /-darwin/
+                && (/^\s*\.subsections_via_symbols/
+                  ||/^\s*\.no_dead_strip.*/)) {
+            # 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.
+            # The .no_dead_strip directives are actually put there by
+            # the gcc3 "used" attribute on entry points.
        } elsif ( /^\s+/ ) { # most common case first -- a simple line!
            # duplicated from the bottom
 
@@ -540,12 +547,6 @@ 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-/
@@ -1216,8 +1217,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;
@@ -1362,8 +1378,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;