Mercurial > hg > truffle

comparison src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp @ 8001:db9981fd3124

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS. Reviewed-by: coleenp, stefank
author jprovino
date Wed, 23 Jan 2013 13:02:39 -0500
parents d02120b7a34f
children 46f6f063b272
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
28 #include "c1/c1_LIRAssembler.hpp" 28 #include "c1/c1_LIRAssembler.hpp"
29 #include "c1/c1_MacroAssembler.hpp" 29 #include "c1/c1_MacroAssembler.hpp"
30 #include "c1/c1_Runtime1.hpp" 30 #include "c1/c1_Runtime1.hpp"
31 #include "nativeInst_sparc.hpp" 31 #include "nativeInst_sparc.hpp"
32 #include "runtime/sharedRuntime.hpp" 32 #include "runtime/sharedRuntime.hpp"
33 #include "utilities/macros.hpp"
33 #include "vmreg_sparc.inline.hpp" 34 #include "vmreg_sparc.inline.hpp"
34 #ifndef SERIALGC 35 #if INCLUDE_ALL_GCS
35 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 36 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
36 #endif 37 #endif // INCLUDE_ALL_GCS
37 38
38 #define __ ce->masm()-> 39 #define __ ce->masm()->
39 40
40 RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, 41 RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index,
41 bool throw_index_out_of_bounds_exception) 42 bool throw_index_out_of_bounds_exception)
418 __ delayed()->nop(); 419 __ delayed()->nop();
419 } 420 }
420 421
421 422
422 /////////////////////////////////////////////////////////////////////////////////// 423 ///////////////////////////////////////////////////////////////////////////////////
423 #ifndef SERIALGC 424 #if INCLUDE_ALL_GCS
424 425
425 void G1PreBarrierStub::emit_code(LIR_Assembler* ce) { 426 void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
426 // At this point we know that marking is in progress. 427 // At this point we know that marking is in progress.
427 // If do_load() is true then we have to emit the 428 // If do_load() is true then we have to emit the
428 // load of the previous value; otherwise it has already 429 // load of the previous value; otherwise it has already
481 __ delayed()->mov(addr_reg, G4); 482 __ delayed()->mov(addr_reg, G4);
482 __ br(Assembler::always, false, Assembler::pt, _continuation); 483 __ br(Assembler::always, false, Assembler::pt, _continuation);
483 __ delayed()->nop(); 484 __ delayed()->nop();
484 } 485 }
485 486
486 #endif // SERIALGC 487 #endif // INCLUDE_ALL_GCS
487 /////////////////////////////////////////////////////////////////////////////////// 488 ///////////////////////////////////////////////////////////////////////////////////
488 489
489 #undef __ 490 #undef __