&collectExports_hppa() if $TargetPlatform =~ /^hppa/;
&collectExports_mips() if $TargetPlatform =~ /^mips/;
+ &collectDyldStuff_darwin() if $TargetPlatform =~ /-apple-darwin/;
$octr = 0; # output file counter
$* = 1; # multi-line matches are OK
# if $prologue_stuff eq $s_stuff;
# lie about where this stuff came from
- $prologue_stuff =~ s|"${Tmp_prefix}\.c"|"$ifile_root\.hc"|g;
+ # Note the \Q: this ignores regex meta-chars in $Tmp_prefix.
+ $prologue_stuff =~ s/\Q"$Tmp_prefix.c"/"$ifile_root.hc"/g;
while ( $_ ne '' ) { # not EOF
$octr++;
|| &tidy_up_and_die(1,"$Pgm:Failed writing ${Tmp_prefix}__${octr}.s\n");
}
+ # Make sure that we still have some output when the input file is empty
+ if ( $octr == 0 ) {
+ $octr = 1;
+ $ofname = "${Tmp_prefix}__${octr}.s";
+ open(OUTF, "> $ofname") || die "$Pgm: can't open output file: $ofname\n";
+
+ print OUTF $prologue_stuff;
+
+ close(OUTF)
+ || &tidy_up_and_die(1,"$Pgm:Failed writing ${Tmp_prefix}__${octr}.s\n");
+ }
+
$NoOfSplitFiles = $octr;
close(TMPI) || &tidy_up_and_die(1,"Failed reading $asm_file\n");
seek(TMPI, 0, 0);
}
+sub collectDyldStuff_darwin {
+ local($chunk_label,$label,$cur_section,$section,$chunk,$alignment,$cur_alignment);
+
+ %DyldChunks = (); # NB: global table
+ %DyldChunksDefined = (); # NB: global table
+
+ $cur_section = '';
+ $section = '';
+ $label = '';
+ $chunk = '';
+ $alignment = '';
+ $cur_alignment = '';
+
+ while ( 1 ) {
+ $_ = <TMPI>;
+ if ( $_ eq '' || /^L(_.+)\$.+:/ ) {
+ if ( $label ne '' ) {
+ $DyldChunksDefined{$label} .= $section . $alignment . $chunk_label . $ chunk;
+ if( $section =~ s/\.data/\.non_lazy_symbol_pointer/ ) {
+ $chunk = "\t.indirect_symbol $label\n\t.long 0\n";
+ }
+ $DyldChunks{$label} .= $section . $alignment . $chunk_label . $chunk;
+ print STDERR "### dyld chunk: $label\n$section$alignment$chunk\n###\n" if $Dump_asm_splitting_info;
+ }
+ last if ($_ eq '');
+
+ $chunk = '';
+ $chunk_label = $_;
+ $label = $1;
+ $section = $cur_section;
+ $alignment = $cur_alignment;
+ print STDERR "label: $label\n" if $Dump_asm_splitting_info;
+ } elsif ( /^\s*\.(symbol_stub|picsymbol_stub|lazy_symbol_pointer|non_lazy_symbol_pointer|data|section __IMPORT,.*)/ ) {
+ $cur_section = $_;
+ printf STDERR "section: $cur_section\n" if $Dump_asm_splitting_info;
+ $cur_alignment = ''
+ } elsif ( /^\s*\.section\s+__TEXT,__symbol_stub1,symbol_stubs,pure_instructions,\d+/ ) {
+ $cur_section = $_;
+ printf STDERR "section: $cur_section\n" if $Dump_asm_splitting_info;
+ # always make sure we align things
+ $cur_alignment = '\t.align 2'
+ } elsif ( /^\s*\.align.*/ ) {
+ $cur_alignment = $_;
+ printf STDERR "alignment: $cur_alignment\n" if $Dump_asm_splitting_info;
+ } else {
+ $chunk .= $_;
+ }
+ }
+
+ seek(TMPI, 0, 0);
+}
+
sub ReadTMPIUpToAMarker {
local($str, $count) = @_; # already read bits
sub process_asm_block {
local($str) = @_;
+ return(&process_asm_block_darwin($str))
+ if $TargetPlatform =~ /-apple-darwin/;
return(&process_asm_block_m68k($str)) if $TargetPlatform =~ /^m68k-/;
return(&process_asm_block_sparc($str)) if $TargetPlatform =~ /^sparc-/;
return(&process_asm_block_iX86($str)) if $TargetPlatform =~ /^i[34]86-/;
+ return(&process_asm_block_x86_64($str)) if $TargetPlatform =~ /^x86_64-/;
return(&process_asm_block_alpha($str)) if $TargetPlatform =~ /^alpha-/;
return(&process_asm_block_hppa($str)) if $TargetPlatform =~ /^hppa/;
return(&process_asm_block_mips($str)) if $TargetPlatform =~ /^mips-/;
- return(&process_asm_block_powerpc($str)) if $TargetPlatform =~ /^powerpc-|^rs6000-/;
+ return(&process_asm_block_powerpc_linux($str))
+ if $TargetPlatform =~ /^powerpc-[^-]+-linux/;
# otherwise...
&tidy_up_and_die(1,"$Pgm: no process_asm_block for $TargetPlatform\n");
\end{code}
\begin{code}
+sub process_asm_block_x86_64 {
+ local($str) = @_;
+
+ # remove/record any literal constants defined here
+ # [perl made uglier to work around the perl 5.7/5.8 bug documented at
+ # http://bugs6.perl.org/rt2/Ticket/Display.html?id=1760 and illustrated
+ # by the seg fault of perl -e '("x\n" x 5000) =~ /(.*\n)+/'
+ # -- ccshan 2002-09-05]
+ while ( ($str =~ /(\.?(LC\d+):\n(\t\.(ascii|string).*\n|\s*\.byte.*\n){1,100})/ )) {
+ local($label) = $2;
+ local($body) = $1;
+ local($prefix, $suffix, $*) = ($`, $', 0);
+
+ &tidy_up_and_die(1,"Local constant label $label already defined!\n")
+ if $LocalConstant{$label};
+
+ while ( $suffix =~ /^((\t\.(ascii|string).*\n|\s*\.byte.*\n){1,100})/ ) {
+ $body .= $1;
+ $suffix = $';
+ }
+ $LocalConstant{$label} = $body;
+ $str = $prefix . $suffix;
+ }
+
+ # inject definitions for any local constants now used herein
+ foreach $k (keys %LocalConstant) {
+ if ( $str =~ /\b$k\b/ ) {
+ $str = $LocalConstant{$k} . $str;
+ }
+ }
+
+ print STDERR "### STRIPPED BLOCK (x86_64):\n$str" if $Dump_asm_splitting_info;
+
+ $str;
+}
+\end{code}
+
+\begin{code}
sub process_asm_block_hppa {
local($str) = @_;
\end{code}
\begin{code}
-sub process_asm_block_powerpc {
+# The logic for both Darwin/PowerPC and Darwin/x86 ends up being the same.
+
+sub process_asm_block_darwin {
local($str) = @_;
+ local($dyld_stuff) = '';
# strip the marker
$str =~ s/___stg_split_marker.*\n//;
- $str =~ s/___stg_split_marker.*\n//; # yes, twice.
+
+ $str =~ s/L_.*\$.*:\n(.|\n)*//;
# remove/record any literal constants defined here
- while ( $str =~ /^(.csect .data[RW]\n\s+\.align.*\n(LC\.\.\d+):\n(\s\.byte .*\n)+)/ ) {
+ while ( $str =~ s/^(\s+.const.*\n\s+\.align.*\n(LC\d+):\n(\s\.(byte|short|long|fill|space|ascii).*\n)+)// ) {
local($label) = $2;
local($body) = $1;
if $LocalConstant{$label};
$LocalConstant{$label} = $body;
-
- $str =~ s/^.csect .data[RW]\n\s+\.align.*\nLC\.\.\d+:\n(\s\.byte .*\n)+//;
}
# inject definitions for any local constants now used herein
$str = $LocalConstant{$k} . $str;
}
}
+
+ foreach $k (keys %DyldChunks) {
+ if ( $str =~ /\bL$k\$/ ) {
+ if ( $str =~ /^$k:$/ ) {
+ $dyld_stuff .= $DyldChunksDefined{$k};
+ } else {
+ $dyld_stuff .= $DyldChunks{$k};
+ }
+ }
+ }
+
+ $str .= "\n" . $dyld_stuff;
+
+ print STDERR "### STRIPPED BLOCK (darwin):\n$str" if $Dump_asm_splitting_info;
+
+ $str;
+}
+\end{code}
+
+\begin{code}
+sub process_asm_block_powerpc_linux {
+ local($str) = @_;
+
+ # strip the marker
+ $str =~ s/__stg_split_marker.*\n//;
+
+ # remove/record any literal constants defined here
+ while ( $str =~ s/^(\s+.section\s+\.rodata\n\s+\.align.*\n(\.LC\d+):\n(\s\.(byte|short|long|quad|2byte|4byte|8byte|fill|space|ascii|string).*\n)+)// ) {
+ local($label) = $2;
+ local($body) = $1;
- print STDERR "### STRIPPED BLOCK (powerpc/rs6000):\n$str" if $Dump_asm_splitting_info;
+ &tidy_up_and_die(1,"Local constant label $label already defined!\n")
+ if $LocalConstant{$label};
+
+ $LocalConstant{$label} = $body;
+ }
- $str = ".toc\n" . $str;
+ # inject definitions for any local constants now used herein
+ foreach $k (keys %LocalConstant) {
+ if ( $str =~ /[\s,]$k\b/ ) {
+ $str = $LocalConstant{$k} . $str;
+ }
+ }
+
+ print STDERR "### STRIPPED BLOCK (powerpc linux):\n$str" if $Dump_asm_splitting_info;
$str;
}