Mercurial > hg > graal-compiler

comparison src/cpu/x86/vm/c1_CodeStubs_x86.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_x86.hpp" 31 #include "nativeInst_x86.hpp"
32 #include "runtime/sharedRuntime.hpp" 32 #include "runtime/sharedRuntime.hpp"
33 #include "utilities/macros.hpp"
33 #include "vmreg_x86.inline.hpp" 34 #include "vmreg_x86.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 39
39 #define __ ce->masm()-> 40 #define __ ce->masm()->
40 41
41 float ConversionStub::float_zero = 0.0; 42 float ConversionStub::float_zero = 0.0;
480 481
481 __ jmp(_continuation); 482 __ jmp(_continuation);
482 } 483 }
483 484
484 ///////////////////////////////////////////////////////////////////////////// 485 /////////////////////////////////////////////////////////////////////////////
485 #ifndef SERIALGC 486 #if INCLUDE_ALL_GCS
486 487
487 void G1PreBarrierStub::emit_code(LIR_Assembler* ce) { 488 void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
488 // At this point we know that marking is in progress. 489 // At this point we know that marking is in progress.
489 // If do_load() is true then we have to emit the 490 // If do_load() is true then we have to emit the
490 // load of the previous value; otherwise it has already 491 // load of the previous value; otherwise it has already
526 ce->store_parameter(addr()->as_pointer_register(), 0); 527 ce->store_parameter(addr()->as_pointer_register(), 0);
527 __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::g1_post_barrier_slow_id))); 528 __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::g1_post_barrier_slow_id)));
528 __ jmp(_continuation); 529 __ jmp(_continuation);
529 } 530 }
530 531
531 #endif // SERIALGC 532 #endif // INCLUDE_ALL_GCS
532 ///////////////////////////////////////////////////////////////////////////// 533 /////////////////////////////////////////////////////////////////////////////
533 534
534 #undef __ 535 #undef __