[project @ 2000-07-06 15:43:28 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 804b3eb..11702c8 100644 (file)
--- a/ghc/driver/split/ghc-split.lprl
+++ b/ghc/driver/split/ghc-split.lprl
@@ -5,45 +5,23 @@
 %************************************************************************
 
 \begin{code}
-sub inject_split_markers {
-    local($hc_file) = @_;
+$TargetPlatform = $TARGETPLATFORM;
 
-    unlink("$Tmp_prefix.unmkd");
-    local($to_do) = "$Cp $hc_file $Tmp_prefix.unmkd";
-    &run_something($to_do, 'Prepare to number split markers');
+($Pgm = $0) =~ s|.*/||;
+$ifile      = $ARGV[0];
+$Tmp_prefix = $ARGV[1];
+$Output     = $ARGV[2];
 
-    open(TMPI, "< $Tmp_prefix.unmkd") || &tidy_up_and_die(1,"$Pgm: failed to open `$Tmp_prefix.unmkd' (to read)\n");
-    open(TMPO, "> $hc_file") || &tidy_up_and_die(1,"$Pgm: failed to open `$hc_file' (to write)\n");
+&split_asm_file($ifile);
 
-    local($marker_no) = 1;
+open(OUTPUT, "> $Output") ||  &tidy_up_and_die(1,"$Pgm: failed to open `$Output' (to write)\n");
+print OUTPUT "$NoOfSplitFiles\n";
+close(OUTPUT);
 
-    # make sure there is a split marker before any "real" code
-    $_ = <TMPI>;
-    while ( $_ ne '' && ( /^$/ || /^#/ ) ) {
-       print TMPO $_;
-       $_ = <TMPI>;
-    }
-    print TMPO "__STG_SPLIT_MARKER(1)\n";
-    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 (/^\s*\/\* SPLIT \*\/\s*$/) {
-           $marker_no++;
-           print TMPO "__STG_SPLIT_MARKER($marker_no)\n";
-           next;
-       }
-       print TMPO $_;
-    }
-
-    close(TMPI) || &tidy_up_and_die(1,"Failed reading $Tmp_prefix.unmkd\n");
-    close(TMPO) || &tidy_up_and_die(1,"Failed writing $hc_file\n");
-}
+exit(0);
 \end{code}
 
+
 \begin{code}
 sub split_asm_file {
     local($asm_file) = @_;
@@ -200,7 +178,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\.asci[iz].*\n)+)/ ) {
+    while ( $str =~ /(\t\.align .\n\.?(L?LC\d+):\n(\t\.asci[iz].*\n)+)/ ) {
        local($label) = $2;
        local($body)  = $1;
 
@@ -209,7 +187,7 @@ sub process_asm_block_sparc {
 
        $LocalConstant{$label} = $body;
        
-       $str =~ s/\t\.align .\n\.?LC\d+:\n(\t\.asci[iz].*\n)+//;
+       $str =~ s/\t\.align .\n\.?LL?C\d+:\n(\t\.asci[iz].*\n)+//;
     }
 
     # inject definitions for any local constants now used herein
@@ -312,7 +290,7 @@ sub process_asm_block_iX86 {
     $str = "\.text\n\t.align 4\n" . $str;
 
     # remove/record any literal constants defined here
-    while ( ($str =~ /((\.?LC\d+):\n\t\.(ascii|string).*\n)/ )) {
+    while ( ($str =~ /(\.?(LC\d+):\n(\t\.(ascii|string).*\n)+)/ )) {
        local($label) = $2;
        local($body)  = $1;
 
@@ -321,7 +299,7 @@ sub process_asm_block_iX86 {
 
        $LocalConstant{$label} = $body;
        
-       $str =~ s/\.?LC\d+:\n\t\.(ascii|string).*\n//;
+       $str =~ s/\.?LC\d+:\n(\t\.(ascii|string).*\n)+//;
     }
 
     # inject definitions for any local constants now used herein
@@ -470,7 +448,9 @@ sub process_asm_block_powerpc {
 \end{code}
 
 \begin{code}
-# make "require"r happy...
-1;
+sub tidy_up_and_die {
+    local($return_val, $msg) = @_;
+    print STDERR $msg;
+    exit (($return_val == 0) ? 0 : 1);
+}
 \end{code}
-