cvsuser     04/05/26 02:36:40

  Modified:    imcc     main.c
               src      packfile.c
  Log:
  parrotlib SEGV fix with -j, -P ...
  
  Revision  Changes    Path
  1.71      +6 -0      parrot/imcc/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /cvs/public/parrot/imcc/main.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -w -r1.70 -r1.71
  --- main.c    23 Apr 2004 09:20:31 -0000      1.70
  +++ main.c    26 May 2004 09:36:32 -0000      1.71
  @@ -405,6 +405,7 @@
   {
       struct PackFile *pf;
       int obj_file;
  +    Run_Cores core;
   
       Interp *interpreter = Parrot_new(NULL);
   
  @@ -416,6 +417,9 @@
       imcc_init(interpreter);
   
       sourcefile = parseflags(interpreter, &argc, &argv);
  +    /* can't run JIT or prederefed yet */
  +    core = interpreter->run_core;
  +    interpreter->run_core = 0;
   
       /* default optimizations, s. optimizer.c, imc.h */
       if (!*optimizer_opt) {
  @@ -539,6 +543,8 @@
           load_pbc = 1;
       }
       if (run_pbc) {
  +
  +        interpreter->run_core = core;
           if (interpreter->imc_info->imcc_warn)
               PARROT_WARNINGS_on(interpreter, PARROT_WARNINGS_ALL_FLAG);
           else
  
  
  
  1.162     +3 -3      parrot/src/packfile.c
  
  Index: packfile.c
  ===================================================================
  RCS file: /cvs/public/parrot/src/packfile.c,v
  retrieving revision 1.161
  retrieving revision 1.162
  diff -u -w -r1.161 -r1.162
  --- packfile.c        19 May 2004 21:14:33 -0000      1.161
  +++ packfile.c        26 May 2004 09:36:39 -0000      1.162
  @@ -2,7 +2,7 @@
   Copyright (C) 2001-2002 Gregor N. Purdy. All rights reserved.
   This program is free software. It is subject to the same license as
   Parrot itself.
  -$Id: packfile.c,v 1.161 2004/05/19 21:14:33 jrieks Exp $
  +$Id: packfile.c,v 1.162 2004/05/26 09:36:39 leo Exp $
   
   =head1 NAME
   
  
  
  

Reply via email to