X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fmangler%2Fghc-asm.lprl;h=393441662358f1a58a6fd2abb52f4c5ee786e222;hb=fc9bacdece12574a9ba9d2de2a74783da19f2ac4;hp=3c386e2c34ff860ae3e7bd8b8022cf5b0cecc2da;hpb=60ea58ab5cbf8428997d5aa8ec9163a50fe5aed3;p=ghc-hetmet.git diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl index 3c386e2..3934416 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)$/ ) { @@ -152,21 +146,18 @@ sub init_TARGET_STUFF { $T_X86_PRE_LLBL = 'L'; $T_X86_BADJMP = '^\tjmp [^L\*]'; - $T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s+\d+(,0x90)?|\.globl\s+\S+|\.text|\.data|\.stab[^n].*|\.type\s+.*|\.size\s+.*)\n)'; - $T_COPY_DIRVS = '\.(globl|stab)'; - $T_hsc_cc_PAT = '\.ascii.*\)(hsc|cc) (.*)\\\\11"\n\t\.ascii\s+"(.*)\\\\0"'; + $T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s.*|\.globl\s+\S+|\.text|\.data|\.stab[^n].*|\.type\s+.*|\.size\s+.*|\.lcomm.*)\n)'; + $T_COPY_DIRVS = '\.(globl|stab|lcomm)'; $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)$/ ) { @@ -174,34 +165,26 @@ 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 = # regexp that says what comes before APP/NO_APP - ($TargetPlatform =~ /-(linux|freebsd|netbsd)$/) ? '#' : '/' ; + ($TargetPlatform =~ /-(linux|freebsd|netbsd|openbsd)$/) ? '#' : '/' ; $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+.*|\.size\s+\S+\s*,\s*\d+|\.ident.*|\.local.*)\n)'; + $T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s.*|\.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,22 +198,19 @@ 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$/ ) { + } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd)$/ ) { $T_STABBY = 0; # 1 iff .stab things (usually if a.out format) $T_US = ''; # _ if symbols have an underscore on the front @@ -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,18 @@ 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_literal = "\t\.const\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_rodata = "\t\.const\n\t\.align 2\n"; + $T_HDR_relrodata= "\t\.const_data\n\t\.align 2\n"; + $T_HDR_closure = "\t\.data\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 +315,41 @@ 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_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"; + + #--------------------------------------------------------# + } elsif ( $TargetPlatform =~ /^powerpc64-.*-linux/ ) { + # PowerPC 64 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 = '^#'; # 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*(\.(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_DOT_WORD = '\.(long|short|byte|fill|space)'; + $T_DOT_GLOBAL = '\.globl'; + $T_HDR_toc = "\.toc\n"; + $T_HDR_literal = "\t\.section\t\".toc\",\"aw\"\n"; + $T_HDR_misc = "\t\.text\n\t\.align 2\n"; + $T_HDR_data = "\t\.data\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)/ ) { @@ -370,22 +360,19 @@ sub init_TARGET_STUFF { $T_CONST_LBL = '^\.LLC(\d+):$'; # regexp for what such a lbl looks like $T_POST_LBL = ':'; - $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_MOVE_DIRVS = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.stab.*|\s*\.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_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 +385,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/ ) { @@ -422,22 +406,19 @@ sub init_TARGET_STUFF { $T_CONST_LBL = '^\.LLC(\d+):$'; # regexp for what such a lbl looks like $T_POST_LBL = ':'; - $T_MOVE_DIRVS = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.seg|\.stab.*|\.section.*|\s+\.type.*|\s+\.size.*)\n)'; + $T_MOVE_DIRVS = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.seg|\.stab.*|\s+?\.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 { @@ -445,6 +426,12 @@ sub init_TARGET_STUFF { exit 1; } + if($T_HDR_relrodata eq "") { + # default values: + # relrodata defaults to rodata. + $T_HDR_relrodata = $T_HDR_rodata; + } + if ( 0 ) { print STDERR "T_STABBY: $T_STABBY\n"; print STDERR "T_US: $T_US\n"; @@ -458,17 +445,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 +526,19 @@ sub mangle_asm { $chkcat[$i] = 'data'; $chksymb[$i] = ''; + # Labels ending "_str": these are literal strings. + } elsif ( /^${T_US}([A-Za-z0-9_]+)_str${T_POST_LBL}$/ ) { + $chk[++$i] = $_; + $chkcat[$i] = 'rodata'; + $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /-darwin/ + && (/^\s*\.subsections_via_symbols/ + ||/^\s*\.no_dead_strip.*/)) { + # Don't allow Apple's linker to do any dead-stripping of symbols + # in this file, because it will mess up info-tables in mangled + # code. + # The .no_dead_strip directives are actually put there by + # the gcc3 "used" attribute on entry points. } elsif ( /^\s+/ ) { # most common case first -- a simple line! # duplicated from the bottom @@ -549,7 +547,6 @@ sub mangle_asm { } elsif ( /\.\.ng:$/ && $TargetPlatform =~ /^alpha-/ ) { # Alphas: Local labels not to be confused with new chunks $chk[$i] .= $_; - # NB: all the rest start with a non-space } elsif ( $TargetPlatform =~ /^mips-/ @@ -602,6 +599,11 @@ sub mangle_asm { $chkcat[$i] = 'data'; $chksymb[$i] = ''; + } elsif ( /^${T_US}(stg_ap_stack_entries|stg_stack_save_entries|stg_arg_bitmaps)${T_POST_LBL}$/o ) { + $chk[++$i] = $_; + $chkcat[$i] = 'data'; + $chksymb[$i] = ''; + } elsif ( /^(${T_US}__gnu_compiled_c|gcc2_compiled\.)${T_POST_LBL}/o ) { ; # toss it @@ -651,31 +653,45 @@ sub mangle_asm { } elsif ( /^${T_US}[A-Za-z0-9_]/o && ( $TargetPlatform !~ /^hppa/ # need to avoid local labels in this case - || ! /^L\$\d+$/ ) ) { + || ! /^L\$\d+$/ ) + && ( $TargetPlatform !~ /^powerpc64/ # we need to avoid local labels in this case + || ! /^\.L\d+:$/ ) ) { local($thing); chop($thing = $_); $thing =~ s/:$//; - print STDERR "Warning: retaining unknown function \`$thing' in output from C compiler\n" - unless # $KNOWN_FUNNY_THING{$thing} + $chk[++$i] = $_; + $chksymb[$i] = ''; + if ( /^${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}.*_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}.*_srtd${T_POST_LBL}$/o # large bitmaps || /^${T_US}.*_fast${T_POST_LBL}$/o # primops + || /^_uname:/o # x86/Solaris2 + ) + { + $chkcat[$i] = 'misc'; + } elsif ( + /^${T_US}.*_srtd${T_POST_LBL}$/o # large bitmaps || /^${T_US}.*_closure_tbl${T_POST_LBL}$/o # closure tables - || /^_uname:/o; # x86/Solaris2 - $chk[++$i] = $_; - $chkcat[$i] = 'misc'; - $chksymb[$i] = ''; + ) + { + $chkcat[$i] = 'relrodata'; + } else + { + print STDERR "Warning: retaining unknown function \`$thing' in output from C compiler\n"; + $chkcat[$i] = 'unknown'; + } } elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && ( /^\.picsymbol_stub/ || /^\.section __TEXT,__picsymbol_stub1,.*/ + || /^\.section __TEXT,__picsymbolstub1,.*/ || /^\.symbol_stub/ || /^\.section __TEXT,__symbol_stub1,.*/ + || /^\.section __TEXT,__symbolstub1,.*/ || /^\.lazy_symbol_pointer/ || /^\.non_lazy_symbol_pointer/ )) { @@ -687,6 +703,16 @@ sub mangle_asm { $chk[++$i] = $_; $chkcat[$i] = 'dyld'; $chksymb[$i] = ''; + } elsif ( $TargetPlatform =~ /^powerpc-.*-linux/ && /^\.LCTOC1 = /o ) { + # PowerPC Linux's large-model PIC (-fPIC) generates a gobal offset + # table "by hand". Be sure to copy it over. + # Note that this label and all entries in the table should actually + # go into the .got2 section, but it isn't easy to distinguish them + # from other constant literals (.LC\d+), so we just put everything + # in .rodata. + $chk[++$i] = $_; + $chkcat[$i] = 'literal'; + $chksymb[$i] = 'LCTOC1'; } else { # simple line (duplicated at the top) $chk[$i] .= $_; @@ -799,12 +825,12 @@ sub mangle_asm { $p =~ s/__FRAME__/$FRAME/; } elsif ($TargetPlatform =~ /^powerpc-apple-.*/) { $pcrel_label = $p; - $pcrel_label =~ s/(.|\n)*^(L\d+\$pb):\n(.|\n)*/$2/ or $pcrel_label = ""; + $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/^\"?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; @@ -826,12 +852,46 @@ sub mangle_asm { $p =~ s/^\tstw r0,8\(1\)\n//; $p =~ s/^\tstwu 1,-\d+\(1\)\n//; $p =~ s/^\tstw \d+,\d+\(1\)\n//g; + + # GCC's "large-model" PIC (-fPIC) + $pcrel_label = $p; + $pcrel_label =~ s/(.|\n)*^.LCF(\d+):\n(.|\n)*/$2/ or $pcrel_label = ""; + + $p =~ s/^\tbcl 20,31,.LCF\d+\n//; + $p =~ s/^.LCF\d+:\n//; + $p =~ s/^\tmflr 30\n//; + $p =~ s/^\tlwz 0,\.LCL\d+-\.LCF\d+\(30\)\n//; + $p =~ s/^\tadd 30,0,30\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 \d+,0\n//g; $p =~ s/^\tstw \d+,\d+\(1\)\n//g; + } elsif ($TargetPlatform =~ /^powerpc64-.*-linux/) { + $p =~ s/^\tmr 31,1\n//; + $p =~ s/^\tmflr 0\n//; + $p =~ s/^\tstmw \d+,\d+\(1\)\n//; + $p =~ s/^\tstfd \d+,-?\d+\(1\)\n//g; + $p =~ s/^\tstd r0,8\(1\)\n//; + $p =~ s/^\tstdu 1,-\d+\(1\)\n//; + $p =~ s/^\tstd \d+,-?\d+\(1\)\n//g; + + # GCC's "large-model" PIC (-fPIC) + $pcrel_label = $p; + $pcrel_label =~ s/(.|\n)*^.LCF(\d+):\n(.|\n)*/$2/ or $pcrel_label = ""; + + $p =~ s/^\tbcl 20,31,.LCF\d+\n//; + $p =~ s/^.LCF\d+:\n//; + $p =~ s/^\tmflr 30\n//; + $p =~ s/^\tlwz 0,\.LCL\d+-\.LCF\d+\(30\)\n//; + $p =~ s/^\tadd 30,0,30\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 \d+,0\n//g; + $p =~ s/^\tstd \d+,\d+\(1\)\n//g; } else { print STDERR "$Pgm: unknown prologue mangling? $TargetPlatform\n"; } @@ -840,13 +900,20 @@ sub mangle_asm { #print stderr "HWL: this should die! Prologue junk?: $p\n" if $p =~ /^\t[^\.]/; die "Prologue junk?: $p\n" if $p =~ /^\s+[^\s\.]/; + # For PIC, we want to keep part of the prologue 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) + # Darwin: load the current instruction pointer into register r31 $p .= "bcl 20,31,$pcrel_label\n"; $p .= "$pcrel_label:\n"; $p .= "\tmflr r31\n"; - } + } elsif ($TargetPlatform =~ /^powerpc-.*-linux/ && $pcrel_label ne "") { + # Linux: load the GOT pointer into register 30 + $p .= "\tbcl 20,31,.LCF$pcrel_label\n"; + $p .= ".LCF$pcrel_label:\n"; + $p .= "\tmflr 30\n"; + $p .= "\tlwz 0,.LCL$pcrel_label-.LCF$pcrel_label(30)\n"; + $p .= "\tadd 30,0,30\n"; + } # glue together what's left $c = $p . $r; @@ -887,10 +954,26 @@ sub mangle_asm { $e =~ s/^\tj\t\$31\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/^\tlwz r\d+,\d+\(r1\)\n//; + $e =~ s/^\tlmw r\d+,-\d+\(r1\)\n//; $e =~ s/^\tmtlr r0\n//; $e =~ s/^\tblr\n//; + $e =~ s/^\tb restFP ;.*\n//; + } elsif ($TargetPlatform =~ /^powerpc64-.*-linux/) { + $e =~ s/^\tmr 3,0\n//; + $e =~ s/^\taddi 1,1,\d+\n//; + $e =~ s/^\tld 0,16\(1\)\n//; + $e =~ s/^\tmtlr 0\n//; + + # callee-save registers + $e =~ s/^\tld \d+,-?\d+\(1\)\n//g; + $e =~ s/^\tlfd \d+,-?\d+\(1\)\n//g; + + # get rid of the debug junk along with the blr + $e =~ s/^\tblr\n\t.long .*\n\t.byte .*\n//; + + # incase we missed it with the last one get the blr alone + $e =~ s/^\tblr\n//; } else { print STDERR "$Pgm: unknown epilogue mangling? $TargetPlatform\n"; } @@ -905,9 +988,12 @@ sub mangle_asm { # On SPARCs, we don't do --- BEGIN/END ---, we just # toss the register-windowing save/restore/ret* instructions - # directly: + # directly unless they've been generated by function definitions in header + # files on Solaris: if ( $TargetPlatform =~ /^sparc-/ ) { - $c =~ s/^\t(save.*|restore.*|ret|retl)\n//g; + if ( ! ( $TargetPlatform =~ /solaris2$/ && $chkcat[$i] eq 'unknown' )) { + $c =~ s/^\t(save.*|restore.*|ret|retl)\n//g; + } # throw away PROLOGUE comments $c =~ s/^\t!#PROLOGUE# 0\n\t!#PROLOGUE# 1\n//; } @@ -918,7 +1004,8 @@ sub mangle_asm { $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-.*/; - $c =~ s/^\tbl\s+__DISCARD__\n//go if $TargetPlatform =~ /^powerpc-.*-linux/; + $c =~ s/^\tbl\s+__DISCARD__(\@plt)?\n//go if $TargetPlatform =~ /^powerpc-.*-linux/; + $c =~ s/^\tbl\s+\.__DISCARD__\n\s+nop\n//go if $TargetPlatform =~ /^powerpc64-.*-linux/; # IA64: mangle tailcalls into jumps here if ($TargetPlatform =~ /^ia64-/) { @@ -1070,7 +1157,7 @@ sub mangle_asm { next if $chkcat[$i] eq 'DONE ALREADY'; - if ( $chkcat[$i] eq 'misc' ) { + if ( $chkcat[$i] eq 'misc' || $chkcat[$i] eq 'unknown' ) { if ($chk[$i] ne '') { print OUTASM $T_HDR_misc; &print_doctored($chk[$i], 0); @@ -1085,42 +1172,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 +1193,7 @@ sub mangle_asm { # SRT if ( defined($srtchk{$symb}) ) { - print OUTASM $T_HDR_srt; + print OUTASM $T_HDR_relrodata; print OUTASM $chk[$srtchk{$symb}]; $chkcat[$srtchk{$symb}] = 'DONE ALREADY'; } @@ -1158,11 +1209,33 @@ 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-/) { + @o = (); + foreach $l (split(/\n/,$c)) { + next if $l =~ /^.*$symb_(entry|ret)${T_POST_LBL}/; + + # If we have .type/.size direrctives involving foo_entry, + # then make them refer to foo_info instead. The information + # in these directives is used by the cachegrind annotator, + # so it is worthwhile keeping. + if ($l =~ /^\s*\.(type|size).*$symb_(entry|ret)/) { + $l =~ s/$symb(_entry|_ret)/${symb}_info/g; + push(@o,$l); + next; + } + next if $l =~ /^\s*\..*$symb.*\n?/; + push(@o,$l); + } + $c = join("\n",@o) . "\n"; + } + print OUTASM $T_HDR_entry; &print_doctored($c, 1); # NB: the 1!!! @@ -1170,8 +1243,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 +1264,14 @@ 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 'relrodata' ) { + print OUTASM $T_HDR_relrodata; + 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; @@ -1298,8 +1378,16 @@ sub print_doctored { # movl $_blah, # jmp * # + s/^\tmovl\s+\$${T_US}(.*),\s*(\%e[acd]x)\n\tjmp\s+\*\2/\tjmp $T_US$1/g; - s/^\tmovl\s+\$${T_US}(.*),\s*(\%e[abcd]x)\n\tjmp\s+\*\2/\tjmp $T_US$1/g; + # Catch things like + # + # movl -4(%ebx), %eax + # jmp *%eax + # + # and optimise: + # + s/^\tmovl\s+(-?\d*\(\%e(bx|si)\)),\s*(\%e[acd]x)\n\tjmp\s+\*\3/\tjmp\t\*$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; @@ -1419,13 +1507,30 @@ sub rev_tbl { $before .= $lines[$i] . "\n"; # otherwise... } + $infoname = $label; + $infoname =~ s/(.|\n)*^([A-Za-z0-9_]+_info)${T_POST_LBL}$(.|\n)*/\2/; + # Grab the table data... if ( $TargetPlatform !~ /^hppa/ ) { for ( ; $i <= $#lines && $lines[$i] =~ /^\t?${T_DOT_WORD}\s+/o; $i++) { - push(@words, $lines[$i]); + $line = $lines[$i]; + # Convert addresses of SRTs, slow entrypoints and large bitmaps + # to offsets (relative to the info label), + # in order to support position independent code. + $line =~ s/$infoname/0/ + || $line =~ s/([A-Za-z0-9_]+_srtd)$/\1 - $infoname/ + || $line =~ s/([A-Za-z0-9_]+_srt(\+\d+)?)$/\1 - $infoname/ + || $line =~ s/([A-Za-z0-9_]+_slow)$/\1 - $infoname/ + || $line =~ s/([A-Za-z0-9_]+_btm)$/\1 - $infoname/ + || $line =~ s/([A-Za-z0-9_]+_alt)$/\1 - $infoname/ + || $line =~ s/([A-Za-z0-9_]+_dflt)$/\1 - $infoname/ + || $line =~ s/([A-Za-z0-9_]+_ret)$/\1 - $infoname/; + push(@words, $line); } } else { # hppa weirdness for ( ; $i <= $#lines && $lines[$i] =~ /^\s+(${T_DOT_WORD}|\.IMPORT)/; $i++) { + # FIXME: the RTS now expects offsets instead of addresses + # for all labels in info tables. if ($lines[$i] =~ /^\s+\.IMPORT/) { push(@imports, $lines[$i]); } else {