[project @ 2005-03-02 09:57:41 by simonmar]

[ghc-hetmet.git] / ghc / driver / split / ghc-split.lprl

diff --git a/ghc/driver/split/ghc-split.lprl b/ghc/driver/split/ghc-split.lprl
index 58c603f..1f8acfa 100644 (file)
--- a/ghc/driver/split/ghc-split.lprl
+++ b/ghc/driver/split/ghc-split.lprl
@@ -30,7 +30,7 @@ sub split_asm_file {
 
     &collectExports_hppa() if $TargetPlatform =~ /^hppa/;
     &collectExports_mips() if $TargetPlatform =~ /^mips/;
-    &collectDyldStuff_powerpc() if $TargetPlatform =~ /^powerpc-apple/;
+    &collectDyldStuff_powerpc_darwin() if $TargetPlatform =~ /^powerpc-apple-darwin/;
 
     $octr = 0; # output file counter
     $* = 1;    # multi-line matches are OK
@@ -45,13 +45,9 @@ sub split_asm_file {
 #   &tidy_up_and_die(1,"$Pgm: no split markers in .s file!\n")
 #      if $prologue_stuff eq $s_stuff;
 
-    # about to use $Tmp_prefix in a regex - make sure backslashes don't get
-    # interpreted in a strange way.  ToDo: what about other regex
-    # characters, eg. '.'?
-    $Tmp_prefix =~ s/\\/\\\\/g;
-
     # lie about where this stuff came from
-    $prologue_stuff =~ s|"${Tmp_prefix}\.c"|"$ifile_root\.hc"|g;
+    # Note the \Q: this ignores regex meta-chars in $Tmp_prefix.
+    $prologue_stuff =~ s/\Q"$Tmp_prefix.c"/"$ifile_root.hc"/g;
 
     while ( $_ ne '' ) { # not EOF
        $octr++;
@@ -111,7 +107,7 @@ sub collectExports_mips { # Note: MIPS only
     seek(TMPI, 0, 0);
 }
 
-sub collectDyldStuff_powerpc { # Note: Darwin/PowerPC only
+sub collectDyldStuff_powerpc_darwin {
     local($chunk_label,$label,$cur_section,$section,$chunk,$alignment,$cur_alignment);
     
     %DyldChunks = (); # NB: global table
@@ -128,12 +124,11 @@ sub collectDyldStuff_powerpc { # Note: Darwin/PowerPC only
        $_ = <TMPI>;
        if ( $_ eq '' || /^L(_.+)\$.+:/ ) {
            if ( $label ne '' ) {
-               $DyldChunksDefined{$label} .= $section . $chunk_label . $alignment . $ chunk;
+               $DyldChunksDefined{$label} .= $section . $alignment . $chunk_label . $ chunk;
                if( $section =~ s/\.data/\.non_lazy_symbol_pointer/ ) {
                    $chunk = "\t.indirect_symbol $label\n\t.long 0\n";
                }
-               $DyldChunks{$label} .= $section . $chunk_label . $chunk;
-               # don't use $alignment, it's only needed for .data, which we change into .non_lazy_symbol_pointer
+               $DyldChunks{$label} .= $section . $alignment . $chunk_label . $chunk;
                print STDERR "### dyld chunk: $label\n$section$alignment$chunk\n###\n" if $Dump_asm_splitting_info;
            }
            last if ($_ eq '');
@@ -151,7 +146,8 @@ sub collectDyldStuff_powerpc { # Note: Darwin/PowerPC only
        } elsif ( /^\s*\.section\s+__TEXT,__symbol_stub1,symbol_stubs,pure_instructions,\d+/ ) {
            $cur_section = $_;
            printf STDERR "section: $cur_section\n" if $Dump_asm_splitting_info;
-           $cur_alignment = ''
+                # always make sure we align things
+           $cur_alignment = '\t.align 2'
        } elsif ( /^\s*\.align.*/ ) { 
            $cur_alignment = $_;
            printf STDERR "alignment: $cur_alignment\n" if $Dump_asm_splitting_info;
@@ -216,7 +212,10 @@ sub process_asm_block {
     return(&process_asm_block_alpha($str)) if $TargetPlatform =~ /^alpha-/;
     return(&process_asm_block_hppa($str))  if $TargetPlatform =~ /^hppa/;
     return(&process_asm_block_mips($str))   if $TargetPlatform =~ /^mips-/;
-    return(&process_asm_block_powerpc($str))   if $TargetPlatform =~ /^powerpc-apple-/;
+    return(&process_asm_block_powerpc_darwin($str))
+                            if $TargetPlatform =~ /^powerpc-apple-darwin/;
+    return(&process_asm_block_powerpc_linux($str))
+                            if $TargetPlatform =~ /^powerpc-[^-]+-linux/;
 
     # otherwise...
     &tidy_up_and_die(1,"$Pgm: no process_asm_block for $TargetPlatform\n");
@@ -481,7 +480,7 @@ sub process_asm_block_mips {
 \end{code}
 
 \begin{code}
-sub process_asm_block_powerpc {
+sub process_asm_block_powerpc_darwin {
     local($str) = @_;
     local($dyld_stuff) = '';
 
@@ -491,7 +490,7 @@ sub process_asm_block_powerpc {
     $str =~ s/L_.*\$.*:\n(.|\n)*//;
 
     # remove/record any literal constants defined here
-    while ( $str =~ s/^(\s+.const_data\n\s+\.align.*\n(LC\d+):\n(\s\.(byte|short|long|fill|space|ascii).*\n)+)// ) {
+    while ( $str =~ s/^(\s+.const.*\n\s+\.align.*\n(LC\d+):\n(\s\.(byte|short|long|fill|space|ascii).*\n)+)// ) {
        local($label) = $2;
        local($body)  = $1;
 
@@ -520,7 +519,38 @@ sub process_asm_block_powerpc {
 
     $str .= "\n" . $dyld_stuff;
 
-    print STDERR "### STRIPPED BLOCK (powerpc):\n$str" if $Dump_asm_splitting_info;
+    print STDERR "### STRIPPED BLOCK (powerpc darwin):\n$str" if $Dump_asm_splitting_info;
+
+    $str;
+}
+\end{code}
+
+\begin{code}
+sub process_asm_block_powerpc_linux {
+    local($str) = @_;
+
+    # strip the marker
+    $str =~ s/__stg_split_marker.*\n//;
+
+    # remove/record any literal constants defined here
+    while ( $str =~ s/^(\s+.section\s+\.rodata\n\s+\.align.*\n(\.LC\d+):\n(\s\.(byte|short|long|quad|2byte|4byte|8byte|fill|space|ascii|string).*\n)+)// ) {
+       local($label) = $2;
+       local($body)  = $1;
+
+       &tidy_up_and_die(1,"Local constant label $label already defined!\n")
+           if $LocalConstant{$label};
+
+       $LocalConstant{$label} = $body;
+    }
+
+    # inject definitions for any local constants now used herein
+    foreach $k (keys %LocalConstant) {
+       if ( $str =~ /[\s,]$k\b/ ) {
+           $str = $LocalConstant{$k} . $str;
+       }
+    }
+    
+    print STDERR "### STRIPPED BLOCK (powerpc linux):\n$str" if $Dump_asm_splitting_info;
 
     $str;
 }