Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/frame.cpp @ 14465:28f281e8de1d
Merge
author | kvn |
---|---|
date | Thu, 20 Feb 2014 12:20:56 -0800 |
parents | 8a9bb7821e28 |
children | f460c6926af7 78112be27ba0 |
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp Tue Feb 18 09:54:24 2014 -0500 +++ b/src/share/vm/runtime/frame.cpp Thu Feb 20 12:20:56 2014 -0800 @@ -933,7 +933,7 @@ cld_f->do_cld(m->method_holder()->class_loader_data()); } -#if !defined(PPC) || defined(ZERO) +#if !defined(PPC32) || defined(ZERO) if (m->is_native()) { #ifdef CC_INTERP interpreterState istate = get_interpreterState(); @@ -942,11 +942,11 @@ f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset )); #endif /* CC_INTERP */ } -#else // PPC +#else // PPC32 if (m->is_native() && m->is_static()) { f->do_oop(interpreter_frame_mirror_addr()); } -#endif // PPC +#endif // PPC32 int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals();