[project @ 1998-02-05 12:23:33 by simonm]

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

diff --git a/ghc/driver/ghc-asm.lprl b/ghc/driver/ghc-asm.lprl
index 65519e7..d3b99b6 100644 (file)
--- a/ghc/driver/ghc-asm.lprl
+++ b/ghc/driver/ghc-asm.lprl
@@ -976,6 +976,7 @@ sub mangle_asm {
                        $c =~ s/^\s+ldil.*\n\s+ldo.*\n\s+bv.*\n(.*\n)?\s+\.EXIT/$1\t.EXIT/;
                    } elsif ( $TargetPlatform =~ /^i386-/ ) {
                        $c =~ s/^\tmovl \$${T_US}${symb}_fast\d+,\%edx\n\tjmp \*\%edx\n//;
+                       $c =~ s/^\tmovl \$${T_US}${symb}_fast\d+,\%ecx\n\tjmp \*\%ecx\n//;
                        $c =~ s/^\tmovl \$${T_US}${symb}_fast\d+,\%eax\n\tjmp \*\%eax\n//;
                    } elsif ( $TargetPlatform =~ /^mips-/ ) {
                        $c =~ s/^\tjmp \$31,\(\$27\),0\n\t\.align 4\n\t\.end/\t.align 4\n\t.end/;
@@ -1149,6 +1150,8 @@ 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
@@ -1238,16 +1241,26 @@ 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
@@ -1265,7 +1278,14 @@ sub print_doctored {
     # next, here we go with non-%esp patching!
     #
     s/^(\t[a-z])/$entry_patch$1/; # before first instruction
-    s/^(\tcall .*\n(\taddl \$\d+,\%esp\n)?)/$call_exit_patch$1$call_entry_patch/g; # _all_ calls
+
+# 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
 
     # fix _all_ non-local jumps:
 
@@ -1363,7 +1383,6 @@ sub init_FUNNY_THINGS {
        "${T_US}UnderflowVect7${T_POST_LBL}", 1,
        "${T_US}UpdErr${T_POST_LBL}", 1,
        "${T_US}UpdatePAP${T_POST_LBL}", 1,
-       "${T_US}WorldStateToken${T_POST_LBL}", 1,
        "${T_US}_Enter_Internal${T_POST_LBL}", 1,
        "${T_US}_PRMarking_MarkNextAStack${T_POST_LBL}", 1,
        "${T_US}_PRMarking_MarkNextBStack${T_POST_LBL}", 1,