Mercurial > hg > truffle
comparison src/cpu/sparc/vm/c1_Runtime1_sparc.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | db9981fd3124 |
children | 46f6f063b272 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
33 #include "prims/jvmtiExport.hpp" | 33 #include "prims/jvmtiExport.hpp" |
34 #include "register_sparc.hpp" | 34 #include "register_sparc.hpp" |
35 #include "runtime/sharedRuntime.hpp" | 35 #include "runtime/sharedRuntime.hpp" |
36 #include "runtime/signature.hpp" | 36 #include "runtime/signature.hpp" |
37 #include "runtime/vframeArray.hpp" | 37 #include "runtime/vframeArray.hpp" |
38 #include "utilities/macros.hpp" | |
38 #include "vmreg_sparc.inline.hpp" | 39 #include "vmreg_sparc.inline.hpp" |
39 | 40 |
40 // Implementation of StubAssembler | 41 // Implementation of StubAssembler |
41 | 42 |
42 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) { | 43 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) { |
820 __ ret(); | 821 __ ret(); |
821 __ delayed()->restore(); | 822 __ delayed()->restore(); |
822 } | 823 } |
823 break; | 824 break; |
824 | 825 |
825 #ifndef SERIALGC | 826 #if INCLUDE_ALL_GCS |
826 case g1_pre_barrier_slow_id: | 827 case g1_pre_barrier_slow_id: |
827 { // G4: previous value of memory | 828 { // G4: previous value of memory |
828 BarrierSet* bs = Universe::heap()->barrier_set(); | 829 BarrierSet* bs = Universe::heap()->barrier_set(); |
829 if (bs->kind() != BarrierSet::G1SATBCTLogging) { | 830 if (bs->kind() != BarrierSet::G1SATBCTLogging) { |
830 __ save_frame(0); | 831 __ save_frame(0); |
982 | 983 |
983 __ br(Assembler::always, /*annul*/false, Assembler::pt, restart); | 984 __ br(Assembler::always, /*annul*/false, Assembler::pt, restart); |
984 __ delayed()->restore(); | 985 __ delayed()->restore(); |
985 } | 986 } |
986 break; | 987 break; |
987 #endif // !SERIALGC | 988 #endif // INCLUDE_ALL_GCS |
988 | 989 |
989 default: | 990 default: |
990 { __ set_info("unimplemented entry", dont_gc_arguments); | 991 { __ set_info("unimplemented entry", dont_gc_arguments); |
991 __ save_frame(0); | 992 __ save_frame(0); |
992 __ set((int)id, O1); | 993 __ set((int)id, O1); |