X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fmangler%2Fghc-asm.lprl;h=73d05b96d634fb3b0e190d8360e427d84a2ba0c8;hb=f0e0a108cc121f9b0afdb4311f8b6849efb4c907;hp=446ab450171de96f54c471020b5d3f0ee036d767;hpb=4078bb3363f9b6cf457ae7d9bceb2c58e4108889;p=ghc-hetmet.git diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl index 446ab45..73d05b9 100644 --- a/ghc/driver/mangler/ghc-asm.lprl +++ b/ghc/driver/mangler/ghc-asm.lprl @@ -113,6 +113,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\.text\n\t\.align 3\n"; $T_HDR_vector = "\.text\n\t\.align 3\n"; $T_HDR_direct = "\.text\n\t\.align 3\n"; + $T_create_word = "\t.quad"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^hppa/ ) { @@ -140,6 +141,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n"; $T_HDR_vector = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n"; $T_HDR_direct = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^i386-.*-(linuxaout|freebsd2|openbsd|nextstep3|cygwin32|mingw32)$/ ) { @@ -171,6 +173,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\.text\n\t\.align 2,0x90\n"; $T_HDR_vector = "\.text\n\t\.align 2\n"; # NB: requires padding $T_HDR_direct = "\.text\n\t\.align 2,0x90\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^i386-.*-(solaris2|linux|freebsd|netbsd)$/ ) { @@ -207,6 +210,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\.text\n\t\.align 4\n"; $T_HDR_vector = "\.text\n\t\.align 4\n"; # NB: requires padding $T_HDR_direct = "\.text\n\t\.align 4\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^m68k-.*-sunos4/ ) { @@ -234,6 +238,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\.text\n\t\.even\n"; $T_HDR_vector = "\.text\n\t\.even\n"; $T_HDR_direct = "\.text\n\t\.even\n"; + $T_create_word = "\t.long"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^mips-.*/ ) { @@ -261,34 +266,36 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\t\.text\n\t\.align 2\n"; $T_HDR_vector = "\t\.text\n\t\.align 2\n"; $T_HDR_direct = "\t\.text\n\t\.align 2\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# - } elsif ( $TargetPlatform =~ /^powerpc-.*|^rs6000-.*/ ) { - + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ ) { + # Apple PowerPC Darwin/MacOS X. $T_STABBY = 0; # 1 iff .stab things (usually if a.out format) - $T_US = ''; # _ if symbols have an underscore on the front - $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_US = '_'; # _ if symbols have an underscore on the front + $T_PRE_APP = 'WHAT IS THIS'; # regexp that says what comes before APP/NO_APP + $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_COPY_DIRVS = '\.(l?globl)'; + $T_MOVE_DIRVS = '^(\s*(\.align \d+|\.text|\.data|\.cstring|\.non_lazy_symbol_pointer|\.const|\.static_const|\.literal4|\.literal8|\.static_data|\.globl \S+)\n)'; + $T_COPY_DIRVS = '\.(globl)'; $T_hsc_cc_PAT = '\.byte.*\)(hsc|cc) (.*)"\n\t\.byte \d+\n\t\.byte "(.*)"\n\t\.byte \d+'; - $T_DOT_WORD = '\.long'; + $T_DOT_WORD = '\.(long|short|byte)'; $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_srt = "# 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 = "\t\.const_data\n\t\.align 2\n"; + $T_HDR_misc = "\t\.text\n\t\.align 2\n"; + $T_HDR_data = "\t\.data\n\t\.align 2\n"; + $T_HDR_consist = "\t\.text\n\t\.align 2\n"; + $T_HDR_closure = "\t\.const_data\n\t\.align 2\n"; + $T_HDR_srt = "\t\.text\n\t\.align 2\n"; + $T_HDR_info = "\t\.text\n\t\.align 2\n"; + $T_HDR_entry = "\t\.text\n\t\.align 2\n"; + $T_HDR_fast = "\t\.text\n\t\.align 2\n"; + $T_HDR_vector = "\t\.text\n\t\.align 2\n"; + $T_HDR_direct = "\t\.text\n\t\.align 2\n"; + $T_create_word = "\t.long"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^sparc-.*-solaris2/ ) { @@ -316,6 +323,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\.text\n\t\.align 4\n"; $T_HDR_vector = "\.text\n\t\.align 4\n"; $T_HDR_direct = "\.text\n\t\.align 4\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^sparc-.*-sunos4/ ) { @@ -343,6 +351,7 @@ sub init_TARGET_STUFF { $T_HDR_fast = "\.text\n\t\.align 4\n"; $T_HDR_vector = "\.text\n\t\.align 4\n"; $T_HDR_direct = "\.text\n\t\.align 4\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# } else { @@ -421,16 +430,14 @@ sub mangle_asm { $i = 0; $chkcat[0] = 'misc'; $chk[0] = ''; while () { - tr/\r//d if $TargetPlatform =~ /-mingw32$/; + tr/\r//d if $TargetPlatform =~ /-mingw32$/; # In case Perl doesn't convert line endings next if $T_STABBY && /^\.stab.*${T_US}__stg_split_marker/o; next if $T_STABBY && /^\.stab.*ghc.*c_ID/; next if /^\t\.def.*endef$/; next if /${T_PRE_APP}(NO_)?APP/o; next if /^;/ && $TargetPlatform =~ /^hppa/; - next if /(^$|^\t\.file\t|^ # )/ && $TargetPlatform =~ /^(mips|powerpc|rs6000)-/; - - last if /^_section_\.text:$/ && $TargetPlatform =~ /^powerpc-|^rs6000-/; + next if /(^$|^\t\.file\t|^ # )/ && $TargetPlatform =~ /^(mips)-/; if ( $TargetPlatform =~ /^mips-/ && /^\t\.(globl\S+\.text|comm\t)/ ) { @@ -534,11 +541,6 @@ sub mangle_asm { $chkcat[$i] = 'bss'; $chksymb[$i] = ''; - } elsif ( $TargetPlatform =~ /^powerpc-|^rs6000-/ && /^LC\.\.([0-9]+)/ ) { - $chk[++$i] = $_; - $chkcat[$i] = 'toc'; - $chksymb[$i] = $1; - } elsif ( /^${T_US}([A-Za-z0-9_]+)_cc(s)?${T_POST_LBL}$/o ) { # all CC_ symbols go in the data section... $chk[++$i] = $_; @@ -549,9 +551,6 @@ sub mangle_asm { $chk[++$i] = $_; $chkcat[$i] = 'misc'; $chksymb[$i] = ''; - #$symbtmp = $1; - #$chksymb[$i] = $symbtmp if ($TargetPlatform =~ /^powerpc-|^rs6000-/) ; #rm andre - } elsif ( /^${T_US}([A-Za-z0-9_]+)_vtbl${T_POST_LBL}$/o ) { $chk[++$i] = $_; $chkcat[$i] = 'vector'; @@ -583,14 +582,13 @@ sub mangle_asm { } elsif ( /^${T_US}[A-Za-z0-9_]/o && ( $TargetPlatform !~ /^hppa/ # need to avoid local labels in this case - || ! /^L\$\d+$/ ) - && ( $TargetPlatform !~ /^powerpc|^rs6000/ # ditto - || ! /^(L\.\.\d+|LT\.\..*):$/ ) ) { + || ! /^L\$\d+$/ ) ) { local($thing); chop($thing = $_); print STDERR "Funny global thing?: $_" - unless $KNOWN_FUNNY_THING{$thing} - || /^${T_US}stg_.*${T_POST_LBL}$/o # RTS internals + unless # $KNOWN_FUNNY_THING{$thing} + /^${T_US}stg_.*${T_POST_LBL}$/o # RTS internals + || /^${T_US}__stg_.*${T_POST_LBL}$/o # more RTS internals || /^${T_US}__fexp_.*${T_POST_LBL}$/o # foreign export || /^${T_US}__stginit.*${T_POST_LBL}$/o # __stginit || /^${T_US}.*_btm${T_POST_LBL}$/o # large bitmaps @@ -598,9 +596,7 @@ sub mangle_asm { || /^_uname:/o; # x86/Solaris2 $chk[++$i] = $_; $chkcat[$i] = 'misc'; - if ($TargetPlatform =~ /^powerpc-|^rs6000-/) - { $chksymb[$i] = $thing; } - else { $chksymb[$i] = ''; }; + $chksymb[$i] = ''; } else { # simple line (duplicated at the top) @@ -609,9 +605,11 @@ sub mangle_asm { } $numchks = $#chk + 1; - # open CHUNKS, ">/tmp/chunks1" or die "Cannot open /tmp/chunks1: $!\n"; - # for (my $i = 0; $i < @chk; ++$i) { print CHUNKS "======= $i =======\n", $chk[$i] } - # close CHUNKS; + open CHUNKS, ">/tmp/chunks1" or die "Cannot open /tmp/chunks1: $!\n"; + for (my $i = 0; $i < @chk; ++$i) { print CHUNKS "======= $i =======\n", $chk[$i] } + close CHUNKS; + + # ######## # the division into chunks is imperfect; # we throw some things over the fence into the next @@ -634,37 +632,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\],(alt_\S+)/\t\.tc \1\[TC\],\.\2/; - $chk[$i] =~ s/\t\.tc (\S+)\[TC\],(vtbl_\S+)/\t\.tc \1\[TC\],\.\2/; - - $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_TOSSABLE; $i < $numchks; $i++) { $c = $chk[$i]; # convenience copy @@ -708,25 +675,31 @@ 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; + } elsif ($TargetPlatform =~ /^powerpc-apple-.*/) { + $p =~ s/^\tmflr r0\n//; + $p =~ s/^\tbl saveFP # f\d+\n//; + $p =~ s/^\tstmw r\d+,-\d+\(r1\)\n//; + $p =~ s/^\tstfd f\d+,-\d+\(r1\)\n//g; + $p =~ s/^\tstw r0,\d+\(r1\)\n//g; + $p =~ s/^\tstwu r1,-\d+\(r1\)\n//; + $p =~ s/^\tstw r\d+,-\d+\(r1\)\n//g; } else { print STDERR "$Pgm: unknown prologue mangling? $TargetPlatform\n"; } - # HWL HACK: dont die, just print a warning - #print stderr "HWL: this should die! Prologue junk?: $p\n" if $p =~ /^\t[^\.]/ - # && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test - die "Prologue junk?: $p\n" if $p =~ /^\t[^\.]/ - && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test - + if ($TargetPlatform =~ /^powerpc-apple-.*/) { + # on PowerPC, we have to keep a part of the prologue + # (which loads the current instruction pointer into register r31) + $u_p = $p; # $u_p is for unexpected prologue + $u_p =~ s/^\tbcl 20,31,L\d+\$pb\n//; + $u_p =~ s/^L\d+\$pb:\n//; + $u_p =~ s/^\tmflr r31\n//; + die "Prologue junk?: $u_p\n" if $u_p =~ /^\t[^\.]/ + } else { + # HWL HACK: dont die, just print a warning + #print stderr "HWL: this should die! Prologue junk?: $p\n" if $p =~ /^\t[^\.]/; + die "Prologue junk?: $p\n" if $p =~ /^\t[^\.]/; + } # glue together what's left $c = $p . $r; $c =~ s/\n\t\n/\n/; # junk blank line @@ -757,18 +730,17 @@ 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//; + } elsif ($TargetPlatform =~ /^powerpc-apple-.*/) { + $e =~ s/^\taddi r1,r1,\d+\n//; + $e =~ s/^\tcal r1,\d+\(r1\)\n//; + $e =~ s/^\tlw?z? r\d+,\d+\(r1\)\n//; + $e =~ s/^\tmtlr r0\n//; + $e =~ s/^\tblr\n//; } else { print STDERR "$Pgm: unknown epilogue mangling? $TargetPlatform\n"; } - print STDERR "WARNING: Epilogue junk?: $e\n" if $e =~ /^\t\s*[^\.\s\n]/ - && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test + print STDERR "WARNING: Epilogue junk?: $e\n" if $e =~ /^\t\s*[^\.\s\n]/; # glue together what's left $c = $r . $e; @@ -789,6 +761,7 @@ sub mangle_asm { # toss all calls to __DISCARD__ $c =~ s/^\t(call|jbsr|jal)\s+${T_US}__DISCARD__\n//go; +# ###WTT### $c =~ s/^\tbl\s+L___DISCARD__\$stub\n//go if $TargetPlatform =~ /^powerpc-apple-.*/; # MIPS: that may leave some gratuitous asm macros around # (no harm done; but we get rid of them to be tidier) @@ -932,26 +905,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] !~ /\__stginit_Main/) { - print OUTASM "\.csect ${chksymb[$i]}[DS]\n"; - print OUTASM "${p}TOC[tc0], 0\n"; -#ok } - } } } elsif ( $chkcat[$i] eq 'toss' ) { @@ -1030,18 +984,8 @@ 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/; - print OUTASM $chk[$infochk{$symb}]; - } else { - print OUTASM &rev_tbl($symb, $chk[$infochk{$symb}], 1); - } + print OUTASM &rev_tbl($symb, $chk[$infochk{$symb}], 1); + # entry code will be put here! $chkcat[$infochk{$symb}] = 'DONE ALREADY'; @@ -1053,18 +997,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/; @@ -1084,8 +1016,12 @@ 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 =~ /^powerpc-apple-.*/ ) { + $c =~ s/^\taddis r9,r31,ha16\(L_${symb}_fast\d*\$non_lazy_ptr-L\d+\$pb\)\n\tlwz r9,lo16\(L_${symb}_fast\d*\$non_lazy_ptr-L\d+\$pb\)\(r9\)\n\tmtctr r9\n\tbctr\n//; + # addis r9,r31,ha16(L_XXXX_fast3$non_lazy_ptr-L32$pb) + # lwz r9,lo16(L_XXXX_fast3$non_lazy_ptr-L32$pb)(r9) + # mtctr r9 + # bctr } elsif ( $TargetPlatform =~ /^sparc-/ ) { $c =~ s/^\tcall\s+${T_US}${symb}_fast\d+,.*\n\t\s*nop\n//; $c =~ s/^\tcall\s+${T_US}${symb}_fast\d+,.*\n(\t\s*[a-z].*\n)/$1/; @@ -1094,7 +1030,7 @@ sub mangle_asm { } } - if ( $TargetPlatform !~ /^(alpha-|hppa|mips-)/ ) { + if ( $TargetPlatform !~ /^(alpha-|hppa|mips-|powerpc-apple-)/) { # On alphas, hppa: no very good way to look for "dangling" # references to fast-entry point. # (questionable re hppa and mips...) @@ -1119,18 +1055,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); $chkcat[$fastchk{$symb}] = 'DONE ALREADY'; } @@ -1142,17 +1067,28 @@ 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 \.${symb}_vtbl\n"; - print OUTASM "\t\.globl ${symb}_vtbl\n"; - }; - $chk[$vectorchk{$symb}] =~ s/\.long (\S+)/\.long \.\1/g; - print OUTASM ".${symb}_vtbl:\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); + # DO NOT DELETE THE NEXT LINE. It fixes a rather subtle GC bug + # which showed up as a segfault reported by Ryszard Kubiak. + # Problem is with vector tables. They wind up as follows: + # .word some-word + # .word some-other-word + # fooble_vtbl: + # Problem is that we want the label fooble_vtbl to be considered + # in the same section as the vtbl itself, but the label actually + # lives at the next word along. If a data segment should happen + # to immediately follow the vtbl, as it can in GHCi, the label will + # be malclassified as in the data rather than text segment (during + # GC), and so we will regard references to it as static closure + # pointers rather than as code pointers, which is an error which + # usually crashes the garbage collectors. + # To fix this, we place a dummy word after the label, so as to + # ensure that the label is in the same segment as the vtbl proper. + # The native code generator has an analogous fix; see + # ghc/compiler/nativeGen/AbsCStixGen.lhs line 107. + print OUTASM "${T_create_word} 0\n"; + # direct return code will be put here! $chkcat[$vectorchk{$symb}] = 'DONE ALREADY'; @@ -1187,10 +1123,6 @@ 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" - }; - # 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"); @@ -1275,14 +1207,14 @@ sub print_doctored { if ($StolenX86Regs <= 2 ) { # YURGH! spurious uses of esi? s/^\tmovl\s+(.*),\s*\%esi\n\tjmp\s+\*%esi\n/\tmovl $1,\%eax\n\tjmp \*\%eax\n/g; - s/^\tjmp\s+\*(-?\d*)\((.*\%esi.*)\)\n/\tmovl $2,\%eax\n\tjmp \*$1\(\%eax\)\n/g; + s/^\tjmp\s+\*(.*\(.*\%esi.*\))\n/\tmovl $1,\%eax\n\tjmp \*\%eax\n/g; s/^\tjmp\s+\*\%esi\n/\tmovl \%esi,\%eax\n\tjmp \*\%eax\n/g; die "$Pgm: (mangler) still have jump involving \%esi!\n$_" if /(jmp|call)\s+.*\%esi/; } if ($StolenX86Regs <= 3 ) { # spurious uses of edi? s/^\tmovl\s+(.*),\s*\%edi\n\tjmp\s+\*%edi\n/\tmovl $1,\%eax\n\tjmp \*\%eax\n/g; - s/^\tjmp\s+\*(-?\d*\(.*\%edi.*\))\n/\tmovl $1,\%eax\n\tjmp \*\%eax\n/g; + s/^\tjmp\s+\*(.*\(.*\%edi.*\))\n/\tmovl $1,\%eax\n\tjmp \*\%eax\n/g; s/^\tjmp\s+\*\%edi\n/\tmovl \%edi,\%eax\n\tjmp \*\%eax\n/g; die "$Pgm: (mangler) still have jump involving \%edi!\n$_" if /(jmp|call)\s+.*\%edi/; @@ -1443,7 +1375,7 @@ sub rev_tbl { local ($sign, $base, $digits) = ($1, $2, $3); $base = (10, 8, 16)[length $base]; local ($hi, $lo) = (0, 0); - foreach $i (split //, $digits) { + foreach $i (split(//, $digits)) { $j = $lo * $base + $i; $lo = $j % 4294967296; $hi = $hi * $base + ($j - $lo) / 4294967296; @@ -1501,54 +1433,6 @@ sub mini_mangle_asm_hppa { } \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 () { - 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; -} -\end{code} \begin{code} sub tidy_up_and_die {