[project @ 2000-06-13 15:35:29 by sof]
authorsof <unknown>
Tue, 13 Jun 2000 15:35:29 +0000 (15:35 +0000)
committersof <unknown>
Tue, 13 Jun 2000 15:35:29 +0000 (15:35 +0000)
m68k-*-nextstep3 updates

ghc/driver/mangler/ghc-asm.lprl

index 06a6416..c97392c 100644 (file)
@@ -219,32 +219,31 @@ sub init_TARGET_STUFF {
     $T_HDR_direct   = "\t\.text\n\t\.align 2\n";
 
     #--------------------------------------------------------#
-    } elsif ( $TargetPlatform =~ /^powerpc-.*|^rs6000-.*/ ) {
+    } elsif ( $TargetPlatform =~ /^powerpc-.*/ ) {
 
     $T_STABBY      = 0; # 1 iff .stab things (usually if a.out format)
     $T_US          = ''; # _ if symbols have an underscore on the front
-    $T_DO_GC       = '\.PerformGC_wrapper';
+    $T_DO_GC       = 'PerformGC_wrapper';
     $T_PRE_APP     = 'NOT APPLICABLE'; # regexp that says what comes before APP/NO_APP
-    $T_CONST_LBL    = 'NOT APPLICABLE'; # regexp for what such a lbl looks like
+    $T_CONST_LBL    = '^LC\.\.(\d+):$'; # regexp for what such a lbl looks like
     $T_POST_LBL            = ':';
 
-    $T_MOVE_DIRVS   = '^(\s*(\.toc|\.align \d+|\.csect \S+|\t\.?l?globl \S+)\n)';
+    $T_MOVE_DIRVS   = '^(\s*(\.toc|.csect \S+|\.l?globl \S+|\.align \d+)\n)';
     $T_COPY_DIRVS   = '\.(l?globl)';
 
-    $T_hsc_cc_PAT   = '\.byte.*\)(hsc|cc) (.*)"\n\t\.byte \d+\n\t\.byte "(.*)"\n\t\.byte \d+';
+    $T_hsc_cc_PAT   = '\.string.*\)(hsc|cc) (.*)\\\\t(.*)"';
     $T_DOT_WORD            = '\.long';
     $T_DOT_GLOBAL   = '\.globl';
-    $T_HDR_toc      = "\.toc\n";
-    $T_HDR_literal  = "\.csect .data[RW]\n\t\.align 2\n";              #not RO!?
-    $T_HDR_misc            = "# misc\n\.csect \.text[PR]\n\t\.align 2\n";
-    $T_HDR_data            = "# data\n\.csect \.data[RW]\n\t\.align 2\n";
-    $T_HDR_consist  = "# consist\n\.csect \.data[RW]\n\t\.align 2\n";
-    $T_HDR_closure  = "# closure\n\.csect \.data[RW]\n\t\.align 2\n";
-    $T_HDR_info            = "# info\n\.csect \.data[RW]\n\t\.align 2\n"; #not RO!?
-    $T_HDR_entry    = "# entry\n\.csect \.text[PR]\n\t\.align 2\n";
-    $T_HDR_fast            = "# fast\n\.csect \.text[PR]\n\t\.align 2\n";
-    $T_HDR_vector   = "# vector\n\.csect \.data[RW]\n\t\.align 2\n"; #not RO!?
-    $T_HDR_direct   = "# direct\n";
+    $T_HDR_literal  = "\.section\t\.rodata\n";
+    $T_HDR_misc            = "\.text\n\t\.align 2\n";
+    $T_HDR_data            = "\.data\n\t\.align 2\n";
+    $T_HDR_consist  = "\.text\n";
+    $T_HDR_closure  = "\.data\n\t\.align 2\n";
+    $T_HDR_info            = "\.text\n\t\.align 2\n";
+    $T_HDR_entry    = "\.text\n";
+    $T_HDR_fast            = "\.text\n\t\.align 2\n";
+    $T_HDR_vector   = "\.text\n\t\.align 2\n";
+    $T_HDR_direct   = "\.text\n\t\.align 2\n";
 
     #--------------------------------------------------------#
     } elsif ( $TargetPlatform =~ /^sparc-.*-solaris2/ ) {
@@ -392,9 +391,9 @@ sub mangle_asm {
        next if /$TPREAPP(NO_)?APP/o; 
        next if /^;/ && $TargetPlatform =~ /^hppa/;
 
-       next if /(^$|^\t\.file\t|^ # )/ && $TargetPlatform =~ /^(mips|powerpc|rs6000)-/;
+       next if /(^$|^\t\.file\t|^ # )/ && $TargetPlatform =~ /^(mips|powerpc)-/;
 
-       last if /^_section_\.text:$/ && $TargetPlatform =~ /^powerpc-|^rs6000-/;
+       last if /^_section_\.text:$/ && $TargetPlatform =~ /^powerpc-/;
 
        if ( $TargetPlatform =~ /^mips-/ 
          && /^\t\.(globl \S+ \.text|comm\t)/ ) {
@@ -477,25 +476,12 @@ sub mangle_asm {
        } elsif ( /^([A-Za-z0-9_]+)\s+\.comm/ && $TargetPlatform =~ /^hppa/ ) {
            $chk[++$i]   = $_;
            $chkcat[$i]  = 'bss';
-           $chksymb[$i] = '';
-
-       } elsif ( $TargetPlatform =~ /^powerpc-|^rs6000-/ && /^LC\.\.([0-9]+)/ ) {
-           $chk[++$i]   = $_;
-           $chkcat[$i]  = 'toc';
-           $chksymb[$i] = $1;
+           $chksymb[$i] = $1;
 
-       } elsif ( $TargetPlatform =~ /^powerpc-|^rs6000-/ && /^CC_.*$/ ) {
-            # all CC_ symbols go in the data section...
-           $chk[++$i]   = $_;
-           $chkcat[$i]  = 'data';
-           $chksymb[$i] = '';
-
-       } elsif ( /^($TUS[@]?(ret_|djn_)[A-Za-z0-9_]+)/o ) {
+       } elsif ( /^$TUS[@]?(ret_|djn_)/o ) {
            $chk[++$i]   = $_;
            $chkcat[$i]  = 'misc';
            $chksymb[$i] = '';
-           $symbtmp = $1;
-            $chksymb[$i] = $symbtmp if ($TargetPlatform =~ /^powerpc-|^rs6000-/) ; #rm andre
 
        } elsif ( /^$TUS[@]?vtbl_([A-Za-z0-9_]+)$TPOSTLBL[@]?$/o ) {
            $chk[++$i]   = $_;
@@ -511,13 +497,10 @@ sub mangle_asm {
 
            $directchk{$1} = $i;
 
-       } elsif ( /^$TUS[@]?([A-Za-z0-9_]+)_upd$TPOSTLBL[@]?$/o ) {
+       } elsif ( /^$TUS[@]?[A-Za-z0-9_]+_upd$TPOSTLBL[@]?$/o ) {
            $chk[++$i]   = $_;
            $chkcat[$i]  = 'misc';
-            print STDERR "_upd!!!!! I guess this code is dead!!!!\n";
-            # I guess this is never entered, since all _upds are 
-            # either vtbl_'s or ret_'s, caught above. - andre
-           $chksymb[$i] = ''; 
+           $chksymb[$i] = '';
 
        } elsif ( $TargetPlatform =~ /^i386-.*-solaris2/
             &&   /^(_uname|uname|stat|fstat):/ ) {
@@ -537,7 +520,7 @@ sub mangle_asm {
        } elsif ( /^$TUS[@]?[A-Za-z0-9_]/o
                && ( $TargetPlatform !~ /^hppa/ # need to avoid local labels in this case
                   || ! /^L\$\d+$/ )
-               && ( $TargetPlatform !~ /^powerpc|^rs6000/ # ditto
+               && ( $TargetPlatform !~ /^powerpc/ # ditto
                   || ! /^(L\.\.\d+|LT\.\..*):$/ ) ) {
            local($thing);
            chop($thing = $_);
@@ -548,9 +531,7 @@ sub mangle_asm {
                    || /^$TUS[@]?_reg.*$TPOSTLBL$/o;            # PROF: __reg<module>
            $chk[++$i]   = $_;
            $chkcat[$i]  = 'misc';
-            if ($TargetPlatform =~ /^powerpc-|^rs6000-/) 
-              { $chksymb[$i] = $thing; }
-           else { $chksymb[$i] = ''; };
+           $chksymb[$i] = '';
 
        } else { # simple line (duplicated at the top)
 
@@ -579,48 +560,6 @@ sub mangle_asm {
   
     # HPPAs, MIPSen: also start medding at chunk 1
 
-    if ($TargetPlatform =~ /^powerpc|^rs6000/) {
-       print OUTASM $T_HDR_toc; # yes, we have to put a .toc 
-                                # in the beginning of every file!
-    %tocequiv = ();          # maps toc symbol number to toc symbol
-    %revtocequiv = ();       # maps toc symbol to toc symbol number
-    for ($i = 1; $i < $numchks; $i++) {
-       $chk[$i] =~ s/\[RW\]//g;
-       $chk[$i] =~ s/\[DS\]//g;
-       $chk[$i] =~ s/^\.csect .*\[DS\]$//g;
-
-       if ( $chkcat[$i] eq 'toc' && $chk[$i] !~ /\.byte/ )
-#ToDo: instead of all these changes, just fix mangle_powerpc_tailjump and delete/ignore these tocs?
-          { $chk[$i] =~ s/$T_MOVE_DIRVS//g;
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],(\S+_fast\d+)/\t\.tc \1\[TC\],\.\2/; 
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],(\S+_entry)\n/\t\.tc \1\[TC\],\.\2\n/;
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],(ret_\S+)/\t\.tc \1\[TC\],\.\2/;
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],(djn_\S+)/\t\.tc \1\[TC\],\.\2/;
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],(vtbl_\S+)/\t\.tc \1\[TC\],\.\2/;
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],ErrorIO_innards/\t\.tc \1\[TC\],\.ErrorIO_innards/;
-            $chk[$i] =~ s/\t\.tc (\S+)\[TC\],startStgWorld/\t\.tc \1\[TC\],\.startStgWorld/;
-            $chk[$i] =~ s/\.tc UpdatePAP\[TC\],UpdatePAP/\.tc UpdatePAP\[TC\],\.UpdatePAP/;
-            $chk[$i] =~ s/\.tc _regMain\[TC\],_regMain/\.tc _regMain\[TC\],\._regMain/; #PROF
-            $chk[$i] =~ s/\.tc resumeThread\[TC\],resumeThread/\.tc resumeThread\[TC\],\.resumeThread/; #CONC
-            $chk[$i] =~ s/\.tc EnterNodeCode\[TC\],EnterNodeCode/\.tc EnterNodeCode\[TC\],\.EnterNodeCode/; #CONC
-            $chk[$i] =~ s/\.tc StackUnderflowEnterNode\[TC\],StackUnderflowEnterNode/\.tc StackUnderflowEnterNode\[TC\],\.StackUnderflowEnterNode/; #CONC
-            $chk[$i] =~ s/\.tc stopThreadDirectReturn\[TC\],stopThreadDirectReturn/\.tc stopThreadDirectReturn\[TC\],\.stopThreadDirectReturn/; #CONC
-            $chk[$i] =~ s/\.tc CommonUnderflow\[TC\],CommonUnderflow/\.tc CommonUnderflow\[TC\],\.CommonUnderflow/; #PAR
-            $chk[$i] =~ s/\.tc IndUpdRetDir\[TC\],IndUpdRetDir/\.tc IndUpdRetDir\[TC\],\.IndUpdRetDir/;
-            $chk[$i] =~ s/\t\.tc (_PRStart_\S+)\[TC\],_PRStart_\S+/\t\.tc \1\[TC\],\.\1/;
-
-             $tocnumber = $chksymb[$i];
-             $tocsymb = $chk[$i];
-             $tocsymb =~ s/^LC\.\.\d+:\n//;
-             $tocsymb =~ s/^\t\.tc \S+,(\S+)\n/\1/;
-             $tocequiv{$tocnumber} = $tocsymb;
-
-           } elsif ( $chkcat[$i] eq 'toc' && $chk[$i] =~ /\.byte/ ) {
-             $chkcat[$i] = 'literal';
-           }
-    }
-    };
-
     for ($i = $FIRST_MANGLABLE; $i < $numchks; $i++) {
        $c = $chk[$i]; # convenience copy
 
@@ -663,15 +602,6 @@ sub mangle_asm {
                    $p =~ s/^\tsw\t\$fp,\d+\(\$sp\)\n//;
                    $p =~ s/^\tsw\t\$28,\d+\(\$sp\)\n//;
                    $p =~ s/__FRAME__/$FRAME/;
-               } elsif ($TargetPlatform =~ /^powerpc-|^rs6000/) {
-                   $p =~ s/^\tmflr 0\n//;
-                   $p =~ s/^\tstm \d+,-\d+\(1\)\n//;
-                   $p =~ s/^\tstw? 0,\d+\(1\)\n//g;
-                   $p =~ s/^\tstw? 1,\d+\(1\)\n//g; #mc
-                   $p =~ s/^\tlw?z 0,0\(1\)\n//g;   #mc
-                   $p =~ s/^\tstw?u 1,-\d+\(1\)\n//; 
-                   $p =~ s/^\tstw? \d+,-\d+\(1\)\n//g; 
-                   $p =~ s/^\tstfd \d+,-\d+\(1\)\n//g; 
                } else {
                    print STDERR "$Pgm: unknown prologue mangling? $TargetPlatform\n";
                }
@@ -706,12 +636,6 @@ sub mangle_asm {
                    $e =~ s/^\tlw\t\$fp,\d+\(\$sp\)\n//;
                    $e =~ s/^\taddu\t\$sp,\$sp,\d+\n//;
                    $e =~ s/^\tj\t\$31\n//;
-               } elsif ($TargetPlatform =~ /^powerpc-|^rs6000-/) {
-                   $e =~ s/^\taddi 1,1,\d+\n//;
-                   $e =~ s/^\tcal 1,\d+\(1\)\n//;
-                   $e =~ s/^\tlw?z? \d+,\d+\(1\)\n//; 
-                   $e =~ s/^\tmtlr 0\n//;
-                   $e =~ s/^\tbl?r\n//;
                } else {
                    print STDERR "$Pgm: unknown epilogue mangling? $TargetPlatform\n";
                }
@@ -854,26 +778,7 @@ sub mangle_asm {
        if ( $chkcat[$i] eq 'misc' ) {
            if ($chk[$i] ne '') {
                print OUTASM $T_HDR_misc;
-                if ($TargetPlatform =~ /^powerpc-|^rs6000/) { 
-                   $chksymb[$i] =~ s/://;
-#new                   if ($chksymb[$i] =~ /ret.*upd/ || $KNOWN_FUNNY_THING{$chksymb[$i]}
-#new                    || $chksymb[$i] =~ /^$.{T_US}_(PRIn|PRStart).*${T_POST_LBL}$/o )
-#new                      { print OUTASM "\t\.globl $chksymb[$i]\n"; }
-#                   if ($chksymb[$i] ne '' && $chksymb[$i] !~ /ret_[a-z]/ && $chksymb[$i] !~ /djn_[a-z]/) 
-                   if ($chksymb[$i] ne '')
-                       { print OUTASM "\t\.globl \.$chksymb[$i]\n"; };
-                   if ($chk[$i] =~ /TOC\[tc0\], 0\n/)
-                    { ($p, $r) = split(/TOC\[tc0\], 0\n/, $chk[$i]); $printDS = 1;}
-                   else { $r = $chk[$i]; $printDS = 0; };
-                   $chk[$i] = &mangle_powerpc_tailjump($r);
-                };
-               &print_doctored($chk[$i], 0);
-                if ($TargetPlatform =~ /^powerpc-|^rs6000-/ && $printDS) { 
-#ok                   if ($chksymb[$i] !~ /\_regMain/) {
-                    print OUTASM "\.csect ${chksymb[$i]}[DS]\n";       
-                    print OUTASM "${p}TOC[tc0], 0\n";
-#ok                   }
-                }
+               &print_doctored($chk[$i], 0);
            }
 
        } elsif ( $chkcat[$i] eq 'toss' ) {
@@ -894,7 +799,7 @@ sub mangle_asm {
                $consist =~ s/[^A-Za-z0-9_.]/ZZ/g; # ToDo: properly?
                print OUTASM $T_HDR_consist, "${consist}${T_POST_LBL}\n";
 
-           } elsif ( $TargetPlatform !~ /^(mips)-/ ) { # we just don't try in those case (ToDo)
+           } elsif ( $TargetPlatform !~ /^(mips|powerpc)-/ ) { # we just don't try in those case (ToDo)
                # on mips: consistency string is just a v
                # horrible bunch of .bytes,
                # which I am too lazy to sort out (WDP 95/05)
@@ -925,21 +830,7 @@ sub mangle_asm {
            if ( defined($infochk{$symb}) ) {
 
                print OUTASM $T_HDR_info;
-                if ($TargetPlatform =~ /^powerpc-|^rs6000-/) {
-                 if ( !defined($slowchk{$symb}) && defined($fastchk{$symb}) ) {
-                    $fastname = $chk[$fastchk{$symb}];
-                    $fastname =~ s/([_A-Za-z]*_fast\d+):.*(.*\n)*/\1/;
-                     $chk[$infochk{$symb}] =~ s/\.long StdErrorCode/\.long $fastname/;
-                  }
-                  $chk[$infochk{$symb}] =~ s/\.long ([_A-Za-z]\S+_entry)/\.long \.\1/;
-                  $chk[$infochk{$symb}] =~ s/\.long ([A-Za-z]\S+_upd)/\.long \.\1/;
-                  $chk[$infochk{$symb}] =~ s/\.long (IndUpdRet\S+)/\.long \.\1/;
-                  $chk[$infochk{$symb}] =~ s/\.long StdErrorCode/\.long \.StdErrorCode/;
-                  $chk[$infochk{$symb}] =~ s/\.long UpdErr/\.long \.UpdErr/;
-                  print OUTASM $chk[$infochk{$symb}];
-                } else {
                print OUTASM &rev_tbl($symb, $chk[$infochk{$symb}], 1);
-                }
                # entry code will be put here!
 
                # paranoia
@@ -957,18 +848,6 @@ sub mangle_asm {
                # teach it to drop through to the fast entry point:
                $c = $chk[$slowchk{$symb}];
 
-                if ($TargetPlatform =~ /^powerpc-|^rs6000-/) { 
-               ($p, $r) = split(/TOC\[tc0\], 0\n/, $c); 
-                if ($symb =~ /^[_A-Z]/)
-               { 
-                 print OUTASM "\t\.globl \.${chksymb[$i]}_entry\n"; 
-                 print OUTASM "\.csect ${symb}_entry[DS]\n";   
-                 print OUTASM "${p}TOC[tc0], 0\n";
-                  }; 
-                  $r =~ s/\.csect \.text\[PR\]\n//; # todo: properly - andre
-                  $c = &mangle_powerpc_tailjump($r);
-                };
-
                if ( defined($fastchk{$symb}) ) {
                    if ( $TargetPlatform =~ /^alpha-/ ) {
                        $c =~ s/^\tjmp \$31,\(\$27\),0\n\t\.align 4\n\t\.end/\t.align 4\n\t.end/;
@@ -982,8 +861,6 @@ sub mangle_asm {
                    } elsif ( $TargetPlatform =~ /^m68k-/ ) {
                        $c =~ s/^\tjmp ${T_US}${symb}_fast\d+.*\n\tnop\n//;
                        $c =~ s/^\tjmp ${T_US}${symb}_fast\d+.*\n//;
-                   } elsif ( $TargetPlatform =~ /^powerpc-|^rs6000-/ ) {
-                       $c =~ s/^\tb \.${T_US}${symb}_fast\d+\n//;
                    } elsif ( $TargetPlatform =~ /^sparc-/ ) {
                        $c =~ s/^\tcall ${T_US}${symb}_fast\d+,.*\n\tnop\n//;
                        $c =~ s/^\tcall ${T_US}${symb}_fast\d+,.*\n(\t[a-z].*\n)/$1/;
@@ -1009,7 +886,6 @@ sub mangle_asm {
            
            # FAST ENTRY POINT
            if ( defined($fastchk{$symb}) ) {
-               $c = $chk[$fastchk{$symb}];
                if ( ! defined($slowchk{$symb})
                   # ToDo: the || clause can go once we're no longer
                   # concerned about producing exactly the same output as before
@@ -1017,19 +893,7 @@ sub mangle_asm {
                   ) {
                    print OUTASM $T_HDR_fast;
                }
-                  if ($TargetPlatform =~ /^powerpc-|^rs6000-/) {
-                    local(@lbls) = split(/:/, $c);
-                    $fullname = $lbls[0];
-                   $fullname =~ s/$T_MOVE_DIRVS//g;
-                    if ( $fullname =~ /^[A-Z]/)
-                       { print OUTASM "\t\.globl \.${fullname}\n";
-                    } else {
-#                       print OUTASM "\t\.lglobl \.${fullname}\n"; #todo: rm - andre
-                    };
-                    $c =~ s/((.*\n)*)\t.long \S+, TOC\[tc0\], 0\n\.csect \.text\[PR\]\n((.*\n)*)/\1\3/;
-                    $c = &mangle_powerpc_tailjump($c);
-                  };
-               &print_doctored($c, 0);
+               &print_doctored($chk[$fastchk{$symb}], 0);
                $chkcat[$fastchk{$symb}] = 'DONE ALREADY';
            }
 
@@ -1040,17 +904,7 @@ sub mangle_asm {
            # VECTOR TABLE
            if ( defined($vectorchk{$symb}) ) {
                print OUTASM $T_HDR_vector;
-                if ($TargetPlatform =~ /^powerpc-|^rs6000-/) { 
-                  if ( $symb =~ /^[A-Z]/) {
-                     print OUTASM "\t\.globl \.vtbl_${symb}\n";
-                    print OUTASM "\t\.globl vtbl_${symb}\n";
-                  };
-                 $chk[$vectorchk{$symb}] =~ s/\.long (\S+)/\.long \.\1/g;
-                 print OUTASM ".vtbl_${symb}:\n";
-                 print OUTASM $chk[$vectorchk{$symb}];
-               } else {
-                 print OUTASM &rev_tbl($symb, $chk[$vectorchk{$symb}], 0);
-               }
+               print OUTASM &rev_tbl($symb, $chk[$vectorchk{$symb}], 0);
                # direct return code will be put here!
                $chkcat[$vectorchk{$symb}] = 'DONE ALREADY';
            }
@@ -1058,14 +912,7 @@ sub mangle_asm {
            # DIRECT RETURN
            if ( defined($directchk{$symb}) ) {
                print OUTASM $T_HDR_direct;
-                if ($TargetPlatform =~ /^powerpc-|^rs6000-/) { 
-                 ($p, $r) = split(/TOC\[tc0\], 0\n/, $chk[$directchk{$symb}]); 
-                 &print_doctored($r, 0);
-                 print OUTASM "\.csect ${symb}DirectReturn[DS]\n";     
-                 print OUTASM "${p}TOC[tc0], 0\n";
-                } else {
-                 &print_doctored($chk[$directchk{$symb}], 0);
-               }
+               &print_doctored($chk[$directchk{$symb}], 0);
                $chkcat[$directchk{$symb}] = 'DONE ALREADY';
 
            } elsif ( $TargetPlatform =~ /^alpha-/ ) {
@@ -1078,20 +925,6 @@ sub mangle_asm {
                print OUTASM "\t# nop\n";
            }
            
-       } elsif ( $chkcat[$i] eq 'toc' ) {
-            # silly optimisation to print tocs, since they come in groups...
-           print OUTASM $T_HDR_toc;
-            local($j)  = $i;
-            while ($chkcat[$j] eq 'toc')
-              { if (   $chk[$j] !~ /\.tc UpdatePAP\[TC\]/ # not needed: always turned into a jump.
-                   ) 
-                {
-                  print OUTASM $chk[$j];
-                }
-                $chkcat[$j] = 'DONE ALREADY';
-                $j++;
-           }
-           
        } else {
            &tidy_up_and_die(1,"$Pgm: unknown chkcat (ghc-asm: $TargetPlatform)\n$chkcat[$i]\n$chk[$i]\n");
        }
@@ -1099,9 +932,8 @@ sub mangle_asm {
 
     print OUTASM $EXTERN_DECLS if $TargetPlatform =~ /^mips-/;
 
-    if ($TargetPlatform =~ /^powerpc-|^rs6000-/) { 
-         print OUTASM ".csect .text[PR]\n_section_.text:\n.csect .data[RW]\n\t.long _section_.text\n"
-    };
+    print OUTASM ".csect .text[PR]\n_section_.text:\n.csect .data[RW]\n\t.long _section_.text\n"
+       if $TargetPlatform =~ /^powerpc-/;
 
     # finished
     close(OUTASM) || &tidy_up_and_die(1,"Failed writing to $out_asmf\n");
@@ -1149,8 +981,6 @@ sub print_doctored {
     local($exit_patch) = '';
     local($call_entry_patch)= '';
     local($call_exit_patch)    = '';
-    local($gc_call_entry_patch)= '';   # Patches before and after calls to Perform_GC_wrapper
-    local($gc_call_exit_patch) = '';
 
 #OLD:  # first, convert calls to *very magic form*: (ToDo: document
     # for real!)  from
@@ -1240,26 +1070,16 @@ sub print_doctored {
 
     # OK, now we can decide what our patch-up code is going to
     # be:
-
-       # Note funky ".=" stuff; we're *adding* to these _patch guys
     if ( $StolenX86Regs <= 2
         && ( /32\(\%ebx\)/ || /\%esi/ || /^\tcmps/ ) ) { # R1 (esi)
        $entry_patch .= "\tmovl \%esi,32(\%ebx)\n";
        $exit_patch  .= "\tmovl 32(\%ebx),\%esi\n";
-
-       $gc_call_entry_patch  .= "\tmovl \%esi,32(\%ebx)\n";
-       $gc_call_exit_patch .= "\tmovl 32(\%ebx),\%esi\n";
-
        # nothing for call_{entry,exit} because %esi is callee-save
     }
     if ( $StolenX86Regs <= 3
         && ( /64\(\%ebx\)/ || /\%edi/ || /^\t(scas|cmps)/ ) ) { # SpA (edi)
        $entry_patch .= "\tmovl \%edi,64(\%ebx)\n";
        $exit_patch  .= "\tmovl 64(\%ebx),\%edi\n";
-
-       $gc_call_entry_patch  .= "\tmovl \%edi,64(\%ebx)\n";
-       $gc_call_exit_patch .= "\tmovl 64(\%ebx),\%edi\n";
-
        # nothing for call_{entry,exit} because %edi is callee-save
     }
 #=  if ( $StolenX86Regs <= 4
@@ -1277,14 +1097,7 @@ sub print_doctored {
     # next, here we go with non-%esp patching!
     #
     s/^(\t[a-z])/$entry_patch$1/; # before first instruction
-
-# Actually, call_entry_patch and call_exit_patch never get set,
-# so let's nuke this one
-#    s/^(\tcall .*\n(\taddl \$\d+,\%esp\n)?)/$call_exit_patch$1$call_entry_patch/g; # _all_ calls
-
-# Before calling GC we must set up the exit condition before the call
-# and entry condition when we come back
-    s/^(\tcall ${T_DO_GC}\n(\taddl \$\d+,\%esp\n)?)/$gc_call_exit_patch$1$gc_call_entry_patch/g; # _all_ calls
+    s/^(\tcall .*\n(\taddl \$\d+,\%esp\n)?)/$call_exit_patch$1$call_entry_patch/g; # _all_ calls
 
     # fix _all_ non-local jumps:
 
@@ -1422,7 +1235,7 @@ sub rev_tbl {
     local(@words) = ();
     local($after) = '';
     local(@lines) = split(/\n/, $tbl);
-    local($i, $j); #local ($i, $extra, $words_to_pad, $j);
+    local($i, $extra, $words_to_pad, $j);
    
     # see comment in mangleAsm as to why this silliness is needed.
     local($TDOTWORD) = ${T_DOT_WORD};
@@ -1548,55 +1361,6 @@ sub mini_mangle_asm_hppa {
     close(INASM)  || &tidy_up_and_die(1,"Failed reading from $in_asmf\n");
 }
 
-\end{code}
-\begin{code}
-sub mini_mangle_asm_powerpc {
-    local($in_asmf, $out_asmf) = @_;
-
-    open(INASM, "< $in_asmf")
-       || &tidy_up_and_die(1,"$Pgm: failed to open `$in_asmf' (to read)\n");
-    open(OUTASM,"> $out_asmf")
-       || &tidy_up_and_die(1,"$Pgm: failed to open `$out_asmf' (to write)\n");
-
-    while (<INASM>) {
-       s/long _PRStart/long ._PRStart/;
-       s/long _PRIn_/long ._PRIn_/;
-       s/long _Dummy_(\S+)_entry/long ._Dummy_\1_entry/;
-       s/long _PRMarking_MarkNextRoot\[DS\]/long ._PRMarking_MarkNextRoot/;
-       s/long _PRMarking_MarkNextCAF\[DS\]/long ._PRMarking_MarkNextCAF/;
-       s/long _PRMarking_MarkNextAStack\[DS\]/long ._PRMarking_MarkNextAStack/;
-       s/long _PRMarking_MarkNextBStack\[DS\]/long ._PRMarking_MarkNextBStack/;
-        s/\.tc EnterNodeCode\[TC]\,EnterNodeCode\[DS\]/\.tc EnterNodeCode\[TC]\,.EnterNodeCode/; # CONC
-        s/\.tc CheckHeapCode\[TC]\,CheckHeapCode\[DS\]/\.tc CheckHeapCode\[TC]\,.CheckHeapCode/; # CONC
-       print OUTASM;
-    }
-
-    # finished:
-    close(OUTASM) || &tidy_up_and_die(1,"Failed writing to $out_asmf\n");
-    close(INASM)  || &tidy_up_and_die(1,"Failed reading from $in_asmf\n");
-}
-
-sub mangle_powerpc_tailjump {
-    local($c) = @_;
-    local($maybe_more) = 1;
-    while (($c =~ /\tlw?z? \d+,LC\.\.\d+\(2\)\n\tmtctr \d+\n\tbctr\n/) && $maybe_more) 
-      { $maybe_more = 0;
-        $lcsymb = $c;
-        $lcsymb =~ s/(.*\n)*\tlw?z? \d+,LC\.\.(\d+)\(2\)\n\tmtctr \d+\n\tbctr\n(.*\n)*/\2/;
-# the checks for r1 and r2 are mostly paranoia...
-        $r1 = $c;
-        $r1 =~ s/(.*\n)*\tlw?z? (\d+),LC\.\.\d+\(2\)\n\tmtctr \d+\n\tbctr\n(.*\n)*/\2/;
-        $r2 = $c;
-        $r2 =~ s/(.*\n)*\tlw?z? \d+,LC\.\.(\d+)\(2\)\n\tmtctr (\d+)\n\tbctr\n(.*\n)*/\3/;
-        if (r1 == r2)
-          { $maybe_more = 1;
-            $c =~ s/((.*\n)*)\tlw?z? \d+,LC\.\.\d+\(2\)\n\tmtctr \d+\n\tbctr\n((.*\n)*)/\1\tb $tocequiv{$lcsymb}\n\3/;
-          }
-      };
-    $c;
-}
-
 # make "require"r happy...
 1;
 \end{code}