Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/frame.cpp @ 14456:abec000618bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents 2b8e28fdf503
children 8a9bb7821e28 a7d4d4655766
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp	Tue Jan 28 11:21:43 2014 -0800
+++ b/src/share/vm/runtime/frame.cpp	Tue Jan 28 12:25:34 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();