OSDN Git Service
Alex Light [Fri, 18 Jul 2014 21:57:04 +0000 (14:57 -0700)]
Make system use patchoat to relocate during runtime.
Change dalvik_system_DexFile.cc so that isDexOptNeededInternal will be
able to indicate that a patchoat is required. Change default of relocate
option to be on.
Bug:
15358152
(cherry picked from commit
6e183f2e973a20f2eaca135c240908e1bf98c5d0)
Change-Id: Ib21f4f41b6cbf18094e3ca1a30d65a3b197b71b0
Ian Rogers [Wed, 6 Aug 2014 01:48:05 +0000 (01:48 +0000)]
am
e94cddb6: am
a7975e0d: Merge "ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[], ..)"
* commit '
e94cddb6c748511f068dc9ea9afeab9b54b132db':
ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[], ..)
Ian Rogers [Tue, 5 Aug 2014 21:00:07 +0000 (21:00 +0000)]
am
a7975e0d: Merge "ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[], ..)"
* commit '
a7975e0db7ce521b60ac5d4861a69bc76b7fbddc':
ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[], ..)
Ian Rogers [Tue, 5 Aug 2014 17:07:21 +0000 (17:07 +0000)]
am
29c1a6d5: am
35d9a38d: Merge "Set REG0_USED on X86 Set8R instruction"
* commit '
29c1a6d596ad5a8ed3ac9b21e1a0a5a62d6f6626':
Set REG0_USED on X86 Set8R instruction
Ian Rogers [Tue, 5 Aug 2014 17:03:16 +0000 (17:03 +0000)]
am
35d9a38d: Merge "Set REG0_USED on X86 Set8R instruction"
* commit '
35d9a38d14fe8528310dced6d6a41f112ad95fcd':
Set REG0_USED on X86 Set8R instruction
Calin Juravle [Tue, 5 Aug 2014 16:12:29 +0000 (16:12 +0000)]
am
420d6990: am
09f60a9f: Merge "Use canonical paths when searching for dex files" into lmp-dev
* commit '
420d6990cf9a31113b5ae5397e10a657fba9e42c':
Use canonical paths when searching for dex files
Calin Juravle [Tue, 5 Aug 2014 16:03:36 +0000 (16:03 +0000)]
am
09f60a9f: Merge "Use canonical paths when searching for dex files" into lmp-dev
* commit '
09f60a9f53e6a87d5be84388f7fbf9a091fe0345':
Use canonical paths when searching for dex files
Brian Carlstrom [Tue, 5 Aug 2014 16:02:14 +0000 (16:02 +0000)]
am
f6735280: resolved conflicts for merge of
ac304133 to lmp-dev-plus-aosp
* commit '
f6735280cdb627985ec10a10391211aba7a67a57':
ART: Fix memory unmapped twice issue in ElfFile::Load(bool)
Brian Carlstrom [Tue, 5 Aug 2014 15:55:12 +0000 (08:55 -0700)]
resolved conflicts for merge of
ac304133 to lmp-dev-plus-aosp
Change-Id: I6886aa3f4066eead9242eb77042d89c4ee28da1b
Ian Rogers [Tue, 5 Aug 2014 15:10:46 +0000 (15:10 +0000)]
am
d77c40a8: am
6bdbec76: Merge "ART: Correct disassembling of 64bit immediates on x86_64"
* commit '
d77c40a890bd1b30b0da64f4e240d9ea2dbc7040':
ART: Correct disassembling of 64bit immediates on x86_64
Ian Rogers [Tue, 5 Aug 2014 15:06:54 +0000 (15:06 +0000)]
am
2fb8b8b9: am
4d3401e8: Merge "x86_64: Fix Test32RM"
* commit '
2fb8b8b9abc001ab840c0327dd30e39291901fbc':
x86_64: Fix Test32RM
Ian Rogers [Tue, 5 Aug 2014 15:06:06 +0000 (15:06 +0000)]
am
6bdbec76: Merge "ART: Correct disassembling of 64bit immediates on x86_64"
* commit '
6bdbec76e16494e68632bab45f655e13aac477b8':
ART: Correct disassembling of 64bit immediates on x86_64
Ian Rogers [Tue, 5 Aug 2014 15:02:32 +0000 (15:02 +0000)]
am
4d3401e8: Merge "x86_64: Fix Test32RM"
* commit '
4d3401e8e3c45203707431494739cb0a7181972b':
x86_64: Fix Test32RM
Calin Juravle [Tue, 5 Aug 2014 13:21:55 +0000 (13:21 +0000)]
am
3c1a3200: am
32155e0a: Merge "Use canonical paths when searching for dex files"
* commit '
3c1a32000553b919803c8c125fcd5533d2cf99ae':
Use canonical paths when searching for dex files
Vladimir Marko [Tue, 5 Aug 2014 13:21:54 +0000 (13:21 +0000)]
am
582d9367: am
3513cd30: Merge "Create allocator adapter for using Arena in std containers."
* commit '
582d936772cc167d9337c98cf193f59f62d9079a':
Create allocator adapter for using Arena in std containers.
Brian Carlstrom [Tue, 5 Aug 2014 13:21:54 +0000 (13:21 +0000)]
am
e339cbfe: am
8f1dc7a2: Merge "ART: Fix memory unmapped twice issue in ElfFile::Load(bool)"
* commit '
e339cbfe36ea45dbecd9428ade7697dbda9acdf3':
ART: Fix memory unmapped twice issue in ElfFile::Load(bool)
Calin Juravle [Tue, 5 Aug 2014 13:11:45 +0000 (13:11 +0000)]
am
32155e0a: Merge "Use canonical paths when searching for dex files"
* commit '
32155e0a3373b7ce6e490fceb40ca24074dbcbb5':
Use canonical paths when searching for dex files
Vladimir Marko [Tue, 5 Aug 2014 13:11:44 +0000 (13:11 +0000)]
am
3513cd30: Merge "Create allocator adapter for using Arena in std containers."
* commit '
3513cd30ee8e710d58a289a52104e0eb6be9e277':
Create allocator adapter for using Arena in std containers.
Brian Carlstrom [Tue, 5 Aug 2014 13:11:41 +0000 (13:11 +0000)]
am
8f1dc7a2: Merge "ART: Fix memory unmapped twice issue in ElfFile::Load(bool)"
* commit '
8f1dc7a20049ba6e2f3c7f800908bff811cdbea1':
ART: Fix memory unmapped twice issue in ElfFile::Load(bool)
Jim_Guo [Mon, 28 Apr 2014 03:11:57 +0000 (11:11 +0800)]
ART: Fix memory unmapped twice issue in ElfFile::Load(bool)
Root Cause:
The overlapped memory region will be unmapped by
(1) ~MemMap() of reservation MemMap (reserve) and
(2) ~MemMap() of "reuse" MemMap (segment).
Someone takes the memory region after (1) and it will be unmapped in (2).
So, SIGSEGV occurs when using the unmapped memory region.
Solution:
Fixes this issue by skip unmap "reuse" MemMap in destructor.
And always create reservation MemMap before "reuse" MemMap. (It also solved
the fixupELF case which does not reserve the whole needed memory region).
Bug:
16486685
(cherry picked from commit
a62a588a9202f69e53fbeb3045ea8ea5ec2587f8)
Change-Id: Icb83c8e87fa168027d9d8adb34925000399d3d2a
Christopher Ferris [Tue, 5 Aug 2014 03:07:17 +0000 (03:07 +0000)]
am
940cb994: am
b5c5646b: Merge "Use the uncached form of BacktraceMap::Create."
* commit '
940cb994fa06b7c6d1226c2d3744817d615185e9':
Use the uncached form of BacktraceMap::Create.
Christopher Ferris [Tue, 5 Aug 2014 03:03:50 +0000 (03:03 +0000)]
am
b5c5646b: Merge "Use the uncached form of BacktraceMap::Create."
* commit '
b5c5646b5ffd3d451af5e8d52b50743bf61d4c40':
Use the uncached form of BacktraceMap::Create.
Christopher Ferris [Tue, 5 Aug 2014 02:32:40 +0000 (02:32 +0000)]
am
f0bddada: am
27a10f61: Use the uncached form of BacktraceMap::Create.
* commit '
f0bddada64f2cc2bb6fbd8f3cc3049b3a00575bd':
Use the uncached form of BacktraceMap::Create.
Christopher Ferris [Tue, 5 Aug 2014 02:28:01 +0000 (02:28 +0000)]
am
27a10f61: Use the uncached form of BacktraceMap::Create.
* commit '
27a10f618357cf85cc0677a04f0a5a3a8a437aed':
Use the uncached form of BacktraceMap::Create.
Andreas Gampe [Tue, 5 Aug 2014 01:57:03 +0000 (01:57 +0000)]
am
154c3c93: am
c52361cf: Merge "ART: Refactor long ops in quick compiler"
* commit '
154c3c9308ee8342355862d377b7d1c6864dda66':
ART: Refactor long ops in quick compiler
Andreas Gampe [Tue, 5 Aug 2014 01:51:21 +0000 (01:51 +0000)]
am
c52361cf: Merge "ART: Refactor long ops in quick compiler"
* commit '
c52361cfaae8be2fbaa25b175d4f6c37d4110764':
ART: Refactor long ops in quick compiler
Ian Rogers [Tue, 5 Aug 2014 14:57:33 +0000 (14:57 +0000)]
Merge "ART: Correct disassembling of 64bit immediates on x86_64"
Ian Rogers [Tue, 5 Aug 2014 14:53:08 +0000 (14:53 +0000)]
Merge "x86_64: Fix Test32RM"
Chao-ying Fu [Thu, 24 Jul 2014 19:08:28 +0000 (12:08 -0700)]
x86_64: Fix Test32RM
This patch fixes Test32RM use flags and the format.
Change-Id: I486cb7f27e65caeefccbd3bbcc38257ddca033c8
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Andreas Gampe [Tue, 5 Aug 2014 01:44:22 +0000 (01:44 +0000)]
Merge "ART: Refactor long ops in quick compiler"
Andreas Gampe [Mon, 4 Aug 2014 23:30:03 +0000 (16:30 -0700)]
ART: Refactor long ops in quick compiler
Make GenArithOpLong virtual. Let the implementation in gen_common be
very basic, without instruction-set checks, and meant as a fall-back.
Backends should implement and dispatch to code for better implementations.
This allows to remove the GenXXXLong virtual methods from Mir2Lir, and
clean up the backends (especially removing some LOG(FATAL) implementations).
Change-Id: I6366443c0c325c1999582d281608b4fa229343cf
Calin Juravle [Tue, 5 Aug 2014 10:47:26 +0000 (10:47 +0000)]
Merge "Use canonical paths when searching for dex files"
Vladimir Marko [Tue, 5 Aug 2014 09:13:39 +0000 (09:13 +0000)]
Merge "Create allocator adapter for using Arena in std containers."
Vladimir Marko [Thu, 31 Jul 2014 14:33:43 +0000 (15:33 +0100)]
Create allocator adapter for using Arena in std containers.
Create ArenaAllocatorAdapter, similar to the existing
ScopedArenaAllocatorAdapter, for allocating memory for
standard containers via the ArenaAllocator. Add the ability
to specify allocation kind rather than just kArenaAllocSTL
to both adapters. Move the scoped arena allocator to the
scoped_arena_containers.h header file.
Define template aliases for containers using the new adapter
and change a few MIRGraph and Mir2Lir members to use them.
Change-Id: I9bbc50248e0fed81729497b848cb29bf68444268
Christopher Ferris [Tue, 5 Aug 2014 02:56:06 +0000 (02:56 +0000)]
Merge "Use the uncached form of BacktraceMap::Create."
Christopher Ferris [Tue, 5 Aug 2014 00:15:21 +0000 (17:15 -0700)]
Use the uncached form of BacktraceMap::Create.
The code assumes that calling BacktraceMap::Create creates a map based
on the current state of the maps. This is not true by default, so
call the Create function indicating we want an uncached BacktraceMap object.
(cherry picked from
27a10f618357cf85cc0677a04f0a5a3a8a437aed)
Change-Id: Ic7a2dedaea9950174b24ede4dcda30ffe036fe93
Ian Rogers [Tue, 5 Aug 2014 17:30:49 +0000 (17:30 +0000)]
Merge "ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[], ..)"
DaniilSokolov [Fri, 18 Jul 2014 01:58:15 +0000 (18:58 -0700)]
ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[], ..)
Implements x86_64 support for intrinsic for java.lang.System.arraycopy(char[], int, char[], int, int).
With this fix the intrinsic works on x86 and x86_64 architectures.
Change-Id: Icc2889ccd0cf7d821522abb7437893e3149e7c99
Signed-off-by: Daniil Sokolov <daniil.y.sokolov@intel.com>
Calin Juravle [Tue, 5 Aug 2014 10:48:28 +0000 (10:48 +0000)]
Merge "Use canonical paths when searching for dex files" into lmp-dev
Christopher Ferris [Tue, 5 Aug 2014 00:15:21 +0000 (17:15 -0700)]
Use the uncached form of BacktraceMap::Create.
The code assumes that calling BacktraceMap::Create creates a map based
on the current state of the maps. This is not true by default, so
call the Create function indicating we want an uncached BacktraceMap object.
Change-Id: I2c35149ba43db29ef0a9411fa5d9267d7c4dcbb3
Ian Rogers [Tue, 5 Aug 2014 16:56:44 +0000 (16:56 +0000)]
Merge "Set REG0_USED on X86 Set8R instruction"
Mark Mendell [Thu, 31 Jul 2014 18:36:54 +0000 (14:36 -0400)]
Set REG0_USED on X86 Set8R instruction
Since this instruction only affects the low byte of the register, it is
preceded by an XOR to zero the upper 3 bytes. Set8R isn't marked as
using operand 0 as an input. In practice, this works for now, as the
Xor sets the CC and Set8R uses the CC (although not that of the Xor, but
of a Cmp generally).
This just marks REG0 as using the previous contents of the register, as
it is modifying only 1 byte of 4.
Change-Id: I7a69cbdb06979da5d5d2ae17fabd7c22c5a17701
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Brian Carlstrom [Tue, 5 Aug 2014 05:45:06 +0000 (05:45 +0000)]
Merge "ART: Fix memory unmapped twice issue in ElfFile::Load(bool)"
Jim_Guo [Mon, 28 Apr 2014 03:11:57 +0000 (11:11 +0800)]
ART: Fix memory unmapped twice issue in ElfFile::Load(bool)
Root Cause:
The overlapped memory region will be unmapped by
(1) ~MemMap() of reservation MemMap (reserve) and
(2) ~MemMap() of "reuse" MemMap (segment).
Someone takes the memory region after (1) and it will be unmapped in (2).
So, SIGSEGV occurs when using the unmapped memory region.
Solution:
Fixes this issue by skip unmap "reuse" MemMap in destructor.
And always create reservation MemMap before "reuse" MemMap. (It also solved
the fixupELF case which does not reserve the whole needed memory region).
Bug:
16486685
Change-Id: I8f2538861d5c3fa7b9a04d2c3f516319cc060291
Andreas Gampe [Mon, 4 Aug 2014 23:45:42 +0000 (23:45 +0000)]
am
dcc3394c: am
9e9b15dd: Merge "Add trampoline invoke and ART callback tests for native-bridge"
* commit '
dcc3394c6e0a12e501f981646f686a144fe645ce':
Add trampoline invoke and ART callback tests for native-bridge
Andreas Gampe [Mon, 4 Aug 2014 23:41:31 +0000 (23:41 +0000)]
am
9e9b15dd: Merge "Add trampoline invoke and ART callback tests for native-bridge"
* commit '
9e9b15dd29ff4d91f31ed1063561963b2f99ad1c':
Add trampoline invoke and ART callback tests for native-bridge
Andreas Gampe [Mon, 4 Aug 2014 23:33:07 +0000 (23:33 +0000)]
am
efd9c223: am
1a09d286: Merge "AArch64: Implement InexpensiveConstant methods."
* commit '
efd9c223ae1875659b055604d0ab20d88b2cc417':
AArch64: Implement InexpensiveConstant methods.
Andreas Gampe [Mon, 4 Aug 2014 23:27:13 +0000 (23:27 +0000)]
am
1a09d286: Merge "AArch64: Implement InexpensiveConstant methods."
* commit '
1a09d286bdb4abc9aae06dcf4a8b052648816e2b':
AArch64: Implement InexpensiveConstant methods.
Andreas Gampe [Mon, 4 Aug 2014 23:08:14 +0000 (23:08 +0000)]
am
e691eae0: am
c7975a33: Merge "AArch64: Add inlining support for ceil(), floor(), rint(), round()"
* commit '
e691eae05760282d6c22bbe5ae05a5fca56474d1':
AArch64: Add inlining support for ceil(), floor(), rint(), round()
Andreas Gampe [Mon, 4 Aug 2014 23:03:23 +0000 (23:03 +0000)]
am
c7975a33: Merge "AArch64: Add inlining support for ceil(), floor(), rint(), round()"
* commit '
c7975a33b9c8fb36e85c41162462aeec8e76232a':
AArch64: Add inlining support for ceil(), floor(), rint(), round()
Andreas Gampe [Mon, 4 Aug 2014 23:22:12 +0000 (23:22 +0000)]
Merge "AArch64: Implement InexpensiveConstant methods."
Matteo Franchin [Fri, 4 Jul 2014 11:53:27 +0000 (12:53 +0100)]
AArch64: Implement InexpensiveConstant methods.
Implement IsInexpensiveConstant and friends for A64.
Also extending the methods to take the opcode with respect to which
the constant is inexpensive. Additionally, logical operations (i.e.
and, or, xor) can now handle the immediates 0 and ~0 (which are not
logical immediates).
Change-Id: I46ce1287703765c5ab54983d13c1b3a1f5838622
Jeff Hao [Mon, 4 Aug 2014 22:30:34 +0000 (22:30 +0000)]
am
b3f024c9: am
316fb6e4: Merge "Make verifier identify unresolved methods as constructors by <init>."
* commit '
b3f024c94b3de16395c938241c03b9ea19d8a31e':
Make verifier identify unresolved methods as constructors by <init>.
Jeff Hao [Mon, 4 Aug 2014 22:25:52 +0000 (22:25 +0000)]
am
316fb6e4: Merge "Make verifier identify unresolved methods as constructors by <init>."
* commit '
316fb6e4992f41fa0742f1360c6497787c9433e3':
Make verifier identify unresolved methods as constructors by <init>.
Jeff Hao [Mon, 4 Aug 2014 22:12:56 +0000 (22:12 +0000)]
am
18e6cd21: am
04ce1134: Make verifier identify unresolved methods as constructors by <init>.
* commit '
18e6cd215ea1be67001074aded59e0d852005197':
Make verifier identify unresolved methods as constructors by <init>.
Jeff Hao [Mon, 4 Aug 2014 22:10:56 +0000 (22:10 +0000)]
am
04ce1134: Make verifier identify unresolved methods as constructors by <init>.
* commit '
04ce113458b6b01f96d58dbb4c41682ee22d8b5d':
Make verifier identify unresolved methods as constructors by <init>.
Jeff Hao [Mon, 4 Aug 2014 21:47:17 +0000 (14:47 -0700)]
Make verifier identify unresolved methods as constructors by <init>.
Check was previously missing brackets in the method name.
Bug:
16560516
Change-Id: I6b28f8413f3d4c14269a6de38731213d7c964af6
Andreas Gampe [Mon, 4 Aug 2014 20:32:07 +0000 (20:32 +0000)]
am
34679315: am
7aaa8dbf: Merge "ART: Implement the easy long division/remainder by a constant"
* commit '
346793153db6cbe7bc34db05866fcd1e2dedc16f':
ART: Implement the easy long division/remainder by a constant
Andreas Gampe [Mon, 4 Aug 2014 20:24:30 +0000 (20:24 +0000)]
am
7aaa8dbf: Merge "ART: Implement the easy long division/remainder by a constant"
* commit '
7aaa8dbfbcde7f58564b42044892891559669838':
ART: Implement the easy long division/remainder by a constant
Brian Carlstrom [Mon, 4 Aug 2014 19:37:56 +0000 (19:37 +0000)]
am
51e9956f: am
4e97f656: Merge "Move image classes options from art to AndroidRuntime [art]"
* commit '
51e9956fd7ba9a43b7a907e89e9e82aec530fb50':
Move image classes options from art to AndroidRuntime [art]
Brian Carlstrom [Mon, 4 Aug 2014 19:37:55 +0000 (19:37 +0000)]
am
8cfccae4: am
dc3ca147: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
* commit '
8cfccae464825bc263245f898d4d45967c714356':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
Brian Carlstrom [Mon, 4 Aug 2014 19:26:35 +0000 (19:26 +0000)]
am
4e97f656: Merge "Move image classes options from art to AndroidRuntime [art]"
* commit '
4e97f6564fa51609d5651374dcdd2a8f4e79f272':
Move image classes options from art to AndroidRuntime [art]
Brian Carlstrom [Mon, 4 Aug 2014 19:26:34 +0000 (19:26 +0000)]
am
dc3ca147: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
* commit '
dc3ca147ee880088eb2f52b7b0355062ba5749be':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
Andreas Gampe [Mon, 4 Aug 2014 17:55:54 +0000 (17:55 +0000)]
am
d1831615: am
77a5b501: Merge "AArch64: Remove unnecessary work around for sp."
* commit '
d18316153256c5c2ef46db1cdd6c3e45b85b674f':
AArch64: Remove unnecessary work around for sp.
Andreas Gampe [Mon, 4 Aug 2014 17:52:59 +0000 (17:52 +0000)]
am
77a5b501: Merge "AArch64: Remove unnecessary work around for sp."
* commit '
77a5b50148633c2651edb7f35f5254e40cc878dc':
AArch64: Remove unnecessary work around for sp.
Narayan Kamath [Mon, 4 Aug 2014 17:43:04 +0000 (17:43 +0000)]
am
e7187d7f: am
f7f6c978: Merge "Inform about System.exit() call in logcat"
* commit '
e7187d7f3f184910139abcad630d0f7f653aa388':
Inform about System.exit() call in logcat
Narayan Kamath [Mon, 4 Aug 2014 17:38:47 +0000 (17:38 +0000)]
am
f7f6c978: Merge "Inform about System.exit() call in logcat"
* commit '
f7f6c978d44a785d4c12879c6ca20ca1832d3217':
Inform about System.exit() call in logcat
Calin Juravle [Tue, 15 Jul 2014 22:56:47 +0000 (23:56 +0100)]
Use canonical paths when searching for dex files
Apps which use the DexPathClassLoader directly may
pass symlinks when trying to load dex files. This
will not work as we use string comparision to find
the dex in an oat file. The CL fixes this issue by
using using dex conical paths for comparisons.
Bug:
15313272
(cherry picked from commit
4e1d579d6401fef2dd57b16f8d406e33221a69d9)
Change-Id: I441f1ef18388c4a17c747a7e55b57f917724db85
Calin Juravle [Tue, 15 Jul 2014 22:56:47 +0000 (23:56 +0100)]
Use canonical paths when searching for dex files
Apps which use the DexPathClassLoader directly may
pass symlinks when trying to load dex files. This
will not work as we use string comparision to find
the dex in an oat file. The CL fixes this issue by
using using dex conical paths for comparisons.
Bug:
15313272
Change-Id: Ic314374b17612c3afbcadec93a88b2515a0aca5e
Andreas Gampe [Mon, 4 Aug 2014 16:45:53 +0000 (16:45 +0000)]
am
65b62ba0: am
7906b25f: Merge "ART: Rework ARM64 entry sequence"
* commit '
65b62ba00c01602f3eb22a2b88594fc9f2da5370':
ART: Rework ARM64 entry sequence
Andreas Gampe [Mon, 4 Aug 2014 16:40:46 +0000 (16:40 +0000)]
am
7906b25f: Merge "ART: Rework ARM64 entry sequence"
* commit '
7906b25f79f24af3a8b8eee0454b4db1278b9b77':
ART: Rework ARM64 entry sequence
Narayan Kamath [Mon, 4 Aug 2014 12:27:16 +0000 (12:27 +0000)]
am
ddce1213: am
d4c3c62c: Fix broken JNI IsAssignableFrom.
* commit '
ddce1213efce14fd9973eb47ef2fdcffec300550':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Mon, 4 Aug 2014 12:17:41 +0000 (12:17 +0000)]
am
d4c3c62c: Fix broken JNI IsAssignableFrom.
* commit '
d4c3c62cc68296fbaf35e7b37108c2fde2278a3b':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Mon, 4 Aug 2014 11:50:26 +0000 (11:50 +0000)]
am
93c6171c: am
43c63b5a: Merge "Fix broken JNI IsAssignableFrom."
* commit '
93c6171cfb3e4da2a5b07bcc647c15223cc90b12':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Mon, 4 Aug 2014 11:39:30 +0000 (11:39 +0000)]
am
43c63b5a: Merge "Fix broken JNI IsAssignableFrom."
* commit '
43c63b5aaa7cd1c6d0ca13b7ea28cc321848d127':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Fri, 11 Jul 2014 18:15:11 +0000 (19:15 +0100)]
Fix broken JNI IsAssignableFrom.
The expected argument order was the opposite of what the spec
dictated.
Reported-By: Mikhail Naganov <mnaganov@google.com>
bug:
16531674
(cherry picked from commit
1268b742c8cff7318dc0b5b283cbaeabfe0725ba)
Change-Id: I2b6636998c4e15c1eb10dc96a57940aca56c4d0d
Narayan Kamath [Mon, 4 Aug 2014 17:31:49 +0000 (17:31 +0000)]
Merge "Inform about System.exit() call in logcat"
Dmitry Petrochenko [Thu, 3 Jul 2014 10:07:45 +0000 (17:07 +0700)]
Inform about System.exit() call in logcat
This diagnostic message helps to filter out crashes during System.exit()
when thread's behaviour is undefined.
Change-Id: I772932a35b503b1efca695e7da7bf2e562c03a7c
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Narayan Kamath [Mon, 4 Aug 2014 11:24:20 +0000 (11:24 +0000)]
Merge "Fix broken JNI IsAssignableFrom."
Narayan Kamath [Fri, 11 Jul 2014 18:15:11 +0000 (19:15 +0100)]
Fix broken JNI IsAssignableFrom.
The expected argument order was the opposite of what the spec
dictated.
Reported-By: Mikhail Naganov <mnaganov@google.com>
bug:
16531674
Change-Id: I1ebc6d5814ebb4feeb96f3ecdf1a4602da4ba7ce
Jeff Hao [Mon, 4 Aug 2014 22:17:40 +0000 (22:17 +0000)]
Merge "Make verifier identify unresolved methods as constructors by <init>."
Jeff Hao [Mon, 4 Aug 2014 21:47:17 +0000 (14:47 -0700)]
Make verifier identify unresolved methods as constructors by <init>.
Check was previously missing brackets in the method name.
Bug:
16560516
(cherry picked from commit
04ce113458b6b01f96d58dbb4c41682ee22d8b5d)
Change-Id: Ie98c5b84e73ffc43ea08e1b08ae9c6e41bcd5891
Andreas Gampe [Mon, 4 Aug 2014 19:36:53 +0000 (19:36 +0000)]
Merge "ART: Implement the easy long division/remainder by a constant"
Alexei Zavjalov [Mon, 14 Jul 2014 19:19:41 +0000 (02:19 +0700)]
ART: Implement the easy long division/remainder by a constant
Also optimizes long/int divisions by power-of-two values.
Also do some clean-up.
Change-Id: Ie414e64aac251c81361ae107d157c14439e6dab5
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Brian Carlstrom [Mon, 4 Aug 2014 18:27:31 +0000 (18:27 +0000)]
Merge "Move image classes options from art to AndroidRuntime [art]"
Andreas Gampe [Mon, 4 Aug 2014 23:32:31 +0000 (23:32 +0000)]
Merge "Add trampoline invoke and ART callback tests for native-bridge"
Yong WU [Sun, 3 Aug 2014 08:06:52 +0000 (16:06 +0800)]
Add trampoline invoke and ART callback tests for native-bridge
Create trampolines for JNI functions in native-bridge. Test trampoline
invoking from ART side.
Add tests for ART callbacks which called from native-bridge. In this test
they are invoked from the trampoline of JNI_OnLoad.
Change-Id: Ibaa5103fdf49a6b29a1c12f45410fe5f82d46b1e
Brian Carlstrom [Mon, 4 Aug 2014 18:27:30 +0000 (18:27 +0000)]
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
Andreas Gampe [Mon, 4 Aug 2014 16:32:25 +0000 (16:32 +0000)]
Merge "ART: Rework ARM64 entry sequence"
Andreas Gampe [Tue, 29 Jul 2014 07:35:00 +0000 (00:35 -0700)]
ART: Rework ARM64 entry sequence
Try to fold one sub of SP in the ARM64 entry sequence. When the
framesize is small, generate a sub over the full frame-size, and
adjust the spill offsets accordingly. If the framesize is too
large, use a pre-indexed store and fill upwards from there.
Change-Id: I1c15ac6276fb62b8164372de02fd92437f605938
Andreas Gampe [Mon, 4 Aug 2014 22:56:32 +0000 (22:56 +0000)]
Merge "AArch64: Add inlining support for ceil(), floor(), rint(), round()"
Serban Constantinescu [Thu, 31 Jul 2014 18:07:17 +0000 (19:07 +0100)]
AArch64: Add inlining support for ceil(), floor(), rint(), round()
This patch adds inlining support for the following Math, StrictMath
methods in the ARM64 backend:
* double ceil(double)
* double floor(double)
* double rint(double)
* long round(double)
* int round(float)
Also some cleanup.
Change-Id: I9f5a2f4065b1313649f4b0c4380b8176703c3fe1
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Andreas Gampe [Mon, 4 Aug 2014 17:46:05 +0000 (17:46 +0000)]
Merge "AArch64: Remove unnecessary work around for sp."
Zheng Xu [Tue, 1 Jul 2014 01:53:22 +0000 (09:53 +0800)]
AArch64: Remove unnecessary work around for sp.
Use RegRegRegExtend to encode instruction for "sub/add sp, sp, Xm".
Change-Id: I13d3d2d386a7bd827e1396f291a7dcb9bffd5a29
Bill Buzbee [Thu, 31 Jul 2014 22:40:05 +0000 (22:40 +0000)]
am
dbfae92c: am
89c210bf: Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
* commit '
dbfae92cdf7bc446f52dbfa807b112b20be0119e':
Revert "Revert "Enable Load Store Elimination for ARM and ARM64""
Hiroshi Yamauchi [Thu, 31 Jul 2014 22:40:03 +0000 (22:40 +0000)]
am
212704ab: am
59a5525e: Merge "Add read barriers for the roots in the verifier."
* commit '
212704ab469ef40cd74c796b767f04808bc15ac9':
Add read barriers for the roots in the verifier.
Bill Buzbee [Thu, 31 Jul 2014 22:29:01 +0000 (22:29 +0000)]
am
89c210bf: Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
* commit '
89c210bf418a152ccabfbbf853ddcce33aea450d':
Revert "Revert "Enable Load Store Elimination for ARM and ARM64""
Hiroshi Yamauchi [Thu, 31 Jul 2014 22:28:53 +0000 (22:28 +0000)]
am
59a5525e: Merge "Add read barriers for the roots in the verifier."
* commit '
59a5525e72d723c8598b6271c7b09845999beeb0':
Add read barriers for the roots in the verifier.
Bill Buzbee [Thu, 31 Jul 2014 21:02:56 +0000 (21:02 +0000)]
Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
Narayan Kamath [Thu, 31 Jul 2014 18:18:14 +0000 (18:18 +0000)]
am
b8642b03: am
2eb3769c: Merge "Make ImageSpace skip validation if we are using a relocated image"
* commit '
b8642b0353e3128fed986bbdfd64ed0d3851bd06':
Make ImageSpace skip validation if we are using a relocated image