Mercurial > hg > truffle
comparison src/share/vm/runtime/sharedRuntime.hpp @ 1330:4a9cc99938e3
Merge
author | acorn |
---|---|
date | Fri, 26 Mar 2010 11:10:26 -0400 |
parents | 9eba43136cb5 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1329:84043c7507b9 | 1330:4a9cc99938e3 |
---|---|
94 static jdouble dlog(jdouble x); | 94 static jdouble dlog(jdouble x); |
95 static jdouble dlog10(jdouble x); | 95 static jdouble dlog10(jdouble x); |
96 static jdouble dexp(jdouble x); | 96 static jdouble dexp(jdouble x); |
97 static jdouble dpow(jdouble x, jdouble y); | 97 static jdouble dpow(jdouble x, jdouble y); |
98 | 98 |
99 | |
100 // exception handling across interpreter/compiler boundaries | 99 // exception handling across interpreter/compiler boundaries |
101 static address raw_exception_handler_for_return_address(address return_address); | 100 static address raw_exception_handler_for_return_address(JavaThread* thread, address return_address); |
102 static address exception_handler_for_return_address(address return_address); | 101 static address exception_handler_for_return_address(JavaThread* thread, address return_address); |
103 | 102 |
104 #ifndef SERIALGC | 103 #ifndef SERIALGC |
105 // G1 write barriers | 104 // G1 write barriers |
106 static void g1_wb_pre(oopDesc* orig, JavaThread *thread); | 105 static void g1_wb_pre(oopDesc* orig, JavaThread *thread); |
107 static void g1_wb_post(void* card_addr, JavaThread* thread); | 106 static void g1_wb_post(void* card_addr, JavaThread* thread); |
566 | 565 |
567 // should never be used | 566 // should never be used |
568 AdapterHandlerEntry(); | 567 AdapterHandlerEntry(); |
569 | 568 |
570 public: | 569 public: |
571 // The name we give all buffer blobs | |
572 static const char* name; | |
573 | |
574 address get_i2c_entry() { return _i2c_entry; } | 570 address get_i2c_entry() { return _i2c_entry; } |
575 address get_c2i_entry() { return _c2i_entry; } | 571 address get_c2i_entry() { return _c2i_entry; } |
576 address get_c2i_unverified_entry() { return _c2i_unverified_entry; } | 572 address get_c2i_unverified_entry() { return _c2i_unverified_entry; } |
577 | 573 |
578 void relocate(address new_base); | 574 void relocate(address new_base); |