comparison src/share/vm/runtime/thread.hpp @ 21559:be896a1983c0

recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 7848fc12602b
children
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
914 stack_guard_enabled // enabled 914 stack_guard_enabled // enabled
915 }; 915 };
916 916
917 private: 917 private:
918 918
919 #ifdef GRAAL 919 #ifdef JVMCI
920 address _graal_alternate_call_target; 920 address _jvmci_alternate_call_target;
921 address _graal_implicit_exception_pc; // pc at which the most recent implicit exception occurred 921 address _jvmci_implicit_exception_pc; // pc at which the most recent implicit exception occurred
922 922
923 jlong* _graal_counters; 923 jlong* _jvmci_counters;
924 924
925 public: 925 public:
926 static jlong* _graal_old_thread_counters; 926 static jlong* _jvmci_old_thread_counters;
927 static void collect_counters(typeArrayOop array); 927 static void collect_counters(typeArrayOop array);
928 private: 928 private:
929 #endif // GRAAL 929 #endif // JVMCI
930 930
931 nmethod* _scanned_nmethod; // nmethod being scanned by the sweeper 931 nmethod* _scanned_nmethod; // nmethod being scanned by the sweeper
932 932
933 StackGuardState _stack_guard_state; 933 StackGuardState _stack_guard_state;
934 934
1299 void set_vm_result_2 (Metadata* x) { _vm_result_2 = x; } 1299 void set_vm_result_2 (Metadata* x) { _vm_result_2 = x; }
1300 1300
1301 MemRegion deferred_card_mark() const { return _deferred_card_mark; } 1301 MemRegion deferred_card_mark() const { return _deferred_card_mark; }
1302 void set_deferred_card_mark(MemRegion mr) { _deferred_card_mark = mr; } 1302 void set_deferred_card_mark(MemRegion mr) { _deferred_card_mark = mr; }
1303 1303
1304 #ifdef GRAAL 1304 #ifdef JVMCI
1305 void set_graal_alternate_call_target(address a) { _graal_alternate_call_target = a; } 1305 void set_jvmci_alternate_call_target(address a) { _jvmci_alternate_call_target = a; }
1306 void set_graal_implicit_exception_pc(address a) { _graal_implicit_exception_pc = a; } 1306 void set_jvmci_implicit_exception_pc(address a) { _jvmci_implicit_exception_pc = a; }
1307 #endif 1307 #endif
1308 1308
1309 // Exception handling for compiled methods 1309 // Exception handling for compiled methods
1310 oop exception_oop() const { return _exception_oop; } 1310 oop exception_oop() const { return _exception_oop; }
1311 address exception_pc() const { return _exception_pc; } 1311 address exception_pc() const { return _exception_pc; }
1397 static ByteSize vm_result_offset() { return byte_offset_of(JavaThread, _vm_result ); } 1397 static ByteSize vm_result_offset() { return byte_offset_of(JavaThread, _vm_result ); }
1398 static ByteSize vm_result_2_offset() { return byte_offset_of(JavaThread, _vm_result_2 ); } 1398 static ByteSize vm_result_2_offset() { return byte_offset_of(JavaThread, _vm_result_2 ); }
1399 static ByteSize thread_state_offset() { return byte_offset_of(JavaThread, _thread_state ); } 1399 static ByteSize thread_state_offset() { return byte_offset_of(JavaThread, _thread_state ); }
1400 static ByteSize saved_exception_pc_offset() { return byte_offset_of(JavaThread, _saved_exception_pc ); } 1400 static ByteSize saved_exception_pc_offset() { return byte_offset_of(JavaThread, _saved_exception_pc ); }
1401 static ByteSize osthread_offset() { return byte_offset_of(JavaThread, _osthread ); } 1401 static ByteSize osthread_offset() { return byte_offset_of(JavaThread, _osthread ); }
1402 #ifdef GRAAL 1402 #ifdef JVMCI
1403 static ByteSize graal_alternate_call_target_offset() { return byte_offset_of(JavaThread, _graal_alternate_call_target); } 1403 static ByteSize jvmci_alternate_call_target_offset() { return byte_offset_of(JavaThread, _jvmci_alternate_call_target); }
1404 static ByteSize graal_implicit_exception_pc_offset() { return byte_offset_of(JavaThread, _graal_implicit_exception_pc); } 1404 static ByteSize jvmci_implicit_exception_pc_offset() { return byte_offset_of(JavaThread, _jvmci_implicit_exception_pc); }
1405 static ByteSize graal_counters_offset() { return byte_offset_of(JavaThread, _graal_counters ); } 1405 static ByteSize jvmci_counters_offset() { return byte_offset_of(JavaThread, _jvmci_counters ); }
1406 #endif // GRAAL 1406 #endif // JVMCI
1407 static ByteSize exception_oop_offset() { return byte_offset_of(JavaThread, _exception_oop ); } 1407 static ByteSize exception_oop_offset() { return byte_offset_of(JavaThread, _exception_oop ); }
1408 static ByteSize exception_pc_offset() { return byte_offset_of(JavaThread, _exception_pc ); } 1408 static ByteSize exception_pc_offset() { return byte_offset_of(JavaThread, _exception_pc ); }
1409 static ByteSize exception_handler_pc_offset() { return byte_offset_of(JavaThread, _exception_handler_pc); } 1409 static ByteSize exception_handler_pc_offset() { return byte_offset_of(JavaThread, _exception_handler_pc); }
1410 static ByteSize stack_overflow_limit_offset() { return byte_offset_of(JavaThread, _stack_overflow_limit); } 1410 static ByteSize stack_overflow_limit_offset() { return byte_offset_of(JavaThread, _stack_overflow_limit); }
1411 static ByteSize is_method_handle_return_offset() { return byte_offset_of(JavaThread, _is_method_handle_return); } 1411 static ByteSize is_method_handle_return_offset() { return byte_offset_of(JavaThread, _is_method_handle_return); }
1873 1873
1874 CompilerThread(CompileQueue* queue, CompilerCounters* counters); 1874 CompilerThread(CompileQueue* queue, CompilerCounters* counters);
1875 1875
1876 bool is_Compiler_thread() const { return true; } 1876 bool is_Compiler_thread() const { return true; }
1877 1877
1878 #ifdef COMPILERGRAAL 1878 #ifdef COMPILERJVMCI
1879 virtual bool can_call_java() const; 1879 virtual bool can_call_java() const;
1880 #else 1880 #else
1881 virtual bool can_call_java() const { return false; } 1881 virtual bool can_call_java() const { return false; }
1882 #endif 1882 #endif
1883 1883