Ticket #1925: 90418f5c8cbb8.remove_auto_jit.diff

File 90418f5c8cbb8.remove_auto_jit.diff, 8.8 KB (added by jkeenan, 11 years ago)

diff of remove_auto_jit branch against its branch point

  • Configure.pl

    diff --git a/Configure.pl b/Configure.pl
    index 56fc4ee..012d9ec 100644
    a b  
    358358 
    359359Use the given ops files. 
    360360 
    361 =item C<--jitcapable> 
    362  
    363 Use JIT system. 
    364  
    365361=item C<--buildframes> 
    366362 
    367363Dynamically build NCI call frames. 
    368364 
    369 =item C<--execcapable> 
    370  
    371 Use JIT to emit a native executable. 
    372  
    373365=back 
    374366 
    375367=head2 International Components For Unicode (ICU) Options 
  • MANIFEST

    diff --git a/MANIFEST b/MANIFEST
    index ccae08c..06deecb 100644
    a b  
    167167config/auto/ipv6/test.in                                    [] 
    168168config/auto/isreg.pm                                        [] 
    169169config/auto/isreg/test_c.in                                 [] 
    170 config/auto/jit.pm                                          [] 
    171170config/auto/libffi.pm                                       [] 
    172171config/auto/libffi/test_c.in                                [] 
    173172config/auto/llvm.pm                                         [] 
     
    19871986t/steps/auto/inline-01.t                                    [test] 
    19881987t/steps/auto/ipv6-01.t                                      [test] 
    19891988t/steps/auto/isreg-01.t                                     [test] 
    1990 t/steps/auto/jit-01.t                                       [test] 
    19911989t/steps/auto/libffi-01.t                                    [test] 
    19921990t/steps/auto/llvm-01.t                                      [test] 
    19931991t/steps/auto/memalign-01.t                                  [test] 
  • config/gen/config_h/config_h.in

    diff --git a/config/gen/config_h/config_h.in b/config/gen/config_h/config_h.in
    index d2dd1f9..09cc1b2 100644
    a b  
    2121#define PARROT_MINOR_VERSION    @MINOR@ 
    2222#define PARROT_PATCH_VERSION    @PATCH@ 
    2323#define PARROT_ARCHNAME         "@cpuarch@-@osname@" 
    24 #define PARROT_JIT_CAPABLE      @jitcapable@ 
    25 #define PARROT_EXEC_CAPABLE     @execcapable@ 
    2624#define PARROT_SHARE_EXT        "@share_ext@" 
    2725#define PARROT_LOAD_EXT         "@load_ext@" 
    2826#define PARROT_OBJ_EXT          "@o@" 
     
    9290#include <stddef.h> 
    9391 
    9492#define PARROT_CPU_ARCH         "@cpuarch@" 
    95 #define PARROT_OS_NAME          "@jitosname@" 
    9693#define PARROT_BYTEORDER        0x@byteorder@ 
    9794#define PARROT_BIGENDIAN        @bigendian@ 
    9895 
     
    141138typedef struct _vtable VTABLE; 
    142139typedef void DPOINTER; 
    143140 
    144 /* JIT and exec cores. */ 
    145 #define JIT_CPUARCH  "@jitcpuarch@" 
    146 #define JIT_OSNAME   "@jitosname@" 
    147 #define JIT_ARCHNAME "@jitarchname@" 
    148 #define JIT_CAPABLE  @jitcapable@ 
    149 #define EXEC_CAPABLE @execcapable@ 
    150 #define PARROT_EXEC_OS_@jitosname@ 1 
    151 #define PARROT_@jitcpu@ 1 
    152  
    153141/* Oplib and dynamic ops related. */ 
    154142#define PARROT_CORE_OPLIB_NAME    "core_ops" 
    155143#define PARROT_CORE_OPLIB_INIT    Parrot_DynOp_core_@MAJOR@_@MINOR@_@PATCH@ 
  • config/gen/config_pm/myconfig.in

    diff --git a/config/gen/config_pm/myconfig.in b/config/gen/config_pm/myconfig.in
    index efecb66..4f2acf2 100644
    a b  
    22  configdate='@configdate@' 
    33  Platform: 
    44    osname=@osname@, archname=@archname@ 
    5     jitcapable=@jitcapable@, jitarchname=@jitarchname@, 
    6     jitosname=@jitosname@, jitcpuarch=@jitcpuarch@ 
    7     execcapable=@execcapable@ 
    85    perl=@perl@ 
    96  Compiler: 
    107    cc='@cc@', ccflags='@ccflags@', 
  • include/parrot/embed.h

    diff --git a/include/parrot/embed.h b/include/parrot/embed.h
    index 069216c..6168c9c 100644
    a b  
    1212 
    1313#include "parrot/core_types.h"  /* types used */ 
    1414#include "parrot/compiler.h"    /* compiler capabilities */ 
    15 #include "parrot/config.h"      /* PARROT_VERSION, PARROT_JIT_CAPABLE... */ 
     15#include "parrot/config.h"      /* PARROT_VERSION... */ 
    1616#include "parrot/interpreter.h" /* give us the interpreter flags */ 
    1717#include "parrot/warnings.h"    /* give us the warnings flags    */ 
    1818 
  • include/parrot/extend.h

    diff --git a/include/parrot/extend.h b/include/parrot/extend.h
    index fca555f..9f99d55 100644
    a b  
    1515 
    1616#include <stdarg.h> 
    1717#include "parrot/core_types.h" 
    18 #include "parrot/config.h"      /* PARROT_VERSION, PARROT_JIT_CAPABLE... */ 
     18#include "parrot/config.h"      /* PARROT_VERSION... */ 
    1919#include "parrot/interpreter.h" /* give us the interpreter flags */ 
    2020#include "parrot/warnings.h"    /* give us the warnings flags    */ 
    2121 
  • lib/Parrot/Configure/Options/Conf.pm

    diff --git a/lib/Parrot/Configure/Options/Conf.pm b/lib/Parrot/Configure/Options/Conf.pm
    index ffe8aea..0f3a6da 100644
    a b  
    9090   --opcode=(type)      Use the given type for opcodes 
    9191   --ops=(files)        Use the given ops files 
    9292 
    93    --jitcapable         Use JIT 
    94    --execcapable        Use JIT to emit a native executable 
    9593   --without-threads    Build parrot without thread support 
    9694   --buildframes        Dynamically build NCI call frames 
    9795   --without-core-nci-thunks 
  • lib/Parrot/Configure/Options/Conf/Shared.pm

    diff --git a/lib/Parrot/Configure/Options/Conf/Shared.pm b/lib/Parrot/Configure/Options/Conf/Shared.pm
    index 05ed095..a2c1b6c 100644
    a b  
    2626    define 
    2727    disable-rpath 
    2828    exec-prefix 
    29     execcapable 
    3029    fatal 
    3130    fatal-step 
    3231    floatval 
     
    3938    infodir 
    4039    inline 
    4140    intval 
    42     jitcapable 
    4341    buildframes 
    4442    ld 
    4543    ldflags 
  • lib/Parrot/Configure/Step/List.pm

    diff --git a/lib/Parrot/Configure/Step/List.pm b/lib/Parrot/Configure/Step/List.pm
    index 02ef0fb..070bf48 100644
    a b  
    3535    auto::va_ptr 
    3636    auto::format 
    3737    auto::isreg 
    38     auto::jit 
    3938    auto::frames 
    4039    auto::llvm 
    4140    auto::inline 
  • runtime/parrot/library/distutils.pir

    diff --git a/runtime/parrot/library/distutils.pir b/runtime/parrot/library/distutils.pir
    index 792b322..6c8f31c 100644
    a b  
    42164216    $S0 = $P0['ccwarn'] 
    42174217    flags .= $S0 
    42184218    flags .= " " 
    4219     $S0 = $P0['cc_hasjit'] 
    4220     flags .= $S0 
    42214219    .return (flags) 
    42224220.end 
    42234221 
  • src/exceptions.c

    diff --git a/src/exceptions.c b/src/exceptions.c
    index fc8b207..5c873d3 100644
    a b  
    714714    fprintf(stderr, "Version     : %s\n", PARROT_VERSION); 
    715715    fprintf(stderr, "Configured  : %s\n", PARROT_CONFIG_DATE); 
    716716    fprintf(stderr, "Architecture: %s\n", PARROT_ARCHNAME); 
    717     fprintf(stderr, "JIT Capable : %s\n", JIT_CAPABLE ? "Yes" : "No"); 
    718717    if (interp) 
    719718        fprintf(stderr, "Interp Flags: %#x\n", (unsigned int)interp->flags); 
    720719    else 
  • t/examples/shootout.t

    diff --git a/t/examples/shootout.t b/t/examples/shootout.t
    index bdbcc2f..408fd2f 100644
    a b  
    6969    if ( $shebang =~ /^\#.+parrot\s+(.+)$/ ) { 
    7070        $args = $1;    # parrot options 
    7171    } 
    72     unless ( $PConfig{jitcapable} ) { 
    7372        $args =~ s/-j/-C/; 
    7473        $args =~ s/-Cj/-C/; 
    75     } 
    7674    $args =~ s/-Cj/-j/; 
    7775 
    7876    # Remove any plain -C option. 
  • t/native_pbc/integer.t

    diff --git a/t/native_pbc/integer.t b/t/native_pbc/integer.t
    index 3dc71c1..8972d39 100644
    a b  
    173173# ] 
    174174test_pbc_integer(1, "(4_le) i386 32 bit opcode_t, 4 byte intval, 8 byte double"); 
    175175 
    176 # adding --floatval="long double" --jitcapable=0 
     176# adding --floatval="long double" 
    177177# HEADER => [ 
    178178#         wordsize  = 4   (interpreter's wordsize/INTVAL = 4/4) 
    179179#         byteorder = 0   (interpreter's byteorder       = 0) 
  • tools/dev/create_language.pl

    diff --git a/tools/dev/create_language.pl b/tools/dev/create_language.pl
    index 2a87378..fc7dc55 100644
    a b  
    486486HAS_ICU            = @has_icu@ 
    487487 
    488488CC            = @cc@ 
    489 CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ 
     489CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cg_flag@ @gc_flag@ 
    490490EXE           = @exe@ 
    491491LD            = @ld@ 
    492492LDFLAGS       = @ldflags@ @ld_debug@ 
  • tools/dev/mk_native_pbc

    diff --git a/tools/dev/mk_native_pbc b/tools/dev/mk_native_pbc
    index 1013610..628c56d 100755
    a b  
    144144      exit 
    145145    fi 
    146146    make -s prog-clean 
    147     perl Configure.pl --floatval="long double" --jitcapable=0 --nomanicheck 
     147    perl Configure.pl --floatval="long double" --nomanicheck 
    148148    tail myconfig 
    149149    make -s || exit 1 
    150150    hugefloatvalsize=$(./parrot_config hugefloatvalsize)