[project @ 1996-03-22 09:24:22 by partain]

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

diff --git a/ghc/driver/ghc-split.lprl b/ghc/driver/ghc-split.lprl
index 3afe3f5..00c116e 100644 (file)
--- a/ghc/driver/ghc-split.lprl
+++ b/ghc/driver/ghc-split.lprl
@@ -24,10 +24,14 @@ sub inject_split_markers {
        $_ = <TMPI>;
     }
     print TMPO "__STG_SPLIT_MARKER(1)\n";
-    print TMPO $_ if ! /\/\* SPLIT \*\//;
+    print TMPO $_ if ! /^\s*\/\* SPLIT \*\/\s*$/;
+
+       # Have to be a bit careful detecting /* SPLIT */ comments
+       # since a progam may use a string containing "/* SPLIT */"
+       # We check that there is nothing else on the line
 
     while (<TMPI>) {
-       if (/\/\* SPLIT \*\//) {
+       if (/^\s*\/\* SPLIT \*\/\s*$/) {
            $marker_no++;
            print TMPO "__STG_SPLIT_MARKER($marker_no)\n";
            next;
@@ -54,7 +58,7 @@ sub split_asm_file {
 
     %LocalConstant = (); # we have to subvert C compiler's commoning-up of constants...
 
-    $s_stuff = &ReadTMPIUpToAMarker( '' );
+    $s_stuff = &ReadTMPIUpToAMarker( '', $octr );
     # that first stuff is a prologue for all .s outputs
     $prologue_stuff = &process_asm_block ( $s_stuff );
     # $_ already has some of the next stuff in it...
@@ -66,14 +70,14 @@ sub split_asm_file {
     $prologue_stuff =~ s|"/tmp/ghc\d+\.c"|"$ifile_root\.hc"|g;
 
     while ( $_ ne '' ) { # not EOF
+       $octr++;
 
        # grab and de-mangle a section of the .s file...
-       $s_stuff = &ReadTMPIUpToAMarker ( $_ );
+       $s_stuff = &ReadTMPIUpToAMarker ( $_, $octr );
        $this_piece = &process_asm_block ( $s_stuff );
 
        # output to a file of its own
        # open a new output file...
-       $octr++;
        $ofname = "${Tmp_prefix}__${octr}.s";
        open(OUTF, "> $ofname") || die "$Pgm: can't open output file: $ofname\n";
 
@@ -124,7 +128,7 @@ sub collectExports_mips { # Note: MIPS only
 }
 
 sub ReadTMPIUpToAMarker {
-    local($str) = @_; # already read bits
+    local($str, $count) = @_; # already read bits
 
     
     for ( $_ = <TMPI>; $_ ne '' && ! /_?__stg_split_marker/; $_ = <TMPI> ) {
@@ -154,7 +158,7 @@ sub ReadTMPIUpToAMarker {
        $_ = <TMPI>;
     }
 
-    print STDERR "### BLOCK:\n$str" if $Dump_asm_splitting_info;
+    print STDERR "### BLOCK:$count:\n$str" if $Dump_asm_splitting_info;
 
     # return str
     $str;
@@ -195,7 +199,7 @@ sub process_asm_block_sparc {
     $str =~ s/^\.stabs "(ghc\d+\.c)"/.stabs "$ifile_root.hc"/g; # HACK HACK
 
     # remove/record any literal constants defined here
-    while ( $str =~ /(\t\.align .\n(LC\d+):\n\t\.ascii.*\n)/ ) {
+    while ( $str =~ /(\t\.align .\n(LC\d+):\n(\t\.ascii.*\n)+)/ ) {
        local($label) = $2;
        local($body)  = $1;
 
@@ -204,7 +208,7 @@ sub process_asm_block_sparc {
 
        $LocalConstant{$label} = $body;
        
-       $str =~ s/\t\.align .\nLC\d+:\n\t\.ascii.*\n//;
+       $str =~ s/\t\.align .\nLC\d+:\n(\t\.ascii.*\n)+//;
     }
 
     # inject definitions for any local constants now used herein