pike.git/ src/ interpret.c

2000-11-20

2000-11-20 01:20:26 by Martin Stjernholm <mast@lysator.liu.se>

• 6697046875af3feb10279a9c413b08e77ebde192 (47 lines) (+30/-17) ^{[ Show | Annotate ]}
  Branch: 7.9

Reserve some stack room to give handle_error a fighting chance to report
out-of-stack errors without getting them itself.

Rev: src/backend.c:1.60
Rev: src/interpret.c:1.173
Rev: src/interpret.h:1.68
Rev: src/las.c:1.222
Rev: src/main.c:1.107
Rev: src/program.c:1.282
Rev: src/threads.c:1.145

5:   \*/   /**/   #include "global.h" - RCSID("$Id: interpret.c,v 1.172 2000/10/01 08:51:52 hubbe Exp $"); + RCSID("$Id: interpret.c,v 1.173 2000/11/20 01:20:24 mast Exp $");   #include "interpret.h"   #include "object.h"   #include "program.h"
58:      #define TRACE_LEN (100 + t_flag * 10)    + /* Keep some margin on the stack space checks. They're lifted when +  * handle_error runs to give it some room. */ + #define SVALUE_STACK_MARGIN 100 /* Tested in 7.1: 40 was enough, 30 wasn't. */ + #define C_STACK_MARGIN 2000 /* Tested in 7.1: 1500 was enough, 1400 wasn't. */    -  +    #ifdef PIKE_DEBUG   static char trace_buffer[2000];   #endif
177:    Pike_mark_sp=Pike_interpreter.mark_stack;    Pike_fp=0;    +  Pike_interpreter.svalue_stack_margin = SVALUE_STACK_MARGIN; +  Pike_interpreter.c_stack_margin = C_STACK_MARGIN; +    #ifdef PIKE_DEBUG    {    static struct callback *spcb;
1431:    mega_apply(APPLY_STACK,args,0,0);   }    + PMOD_EXPORT void call_handle_error(void) + { +  if (Pike_interpreter.svalue_stack_margin) { +  ONERROR tmp; +  int old_t_flag = t_flag; +  t_flag = 0; +  Pike_interpreter.svalue_stack_margin = 0; +  Pike_interpreter.c_stack_margin = 0; +  SET_ONERROR(tmp,exit_on_error,"Error in handle_error in master object!"); +  assign_svalue_no_free(Pike_sp++, & throw_value); +  APPLY_MASTER("handle_error", 1); +  pop_stack(); +  UNSET_ONERROR(tmp); +  Pike_interpreter.svalue_stack_margin = SVALUE_STACK_MARGIN; +  Pike_interpreter.c_stack_margin = C_STACK_MARGIN; +  t_flag = old_t_flag; +  } + } +    PMOD_EXPORT int apply_low_safe_and_stupid(struct object *o, INT32 offset)   {    JMP_BUF tmp;
1486:    if(SETJMP(recovery))    {    if(throw_value.type == T_ARRAY) -  { -  static int inside=0; -  if(!inside) -  { -  ONERROR tmp; -  /* We silently ignore errors if we are already describing one.. */ -  inside=1; -  SET_ONERROR(tmp,exit_on_error,"Error in handle_error in master object!"); -  assign_svalue_no_free(Pike_sp++, & throw_value); -  APPLY_MASTER("handle_error", 1); -  pop_stack(); -  UNSET_ONERROR(tmp); -  inside=0; -  } -  } -  +  call_handle_error();    Pike_sp->u.integer = 0;    Pike_sp->subtype=NUMBER_NUMBER;    Pike_sp->type = T_INT;