diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-05-02 14:40:15 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-05-13 11:43:22 +0100 |
| commit | 7624d25dad2d1ba25969ae704fccf68649103ae5 (patch) | |
| tree | de72194b76a4e23e0b15ec4085447ae7e4425815 /compiler/jni | |
| parent | e1910f1d802dff79bba5ef61e1c4fd0b95f6e5b0 (diff) | |
| download | art-7624d25dad2d1ba25969ae704fccf68649103ae5.zip art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.gz art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.bz2 | |
Move quick frame info to OatQuickMethodHeader.
Rename OatMethodHeader to OatQuickMethodHeader, move frame
info from OatMethodOffsets to OatQuickMethodHeader. Retrieve
the info from other places for non-quick methods (portable
compiled bytecode or jni stub, generic jni, runtime,
abstract and proxy).
This change has a libcore/ companion CL
"Remove ArtMethod's quick fields for frame size and spills."
https://android-review.googlesource.com/94164
Bug: 11767815
Change-Id: I0e31a7875d76732e1ec479c86b9b5ca01203507f
Diffstat (limited to 'compiler/jni')
| -rw-r--r-- | compiler/jni/quick/x86_64/calling_convention_x86_64.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc index 4dfa29a..52490e6 100644 --- a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc +++ b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc @@ -133,7 +133,7 @@ X86_64JniCallingConvention::X86_64JniCallingConvention(bool is_static, bool is_s } uint32_t X86_64JniCallingConvention::CoreSpillMask() const { - return 1 << RBX | 1 << RBP | 1 << R12 | 1 << R13 | 1 << R14 | 1 << R15 | 1 << R13 | + return 1 << RBX | 1 << RBP | 1 << R12 | 1 << R13 | 1 << R14 | 1 << R15 | 1 << kNumberOfCpuRegisters; } |