pike.git/ src/ interpret.c

2001-07-09

2001-07-09 11:37:21 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• eff6217781f1e16683e53c0617017691828ba5f8 (23 lines) (+17/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

Yet another batch of computed goto cleanups.

Rev: src/interpret.c:1.217
Rev: src/interpret_functions.h:1.72
Rev: src/interpreter.h:1.62
Rev: src/lex.c:1.95
Rev: src/lex.h:1.17
Rev: src/program.c:1.350
Rev: src/program.h:1.135

5:   \*/   /**/   #include "global.h" - RCSID("$Id: interpret.c,v 1.216 2001/07/08 20:58:35 grubba Exp $"); + RCSID("$Id: interpret.c,v 1.217 2001/07/09 11:37:20 grubba Exp $");   #include "interpret.h"   #include "object.h"   #include "program.h"
135:   }   #endif    - static int eval_instruction(unsigned char *pc); + static int eval_instruction(PIKE_OPCODE_T *pc);      PMOD_EXPORT void init_interpreter(void)   {
639:   #define BACKLOG 1024   struct backlog   { + #ifdef HAVE_COMPUTED_GOTO +  PIKE_OPCODE_T instruction; + #else /* !HAVE_COMPUTED_GOTO */    INT32 instruction; -  + #endif /* HAVE_COMPUTED_GOTO */    INT32 arg,arg2;    struct program *program; -  unsigned char *pc; +  PIKE_OPCODE_T *pc;   #ifdef _REENTRANT    struct object *thread_id;   #endif
683:   #endif       file=get_line(backlog[e].pc-1,backlog[e].program, &line); + #ifdef HAVE_COMPUTED_GOTO +  fprintf(stderr,"%s:%ld: %s", +  file, +  (long)line, +  low_get_f_name(backlog[e].instruction, backlog[e].program)); + #else /* !HAVE_COMPUTED_GOTO */    if(backlog[e].instruction < 0 || backlog[e].instruction+F_OFFSET > F_MAX_OPCODE)    {    fprintf(stderr,"%s:%ld: ILLEGAL INSTRUCTION %d\n",
692:    continue;    }    -  +     fprintf(stderr,"%s:%ld: %s",    file,    (long)line,
714:    fprintf(stderr," %ld, %ld\n",    DO_NOT_WARN((long)backlog[e].stack),    DO_NOT_WARN((long)backlog[e].mark_stack)); + #endif /* HAVE_COMPUTED_GOTO */    }    }while(e!=backlogp);   }      #endif - static int o_catch(unsigned char *pc); + static int o_catch(PIKE_OPCODE_T *pc);         #ifdef PIKE_DEBUG
1458:    * the setjmp won't affect the optimization of    * eval_instruction    */ - static int o_catch(unsigned char *pc) + static int o_catch(PIKE_OPCODE_T *pc)   {    JMP_BUF tmp;    struct svalue *expendible=Pike_fp->expendible;