*** old/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Jan 12 10:51:29 2009
--- new/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Jan 12 10:51:28 2009

*** 161,171 ****
--- 161,171 ----
   */
  #undef CONTINUE
  #ifdef USELABELS
  // Have to do this dispatch this way in C++ because otherwise gcc complains about crossing an
  // initialization (which is is the initialization of the table pointer...)
! #define DISPATCH(opcode) goto *(void*)dispatch_table[opcode]
  #define CONTINUE {                              \
          opcode = *pc;                           \
          DO_UPDATE_INSTRUCTION_COUNT(opcode);    \
          DEBUGGER_SINGLE_STEP_NOTIFY();          \
          DISPATCH(opcode);                       \

*** 339,349 ****
--- 339,349 ----
   * passed is a null ref.
   * On some architectures/platforms it should be possible to do this implicitly
   */
  #undef CHECK_NULL
  #define CHECK_NULL(obj_)                                                 \
!     if ((obj_) == 0) {                                                   \
!     if ((obj_) == NULL) {                                                \
          VM_JAVA_ERROR(vmSymbols::java_lang_NullPointerException(), "");  \
      }
  
  #define VMdoubleConstZero() 0.0
  #define VMdoubleConstOne() 1.0

*** 1360,1380 ****
--- 1360,1380 ----
            CONTINUE;                                                          \
        }
  
  #define NULL_COMPARISON_NOT_OP(name)                                         \
        CASE(_if##name): {                                                     \
!           int skip = (!(STACK_OBJECT(-1) == 0))                              \
!           int skip = (!(STACK_OBJECT(-1) == NULL))                           \
                        ? (int16_t)Bytes::get_Java_u2(pc + 1) : 3;             \
            address branch_pc = pc;                                            \
            UPDATE_PC_AND_TOS(skip, -1);                                       \
            DO_BACKEDGE_CHECKS(skip, branch_pc);                               \
            CONTINUE;                                                          \
        }
  
  #define NULL_COMPARISON_OP(name)                                             \
        CASE(_if##name): {                                                     \
!           int skip = ((STACK_OBJECT(-1) == 0))                               \
!           int skip = ((STACK_OBJECT(-1) == NULL))                            \
                        ? (int16_t)Bytes::get_Java_u2(pc + 1) : 3;             \
            address branch_pc = pc;                                            \
            UPDATE_PC_AND_TOS(skip, -1);                                       \
            DO_BACKEDGE_CHECKS(skip, branch_pc);                               \
            CONTINUE;                                                          \