Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/frame.cpp	Wed Mar 26 18:21:05 2014 -0700
     1.2 +++ b/src/share/vm/runtime/frame.cpp	Wed Feb 26 11:33:34 2014 -0800
     1.3 @@ -936,20 +936,9 @@
     1.4      cld_f->do_cld(m->method_holder()->class_loader_data());
     1.5    }
     1.6  
     1.7 -#if !defined(PPC32) || defined(ZERO)
     1.8 -  if (m->is_native()) {
     1.9 -#ifdef CC_INTERP
    1.10 -    interpreterState istate = get_interpreterState();
    1.11 -    f->do_oop((oop*)&istate->_oop_temp);
    1.12 -#else
    1.13 -    f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset ));
    1.14 -#endif /* CC_INTERP */
    1.15 +  if (m->is_native() PPC32_ONLY(&& m->is_static())) {
    1.16 +    f->do_oop(interpreter_frame_temp_oop_addr());
    1.17    }
    1.18 -#else // PPC32
    1.19 -  if (m->is_native() && m->is_static()) {
    1.20 -    f->do_oop(interpreter_frame_mirror_addr());
    1.21 -  }
    1.22 -#endif // PPC32
    1.23  
    1.24    int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals();
    1.25