X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fmangler%2Fghc-asm.lprl;h=29cbfb10780150550a1a488041dd2905ec22ae0d;hb=5ecfa1f1d48111f5c95ec2fdae895fa24f8e321a;hp=8e03615158a79246e3ea01dcf68b98bd6a2a8584;hpb=f5448f5c5efe0630cb865ee0d21691a23ea932d3;p=ghc-hetmet.git diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl index 8e03615..29cbfb1 100644 --- a/ghc/driver/mangler/ghc-asm.lprl +++ b/ghc/driver/mangler/ghc-asm.lprl @@ -66,7 +66,11 @@ $ifile = $ARGV[0]; $ofile = $ARGV[1]; if ( $TargetPlatform =~ /^i386-/ ) { - $StolenX86Regs = $ARGV[2]; + if ($ARGV[2] eq '') { + $StolenX86Regs = 4; + } else { + $StolenX86Regs = $ARGV[2]; + } } &mangle_asm($ifile,$ofile); @@ -89,14 +93,14 @@ sub init_TARGET_STUFF { $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 = 'DONT THINK THIS APPLIES'; # regexp that says what comes before APP/NO_APP - $T_CONST_LBL = '^\$C(\d+):$'; # regexp for what such a lbl looks like + $T_CONST_LBL = '^\$L?C(\d+):$'; # regexp for what such a lbl looks like $T_POST_LBL = ':'; - $T_MOVE_DIRVS = '^(\s*(\.align\s+\d+|\.(globl|ent)\s+\S+|\#.*|\.(file|loc)\s+\S+\s+\S+|\.text|\.r?data)\n)'; - $T_COPY_DIRVS = '^\s*(\#|\.(file|globl|ent|loc))'; + $T_MOVE_DIRVS = '^(\s*(\$.*\.\.ng:|\.align\s+\d+|\.(globl|ent)\s+\S+|\#.*|\.(file|loc)\s+\S+\s+\S+|\.text|\.r?data)\n)'; + $T_COPY_DIRVS = '^\s*(\$.*\.\.ng:|\#|\.(file|globl|ent|loc))'; $T_hsc_cc_PAT = '\.ascii.*\)(hsc|cc) (.*)\\\\11"\n\t\.ascii\s+"(.*)\\\\0"'; - $T_DOT_WORD = '\.quad'; + $T_DOT_WORD = '\.(long|quad|byte|word)'; $T_DOT_GLOBAL = '^\t\.globl'; $T_HDR_literal = "\.rdata\n\t\.align 3\n"; $T_HDR_misc = "\.text\n\t\.align 3\n"; @@ -106,9 +110,9 @@ sub init_TARGET_STUFF { $T_HDR_srt = "\.text\n\t\.align 3\n"; $T_HDR_info = "\.text\n\t\.align 3\n"; $T_HDR_entry = "\.text\n\t\.align 3\n"; - $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/ ) { @@ -133,12 +137,12 @@ sub init_TARGET_STUFF { $T_HDR_srt = "\t.SPACE \$PRIVATE\$\n\t.SUBSPA \$DATA\$\n\t\.align 4\n"; $T_HDR_info = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n"; $T_HDR_entry = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n"; - $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|netbsd|openbsd|nextstep3|cygwin32|mingw32)$/ ) { + } elsif ( $TargetPlatform =~ /^i386-.*-(linuxaout|freebsd2|openbsd|nextstep3|cygwin32|mingw32)$/ ) { # NeXT added but not tested. CaS $T_STABBY = 1; # 1 iff .stab things (usually if a.out format) @@ -160,37 +164,36 @@ sub init_TARGET_STUFF { $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_closure = "\.data\n\t\.align 2\n\t.long 0\n" if ( $TargetPlatform =~ /.*-mingw32$/ ); $T_HDR_srt = "\.text\n\t\.align 2\n"; $T_HDR_info = "\.text\n\t\.align 2\n"; # NB: requires padding $T_HDR_entry = "\.text\n"; # no .align so we're right next to _info (arguably wrong...?) - $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_elf)$/ ) { + } elsif ( $TargetPlatform =~ /^i386-.*-(solaris2|linux|freebsd|netbsd)$/ ) { $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 = # regexp that says what comes before APP/NO_APP - ($TargetPlatform =~ /-(linux|freebsd|netbsd_elf)$/) ? '#' : '/' ; + ($TargetPlatform =~ /-(linux|freebsd|netbsd)$/) ? '#' : '/' ; $T_CONST_LBL = '^\.LC(\d+):$'; # regexp for what such a lbl looks like $T_POST_LBL = ':'; $T_X86_PRE_LLBL_PAT = '\.L'; $T_X86_PRE_LLBL = '.L'; $T_X86_BADJMP = '^\tjmp\s+[^\.\*]'; - $T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s+\d+(,\s*0x90)?|\.globl\s+\S+|\.text|\.data|\.section\s+.*|\.type\s+.*|\.Lfe.*\n\s*\.size\s+.*|\.size\s+.*|\.ident.*)\n)'; - $T_COPY_DIRVS = '\.(globl)'; + $T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s+\d+(,\s*0x90)?|\.globl\s+\S+|\.text|\.data|\.section\s+.*|\.type\s+.*|\.size\s+\S+\s*,\s*\d+|\.ident.*|\.local.*)\n)'; + $T_COPY_DIRVS = '^\s*\.(globl|type|size|local)'; - if ( $TargetPlatform =~ /freebsd|netbsd_elf/ ) { + if ( $TargetPlatform =~ /freebsd|netbsd/ ) { $T_hsc_cc_PAT = '\.ascii.*\)(hsc|cc) (.*)\\\\11"\n\t\.ascii\s+"(.*)\\\\0"'; } else { $T_hsc_cc_PAT = '\.string.*\)(hsc|cc) (.*)\\\\t(.*)"'; } - $T_DOT_WORD = '\.(long|value|byte|zero)'; + $T_DOT_WORD = '\.(long|value|word|byte|zero)'; $T_DOT_GLOBAL = '\.globl'; $T_HDR_literal = "\.section\t\.rodata\n"; # or just use .text??? (WDP 95/11) $T_HDR_misc = "\.text\n\t\.align 4\n"; @@ -200,9 +203,36 @@ sub init_TARGET_STUFF { $T_HDR_srt = "\.text\n\t\.align 4\n"; # ToDo: change align? $T_HDR_info = "\.text\n\t\.align 4\n"; # NB: requires padding $T_HDR_entry = "\.text\n"; # no .align so we're right next to _info (arguably wrong...?) - $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 =~ /^ia64-.*-linux$/ ) { + + $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 = '#'; + $T_CONST_LBL = '^\.LC(\d+):$'; # regexp for what such a lbl looks like + $T_POST_LBL = ':'; + + $T_MOVE_DIRVS = '^(\s*\.(global|proc|pred\.safe_across_calls|text|data|section|subsection|align|size|type|ident)\s+.*\n)'; + $T_COPY_DIRVS = '\.(global|proc)'; + + $T_hsc_cc_PAT = '\.string.*\)(hsc|cc) (.*)\\\\t(.*)"'; + $T_DOT_WORD = '\.(long|value|byte|zero)'; + $T_DOT_GLOBAL = '\.global'; + $T_HDR_literal = "\.section\t\.rodata\n"; + $T_HDR_misc = "\.text\n\t\.align 8\n"; + $T_HDR_data = "\.data\n\t\.align 8\n"; + $T_HDR_consist = "\.text\n"; + $T_HDR_closure = "\.data\n\t\.align 8\n"; + $T_HDR_srt = "\.text\n\t\.align 8\n"; + $T_HDR_info = "\.text\n\t\.align 8\n"; + $T_HDR_entry = "\.text\n\t\.align 16\n"; + $T_HDR_vector = "\.text\n\t\.align 8\n"; + $T_HDR_direct = "\.text\n\t\.align 8\n"; + $T_create_word = "\t.word"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^m68k-.*-sunos4/ ) { @@ -227,9 +257,9 @@ sub init_TARGET_STUFF { $T_HDR_srt = "\.text\n\t\.even\n"; $T_HDR_info = "\.text\n\t\.even\n"; $T_HDR_entry = "\.text\n\t\.even\n"; - $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-.*/ ) { @@ -254,37 +284,37 @@ sub init_TARGET_STUFF { $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.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|\.const_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|fill|space)'; $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_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/ ) { @@ -299,7 +329,7 @@ sub init_TARGET_STUFF { $T_COPY_DIRVS = '\.(global|proc|stab)'; $T_hsc_cc_PAT = '\.asciz.*\)(hsc|cc) (.*)\\\\t(.*)"'; - $T_DOT_WORD = '\.(word|byte|half|skip|uahalf|uaword)'; + $T_DOT_WORD = '\.(long|word|byte|half|skip|uahalf|uaword)'; $T_DOT_GLOBAL = '^\t\.global'; $T_HDR_literal = "\.text\n\t\.align 8\n"; $T_HDR_misc = "\.text\n\t\.align 4\n"; @@ -309,9 +339,9 @@ sub init_TARGET_STUFF { $T_HDR_srt = "\.data\n\t\.align 4\n"; $T_HDR_info = "\.text\n\t\.align 4\n"; $T_HDR_entry = "\.text\n\t\.align 4\n"; - $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/ ) { @@ -336,9 +366,9 @@ sub init_TARGET_STUFF { $T_HDR_srt = "\.data\n\t\.align 4\n"; $T_HDR_info = "\.text\n\t\.align 4\n"; $T_HDR_entry = "\.text\n\t\.align 4\n"; - $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 { @@ -368,7 +398,6 @@ print STDERR "T_HDR_consist: $T_HDR_consist\n"; print STDERR "T_HDR_closure: $T_HDR_closure\n"; print STDERR "T_HDR_info: $T_HDR_info\n"; print STDERR "T_HDR_entry: $T_HDR_entry\n"; -print STDERR "T_HDR_fast: $T_HDR_fast\n"; print STDERR "T_HDR_vector: $T_HDR_vector\n"; print STDERR "T_HDR_direct: $T_HDR_direct\n"; } @@ -406,8 +435,7 @@ sub mangle_asm { $numchks = 0; # number of them @chkcat = (); # what category of thing in each chunk @chksymb = (); # what symbol(base) is defined in this chunk - %slowchk = (); # ditto, its regular "slow" entry code - %fastchk = (); # ditto, fast entry code + %entrychk = (); # ditto, its entry code %closurechk = (); # ditto, the (static) closure %srtchk = (); # ditto, its SRT (for top-level things) %infochk = (); # given a symbol base, say what chunk its info tbl is in @@ -417,25 +445,29 @@ sub mangle_asm { $i = 0; $chkcat[0] = 'misc'; $chk[0] = ''; while () { + 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|ia64)-/; if ( $TargetPlatform =~ /^mips-/ - && /^\t\.(globl \S+ \.text|comm\t)/ ) { + && /^\t\.(globl\S+\.text|comm\t)/ ) { $EXTERN_DECLS .= $_ unless /(__DISCARD__|\b(PK_|ASSIGN_)(FLT|DBL)\b)/; - - # As a temporary solution for compiling "foreign export" declarations, - # we use global variables to pass arguments from C to STG land. - # These declarations live in the .hc file and not in the generated C - # stub file, so we let them pass through here. - } elsif ( /^\t\.comm\t__fexp_.*$/ ) { + # Treat .comm variables as data. These show up in two (known) places: + # + # - the module_registered variable used in the __stginit fragment. + # even though these are declared static and initialised, gcc 3.3 + # likes to make them .comm, presumably to save space in the + # object file. + # + # - global variables used to pass arguments from C to STG in + # a foreign export. (is this still true? --SDM) + # + } elsif ( /^\t\.comm.*$/ ) { $chk[++$i] = $_; $chkcat[$i] = 'data'; $chksymb[$i] = ''; @@ -477,17 +509,10 @@ sub mangle_asm { } elsif ( /^${T_US}([A-Za-z0-9_]+)_(entry|ret)${T_POST_LBL}$/o ) { $chk[++$i] = $_; - $chkcat[$i] = 'slow'; + $chkcat[$i] = 'entry'; $chksymb[$i] = $1; - $slowchk{$1} = $i; - - } elsif ( /^${T_US}([A-Za-z0-9_]+)_fast\d*${T_POST_LBL}$/o ) { - $chk[++$i] = $_; - $chkcat[$i] = 'fast'; - $chksymb[$i] = $1; - - $fastchk{$1} = $i; + $entrychk{$1} = $i; } elsif ( /^${T_US}([A-Za-z0-9_]+)_closure${T_POST_LBL}$/o ) { $chk[++$i] = $_; @@ -508,10 +533,6 @@ sub mangle_asm { $chkcat[$i] = 'data'; $chksymb[$i] = ''; - } elsif ( /^${T_US}ghc.*c_ID${T_POST_LBL}/o ) { - $chk[++$i] = $_; - $chkcat[$i] = 'consist'; - } elsif ( /^(${T_US}__gnu_compiled_c|gcc2_compiled\.)${T_POST_LBL}/o ) { ; # toss it @@ -529,11 +550,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] = $_; @@ -544,9 +560,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'; @@ -554,50 +567,66 @@ sub mangle_asm { $vectorchk{$1} = $i; - # As a temporary solution for compiling "foreign export" declarations, - # we use global variables to pass arguments from C to STG land. - # These declarations live in the .hc file and not in the generated C - # stub file, so we let them pass through here. - } elsif ( /^[\t ]+\.comm[\t ]+__fexp_.*$/ ) { - $chk[++$i] = $_; - $chkcat[$i] = 'data'; - $chksymb[$i] = ''; - } elsif ( $TargetPlatform =~ /^i386-.*-solaris2/ - && /^(_uname|uname|stat|fstat):/ ) { - # for some utterly bizarre reason, this platform - # likes to drop little local C routines with these names - # into each and every .o file that #includes the - # relevant system .h file. Yuck. We just don't - # tolerate them in .hc files (which we are processing - # here). If you need to call one of these things from - # Haskell, make a call to your own C wrapper, then - # put that C wrapper (which calls one of these) in a - # plain .c file. WDP 95/12 + && /^[A-Za-z0-9][A-Za-z0-9_]*:/ ) { + # Some Solaris system headers contain function definitions (as + # opposed to mere prototypes), which end up in the .hc file when + # a Haskell module foreign imports the corresponding system + # functions (most notably stat()). We put them into the text + # segment. Note that this currently does not extend to function + # names starting with an underscore. + # - chak 7/2001 $chk[++$i] = $_; - $chkcat[$i] = 'toss'; + $chkcat[$i] = 'misc'; $chksymb[$i] = $1; } 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 "Funny global thing?: $_" - unless $KNOWN_FUNNY_THING{$thing} - || /^${T_US}stg_.*${T_POST_LBL}$/o # RTS internals + $thing =~ s/:$//; + print STDERR "Warning: retaining unknown function \`$thing' in output from C compiler\n" + 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}__init.*${T_POST_LBL}$/o # __init + || /^${T_US}.*_slow${T_POST_LBL}$/o # slow entry + || /^${T_US}__stginit.*${T_POST_LBL}$/o # __stginit || /^${T_US}.*_btm${T_POST_LBL}$/o # large bitmaps - || /^${T_US}.*_closure_tbl${T_POST_LBL}$/o; # closure tables + || /^${T_US}.*_srtd${T_POST_LBL}$/o # large bitmaps + || /^${T_US}.*_fast${T_POST_LBL}$/o # primops + || /^${T_US}.*_closure_tbl${T_POST_LBL}$/o # closure tables + || /^_uname:/o; # x86/Solaris2 $chk[++$i] = $_; $chkcat[$i] = 'misc'; - if ($TargetPlatform =~ /^powerpc-|^rs6000-/) - { $chksymb[$i] = $thing; } - else { $chksymb[$i] = ''; }; + $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && /^\.picsymbol_stub/ ) + { + $chk[++$i] = $_; + $chkcat[$i] = 'dyld'; + $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && /^\.symbol_stub/ ) + { + $chk[++$i] = $_; + $chkcat[$i] = 'dyld'; + $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && /^\.lazy_symbol_pointer/ ) + { + $chk[++$i] = $_; + $chkcat[$i] = 'dyld'; + $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && /^\.non_lazy_symbol_pointer/ ) + { + $chk[++$i] = $_; + $chkcat[$i] = 'dyld'; + $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && /^\.data/ && $chkcat[$i] eq 'dyld') + { # non_lazy_symbol_ptrs that point to local symbols + $chk[++$i] = $_; + $chkcat[$i] = 'dyld'; + $chksymb[$i] = ''; } else { # simple line (duplicated at the top) $chk[$i] .= $_; @@ -605,6 +634,10 @@ 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; + # the division into chunks is imperfect; # we throw some things over the fence into the next # chunk. @@ -614,68 +647,68 @@ sub mangle_asm { # output. local($FIRST_MANGLABLE) = ($TargetPlatform =~ /^(alpha-|hppa|mips-)/) ? 1 : 0; + local($FIRST_TOSSABLE ) = ($TargetPlatform =~ /^(hppa|mips-)/) ? 1 : 0; # print STDERR "first chunk to mangle: $FIRST_MANGLABLE\n"; # Alphas: NB: we start meddling at chunk 1, not chunk 0 # The first ".rdata" is quite magical; as of GCC 2.7.x, it - # spits a ".quad 0" in after the v first ".rdata"; we + # spits a ".quad 0" in after the very first ".rdata"; we # detect this special case (tossing the ".quad 0")! local($magic_rdata_seen) = 0; # 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_MANGLABLE; $i < $numchks; $i++) { + for ($i = $FIRST_TOSSABLE; $i < $numchks; $i++) { $c = $chk[$i]; # convenience copy # print STDERR "\nCHK $i (BEFORE) (",$chkcat[$i],"):\n", $c; # toss all prologue stuff; HPPA is pretty weird # (see elsewhere) - $c = &mash_hppa_prologue($c) if $TargetPlatform =~ /^hppa/; + $c = &hppa_mash_prologue($c) if $TargetPlatform =~ /^hppa-/; # be slightly paranoid to make sure there's # nothing surprising in there if ( $c =~ /--- BEGIN ---/ ) { if (($p, $r) = split(/--- BEGIN ---/, $c)) { + # remove junk whitespace around the split point + $p =~ s/\t+$//; + $r =~ s/^\s*\n//; + if ($TargetPlatform =~ /^i386-/) { $p =~ s/^\tpushl\s+\%edi\n//; $p =~ s/^\tpushl\s+\%esi\n//; $p =~ s/^\tpushl\s+\%ebx\n//; + $p =~ s/^\tmovl\s+\%esi,\s*\d*\(\%esp\)\n//; + $p =~ s/^\tmovl\s+\%edi,\s*\d*\(\%esp\)\n//; $p =~ s/^\tsubl\s+\$\d+,\s*\%esp\n//; $p =~ s/^\tmovl\s+\$\d+,\s*\%eax\n\tcall\s+__alloca\n// if ($TargetPlatform =~ /^.*-cygwin32/); + + # GCC 3.1 is in the habit of adding spurious writes to the + # stack in the prologue. Just to be on the safe side, + # chuck these over the fence into the main code. + while ($p =~ /^\tmovl\s+\$\d+,\s*\d*\(\%esp\)\n/) { + # print "Spurious instruction: $&"; + $p = $` . $'; + $r = $& . $r; + } + + } elsif ($TargetPlatform =~ /^ia64-/) { + $p =~ s/^\t\.prologue .*\n//; + $p =~ s/^\t\.save ar\.pfs, r\d+\n\talloc r\d+ = ar\.pfs, 0, 3[12], \d+, 0\n//; + $p =~ s/^\t\.fframe \d+\n\tadds r12 = -\d+, r12\n//; + $p =~ s/^\t\.save rp, r\d+\n\tmov r\d+ = b0\n//; + $p =~ s/^\t\.(mii|mmi)\n//g; # bundling is no longer sensible + $p =~ s/^\t;;\n//g; # discard stops + $p =~ s/^\t\/\/.*\n//g; # gcc inserts timings in // comments + + # GCC 3.3 saves r1 in the prologue, move this to the body + if ($p =~ /^\tmov r\d+ = r1\n/) { + $p = $` . $'; + $r = $& . $r; + } } elsif ($TargetPlatform =~ /^m68k-/) { $p =~ s/^\tlink a6,#-?\d.*\n//; $p =~ s/^\tpea a6@\n\tmovel sp,a6\n//; @@ -699,28 +732,46 @@ 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-.*/) { + $pcrel_label = $p; + $pcrel_label =~ s/(.|\n)*^(L\d+\$pb):\n(.|\n)*/$2/ or $pcrel_label = ""; + + $p =~ s/^\tmflr r0\n//; + $p =~ s/^\tbl saveFP # f\d+\n//; + $p =~ s/^\tbl saveFP ; save f\d+-f\d+\n//; + $p =~ s/^L\d+\$pb:\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; + $p =~ s/^\tbcl 20,31,L\d+\$pb\n//; + $p =~ s/^L\d+\$pb:\n//; + $p =~ s/^\tmflr r31\n//; + + # This is bad: GCC 3 seems to zero-fill some local variables in the prologue + # under some circumstances, only when generating position dependent code. + # I have no idea why, and I don't think it is necessary, so let's toss it. + $p =~ s/^\tli r\d+,0\n//g; + $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 - + #print stderr "HWL: this should die! Prologue junk?: $p\n" if $p =~ /^\t[^\.]/; + die "Prologue junk?: $p\n" if $p =~ /^\s+[^\s\.]/; + + if ($TargetPlatform =~ /^powerpc-apple-.*/ && $pcrel_label ne "") { + # on PowerPC, we have to keep a part of the prologue + # (which loads the current instruction pointer into register r31) + $p .= "bcl 20,31,$pcrel_label\n"; + $p .= "$pcrel_label:\n"; + $p .= "\tmflr r31\n"; + } + # glue together what's left $c = $p . $r; - $c =~ s/\n\t\n/\n/; # junk blank line } } @@ -740,6 +791,14 @@ sub mangle_asm { $e =~ s/^\tpopl\s+\%ecx\n//; $e =~ s/^\taddl\s+\$\d+,\s*\%esp\n//; $e =~ s/^\tsubl\s+\$-\d+,\s*\%esp\n//; + } elsif ($TargetPlatform =~ /^ia64-/) { + $e =~ s/^\tmov ar\.pfs = r\d+\n//; + $e =~ s/^\tmov b0 = r\d+\n//; + $e =~ s/^\t\.restore sp\n\tadds r12 = \d+, r12\n//; + $e =~ s/^\tbr\.ret\.sptk\.many b0\n//; + $e =~ s/^\t\.(mii|mmi|mib)\n//g; # bundling is no longer sensible + $e =~ s/^\t;;\n//g; # discard stops - stop at end of body is sufficient + $e =~ s/^\t\/\/.*\n//g; # gcc inserts timings in // comments } elsif ($TargetPlatform =~ /^m68k-/) { $e =~ s/^\tunlk a6\n//; $e =~ s/^\trts\n//; @@ -748,27 +807,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"; } - # HWL HACK: dont die, just print a warning - #print stderr "HWL: this should die! Epilogue junk?: $e\n" if $e =~ /^\t[^\.]/ - # && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test - - # ** FIXME: - # ** chak: - # Commented this out, because it complains about junk that - # is later removed in the FUNNY#END#THING loop - but as I am - # not sure how this could ever have worked, there may be a - # better solution... - #die "Epilogue junk?: $e\n" if $e =~ /^\t[^\.\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; @@ -780,7 +829,7 @@ sub mangle_asm { # toss the register-windowing save/restore/ret* instructions # directly: if ( $TargetPlatform =~ /^sparc-/ ) { - $c =~ s/^\t(save.*|restore|ret|retl)\n//g; + $c =~ s/^\t(save.*|restore.*|ret|retl)\n//g; # throw away PROLOGUE comments $c =~ s/^\t!#PROLOGUE# 0\n\t!#PROLOGUE# 1\n//; } @@ -789,6 +838,17 @@ sub mangle_asm { # toss all calls to __DISCARD__ $c =~ s/^\t(call|jbsr|jal)\s+${T_US}__DISCARD__\n//go; + $c =~ s/^\tjsr\s+\$26\s*,\s*${T_US}__DISCARD__\n//go if $TargetPlatform =~ /^alpha-/; + $c =~ s/^\tbl\s+L___DISCARD__\$stub\n//go if $TargetPlatform =~ /^powerpc-apple-.*/; + + # IA64: mangle tailcalls into jumps here + if ($TargetPlatform =~ /^ia64-/) { + while ($c =~ s/^\tbr\.call\.sptk\.many b0 = (.*)\n(?:^\.L([0-9]*):\n)?(?:\t;;\n)?(?:\tmov r1 = r\d+\n)?(?:\t;;\n)?\t--- TAILCALL ---\n(?:\t;;\n\tbr \.L\d+\n)?/\tbr\.few $1\n/) { + # Eek, the gcc optimiser is getting smarter... if we see a jump to the --- TAILCALL --- + # marker then we reapply the substitution at the source sites + $c =~ s/^\tbr \.L$2\n/\t--- TAILCALL ---\n/g if ($2); + } + } # MIPS: that may leave some gratuitous asm macros around # (no harm done; but we get rid of them to be tidier) @@ -825,7 +885,7 @@ sub mangle_asm { # blah_closure: # ... # - if ( $TargetPlatform =~ /^(i386|sparc)/ && $to_move =~ /${T_COPY_DIRVS}/ ) { + if ( $TargetPlatform =~ /^(i386|sparc|powerpc)/ && $to_move =~ /${T_COPY_DIRVS}/ ) { $j = $i + 1; while ( $j < $numchks && $chk[$j] =~ /$T_CONST_LBL/) { $j++; @@ -848,14 +908,18 @@ sub mangle_asm { if ( $TargetPlatform =~ /^alpha-/ && $c =~ /^\t\.ent\s+(\S+)/ ) { $ent = $1; # toss all prologue stuff, except for loading gp, and the ..ng address - if (($p, $r) = split(/^\t\.prologue/, $c)) { - if (($keep, $junk) = split(/\.\.ng:/, $p)) { - $c = $keep . "..ng:\n"; - } else { - print STDERR "malformed code block ($ent)?\n" - } - } - $c .= "\t.frame \$30,0,\$26,0\n\t.prologue" . $r; + unless ($c =~ /\.ent.*\n\$.*\.\.ng:/) { + if (($p, $r) = split(/^\t\.prologue/, $c)) { + if (($keep, $junk) = split(/\.\.ng:/, $p)) { + $keep =~ s/^\t\.frame.*\n/\t.frame \$30,0,\$26,0\n/; + $keep =~ s/^\t\.(mask|fmask).*\n//g; + $c = $keep . "..ng:\n"; + } else { + print STDERR "malformed code block ($ent)?\n" + } + } + $c .= "\t.prologue" . $r; + } } $c =~ s/FUNNY#END#THING//; @@ -865,6 +929,10 @@ sub mangle_asm { $chk[$i] = $c; # update w/ convenience copy } + # open CHUNKS, ">/tmp/chunks2" or die "Cannot open /tmp/chunks2: $!\n"; + # for (my $i = 0; $i < @chk; ++$i) { print CHUNKS "======= $i =======\n", $chk[$i] } + # close CHUNKS; + if ( $TargetPlatform =~ /^alpha-/ ) { # print out the header stuff first $chk[0] =~ s/^(\t\.file.*)"(ghc\d+\.c)"/$1"$ifile_root.hc"/; @@ -926,26 +994,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] !~ /\__init_Main/) { - print OUTASM "\.csect ${chksymb[$i]}[DS]\n"; - print OUTASM "${p}TOC[tc0], 0\n"; -#ok } - } } } elsif ( $chkcat[$i] eq 'toss' ) { @@ -1002,8 +1051,7 @@ sub mangle_asm { } elsif ( $chkcat[$i] eq 'closure' || $chkcat[$i] eq 'srt' || $chkcat[$i] eq 'infotbl' - || $chkcat[$i] eq 'slow' - || $chkcat[$i] eq 'fast' ) { # do them in that order + || $chkcat[$i] eq 'entry') { # do them in that order $symb = $chksymb[$i]; # CLOSURE @@ -1024,111 +1072,25 @@ 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'; } # STD ENTRY POINT - if ( defined($slowchk{$symb}) ) { - - # 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/; - } elsif ( $TargetPlatform =~ /^hppa/ ) { - $c =~ s/^\s+ldil.*\n\s+ldo.*\n\s+bv.*\n(.*\n)?\s+\.EXIT/$1\t.EXIT/; - } elsif ( $TargetPlatform =~ /^i386-/ ) { - # Reg alloc depending, gcc generated code may jump to the fast entry point via - # a number of registers. - $c =~ s/^\tmovl\s+\$${T_US}${symb}_fast\d*,\s*\%edx\n\tjmp\s+\*\%edx\n//; - $c =~ s/^\tmovl\s+\$${T_US}${symb}_fast\d*,\s*\%ecx\n\tjmp\s+\*\%ecx\n//; - $c =~ s/^\tmovl\s+\$${T_US}${symb}_fast\d*,\s*\%eax\n\tjmp\s+\*\%eax\n//; - # The next two only apply if we're not stealing %esi or %edi. - $c =~ s/^\tmovl\s+\$${T_US}${symb}_fast\d*,\s*\%esi\n\tjmp\s+\*\%esi\n// if ($StolenX86Regs < 3); - $c =~ s/^\tmovl\s+\$${T_US}${symb}_fast\d*,\s*\%edi\n\tjmp\s+\*\%edi\n// if ($StolenX86Regs < 4); - } elsif ( $TargetPlatform =~ /^mips-/ ) { - $c =~ s/^\tjmp \$31,\(\$27\),0\n\t\.align 4\n\t\.end/\t.align 4\n\t.end/; - } 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\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/; - } else { - print STDERR "$Pgm: mystery slow-fast dropthrough: $TargetPlatform\n"; - } - } + if ( defined($entrychk{$symb}) ) { - if ( $TargetPlatform !~ /^(alpha-|hppa|mips-)/ ) { - # On alphas, hppa: no very good way to look for "dangling" - # references to fast-entry point. - # (questionable re hppa and mips...) - print STDERR "still has jump to fast entry point:\n$c" - if $c =~ /${T_US}${symb}_fast/; - } + $c = $chk[$entrychk{$symb}]; print OUTASM $T_HDR_entry; &print_doctored($c, 1); # NB: the 1!!! - $chkcat[$slowchk{$symb}] = 'DONE ALREADY'; + $chkcat[$entrychk{$symb}] = 'DONE ALREADY'; } - # 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 -#OLD: || $TargetPlatform =~ /^(m68k|sparc|i386)-/ - ) { - 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'; - } - } elsif ( $chkcat[$i] eq 'vector' || $chkcat[$i] eq 'direct' ) { # do them in that order $symb = $chksymb[$i]; @@ -1136,17 +1098,8 @@ 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); + # direct return code will be put here! $chkcat[$vectorchk{$symb}] = 'DONE ALREADY'; @@ -1174,6 +1127,12 @@ sub mangle_asm { $j++; } + } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && $chkcat[$i] eq 'dyld' ) { + # powerpc-apple: dynamic linker stubs + if($chk[$i] !~ /\.indirect_symbol ___DISCARD__/) + { # print them out unchanged, but remove the stubs for __DISCARD__ + print OUTASM $chk[$i]; + } } else { &tidy_up_and_die(1,"$Pgm: unknown chkcat (ghc-asm: $TargetPlatform)\n$chkcat[$i]\n$chk[$i]\n"); } @@ -1181,10 +1140,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"); @@ -1192,7 +1147,7 @@ sub mangle_asm { \end{code} \begin{code} -sub mash_hppa_prologue { # OK, epilogue, too +sub hppa_mash_prologue { # OK, epilogue, too local($_) = @_; # toss all prologue stuff @@ -1222,7 +1177,7 @@ sub print_doctored { if ( $TargetPlatform !~ /^i386-/ || ! /^\t[a-z]/ # no instructions in here, apparently - || /^${T_US}__init_[A-Za-z0-9_]+${T_POST_LBL}/) { + || /^${T_US}__stginit_[A-Za-z0-9_]+${T_POST_LBL}/) { print OUTASM $_; return; } @@ -1265,19 +1220,18 @@ sub print_doctored { # jmp * # -# Because of Perl bug, needed separate cases for eax, ebx, ecx, edx in the past - s/^\tmovl \$${T_US}(.*),(\%e[abcd]x)\n\tjmp \*$2/\tjmp $T_US$1/g; + s/^\tmovl\s+\$${T_US}(.*),\s*(\%e[abcd]x)\n\tjmp\s+\*\2/\tjmp $T_US$1/g; 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/; @@ -1289,7 +1243,7 @@ sub print_doctored { # Offsets into register table - you'd better update these magic # numbers should you change its contents! # local($OFFSET_R1)=0; No offset for R1 in new RTS. - local($OFFSET_Hp)=92; + local($OFFSET_Hp)=88; # Note funky ".=" stuff; we're *adding* to these _patch guys if ( $StolenX86Regs <= 2 @@ -1366,13 +1320,15 @@ right after the table itself. (The code pasting is done elsewhere.) sub rev_tbl { local($symb, $tbl, $discard1) = @_; + return ($tbl) if ($TargetPlatform =~ /^ia64-/); + local($before) = ''; local($label) = ''; local(@imports) = (); # hppa only local(@words) = (); local($after) = ''; local(@lines) = split(/\n/, $tbl); - local($i, $j); #local ($i, $extra, $words_to_pad, $j); + local($i, $j); # Deal with the header... for ($i = 0; $i <= $#lines && $lines[$i] !~ /^\t?${T_DOT_WORD}\s+/o; $i++) { @@ -1402,31 +1358,62 @@ sub rev_tbl { } } - # now throw away the first word (SRT) iff it is empty. + # Now throw away any initial zero word from the table. This is a hack + # that lets us reduce the size of info tables when the SRT field is not + # needed: see comments StgFunInfoTable in InfoTables.h. + # # The .zero business is for Linux/ELF. # The .skip business is for Sparc/Solaris/ELF. # The .blockz business is for HPPA. - if ($discard1 && $words[0] =~ /^\t?(${T_DOT_WORD}\s+0|\.zero\s+4|\.skip\s+4|\.blockz\s+4)/) { - shift(@words) - } - -# Padding removed to reduce code size and improve performance on Pentiums. -# Simon M. 13/4/96 - # for 486-cache-friendliness, we want our tables aligned - # on 16-byte boundaries (.align 4). Let's pad: -# $extra = ($#words + 1) % 4; -# $words_to_pad = ($extra == 0) ? 0 : 4 - $extra; -# for ($j = 0; $j < $words_to_pad; $j++) { push(@words, "\t${T_DOT_WORD} 0"); } +# if ($discard1) { +# if ($words[0] =~ /^\t?(${T_DOT_WORD}\s+0|\.zero\s+4|\.skip\s+4|\.blockz\s+4)/) { +# shift(@words); +# } +# } for (; $i <= $#lines; $i++) { $after .= $lines[$i] . "\n"; } - # Alphas:If we have anonymous text (not part of a procedure), the + # Alphas: If we have anonymous text (not part of a procedure), the # linker may complain about missing exception information. Bleh. + # To suppress this, we place a .ent/.end pair around the code. + # At the same time, we have to be careful and not enclose any leading + # .file/.loc directives. if ( $TargetPlatform =~ /^alpha-/ && $label =~ /^([A-Za-z0-9_]+):$/) { - $before = "\t.ent $1\n" . $before; - $after .= "\t.end $1\n"; + local ($ident) = $1; + $before =~ s/^((\s*\.(file|loc)\s+[^\n]*\n)*)/$1\t.ent $ident\n/; + $after .= "\t.end $ident\n"; + } + + # Alphas: The heroic Simon Marlow found a bug in the Digital UNIX + # assembler (!) wherein .quad constants inside .text sections are + # first narrowed to 32 bits then sign-extended back to 64 bits. + # This obviously screws up our 64-bit bitmaps, so we work around + # the bug by replacing .quad with .align 3 + .long + .long [ccshan] + if ( $TargetPlatform =~ /^alpha-/ ) { + foreach (@words) { + if (/^\s*\.quad\s+([-+0-9].*\S)\s*$/ && length $1 >= 10) { + local ($number) = $1; + if ($number =~ /^([-+])?(0x?)?([0-9]+)$/) { + local ($sign, $base, $digits) = ($1, $2, $3); + $base = (10, 8, 16)[length $base]; + local ($hi, $lo) = (0, 0); + foreach $i (split(//, $digits)) { + $j = $lo * $base + $i; + $lo = $j % 4294967296; + $hi = $hi * $base + ($j - $lo) / 4294967296; + } + ($hi, $lo) = (4294967295 - $hi, 4294967296 - $lo) + if $sign eq "-"; + $_ = "\t.align 3\n\t.long $lo\n\t.long $hi\n"; + # printf STDERR "TURNING %s into 0x %08x %08x\n", $number, $hi, $lo; + } else { + print STDERR "Cannot handle \".quad $number\" in info table\n"; + exit 1; + } + } + } } $tbl = $before @@ -1470,54 +1457,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 {