comparison src/cpu/x86/vm/templateInterpreter_x86_64.cpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 989155e2d07a db9981fd3124
children 6b6cbd8b8914
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 49
49 #define __ _masm-> 50 #define __ _masm->
50 51
51 #ifndef CC_INTERP 52 #ifndef CC_INTERP
52 53
771 return entry_point; 772 return entry_point;
772 } 773 }
773 774
774 // Method entry for java.lang.ref.Reference.get. 775 // Method entry for java.lang.ref.Reference.get.
775 address InterpreterGenerator::generate_Reference_get_entry(void) { 776 address InterpreterGenerator::generate_Reference_get_entry(void) {
776 #ifndef SERIALGC 777 #if INCLUDE_ALL_GCS
777 // Code: _aload_0, _getfield, _areturn 778 // Code: _aload_0, _getfield, _areturn
778 // parameter size = 1 779 // parameter size = 1
779 // 780 //
780 // The code that gets generated by this routine is split into 2 parts: 781 // The code that gets generated by this routine is split into 2 parts:
781 // 1. The "intrinsified" code for G1 (or any SATB based GC), 782 // 1. The "intrinsified" code for G1 (or any SATB based GC),
850 __ bind(slow_path); 851 __ bind(slow_path);
851 (void) generate_normal_entry(false); 852 (void) generate_normal_entry(false);
852 853
853 return entry; 854 return entry;
854 } 855 }
855 #endif // SERIALGC 856 #endif // INCLUDE_ALL_GCS
856 857
857 // If G1 is not enabled then attempt to go through the accessor entry point 858 // If G1 is not enabled then attempt to go through the accessor entry point
858 // Reference.get is an accessor 859 // Reference.get is an accessor
859 return generate_accessor_entry(); 860 return generate_accessor_entry();
860 } 861 }