comparison src/cpu/x86/vm/templateTable_x86_32.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 cd3d6a6b95d9
children aeaca88565e6
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
33 #include "oops/oop.inline.hpp" 33 #include "oops/oop.inline.hpp"
34 #include "prims/methodHandles.hpp" 34 #include "prims/methodHandles.hpp"
35 #include "runtime/sharedRuntime.hpp" 35 #include "runtime/sharedRuntime.hpp"
36 #include "runtime/stubRoutines.hpp" 36 #include "runtime/stubRoutines.hpp"
37 #include "runtime/synchronizer.hpp" 37 #include "runtime/synchronizer.hpp"
38 #include "utilities/macros.hpp"
38 39
39 #ifndef CC_INTERP 40 #ifndef CC_INTERP
40 #define __ _masm-> 41 #define __ _masm->
41 42
42 //---------------------------------------------------------------------------------------------------- 43 //----------------------------------------------------------------------------------------------------
123 Register val, 124 Register val,
124 BarrierSet::Name barrier, 125 BarrierSet::Name barrier,
125 bool precise) { 126 bool precise) {
126 assert(val == noreg || val == rax, "parameter is just for looks"); 127 assert(val == noreg || val == rax, "parameter is just for looks");
127 switch (barrier) { 128 switch (barrier) {
128 #ifndef SERIALGC 129 #if INCLUDE_ALL_GCS
129 case BarrierSet::G1SATBCT: 130 case BarrierSet::G1SATBCT:
130 case BarrierSet::G1SATBCTLogging: 131 case BarrierSet::G1SATBCTLogging:
131 { 132 {
132 // flatten object address if needed 133 // flatten object address if needed
133 // We do it regardless of precise because we need the registers 134 // We do it regardless of precise because we need the registers
162 } 163 }
163 __ restore_bcp(); 164 __ restore_bcp();
164 165
165 } 166 }
166 break; 167 break;
167 #endif // SERIALGC 168 #endif // INCLUDE_ALL_GCS
168 case BarrierSet::CardTableModRef: 169 case BarrierSet::CardTableModRef:
169 case BarrierSet::CardTableExtension: 170 case BarrierSet::CardTableExtension:
170 { 171 {
171 if (val == noreg) { 172 if (val == noreg) {
172 __ movptr(obj, NULL_WORD); 173 __ movptr(obj, NULL_WORD);