X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fmangler%2Fghc-asm.lprl;h=fbcd93441a2679b2e605ef05014ff4a452a7834a;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=b19550de6307da9bea589b4eaaf2d0caae22981a;hpb=553e90d9a32ee1b1809430f260c401cc4169c6c7;p=ghc-hetmet.git diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl index b19550d..fbcd934 100644 --- a/ghc/driver/mangler/ghc-asm.lprl +++ b/ghc/driver/mangler/ghc-asm.lprl @@ -99,19 +99,16 @@ sub init_TARGET_STUFF { $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 = '\.(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"; $T_HDR_data = "\.data\n\t\.align 3\n"; - $T_HDR_consist = "\.text\n"; + $T_HDR_rodata = "\.rdata\n\t\.align 3\n"; $T_HDR_closure = "\.data\n\t\.align 3\n"; - $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_vector = "\.text\n\t\.align 3\n"; - $T_HDR_direct = "\.text\n\t\.align 3\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^hppa/ ) { @@ -125,19 +122,16 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^((\s+\.(IMPORT|EXPORT|PARAM).*|\s+\.align\s+\d+|\s+\.(SPACE|SUBSPA)\s+\S+|\s*)\n)'; $T_COPY_DIRVS = '^\s+\.(IMPORT|EXPORT)'; - $T_hsc_cc_PAT = '\.STRING.*\)(hsc|cc) (.*)\\\\x09(.*)\\\\x00"'; $T_DOT_WORD = '\.(blockz|word|half|byte)'; $T_DOT_GLOBAL = '^\s+\.EXPORT'; $T_HDR_literal = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$LIT\$\n"; $T_HDR_misc = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n"; $T_HDR_data = "\t.SPACE \$PRIVATE\$\n\t.SUBSPA \$DATA\$\n\t\.align 4\n"; - $T_HDR_consist = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$LIT\$\n"; + $T_HDR_rodata = "\t.SPACE \$PRIVATE\$\n\t.SUBSPA \$DATA\$\n\t\.align 4\n"; $T_HDR_closure = "\t.SPACE \$PRIVATE\$\n\t.SUBSPA \$DATA\$\n\t\.align 4\n"; - $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_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"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^i386-.*-(linuxaout|freebsd2|nextstep3|cygwin32|mingw32)$/ ) { @@ -154,19 +148,16 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s+\d+(,0x90)?|\.globl\s+\S+|\.text|\.data|\.stab[^n].*|\.type\s+.*|\.size\s+.*|\.lcomm.*)\n)'; $T_COPY_DIRVS = '\.(globl|stab|lcomm)'; - $T_hsc_cc_PAT = '\.ascii.*\)(hsc|cc) (.*)\\\\11"\n\t\.ascii\s+"(.*)\\\\0"'; $T_DOT_WORD = '\.(long|word|value|byte|space)'; $T_DOT_GLOBAL = '\.globl'; $T_HDR_literal = "\.text\n\t\.align 2\n"; $T_HDR_misc = "\.text\n\t\.align 2,0x90\n"; $T_HDR_data = "\.data\n\t\.align 2\n"; - $T_HDR_consist = "\.text\n"; + $T_HDR_rodata = "\.text\n\t\.align 2\n"; $T_HDR_closure = "\.data\n\t\.align 2\n"; - $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_vector = "\.text\n\t\.align 2\n"; # NB: requires padding - $T_HDR_direct = "\.text\n\t\.align 2,0x90\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^i386-.*-(solaris2|linux|freebsd|netbsd|openbsd)$/ ) { @@ -184,24 +175,16 @@ sub init_TARGET_STUFF { $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/ ) { - $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|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"; - $T_HDR_data = "\.data\n\t\.align 4\n"; # ToDo: change align?? - $T_HDR_consist = "\.text\n"; - $T_HDR_closure = "\.data\n\t\.align 4\n"; # ToDo: change align? - $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_data = "\.data\n\t\.align 4\n"; + $T_HDR_rodata = "\.section\t\.rodata\n\t\.align 4\n"; + $T_HDR_closure = "\.data\n\t\.align 4\n"; + $T_HDR_info = "\.text\n\t\.align 4\n"; $T_HDR_entry = "\.text\n"; # no .align so we're right next to _info (arguably wrong...?) $T_HDR_vector = "\.text\n\t\.align 4\n"; # NB: requires padding - $T_HDR_direct = "\.text\n\t\.align 4\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^ia64-.*-linux$/ ) { @@ -215,19 +198,16 @@ sub init_TARGET_STUFF { $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_rodata = "\.section\t\.rodata\n\t\.align 8\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"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd)$/ ) { @@ -241,19 +221,16 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^(\s*\.(globl|text|data|section|align|size|type|ident|local)\s+.*\n)'; $T_COPY_DIRVS = '\.(globl|local)'; - $T_hsc_cc_PAT = '\.string.*\)(hsc|cc) (.*)\\\\t(.*)"'; $T_DOT_WORD = '\.(quad|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_rodata = "\.section\t\.rodata\n\t\.align 8\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 8\n"; $T_HDR_vector = "\.text\n\t\.align 8\n"; - $T_HDR_direct = "\.text\n\t\.align 8\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^m68k-.*-sunos4/ ) { @@ -266,20 +243,17 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^(\s*(\.align\s+\d+|\.proc\s+\d+|\.const|\.cstring|\.globl\s+\S+|\.text|\.data|\.even|\.stab[^n].*)\n)'; $T_COPY_DIRVS = '\.(globl|proc|stab)'; - $T_hsc_cc_PAT = '\.ascii.*\)(hsc|cc) (.*)\\\\11"\n\t\.ascii\s+"(.*)\\\\0"'; $T_DOT_WORD = '\.long'; $T_DOT_GLOBAL = '\.globl'; $T_HDR_literal = "\.text\n\t\.even\n"; $T_HDR_misc = "\.text\n\t\.even\n"; $T_HDR_data = "\.data\n\t\.even\n"; - $T_HDR_consist = "\.text\n"; + $T_HDR_rodata = "\.text\n\t\.even\n"; $T_HDR_closure = "\.data\n\t\.even\n"; - $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_vector = "\.text\n\t\.even\n"; - $T_HDR_direct = "\.text\n\t\.even\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^mips-.*/ ) { @@ -293,19 +267,16 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^(\s*(\.align\s+\d+|\.(globl|ent)\s+\S+|\.text|\.r?data)\n)'; $T_COPY_DIRVS = '\.(globl|ent)'; - $T_hsc_cc_PAT = 'I WAS TOO LAZY TO DO THIS BIT (WDP 95/05)'; $T_DOT_WORD = '\.word'; $T_DOT_GLOBAL = '^\t\.globl'; $T_HDR_literal = "\t\.rdata\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 = 'TOO LAZY TO DO THIS TOO'; + $T_HDR_rodata = "\t\.rdata\n\t\.align 2\n"; $T_HDR_closure = "\t\.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"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ ) { @@ -319,20 +290,17 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^(\s*(\.align \d+|\.text|\.data|\.const_data|\.cstring|\.non_lazy_symbol_pointer|\.const|\.static_const|\.literal4|\.literal8|\.static_data|\.globl \S+|\.section .*|\.lcomm.*)\n)'; $T_COPY_DIRVS = '\.(globl|lcomm)'; - $T_hsc_cc_PAT = '\.byte.*\)(hsc|cc) (.*)"\n\t\.byte \d+\n\t\.byte "(.*)"\n\t\.byte \d+'; $T_DOT_WORD = '\.(long|short|byte|fill|space)'; $T_DOT_GLOBAL = '\.globl'; $T_HDR_toc = "\.toc\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_rodata = "\t\.const_data\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"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^powerpc-.*-linux/ ) { @@ -346,20 +314,17 @@ sub init_TARGET_STUFF { $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)'; - $T_hsc_cc_PAT = '\.string.*\)(hsc|cc) (.*)\\\\t(.*)"'; $T_DOT_WORD = '\.(long|short|byte|fill|space)'; $T_DOT_GLOBAL = '\.globl'; $T_HDR_toc = "\.toc\n"; $T_HDR_literal = "\t\.section\t.rodata\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_rodata = "\t\.section\t.rodata\n\t\.align 2\n"; $T_HDR_closure = "\t\.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"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^sparc-.*-(solaris2|openbsd)/ ) { @@ -373,19 +338,15 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.stab.*|\.section.*|\s+\.type.*|\s+\.size.*)\n)'; $T_COPY_DIRVS = '\.(global|proc|stab)'; - $T_hsc_cc_PAT = '\.asciz.*\)(hsc|cc) (.*)\\\\t(.*)"'; $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"; $T_HDR_data = "\.data\n\t\.align 8\n"; - $T_HDR_consist = "\.text\n"; + $T_HDR_rodata = "\.text\n\t\.align 4\n"; $T_HDR_closure = "\.data\n\t\.align 4\n"; - $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_vector = "\.text\n\t\.align 4\n"; - $T_HDR_direct = "\.text\n\t\.align 4\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^sparc-.*-sunos4/ ) { @@ -398,20 +359,17 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.stab.*)\n)'; $T_COPY_DIRVS = '\.(global|proc|stab)'; - $T_hsc_cc_PAT = '\.ascii.*\)(hsc|cc) (.*)\\\\11"\n\t\.ascii\s+"(.*)\\\\0"'; $T_DOT_WORD = '\.word'; $T_DOT_GLOBAL = '^\t\.global'; $T_HDR_literal = "\.text\n\t\.align 8\n"; $T_HDR_misc = "\.text\n\t\.align 4\n"; $T_HDR_data = "\.data\n\t\.align 8\n"; - $T_HDR_consist = "\.text\n"; + $T_HDR_rodata = "\.text\n\t\.align 4\n"; $T_HDR_closure = "\.data\n\t\.align 4\n"; - $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_vector = "\.text\n\t\.align 4\n"; - $T_HDR_direct = "\.text\n\t\.align 4\n"; #--------------------------------------------------------# } elsif ( $TargetPlatform =~ /^sparc-.*-linux/ ) { @@ -425,19 +383,16 @@ sub init_TARGET_STUFF { $T_MOVE_DIRVS = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.seg|\.stab.*|\t?\.section.*|\s+\.type.*|\s+\.size.*)\n)'; $T_COPY_DIRVS = '\.(global|globl|proc|stab)'; - $T_hsc_cc_PAT = '\.asciz.*\)(hsc|cc) (.*)\\\\t(.*)"'; $T_DOT_WORD = '\.(long|word|nword|xword|byte|half|short|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"; $T_HDR_data = "\.data\n\t\.align 8\n"; - $T_HDR_consist = "\.text\n"; + $T_HDR_rodata = "\.text\n\t\.align 4\n"; $T_HDR_closure = "\.data\n\t\.align 4\n"; - $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_vector = "\.text\n\t\.align 4\n"; - $T_HDR_direct = "\.text\n\t\.align 4\n"; #--------------------------------------------------------# } else { @@ -458,17 +413,15 @@ if ( $TargetPlatform =~ /^i386-/ ) { } print STDERR "T_MOVE_DIRVS: $T_MOVE_DIRVS\n"; print STDERR "T_COPY_DIRVS: $T_COPY_DIRVS\n"; -print STDERR "T_hsc_cc_PAT: $T_hsc_cc_PAT\n"; print STDERR "T_DOT_WORD: $T_DOT_WORD\n"; print STDERR "T_HDR_literal: $T_HDR_literal\n"; print STDERR "T_HDR_misc: $T_HDR_misc\n"; print STDERR "T_HDR_data: $T_HDR_data\n"; -print STDERR "T_HDR_consist: $T_HDR_consist\n"; +print STDERR "T_HDR_rodata: $T_HDR_rodata\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_vector: $T_HDR_vector\n"; -print STDERR "T_HDR_direct: $T_HDR_direct\n"; } } @@ -541,6 +494,12 @@ sub mangle_asm { $chkcat[$i] = 'data'; $chksymb[$i] = ''; + # Labels beginning "_c": these are literal strings. + } elsif ( /^${T_US}_c.*$/ ) { + $chk[++$i] = $_; + $chkcat[$i] = 'rodata'; + $chksymb[$i] = ''; + } elsif ( /^\s+/ ) { # most common case first -- a simple line! # duplicated from the bottom @@ -891,6 +850,7 @@ sub mangle_asm { $e =~ s/^\tlw?z? r\d+,\d+\(r1\)\n//; $e =~ s/^\tmtlr r0\n//; $e =~ s/^\tblr\n//; + $e =~ s/^\tb restFP ;.*\n//; } else { print STDERR "$Pgm: unknown epilogue mangling? $TargetPlatform\n"; } @@ -1085,42 +1045,6 @@ sub mangle_asm { print OUTASM $chk[$i]; } - } elsif ( $chkcat[$i] eq 'consist' ) { - if ( $chk[$i] =~ /$T_hsc_cc_PAT/o ) { - local($consist) = "$1.$2.$3"; - $consist =~ s/,/./g; - $consist =~ s/\//./g; - $consist =~ s/-/_/g; - $consist =~ s/[^A-Za-z0-9_.]/ZZ/g; # ToDo: properly? - # - # Using a cygnus-2.7-96q4 gcc build on hppas, the - # consistency chunk for ghc_cc_ID often (but not always!) - # gets lumped with a bunch of .IMPORT directives containing info on - # the code or data space nature of external symbols. We can't - # toss these, so once the consistency ID has been turned into - # a representable symbol, we substitute it for the symbol - # that the string was attached to in the first place (ghc_cc_ID.) - # (The original string is also substituted away.) - # - # This change may affect the code output on other platforms in - # adverse ways, hence we restrict this hack hppa targets only. - # - # -- 2/98 SOF - if ( $TargetPlatform =~ /^hppa/ ) { - $chk[$i] =~ s/^${T_US}ghc.*c_ID$TPOSTLBL/$consist/o; - $chk[$i] =~ s/\t$T_hsc_cc_PAT/$T_HDR_misc/o; - $consist = $chk[$i]; #clumsily - } - print OUTASM $T_HDR_consist, "${consist}${T_POST_LBL}\n"; - - } elsif ( $TargetPlatform !~ /^(mips)-/ ) { # 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) - - print STDERR "Couldn't grok consistency: ", $chk[$i]; - } - } elsif ( $chkcat[$i] eq 'splitmarker' ) { # we can just re-constitute this one... # NB: we emit _three_ underscores no matter what, @@ -1142,7 +1066,7 @@ sub mangle_asm { # SRT if ( defined($srtchk{$symb}) ) { - print OUTASM $T_HDR_srt; + print OUTASM $T_HDR_rodata; print OUTASM $chk[$srtchk{$symb}]; $chkcat[$srtchk{$symb}] = 'DONE ALREADY'; } @@ -1158,11 +1082,18 @@ sub mangle_asm { $chkcat[$infochk{$symb}] = 'DONE ALREADY'; } - # STD ENTRY POINT + # ENTRY POINT if ( defined($entrychk{$symb}) ) { $c = $chk[$entrychk{$symb}]; + # If this is an entry point with an info table, + # eliminate the entry symbol and all directives involving it. + if (defined($infochk{$symb}) && $TargetPlatform !~ /^ia64-/) { + $c =~ s/^.*$symb_(entry|ret)${T_POST_LBL}\n//; + $c =~ s/^\s*\..*$symb.*\n//g; + } + print OUTASM $T_HDR_entry; &print_doctored($c, 1); # NB: the 1!!! @@ -1170,8 +1101,7 @@ sub mangle_asm { $chkcat[$entrychk{$symb}] = 'DONE ALREADY'; } - } elsif ( $chkcat[$i] eq 'vector' - || $chkcat[$i] eq 'direct' ) { # do them in that order + } elsif ( $chkcat[$i] eq 'vector' ) { $symb = $chksymb[$i]; # VECTOR TABLE @@ -1192,6 +1122,11 @@ sub mangle_asm { print OUTASM "\t# nop\n"; } + } elsif ( $chkcat[$i] eq 'rodata' ) { + print OUTASM $T_HDR_rodata; + print OUTASM $chk[$i]; + $chkcat[$i] = 'DONE ALREADY'; + } elsif ( $chkcat[$i] eq 'toc' ) { # silly optimisation to print tocs, since they come in groups... print OUTASM $T_HDR_toc;