comparison src/cpu/zero/vm/cppInterpreter_zero.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 2cd5e15048e6
children 0094485b46c7
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
45 #include "runtime/synchronizer.hpp" 45 #include "runtime/synchronizer.hpp"
46 #include "runtime/timer.hpp" 46 #include "runtime/timer.hpp"
47 #include "runtime/vframeArray.hpp" 47 #include "runtime/vframeArray.hpp"
48 #include "stack_zero.inline.hpp" 48 #include "stack_zero.inline.hpp"
49 #include "utilities/debug.hpp" 49 #include "utilities/debug.hpp"
50 #include "utilities/macros.hpp"
50 #ifdef SHARK 51 #ifdef SHARK
51 #include "shark/shark_globals.hpp" 52 #include "shark/shark_globals.hpp"
52 #endif 53 #endif
53 54
54 #ifdef CC_INTERP 55 #ifdef CC_INTERP
789 790
790 return generate_entry((address) CppInterpreter::accessor_entry); 791 return generate_entry((address) CppInterpreter::accessor_entry);
791 } 792 }
792 793
793 address InterpreterGenerator::generate_Reference_get_entry(void) { 794 address InterpreterGenerator::generate_Reference_get_entry(void) {
794 #ifndef SERIALGC 795 #if INCLUDE_ALL_GCS
795 if (UseG1GC) { 796 if (UseG1GC) {
796 // We need to generate have a routine that generates code to: 797 // We need to generate have a routine that generates code to:
797 // * load the value in the referent field 798 // * load the value in the referent field
798 // * passes that value to the pre-barrier. 799 // * passes that value to the pre-barrier.
799 // 800 //
801 // referent in an SATB buffer if marking is active. 802 // referent in an SATB buffer if marking is active.
802 // This will cause concurrent marking to mark the referent 803 // This will cause concurrent marking to mark the referent
803 // field as live. 804 // field as live.
804 Unimplemented(); 805 Unimplemented();
805 } 806 }
806 #endif // SERIALGC 807 #endif // INCLUDE_ALL_GCS
807 808
808 // If G1 is not enabled then attempt to go through the accessor entry point 809 // If G1 is not enabled then attempt to go through the accessor entry point
809 // Reference.get is an accessor 810 // Reference.get is an accessor
810 return generate_accessor_entry(); 811 return generate_accessor_entry();
811 } 812 }