Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 12942:ee99e1a7c5fb
Merge
| author | ccheung |
|---|---|
| date | Fri, 18 Oct 2013 19:44:40 -0700 |
| parents | d2db09f281ca c51cd6af7e61 |
| children | 6b32b911d723 |
comparison
equal
deleted
inserted
replaced
| 12941:d0453d2fd045 | 12942:ee99e1a7c5fb |
|---|---|
| 56 #include "memory/freeBlockDictionary.hpp" | 56 #include "memory/freeBlockDictionary.hpp" |
| 57 #include "memory/genCollectedHeap.hpp" | 57 #include "memory/genCollectedHeap.hpp" |
| 58 #include "memory/generation.hpp" | 58 #include "memory/generation.hpp" |
| 59 #include "memory/generationSpec.hpp" | 59 #include "memory/generationSpec.hpp" |
| 60 #include "memory/heap.hpp" | 60 #include "memory/heap.hpp" |
| 61 #include "memory/metablock.hpp" | 61 #include "memory/metachunk.hpp" |
| 62 #include "memory/referenceType.hpp" | 62 #include "memory/referenceType.hpp" |
| 63 #include "memory/space.hpp" | 63 #include "memory/space.hpp" |
| 64 #include "memory/tenuredGeneration.hpp" | 64 #include "memory/tenuredGeneration.hpp" |
| 65 #include "memory/universe.hpp" | 65 #include "memory/universe.hpp" |
| 66 #include "memory/watermark.hpp" | 66 #include "memory/watermark.hpp" |
| 915 nonstatic_field(JavaThread, _vm_result_2, Metadata*) \ | 915 nonstatic_field(JavaThread, _vm_result_2, Metadata*) \ |
| 916 nonstatic_field(JavaThread, _pending_async_exception, oop) \ | 916 nonstatic_field(JavaThread, _pending_async_exception, oop) \ |
| 917 volatile_nonstatic_field(JavaThread, _exception_oop, oop) \ | 917 volatile_nonstatic_field(JavaThread, _exception_oop, oop) \ |
| 918 volatile_nonstatic_field(JavaThread, _exception_pc, address) \ | 918 volatile_nonstatic_field(JavaThread, _exception_pc, address) \ |
| 919 volatile_nonstatic_field(JavaThread, _is_method_handle_return, int) \ | 919 volatile_nonstatic_field(JavaThread, _is_method_handle_return, int) \ |
| 920 nonstatic_field(JavaThread, _is_compiling, bool) \ | |
| 921 nonstatic_field(JavaThread, _special_runtime_exit_condition, JavaThread::AsyncRequests) \ | 920 nonstatic_field(JavaThread, _special_runtime_exit_condition, JavaThread::AsyncRequests) \ |
| 922 nonstatic_field(JavaThread, _saved_exception_pc, address) \ | 921 nonstatic_field(JavaThread, _saved_exception_pc, address) \ |
| 923 volatile_nonstatic_field(JavaThread, _thread_state, JavaThreadState) \ | 922 volatile_nonstatic_field(JavaThread, _thread_state, JavaThreadState) \ |
| 924 nonstatic_field(JavaThread, _osthread, OSThread*) \ | 923 nonstatic_field(JavaThread, _osthread, OSThread*) \ |
| 925 nonstatic_field(JavaThread, _stack_base, address) \ | 924 nonstatic_field(JavaThread, _stack_base, address) \ |