Branch: Tag:

2013-08-16

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

Removed eval_instruction(NULL) when using opcode_inline_return, it is not used

322: Inside #if defined(HAVE_COMPUTED_GOTO) || defined(PIKE_USE_MACHINE_CODE)
   static int tables_need_init=1;    if(tables_need_init) {    /* Initialize the fcode_to_opcode table / jump labels. */ + #if !defined(OPCODE_INLINE_RETURN)    eval_instruction(NULL); -  + #endif   #if defined(PIKE_USE_MACHINE_CODE) && !defined(PIKE_DEBUG)    /* Simple operator opcodes... */   #define SET_INSTR_ADDRESS(X, Y) (instrs[(X)-F_OFFSET].address = (void *)Y)
1665:   static int eval_instruction_low(PIKE_OPCODE_T *pc)   #endif /* PIKE_DEBUG */   { -  if(pc == NULL) { -  +    #ifndef OPCODE_INLINE_RETURN -  +  if(pc == NULL) {    if(do_inter_return_label != NULL)    Pike_fatal("eval_instruction called with NULL (twice).\n");   
1699:    /* Trick optimizer */    if(!dummy_label)    return 0; - #endif /* !OPCODE_INLINE_RETURN */ +     }       /* This else is important to avoid an overoptimization bug in (at    * least) gcc 4.0.2 20050808 which caused the address stored in    * do_inter_return_label to be at the CALL_MACHINE_CODE below. */    else { -  + #endif /* !OPCODE_INLINE_RETURN */    CALL_MACHINE_CODE(pc);    -  + #ifndef OPCODE_INLINE_RETURN    /* This code is never reached, but will    * prevent gcc from optimizing the labels below too much    */
1717:   #endif    }    - #ifndef OPCODE_INLINE_RETURN +    #ifdef __GNUC__    goto *dummy_label;   #endif    - #if 0 -  if (dummy_label) { -  inter_escape_catch_label: -  EXIT_MACHINE_CODE(); -  return -2; -  } - #endif -  - #endif /* !OPCODE_INLINE_RETURN */ +     inter_return_label: -  EXIT_MACHINE_CODE(); + #endif /*!OPCODE_INLINE_RETURUN */   #ifdef PIKE_DEBUG    pike_trace(3, "- Inter return\n");   #endif -  +  EXIT_MACHINE_CODE();    return -1;   }