Author: bernhard
Date: Wed Oct 19 11:57:42 2005
New Revision: 9515
Modified:
trunk/config/auto/jit.pl
Log:
Teach Parrot about the $osname on Darwin.
Thanks to Nick Glencross, [perl #37481]
Make config/auto/jit.pl conform more to coding standards,
while trying not to break things.
Modified: trunk/config/auto/jit.pl
==============================================================================
--- trunk/config/auto/jit.pl (original)
+++ trunk/config/auto/jit.pl Wed Oct 19 11:57:42 2005
@@ -20,175 +20,169 @@ use Parrot::Configure::Step qw(copy_if_d
$description = "Determining architecture, OS and JIT capability...";
[EMAIL PROTECTED](jitcapable miniparrot execcapable verbose);
[EMAIL PROTECTED] = qw(jitcapable miniparrot execcapable verbose);
sub runstep {
my ($set_jitcapable, $miniparrot, $set_execcapable, $verbose) = @_;
return if $miniparrot;
- my $archname = $Config{archname};
- my ($cpuarch, $osname) = split('-', $archname);
+ my $archname = $Config{archname};
+ my ($cpuarch, $osname) = split( /-/, $archname);
- if (!defined $osname) {
- ($osname, $cpuarch) = ($cpuarch, "");
- }
-
- # This was added to convert 9000/800 to 9000_800 on HP-UX
- $cpuarch =~ s|/|_|g;
-
- # On OS X if you are using the Perl that shipped with the system
- # the above split fails because archname is "darwin-thread-multi-2level".
-
- if($cpuarch =~ /darwin/) {
- $osname = 'darwin';
- $cpuarch = 'ppc';
- }
-
- if(($osname =~ /darwin/) || ($archname =~ /powerpc/)) {
- $cpuarch = 'ppc';
- }
-
- if($cpuarch =~ /MSWin32/) {
- $cpuarch = 'i386';
- $osname = 'MSWin32';
- }
- elsif($osname =~ /cygwin/i or $cpuarch =~ /cygwin/i) {
- $cpuarch = 'i386';
- }
-
- $cpuarch =~ s/armv[34]l?/arm/i;
- $cpuarch =~ s/i[456]86/i386/i;
-
- Configure::Data->set(
- archname => $archname,
- cpuarch => $cpuarch,
- osname => $osname
- );
-
-
- my $jitarchname = "$cpuarch-$osname";
- #$jitarchname =~ s/-(net|free|open)bsd$/-bsd/i;
- my $jitcapable = 0;
- my $execcapable = 0;
-
-print("-e \"jit/$cpuarch/core.jit\" = ", -e "jit/$cpuarch/core.jit" ? 'yes' :
'no', "\n") if $verbose;
-
- if (-e "jit/$cpuarch/core.jit") {
- $jitcapable = 1;
- if ($cpuarch =~ /sun4|sparc64/ &&
- Configure::Data->get('intvalsize') > Configure::Data->get('ptrsize')) {
- $jitcapable = 0;
- }
- }
-
- if (-e "jit/$cpuarch/$jitarchname.s") {
- copy_if_diff("jit/$cpuarch/$jitarchname.s", "src/asmfun.s");
- Configure::Data->set(asmfun_o => 'src/asmfun$(O)');
- }
- elsif (-e "jit/$cpuarch/asm.s") {
- copy_if_diff("jit/$cpuarch/asm.s", "src/asmfun.s");
- Configure::Data->set(asmfun_o => 'src/asmfun$(O)');
- } else {
- Configure::Data->set(asmfun_o => '');
- }
+ if (!defined $osname) {
+ ($osname, $cpuarch) = ($cpuarch, q{});
+ }
+
+ # This was added to convert 9000/800 to 9000_800 on HP-UX
+ $cpuarch =~ s|/|_|g;
- $jitcapable = $set_jitcapable if defined $set_jitcapable;
+ # On OS X if you are using the Perl that shipped with the system
+ # the above split fails because archname is "darwin-thread-multi-2level".
+ if ($cpuarch =~ /darwin/) {
+ $osname = 'darwin';
+ $cpuarch = 'ppc';
+ }
+ elsif ($cpuarch =~ /MSWin32/) {
+ $cpuarch = 'i386';
+ $osname = 'MSWin32';
+ }
+ elsif ($osname =~ /cygwin/i || $cpuarch =~ /cygwin/i) {
+ $cpuarch = 'i386';
+ $osname = 'cygwin';
+ }
- if($jitcapable) {
- my($jitcpuarch, $jitosname) = split('-', $jitarchname);
+ if ( $archname =~ m/powerpc/ ) {
+ $cpuarch = 'ppc';
+ }
+
+ $cpuarch =~ s/armv[34]l?/arm/i;
+ $cpuarch =~ s/i[456]86/i386/i;
Configure::Data->set(
- jitarchname => $jitarchname,
- jitcpuarch => $jitcpuarch,
- jitcpu => uc($jitcpuarch),
- jitosname => uc($jitosname),
- jitcapable => 1,
- cc_hasjit => " -DHAS_JIT -D\U$jitcpuarch",
- TEMP_jit_h => '$(INC_DIR)/jit.h',
- TEMP_jit_o => '$(SRC_DIR)/jit$(O) $(SRC_DIR)/jit_cpu$(O)
$(SRC_DIR)/jit_debug$(O) $(SRC_DIR)/jit_debug_xcoff$(O)'
+ archname => $archname,
+ cpuarch => $cpuarch,
+ osname => $osname
);
- if (($jitcpuarch eq 'i386')
- || ($jitcpuarch eq 'ppc') || ($jitcpuarch eq 'arm')) {
- $execcapable = 1;
- unless (($osname eq 'openbsd') ||
- ($osname eq 'freebsd') ||
- ($osname eq 'netbsd') ||
- ($osname eq 'linux') ||
- ($osname eq 'darwin') ||
- ($osname eq 'MSWin32'))
- {
- $execcapable = 0;
- }
- }
- $execcapable = $set_execcapable if defined $set_execcapable;
- if ($execcapable) {
- Configure::Data->set(
- TEMP_exec_h => '$(INC_DIR)/jit.h $(INC_DIR)/exec.h
$(INC_DIR)/exec_dep.h $(INC_DIR)/exec_save.h',
- TEMP_exec_o => '$(SRC_DIR)/exec$(O) $(SRC_DIR)/exec_cpu$(O)
$(SRC_DIR)/exec_save$(O)',
- execcapable => 1
- );
+
+ my $jitarchname = "$cpuarch-$osname";
+ my ( $jitcapable, $execcapable ) = ( 0, 0 );
+
+ print( qq{-e "jit/$cpuarch/core.jit" = }, -e "jit/$cpuarch/core.jit" ?
'yes' : 'no', "\n" ) if $verbose;
+
+ if (-e "jit/$cpuarch/core.jit") {
+ $jitcapable = 1;
+ if ($cpuarch =~ /sun4|sparc64/ &&
+ Configure::Data->get('intvalsize') >
Configure::Data->get('ptrsize')) {
+ $jitcapable = 0;
+ }
+ }
+
+ if (-e "jit/$cpuarch/$jitarchname.s") {
+ copy_if_diff("jit/$cpuarch/$jitarchname.s", "src/asmfun.s");
+ Configure::Data->set(asmfun_o => 'src/asmfun$(O)');
+ }
+ elsif (-e "jit/$cpuarch/asm.s") {
+ copy_if_diff("jit/$cpuarch/asm.s", "src/asmfun.s");
+ Configure::Data->set(asmfun_o => 'src/asmfun$(O)');
}
else {
- Configure::Data->set(
- TEMP_exec_h => '',
- TEMP_exec_o => '',
- execcapable => 0
- );
- }
-
- # test for executable malloced memory
- if (-e "config/auto/jit/test_exec_$osname.in") {
- print " (has_exec_protect " if $verbose;
- cc_gen("config/auto/jit/test_exec_$osname.in");
- eval { cc_build(); };
- if ($@) {
- print " $@) " if $verbose;
- }
- else {
- if (cc_run(0) !~ /ok/ && cc_run(1) =~ /ok/) {
- Configure::Data->set(
- has_exec_protect => 1
- );
- print "yes) " if $verbose;
- }
- else {
- print "no) " if $verbose;
- }
- }
- cc_clean();
- }
-
- # TODO use executable memory for this test if needed
- #
- # test for some instructions
- if ($jitcpuarch eq 'i386') {
- cc_gen('config/auto/jit/test_c.in');
- eval { cc_build(); };
- unless ($@ || cc_run() !~ /ok/) {
- Configure::Data->set(
- jit_i386 => 'fcomip'
- );
- }
- cc_clean();
+ Configure::Data->set(asmfun_o => '');
+ }
+
+ $jitcapable = $set_jitcapable if defined $set_jitcapable;
+
+ if ($jitcapable) {
+ my($jitcpuarch, $jitosname) = split( /-/, $jitarchname);
+
+ Configure::Data->set(
+ jitarchname => $jitarchname,
+ jitcpuarch => $jitcpuarch,
+ jitcpu => uc($jitcpuarch),
+ jitosname => uc($jitosname),
+ jitcapable => 1,
+ cc_hasjit => " -DHAS_JIT -D\U$jitcpuarch",
+ TEMP_jit_h => '$(INC_DIR)/jit.h',
+ TEMP_jit_o => '$(SRC_DIR)/jit$(O) $(SRC_DIR)/jit_cpu$(O)
$(SRC_DIR)/jit_debug$(O) $(SRC_DIR)/jit_debug_xcoff$(O)'
+ );
+
+ if ( ($jitcpuarch eq 'i386')
+ || ($jitcpuarch eq 'ppc')
+ || ($jitcpuarch eq 'arm')) {
+ $execcapable = 1;
+ unless ( ($osname eq 'openbsd')
+ || ($osname eq 'freebsd')
+ || ($osname eq 'netbsd')
+ || ($osname eq 'linux')
+ || ($osname eq 'darwin')
+ || ($osname eq 'MSWin32') ) {
+ $execcapable = 0;
+ }
+ }
+ $execcapable = $set_execcapable if defined $set_execcapable;
+ if ($execcapable) {
+ Configure::Data->set(
+ TEMP_exec_h => '$(INC_DIR)/jit.h $(INC_DIR)/exec.h
$(INC_DIR)/exec_dep.h $(INC_DIR)/exec_save.h',
+ TEMP_exec_o => '$(SRC_DIR)/exec$(O)
$(SRC_DIR)/exec_cpu$(O) $(SRC_DIR)/exec_save$(O)',
+ execcapable => 1
+ );
+ }
+ else {
+ Configure::Data->set(
+ TEMP_exec_h => '',
+ TEMP_exec_o => '',
+ execcapable => 0
+ );
+ }
+
+ # test for executable malloced memory
+ if (-e "config/auto/jit/test_exec_$osname.in") {
+ print " (has_exec_protect " if $verbose;
+ cc_gen("config/auto/jit/test_exec_$osname.in");
+ eval { cc_build(); };
+ if ($@) {
+ print " $@) " if $verbose;
+ }
+ else {
+ if (cc_run(0) !~ /ok/ && cc_run(1) =~ /ok/) {
+ Configure::Data->set( has_exec_protect => 1 );
+ print "yes) " if $verbose;
+ }
+ else {
+ print "no) " if $verbose;
+ }
+ }
+ cc_clean();
+ }
+
+ # TODO use executable memory for this test if needed
+ #
+ # test for some instructions
+ if ($jitcpuarch eq 'i386') {
+ cc_gen('config/auto/jit/test_c.in');
+ eval { cc_build(); };
+ unless ($@ || cc_run() !~ /ok/) {
+ Configure::Data->set( jit_i386 => 'fcomip');
+ }
+ cc_clean();
+ }
+ }
+ else {
+ Configure::Data->set(
+ jitarchname => 'nojit',
+ jitcpuarch => $cpuarch,
+ jitcpu => $cpuarch,
+ jitosname => $osname,
+ jitcapable => 0,
+ execcapable => 0,
+ cc_hasjit => '',
+ TEMP_jit_h => '',
+ TEMP_jit_o => '',
+ TEMP_exec_h => '',
+ TEMP_exec_o => ''
+ );
}
- }
- else {
- Configure::Data->set(
- jitarchname => 'nojit',
- jitcpuarch => $cpuarch,
- jitcpu => $cpuarch,
- jitosname => $osname,
- jitcapable => 0,
- execcapable => 0,
- cc_hasjit => '',
- TEMP_jit_h => '',
- TEMP_jit_o => '',
- TEMP_exec_h => '',
- TEMP_exec_o => ''
- );
- }
}
1;
