diff options
| author | Andreas Gampe <agampe@google.com> | 2014-02-27 12:26:20 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-03 23:27:12 +0000 |
| commit | 2da882315a61072664f7ce3c212307342e907207 (patch) | |
| tree | 67d777be044f5b60e2f13ab7968b63c581904ea9 /compiler/image_writer.h | |
| parent | 762d4e5b9e777ae64c4ba581af9c84b78a5e96a6 (diff) | |
| download | android_art-2da882315a61072664f7ce3c212307342e907207.tar.gz android_art-2da882315a61072664f7ce3c212307342e907207.tar.bz2 android_art-2da882315a61072664f7ce3c212307342e907207.zip | |
Initial changes towards Generic JNI option
Some initial changes that lead to an UNIMPLEMENTED. Works
by not compiling for JNI right now and tracking native methods
which have neither quick nor portable code. Uses new trampoline.
Change-Id: I5448654044eb2717752fd7359f4ef8bd5c17be6e
Diffstat (limited to 'compiler/image_writer.h')
| -rw-r--r-- | compiler/image_writer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/image_writer.h b/compiler/image_writer.h index a1504eeca8..dff33bad1e 100644 --- a/compiler/image_writer.h +++ b/compiler/image_writer.h @@ -41,8 +41,8 @@ class ImageWriter { : compiler_driver_(compiler_driver), oat_file_(NULL), image_end_(0), image_begin_(NULL), oat_data_begin_(NULL), interpreter_to_interpreter_bridge_offset_(0), interpreter_to_compiled_code_bridge_offset_(0), portable_imt_conflict_trampoline_offset_(0), - portable_resolution_trampoline_offset_(0), quick_imt_conflict_trampoline_offset_(0), - quick_resolution_trampoline_offset_(0) {} + portable_resolution_trampoline_offset_(0), quick_generic_jni_trampoline_offset_(0), + quick_imt_conflict_trampoline_offset_(0), quick_resolution_trampoline_offset_(0) {} ~ImageWriter() {} @@ -195,6 +195,7 @@ class ImageWriter { uint32_t portable_imt_conflict_trampoline_offset_; uint32_t portable_resolution_trampoline_offset_; uint32_t portable_to_interpreter_bridge_offset_; + uint32_t quick_generic_jni_trampoline_offset_; uint32_t quick_imt_conflict_trampoline_offset_; uint32_t quick_resolution_trampoline_offset_; uint32_t quick_to_interpreter_bridge_offset_; |