[project @ 2005-03-08 13:32:06 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 d704f09..3ba4e9b 100644 (file)
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/ghc/driver/mangler/ghc-asm.lprl
@@ -223,10 +223,21 @@ sub init_TARGET_STUFF {
 
     $T_DOT_WORD     = '\.(quad|long|value|byte|zero)';
     $T_DOT_GLOBAL   = '\.global';
+
+    $T_HDR_literal16 = "\.section\t\.rodata.cst16\n\t.align 16\n";
     $T_HDR_literal  = "\.section\t\.rodata\n";
+
     $T_HDR_misc     = "\.text\n\t\.align 8\n";
     $T_HDR_data     = "\.data\n\t\.align 8\n";
     $T_HDR_rodata   = "\.section\t\.rodata\n\t\.align 8\n";
+
+       # the assembler on x86_64/Linux refuses to generate code for
+       #   .quad  x - y
+       # where x is in the text section and y in the rodata section.
+       # It works if y is in the text section, though.  This is probably
+       # going to cause difficulties for PIC, I imagine.
+    $T_HDR_relrodata= "\.text\n\t\.align 8\n";
+
     $T_HDR_closure  = "\.data\n\t\.align 8\n";
     $T_HDR_info     = "\.text\n\t\.align 8\n";
     $T_HDR_entry    = "\.text\n\t\.align 8\n";
@@ -360,7 +371,7 @@ sub init_TARGET_STUFF {
     $T_CONST_LBL    = '^\.LLC(\d+):$'; # regexp for what such a lbl looks like
     $T_POST_LBL            = ':';
 
-    $T_MOVE_DIRVS   = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.stab.*|\.section.*|\s+\.type.*|\s+\.size.*)\n)';
+    $T_MOVE_DIRVS   = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.stab.*|\s*\.section.*|\s+\.type.*|\s+\.size.*)\n)';
     $T_COPY_DIRVS   = '\.(global|proc|stab)';
 
     $T_DOT_WORD            = '\.(long|word|byte|half|skip|uahalf|uaword)';
@@ -531,7 +542,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 +558,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-/
@@ -1132,7 +1144,22 @@ sub mangle_asm {
     # print out all the literal strings next
     for ($i = 0; $i < $numchks; $i++) {
        if ( $chkcat[$i] eq 'literal' ) {
-           print OUTASM $T_HDR_literal, $chk[$i];
+
+           # HACK: try to detect 16-byte constants and align them
+           # on a 16-byte boundary.  x86_64 sometimes needs 128-bit
+           # aligned constants.
+           if ( $TargetPlatform =~ /^x86_64/ ) { 
+               $z = $chk[$i];
+               if ($z =~ /(\.long.*\n.*\.long.*\n.*\.long.*\n.*\.long|\.quad.*\n.*\.quad)/) {
+                   print OUTASM $T_HDR_literal16;
+               } else {
+                   print OUTASM $T_HDR_literal;
+               }
+           } else {
+               print OUTASM $T_HDR_literal;
+           }
+
+           print OUTASM $chk[$i];
            print OUTASM "; end literal\n" if $TargetPlatform =~ /^hppa/; # for the splitter
 
            $chkcat[$i] = 'DONE ALREADY';