diff options
| author | Andreas Gampe <agampe@google.com> | 2014-03-05 16:11:04 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-05 22:32:53 -0800 |
| commit | bf6b92a158053c98b15f4393abb3b86344ec9a20 (patch) | |
| tree | 93a28d1e01b045a8df23fe5279601496b62af3dd /runtime/stack.h | |
| parent | 359597ee8c0667a7d2c0b74dcbb0f90bb6059bae (diff) | |
| download | art-bf6b92a158053c98b15f4393abb3b86344ec9a20.tar.gz art-bf6b92a158053c98b15f4393abb3b86344ec9a20.tar.bz2 art-bf6b92a158053c98b15f4393abb3b86344ec9a20.zip | |
Generic JNI implementation for x86_64
Starting implementation for generic JNI on x86_64. Frames are of
large static size (>4K) right now, should be compacted later. Passes
the whole of jni_compiler_test.
Change-Id: I88ac3e13a534afe7568d62a1ef97cb766e8260e4
Diffstat (limited to 'runtime/stack.h')
| -rw-r--r-- | runtime/stack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index 6a629224cc..f840f6776f 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -532,7 +532,7 @@ class StackVisitor { DCHECK(GetMethod() != nullptr); byte* save_addr = reinterpret_cast<byte*>(cur_quick_frame_) + frame_size - ((num + 1) * kPointerSize); -#if defined(__i386__) +#if defined(__i386__) || defined(__x86_64__) save_addr -= kPointerSize; // account for return address #endif return reinterpret_cast<uintptr_t*>(save_addr); |