Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/frame.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | 2b8e28fdf503 |
children | 8a9bb7821e28 a7d4d4655766 |
comparison
equal
deleted
inserted
replaced
14269:2a8891e0a082 | 14456:abec000618bf |
---|---|
931 // To minimze the overhead of doing that here, we ask the GC to pass down a | 931 // To minimze the overhead of doing that here, we ask the GC to pass down a |
932 // closure that knows how to keep klasses alive given a ClassLoaderData. | 932 // closure that knows how to keep klasses alive given a ClassLoaderData. |
933 cld_f->do_cld(m->method_holder()->class_loader_data()); | 933 cld_f->do_cld(m->method_holder()->class_loader_data()); |
934 } | 934 } |
935 | 935 |
936 #if !defined(PPC) || defined(ZERO) | 936 #if !defined(PPC32) || defined(ZERO) |
937 if (m->is_native()) { | 937 if (m->is_native()) { |
938 #ifdef CC_INTERP | 938 #ifdef CC_INTERP |
939 interpreterState istate = get_interpreterState(); | 939 interpreterState istate = get_interpreterState(); |
940 f->do_oop((oop*)&istate->_oop_temp); | 940 f->do_oop((oop*)&istate->_oop_temp); |
941 #else | 941 #else |
942 f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset )); | 942 f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset )); |
943 #endif /* CC_INTERP */ | 943 #endif /* CC_INTERP */ |
944 } | 944 } |
945 #else // PPC | 945 #else // PPC32 |
946 if (m->is_native() && m->is_static()) { | 946 if (m->is_native() && m->is_static()) { |
947 f->do_oop(interpreter_frame_mirror_addr()); | 947 f->do_oop(interpreter_frame_mirror_addr()); |
948 } | 948 } |
949 #endif // PPC | 949 #endif // PPC32 |
950 | 950 |
951 int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals(); | 951 int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals(); |
952 | 952 |
953 Symbol* signature = NULL; | 953 Symbol* signature = NULL; |
954 bool has_receiver = false; | 954 bool has_receiver = false; |