Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.hpp @ 12355:cefad50507d8
Merge with hs25-b53
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Fri, 11 Oct 2013 10:38:03 +0200 |
| parents | ec267141f753 190899198332 |
| children | 096c224171c4 |
comparison
equal
deleted
inserted
replaced
| 12058:ccb4f2af2319 | 12355:cefad50507d8 |
|---|---|
| 111 // int _exception_line; // line information for exception (debugging only) | 111 // int _exception_line; // line information for exception (debugging only) |
| 112 protected: | 112 protected: |
| 113 // Support for forcing alignment of thread objects for biased locking | 113 // Support for forcing alignment of thread objects for biased locking |
| 114 void* _real_malloc_address; | 114 void* _real_malloc_address; |
| 115 public: | 115 public: |
| 116 void* operator new(size_t size) { return allocate(size, true); } | 116 void* operator new(size_t size) throw() { return allocate(size, true); } |
| 117 void* operator new(size_t size, const std::nothrow_t& nothrow_constant) { return allocate(size, false); } | 117 void* operator new(size_t size, const std::nothrow_t& nothrow_constant) throw() { |
| 118 return allocate(size, false); } | |
| 118 void operator delete(void* p); | 119 void operator delete(void* p); |
| 119 | 120 |
| 120 protected: | 121 protected: |
| 121 static void* allocate(size_t size, bool throw_excpt, MEMFLAGS flags = mtThread); | 122 static void* allocate(size_t size, bool throw_excpt, MEMFLAGS flags = mtThread); |
| 122 private: | 123 private: |
| 1313 oop exception_oop() const { return _exception_oop; } | 1314 oop exception_oop() const { return _exception_oop; } |
| 1314 address exception_pc() const { return _exception_pc; } | 1315 address exception_pc() const { return _exception_pc; } |
| 1315 address exception_handler_pc() const { return _exception_handler_pc; } | 1316 address exception_handler_pc() const { return _exception_handler_pc; } |
| 1316 bool is_method_handle_return() const { return _is_method_handle_return == 1; } | 1317 bool is_method_handle_return() const { return _is_method_handle_return == 1; } |
| 1317 | 1318 |
| 1318 void set_exception_oop(oop o) { _exception_oop = o; } | 1319 void set_exception_oop(oop o) { (void)const_cast<oop&>(_exception_oop = o); } |
| 1319 void set_exception_pc(address a) { _exception_pc = a; } | 1320 void set_exception_pc(address a) { _exception_pc = a; } |
| 1320 void set_exception_handler_pc(address a) { _exception_handler_pc = a; } | 1321 void set_exception_handler_pc(address a) { _exception_handler_pc = a; } |
| 1321 void set_is_method_handle_return(bool value) { _is_method_handle_return = value ? 1 : 0; } | 1322 void set_is_method_handle_return(bool value) { _is_method_handle_return = value ? 1 : 0; } |
| 1322 | 1323 |
| 1323 // Stack overflow support | 1324 // Stack overflow support |