Mercurial > hg > truffle
comparison src/cpu/sparc/vm/cppInterpreter_sparc.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | db9981fd3124 |
children | 0094485b46c7 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
43 #include "runtime/stubRoutines.hpp" | 43 #include "runtime/stubRoutines.hpp" |
44 #include "runtime/synchronizer.hpp" | 44 #include "runtime/synchronizer.hpp" |
45 #include "runtime/timer.hpp" | 45 #include "runtime/timer.hpp" |
46 #include "runtime/vframeArray.hpp" | 46 #include "runtime/vframeArray.hpp" |
47 #include "utilities/debug.hpp" | 47 #include "utilities/debug.hpp" |
48 #include "utilities/macros.hpp" | |
48 #ifdef SHARK | 49 #ifdef SHARK |
49 #include "shark/shark_globals.hpp" | 50 #include "shark/shark_globals.hpp" |
50 #endif | 51 #endif |
51 | 52 |
52 #ifdef CC_INTERP | 53 #ifdef CC_INTERP |
549 } | 550 } |
550 return NULL; | 551 return NULL; |
551 } | 552 } |
552 | 553 |
553 address InterpreterGenerator::generate_Reference_get_entry(void) { | 554 address InterpreterGenerator::generate_Reference_get_entry(void) { |
554 #ifndef SERIALGC | 555 #if INCLUDE_ALL_GCS |
555 if (UseG1GC) { | 556 if (UseG1GC) { |
556 // We need to generate have a routine that generates code to: | 557 // We need to generate have a routine that generates code to: |
557 // * load the value in the referent field | 558 // * load the value in the referent field |
558 // * passes that value to the pre-barrier. | 559 // * passes that value to the pre-barrier. |
559 // | 560 // |
561 // referent in an SATB buffer if marking is active. | 562 // referent in an SATB buffer if marking is active. |
562 // This will cause concurrent marking to mark the referent | 563 // This will cause concurrent marking to mark the referent |
563 // field as live. | 564 // field as live. |
564 Unimplemented(); | 565 Unimplemented(); |
565 } | 566 } |
566 #endif // SERIALGC | 567 #endif // INCLUDE_ALL_GCS |
567 | 568 |
568 // If G1 is not enabled then attempt to go through the accessor entry point | 569 // If G1 is not enabled then attempt to go through the accessor entry point |
569 // Reference.get is an accessor | 570 // Reference.get is an accessor |
570 return generate_accessor_entry(); | 571 return generate_accessor_entry(); |
571 } | 572 } |