Mercurial > hg > graal-jvmci-8

comparison src/cpu/x86/vm/macroAssembler_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 038dd2875b94
children 8391fdd36e1f
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
35 #include "runtime/interfaceSupport.hpp" 35 #include "runtime/interfaceSupport.hpp"
36 #include "runtime/objectMonitor.hpp" 36 #include "runtime/objectMonitor.hpp"
37 #include "runtime/os.hpp" 37 #include "runtime/os.hpp"
38 #include "runtime/sharedRuntime.hpp" 38 #include "runtime/sharedRuntime.hpp"
39 #include "runtime/stubRoutines.hpp" 39 #include "runtime/stubRoutines.hpp"
40 #ifndef SERIALGC 40 #include "utilities/macros.hpp"
41 #if INCLUDE_ALL_GCS
41 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 42 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
42 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 43 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
43 #include "gc_implementation/g1/heapRegion.hpp" 44 #include "gc_implementation/g1/heapRegion.hpp"
44 #endif 45 #endif // INCLUDE_ALL_GCS
45 46
46 #ifdef PRODUCT 47 #ifdef PRODUCT
47 #define BLOCK_COMMENT(str) /* nothing */ 48 #define BLOCK_COMMENT(str) /* nothing */
48 #define STOP(error) stop(error) 49 #define STOP(error) stop(error)
49 #else 50 #else
3205 } 3206 }
3206 } 3207 }
3207 3208
3208 3209
3209 ////////////////////////////////////////////////////////////////////////////////// 3210 //////////////////////////////////////////////////////////////////////////////////
3210 #ifndef SERIALGC 3211 #if INCLUDE_ALL_GCS
3211 3212
3212 void MacroAssembler::g1_write_barrier_pre(Register obj, 3213 void MacroAssembler::g1_write_barrier_pre(Register obj,
3213 Register pre_val, 3214 Register pre_val,
3214 Register thread, 3215 Register thread,
3215 Register tmp, 3216 Register tmp,
3415 pop(store_addr); 3416 pop(store_addr);
3416 3417
3417 bind(done); 3418 bind(done);
3418 } 3419 }
3419 3420
3420 #endif // SERIALGC 3421 #endif // INCLUDE_ALL_GCS
3421 ////////////////////////////////////////////////////////////////////////////////// 3422 //////////////////////////////////////////////////////////////////////////////////
3422 3423
3423 3424
3424 void MacroAssembler::store_check(Register obj) { 3425 void MacroAssembler::store_check(Register obj) {
3425 // Does a store check for the oop in register obj. The content of 3426 // Does a store check for the oop in register obj. The content of