*** old/src/cpu/sparc/vm/cppInterpreter_sparc.cpp	Fri Dec 21 11:19:34 2012
--- new/src/cpu/sparc/vm/cppInterpreter_sparc.cpp	Fri Dec 21 11:19:34 2012

*** 135,145 ****
--- 135,145 ----
        break;
      default       : ShouldNotReachHere();
    }
    __ ret();                           // return from interpreter activation
    __ delayed()->restore(I5_savedSP, G0, SP);  // remove interpreter frame
!   NOT_PRODUCT(__ emit_long(0);)       // marker for disassembly
!   NOT_PRODUCT(__ emit_int32(0);)       // marker for disassembly
    return entry;
  }
  
  // tosca based result to c++ interpreter stack based result.
  // Result goes to address in L1_scratch

*** 230,240 ****
--- 230,240 ----
        break;
      default       : ShouldNotReachHere();
    }
    __ retl();                          // return from interpreter activation
    __ delayed()->nop();                // schedule this better
!   NOT_PRODUCT(__ emit_long(0);)       // marker for disassembly
!   NOT_PRODUCT(__ emit_int32(0);)       // marker for disassembly
    return entry;
  }
  
  address CppInterpreterGenerator::generate_stack_to_stack_converter(BasicType type) {
    // A result is in the java expression stack of the interpreted method that has just

*** 1463,1473 ****
--- 1463,1473 ----
      __ ld_ptr(STATE(_self_link), scratch);                        \
      __ cmp(Lstate, scratch);                                      \
      __ brx(Assembler::equal, false, Assembler::pt, skip);         \
      __ delayed()->nop();                                          \
      __ breakpoint_trap();                                         \
!     __ emit_long(marker);                                         \
!     __ emit_int32(marker);                                         \
      __ bind(skip);                                                \
    }
  #else
    #define VALIDATE_STATE(scratch, marker)
  #endif /* ASSERT */