diff options
| author | Dave Allison <dallison@google.com> | 2014-06-23 13:19:59 -0700 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-06-23 13:19:59 -0700 |
| commit | 50abf0ad03c2cad0fa7969fc1b0bfadb0ca3bf3a (patch) | |
| tree | 36e6b2f2453f47dbd12223cfcae07daebf152b8b /compiler/compiled_method.h | |
| parent | 49e5ec42595b29e233fb92b8bd2cf8ade77c6501 (diff) | |
| download | android_art-50abf0ad03c2cad0fa7969fc1b0bfadb0ca3bf3a.tar.gz android_art-50abf0ad03c2cad0fa7969fc1b0bfadb0ca3bf3a.tar.bz2 android_art-50abf0ad03c2cad0fa7969fc1b0bfadb0ca3bf3a.zip | |
Move trampolines to thumb2 instead of ARM
Currently the entrypoint trampolines are compiled using the ARM32 assembler.
This changes that to use the thumb2 assembler for consistency with the
other compiled code.
Bug: 15455279
Change-Id: I6bacdf359e2ae4c0967fb5cd9dc694af11f802ec
Diffstat (limited to 'compiler/compiled_method.h')
| -rw-r--r-- | compiler/compiled_method.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/compiled_method.h b/compiler/compiled_method.h index 23cd250678..b8cd851a1f 100644 --- a/compiler/compiled_method.h +++ b/compiler/compiled_method.h @@ -67,6 +67,7 @@ class CompiledCode { // returns the difference between the code address and a usable PC. // mainly to cope with kThumb2 where the lower bit must be set. size_t CodeDelta() const; + static size_t CodeDelta(InstructionSet instruction_set); // Returns a pointer suitable for invoking the code at the argument // code_pointer address. Mainly to cope with kThumb2 where the |