comparison src/share/vm/runtime/frame.cpp @ 17812:a7d4d4655766

Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 6b207d038106 2b8e28fdf503
children af8cc1dae608
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
934 // To minimze the overhead of doing that here, we ask the GC to pass down a 934 // To minimze the overhead of doing that here, we ask the GC to pass down a
935 // closure that knows how to keep klasses alive given a ClassLoaderData. 935 // closure that knows how to keep klasses alive given a ClassLoaderData.
936 cld_f->do_cld(m->method_holder()->class_loader_data()); 936 cld_f->do_cld(m->method_holder()->class_loader_data());
937 } 937 }
938 938
939 #if !defined(PPC) || defined(ZERO) 939 #if !defined(PPC32) || defined(ZERO)
940 if (m->is_native()) { 940 if (m->is_native()) {
941 #ifdef CC_INTERP 941 #ifdef CC_INTERP
942 interpreterState istate = get_interpreterState(); 942 interpreterState istate = get_interpreterState();
943 f->do_oop((oop*)&istate->_oop_temp); 943 f->do_oop((oop*)&istate->_oop_temp);
944 #else 944 #else
945 f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset )); 945 f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset ));
946 #endif /* CC_INTERP */ 946 #endif /* CC_INTERP */
947 } 947 }
948 #else // PPC 948 #else // PPC32
949 if (m->is_native() && m->is_static()) { 949 if (m->is_native() && m->is_static()) {
950 f->do_oop(interpreter_frame_mirror_addr()); 950 f->do_oop(interpreter_frame_mirror_addr());
951 } 951 }
952 #endif // PPC 952 #endif // PPC32
953 953
954 int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals(); 954 int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals();
955 955
956 Symbol* signature = NULL; 956 Symbol* signature = NULL;
957 bool has_receiver = false; 957 bool has_receiver = false;