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

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 ffa87474d7a4
children a5de0cc2f91c
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
34 #include "runtime/interfaceSupport.hpp" 34 #include "runtime/interfaceSupport.hpp"
35 #include "runtime/objectMonitor.hpp" 35 #include "runtime/objectMonitor.hpp"
36 #include "runtime/os.hpp" 36 #include "runtime/os.hpp"
37 #include "runtime/sharedRuntime.hpp" 37 #include "runtime/sharedRuntime.hpp"
38 #include "runtime/stubRoutines.hpp" 38 #include "runtime/stubRoutines.hpp"
39 #ifndef SERIALGC 39 #include "utilities/macros.hpp"
40 #if INCLUDE_ALL_GCS
40 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 41 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
41 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 42 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
42 #include "gc_implementation/g1/heapRegion.hpp" 43 #include "gc_implementation/g1/heapRegion.hpp"
43 #endif 44 #endif // INCLUDE_ALL_GCS
44 45
45 #ifdef PRODUCT 46 #ifdef PRODUCT
46 #define BLOCK_COMMENT(str) /* nothing */ 47 #define BLOCK_COMMENT(str) /* nothing */
47 #define STOP(error) stop(error) 48 #define STOP(error) stop(error)
48 #else 49 #else
3865 st(G0, Rtsp, Rscratch); 3866 st(G0, Rtsp, Rscratch);
3866 } 3867 }
3867 } 3868 }
3868 3869
3869 /////////////////////////////////////////////////////////////////////////////////// 3870 ///////////////////////////////////////////////////////////////////////////////////
3870 #ifndef SERIALGC 3871 #if INCLUDE_ALL_GCS
3871 3872
3872 static address satb_log_enqueue_with_frame = NULL; 3873 static address satb_log_enqueue_with_frame = NULL;
3873 static u_char* satb_log_enqueue_with_frame_end = NULL; 3874 static u_char* satb_log_enqueue_with_frame_end = NULL;
3874 3875
3875 static address satb_log_enqueue_frameless = NULL; 3876 static address satb_log_enqueue_frameless = NULL;
4229 restore(); 4230 restore();
4230 4231
4231 bind(filtered); 4232 bind(filtered);
4232 } 4233 }
4233 4234
4234 #endif // SERIALGC 4235 #endif // INCLUDE_ALL_GCS
4235 /////////////////////////////////////////////////////////////////////////////////// 4236 ///////////////////////////////////////////////////////////////////////////////////
4236 4237
4237 void MacroAssembler::card_write_barrier_post(Register store_addr, Register new_val, Register tmp) { 4238 void MacroAssembler::card_write_barrier_post(Register store_addr, Register new_val, Register tmp) {
4238 // If we're writing constant NULL, we can skip the write barrier. 4239 // If we're writing constant NULL, we can skip the write barrier.
4239 if (new_val == G0) return; 4240 if (new_val == G0) return;