pike.git/ src/ interpret.c

2013-08-16

2013-08-16 12:57:03 by Per Hedbor <ph@opera.com>

• 5909f93acae76217f42b7a1231c20885e06afae9 (23 lines) (+13/-10) ^{[ Show | Annotate ]}
  Branch: 7.9

Instead of returning 1, return the branch-to address

This makes jumps marginally more efficient (saves one instruction and some memory reading)

962:    (actually, they will always be incorrect before running FILL_STACK,    but at least currently that is the first opcode run).    */ -  if( instr+F_OFFSET != F_FILL_STACK ) -  { -  if(/* Pike_fp->fun>=0 && */ Pike_fp->current_object->prog && -  Pike_fp->locals+Pike_fp->num_locals > Pike_sp) -  Pike_fatal("Stack error (stupid! %p %p+%x).\n",Pike_sp, -  Pike_fp->locals, Pike_fp->num_locals*sizeof(struct svalue)); -  } +     -  +  /* as it turns out, this is no longer true.. */ +  /* if( instr+F_OFFSET != F_FILL_STACK ) */ +  /* { */ +  /* if(/\* Pike_fp->fun>=0 && *\/ Pike_fp->current_object->prog && */ +  /* Pike_fp->locals+Pike_fp->num_locals > Pike_sp) */ +  /* Pike_fatal("Stack error (stupid! %p %p+%x).\n",Pike_sp, */ +  /* Pike_fp->locals, Pike_fp->num_locals*sizeof(struct svalue)); */ +  /* } */ +     if(Pike_interpreter.recoveries &&    (Pike_sp-Pike_interpreter.evaluator_stack <    Pike_interpreter.recoveries->stack_pointer))
2055:    really_free_pike_frame(scope);   }    - int lower_mega_apply( INT32 args, struct object *o, ptrdiff_t fun ) + void *lower_mega_apply( INT32 args, struct object *o, ptrdiff_t fun )   {    struct program *p;    check_stack(256);
2189:    + ENTRY_PROLOGUE_SIZE   #endif /* ENTRY_PROLOGUE_SIZE */    ; -  return 1; +  return new_frame->pc;    }    else    {
2234:    * eval_instruction() is done the frame needs to be removed by a call    * to low_return() or low_return_pop().    */ - int low_mega_apply(enum apply_type type, INT32 args, void *arg1, void *arg2) + void* low_mega_apply(enum apply_type type, INT32 args, void *arg1, void *arg2)   {    struct object *o = NULL;    struct pike_frame *scope=0;