comparison src/share/vm/runtime/thread.hpp @ 22460:f27c163d7dc2

moved JVMCI fields from ThreadShadow to Thread
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Aug 2015 22:35:47 +0200
parents 4a532b03e2cd
children b14500c9da22
comparison
equal deleted inserted replaced
22459:0dd2b79625b3 22460:f27c163d7dc2
915 }; 915 };
916 916
917 private: 917 private:
918 918
919 #if INCLUDE_JVMCI 919 #if INCLUDE_JVMCI
920 int _pending_deoptimization;
921 oop _pending_failed_speculation;
922 bool _pending_monitorenter;
923 bool _pending_transfer_to_interpreter;
920 address _jvmci_alternate_call_target; 924 address _jvmci_alternate_call_target;
921 address _jvmci_implicit_exception_pc; // pc at which the most recent implicit exception occurred 925 address _jvmci_implicit_exception_pc; // pc at which the most recent implicit exception occurred
922 926
923 jlong* _jvmci_counters; 927 jlong* _jvmci_counters;
924 928
1301 1305
1302 MemRegion deferred_card_mark() const { return _deferred_card_mark; } 1306 MemRegion deferred_card_mark() const { return _deferred_card_mark; }
1303 void set_deferred_card_mark(MemRegion mr) { _deferred_card_mark = mr; } 1307 void set_deferred_card_mark(MemRegion mr) { _deferred_card_mark = mr; }
1304 1308
1305 #if INCLUDE_JVMCI 1309 #if INCLUDE_JVMCI
1310 int pending_deoptimization() const { return _pending_deoptimization; }
1311 oop pending_failed_speculation() const { return _pending_failed_speculation; }
1312 bool has_pending_monitorenter() const { return _pending_monitorenter; }
1313 void set_pending_monitorenter(bool b) { _pending_monitorenter = b; }
1314 void set_pending_deoptimization(int reason) { _pending_deoptimization = reason; }
1315 void set_pending_failed_speculation(oop failed_speculation) { _pending_failed_speculation = failed_speculation; }
1316 void set_pending_transfer_to_interpreter(bool b) { _pending_transfer_to_interpreter = b; }
1306 void set_jvmci_alternate_call_target(address a) { _jvmci_alternate_call_target = a; } 1317 void set_jvmci_alternate_call_target(address a) { _jvmci_alternate_call_target = a; }
1307 void set_jvmci_implicit_exception_pc(address a) { _jvmci_implicit_exception_pc = a; } 1318 void set_jvmci_implicit_exception_pc(address a) { _jvmci_implicit_exception_pc = a; }
1308 #endif 1319 #endif
1309 1320
1310 // Exception handling for compiled methods 1321 // Exception handling for compiled methods
1399 static ByteSize vm_result_2_offset() { return byte_offset_of(JavaThread, _vm_result_2 ); } 1410 static ByteSize vm_result_2_offset() { return byte_offset_of(JavaThread, _vm_result_2 ); }
1400 static ByteSize thread_state_offset() { return byte_offset_of(JavaThread, _thread_state ); } 1411 static ByteSize thread_state_offset() { return byte_offset_of(JavaThread, _thread_state ); }
1401 static ByteSize saved_exception_pc_offset() { return byte_offset_of(JavaThread, _saved_exception_pc ); } 1412 static ByteSize saved_exception_pc_offset() { return byte_offset_of(JavaThread, _saved_exception_pc ); }
1402 static ByteSize osthread_offset() { return byte_offset_of(JavaThread, _osthread ); } 1413 static ByteSize osthread_offset() { return byte_offset_of(JavaThread, _osthread ); }
1403 #if INCLUDE_JVMCI 1414 #if INCLUDE_JVMCI
1415 static ByteSize pending_deoptimization_offset() { return byte_offset_of(JavaThread, _pending_deoptimization); }
1416 static ByteSize pending_monitorenter_offset() { return byte_offset_of(JavaThread, _pending_monitorenter); }
1417 static ByteSize pending_failed_speculation_offset() { return byte_offset_of(JavaThread, _pending_failed_speculation); }
1404 static ByteSize jvmci_alternate_call_target_offset() { return byte_offset_of(JavaThread, _jvmci_alternate_call_target); } 1418 static ByteSize jvmci_alternate_call_target_offset() { return byte_offset_of(JavaThread, _jvmci_alternate_call_target); }
1405 static ByteSize jvmci_implicit_exception_pc_offset() { return byte_offset_of(JavaThread, _jvmci_implicit_exception_pc); } 1419 static ByteSize jvmci_implicit_exception_pc_offset() { return byte_offset_of(JavaThread, _jvmci_implicit_exception_pc); }
1406 static ByteSize jvmci_counters_offset() { return byte_offset_of(JavaThread, _jvmci_counters ); } 1420 static ByteSize jvmci_counters_offset() { return byte_offset_of(JavaThread, _jvmci_counters ); }
1407 #endif 1421 #endif
1408 static ByteSize exception_oop_offset() { return byte_offset_of(JavaThread, _exception_oop ); } 1422 static ByteSize exception_oop_offset() { return byte_offset_of(JavaThread, _exception_oop ); }