OSDN Git Service
Andreas Gampe [Wed, 6 Aug 2014 17:40:12 +0000 (17:40 +0000)]
am
a84690e3: am
0a1143de: Merge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation."
* commit '
a84690e3b0607f286e4680350b98d54e208fa614':
Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation.
Mathieu Chartier [Wed, 6 Aug 2014 17:37:35 +0000 (17:37 +0000)]
am
0b8c1530: am
a1227a18: Fix byte_cas to use uintptr_t Atomic.
* commit '
0b8c153082caf6a970e238c9ac34ce0601947dd2':
Fix byte_cas to use uintptr_t Atomic.
Mathieu Chartier [Wed, 6 Aug 2014 17:36:08 +0000 (17:36 +0000)]
am
5ce0921f: am
4853f940: Merge "Fix byte_cas to use uintptr_t Atomic."
* commit '
5ce0921fbaf6a8eead373a253fc8813cde54770a':
Fix byte_cas to use uintptr_t Atomic.
Nicolas Geoffray [Wed, 6 Aug 2014 17:34:24 +0000 (17:34 +0000)]
am
1d874ca3: am
ae5092fc: Merge "Fix movw in x86_64 assembler."
* commit '
1d874ca361749a062f9a8861425873f46242b98c':
Fix movw in x86_64 assembler.
Ian Rogers [Wed, 6 Aug 2014 17:25:46 +0000 (17:25 +0000)]
am
c598f8f8: am
4b6d27c2: Merge "x86: Fix assembler for Pextr"
* commit '
c598f8f88ca70283472434fcfc0ab5af8ddb30f1':
x86: Fix assembler for Pextr
Ian Rogers [Wed, 6 Aug 2014 17:25:37 +0000 (17:25 +0000)]
am
1622baf3: am
cbb5747b: Merge "ART: Fix lock max count definition"
* commit '
1622baf30c9ef3897fd80d8d4fb0860511608573':
ART: Fix lock max count definition
Andreas Gampe [Wed, 6 Aug 2014 15:17:48 +0000 (15:17 +0000)]
am
0a1143de: Merge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation."
* commit '
0a1143de1414abc73634f2ff8941cdd6acd5e9a8':
Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation.
Ian Rogers [Wed, 6 Aug 2014 12:10:59 +0000 (12:10 +0000)]
am
c276c14f: am
f768db4c: Merge "X86: Assembler: Correct r8_form for some cases"
* commit '
c276c14f16c6dde063311631bcb0e9096d822aeb':
X86: Assembler: Correct r8_form for some cases
Ian Rogers [Wed, 6 Aug 2014 12:10:58 +0000 (12:10 +0000)]
am
b74629b7: am
f6e8d030: Merge "x86_64: Load double constant using core register"
* commit '
b74629b7136a7ca8eec19215847ba808b01d2648':
x86_64: Load double constant using core register
Brian Carlstrom [Wed, 6 Aug 2014 12:10:57 +0000 (12:10 +0000)]
am
277c6bb7: am
6175442a: Merge changes Ibe92d8b5,I9bada598
* commit '
277c6bb72a0899dd7c4462bcd8a67fcdeab90650':
Make system use patchoat to relocate during runtime.
Temporary fix for bad LIR generation in GenInlinedGet.
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[], ..)
Mathieu Chartier [Wed, 6 Aug 2014 01:30:07 +0000 (01:30 +0000)]
am
a1227a18: Fix byte_cas to use uintptr_t Atomic.
* commit '
a1227a185a5d6e2af83c532379b2f9b4600f6e16':
Fix byte_cas to use uintptr_t Atomic.
Mathieu Chartier [Wed, 6 Aug 2014 01:22:16 +0000 (01:22 +0000)]
am
4853f940: Merge "Fix byte_cas to use uintptr_t Atomic."
* commit '
4853f940efe0aaccf83a4af55a8dd640d8ef7274':
Fix byte_cas to use uintptr_t Atomic.
Mathieu Chartier [Tue, 5 Aug 2014 22:59:43 +0000 (15:59 -0700)]
Fix byte_cas to use uintptr_t Atomic.
Previously we used int32_t Atomic with a uintptr_t bit shift.
This was a mismatch on 64 bit and resulted in occasionally
having the cas return without having succeeded.
Bug:
16819816
(cherry picked from commit
aa3c3e5ee83c061e7f387c75b1b29c9f248ac39c)
Change-Id: Ib97bf5880153ddfacf52409be3e9e821657bac59
Nicolas Geoffray [Tue, 5 Aug 2014 22:32:18 +0000 (22:32 +0000)]
am
ae5092fc: Merge "Fix movw in x86_64 assembler."
* commit '
ae5092fcaf2175df9f8c7cf7f5542b31e829ac72':
Fix movw in x86_64 assembler.
Ian Rogers [Tue, 5 Aug 2014 22:05:13 +0000 (22:05 +0000)]
am
4b6d27c2: Merge "x86: Fix assembler for Pextr"
* commit '
4b6d27c2079e246cdeb56dca6648539a16493dca':
x86: Fix assembler for Pextr
Ian Rogers [Tue, 5 Aug 2014 21:49:25 +0000 (21:49 +0000)]
am
cbb5747b: Merge "ART: Fix lock max count definition"
* commit '
cbb5747ba911d12cfe8fd97d96441c7e40ab193e':
ART: Fix lock max count definition
Ian Rogers [Tue, 5 Aug 2014 21:43:21 +0000 (21:43 +0000)]
am
f768db4c: Merge "X86: Assembler: Correct r8_form for some cases"
* commit '
f768db4c1cb7ec9374e203305cf3582f32147302':
X86: Assembler: Correct r8_form for some cases
Ian Rogers [Tue, 5 Aug 2014 21:43:18 +0000 (21:43 +0000)]
am
f6e8d030: Merge "x86_64: Load double constant using core register"
* commit '
f6e8d0304d0b0024f1af8e63c2a3a3ad78761d59':
x86_64: Load double constant using core register
Brian Carlstrom [Tue, 5 Aug 2014 21:43:06 +0000 (21:43 +0000)]
am
6175442a: Merge changes Ibe92d8b5,I9bada598
* commit '
6175442a246cded6a9caae4658a0a1dc7cf49071':
Make system use patchoat to relocate during runtime.
Temporary fix for bad LIR generation in GenInlinedGet.
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[], ..)
Mathieu Chartier [Wed, 6 Aug 2014 01:12:05 +0000 (01:12 +0000)]
Merge "Fix byte_cas to use uintptr_t Atomic."
Mathieu Chartier [Tue, 5 Aug 2014 22:59:43 +0000 (15:59 -0700)]
Fix byte_cas to use uintptr_t Atomic.
Previously we used int32_t Atomic with a uintptr_t bit shift.
This was a mismatch on 64 bit and resulted in occasionally
having the cas return without having succeeded.
Bug:
16819816
Change-Id: I10fa9c2f09ae8fe0997a4c9293fa123c6bde5920
Nicolas Geoffray [Tue, 5 Aug 2014 22:19:45 +0000 (22:19 +0000)]
Merge "Fix movw in x86_64 assembler."
Nicolas Geoffray [Tue, 5 Aug 2014 21:52:45 +0000 (22:52 +0100)]
Fix movw in x86_64 assembler.
Change-Id: Ibceb03fd57adea09643aa77a9399be196fa14709
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
Ian Rogers [Tue, 5 Aug 2014 21:57:45 +0000 (21:57 +0000)]
Merge "x86: Fix assembler for Pextr"
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
Brian Carlstrom [Tue, 5 Aug 2014 17:49:28 +0000 (17:49 +0000)]
Merge changes Ibe92d8b5,I9bada598
* changes:
Make system use patchoat to relocate during runtime.
Temporary fix for bad LIR generation in GenInlinedGet.
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
Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
Alex Light [Tue, 29 Jul 2014 22:22:40 +0000 (15:22 -0700)]
Temporary fix for bad LIR generation in GenInlinedGet.
In GenInlinedGet we will sometimes try to load a class directly. If
we are doing that and find one, but cannot get the direct pointer
(due to image compilation or including patch information) we might
end up generating incorrect patching code due to the changing of the
cu_->dex_file attribute.
Bug:
16656190
Change-Id: I9bada598bf4fd972d6164163eedd4a496da306d6
Ian Rogers [Tue, 5 Aug 2014 21:44:41 +0000 (21:44 +0000)]
Merge "ART: Fix lock max count definition"
Ian Rogers [Tue, 5 Aug 2014 21:32:29 +0000 (21:32 +0000)]
Merge "X86: Assembler: Correct r8_form for some cases"
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
Andreas Gampe [Wed, 6 Aug 2014 15:10:58 +0000 (15:10 +0000)]
Merge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation."
Varvara Rainchik [Wed, 30 Jul 2014 13:01:24 +0000 (17:01 +0400)]
Add x86_64 optimized __memcmp16 implementation;
fix tabs in 32-bit implementation.
Change-Id: I7bbfb344074aed66511c1a845998dc38798116ea
Signed-off-by: Varvara Rainchik <varvara.rainchik@intel.com>
Ian Rogers [Tue, 5 Aug 2014 20:38:02 +0000 (20:38 +0000)]
Merge "x86_64: Load double constant using core register"
Alexei Zavjalov [Thu, 10 Jul 2014 11:34:23 +0000 (18:34 +0700)]
x86_64: Load double constant using core register
This changes the double const loading scheme for x86_64 in order to
reduce number of memory accesses.
Change-Id: If6ee34b890287ed616ca4ea5d1c13f06a06293a9
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
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