OSDN Git Service

android-x86/art.git
9 years agoMerge "Support x86_64 stack overflow checks in opt compiler."
Nicolas Geoffray [Thu, 7 Aug 2014 21:03:30 +0000 (21:03 +0000)]
Merge "Support x86_64 stack overflow checks in opt compiler."

9 years agoSupport x86_64 stack overflow checks in opt compiler.
Nicolas Geoffray [Thu, 7 Aug 2014 19:25:41 +0000 (20:25 +0100)]
Support x86_64 stack overflow checks in opt compiler.

Also re-enable SignalTest on optimizing-32.

Change-Id: I2ca13f6f9ea775c654ee07cc5026c985263d6380

9 years agoMerge "Fix a SIGSEGV at background-to-foreground collector transition."
Hiroshi Yamauchi [Thu, 7 Aug 2014 19:20:25 +0000 (19:20 +0000)]
Merge "Fix a SIGSEGV at background-to-foreground collector transition."

9 years agoMerge "Check for a NULL pointer, do not call Build."
Christopher Ferris [Thu, 7 Aug 2014 19:09:34 +0000 (19:09 +0000)]
Merge "Check for a NULL pointer, do not call Build."

9 years agoFix a SIGSEGV at background-to-foreground collector transition.
Hiroshi Yamauchi [Thu, 7 Aug 2014 17:27:17 +0000 (10:27 -0700)]
Fix a SIGSEGV at background-to-foreground collector transition.

The mem map that's used to create the backup main rosalloc space is
set to PROT_NONE by the compaction and the rosalloc space creation
attempts to write the debug magic number in the first page.

This is a debug build only issue.

Bug: 16854263
Change-Id: I3cc6b7288ee53c006366bb428fb245a909bc3db5

9 years agoMerge "Fix GetDexCanonicalLocation test for relative paths."
Calin Juravle [Thu, 7 Aug 2014 12:46:20 +0000 (12:46 +0000)]
Merge "Fix GetDexCanonicalLocation test for relative paths."

9 years agoFix GetDexCanonicalLocation test for relative paths.
Calin Juravle [Thu, 7 Aug 2014 10:54:36 +0000 (11:54 +0100)]
Fix GetDexCanonicalLocation test for relative paths.

If the reference file is created with a relative path the test will
fail.

Change-Id: Ifa8e650e3c8b1d28600ce994d7e6e0cb422b0c9d

9 years agoMerge "Fix target and host gtest dependencies."
Nicolas Geoffray [Thu, 7 Aug 2014 18:16:38 +0000 (18:16 +0000)]
Merge "Fix target and host gtest dependencies."

9 years agoFix target and host gtest dependencies.
Nicolas Geoffray [Thu, 7 Aug 2014 00:58:32 +0000 (01:58 +0100)]
Fix target and host gtest dependencies.

Change-Id: I0da17b12fc2164d9d8bdb8bcf61947c7788c6b8b

9 years agoMerge "Add implicit checks for x86_64 architecture."
Dave Allison [Thu, 7 Aug 2014 18:15:28 +0000 (18:15 +0000)]
Merge "Add implicit checks for x86_64 architecture."

9 years agoAdd implicit checks for x86_64 architecture.
Dave Allison [Wed, 16 Jul 2014 23:04:32 +0000 (16:04 -0700)]
Add implicit checks for x86_64 architecture.

This combines the x86 and x86_64 fault handlers into one.  It also
merges in the change to the entrypoints for X86_64.

Replaces generic instruction length calculator with one that only
works with the specific instructions we use.

Bug: 16256184

Change-Id: I1e8ab5ad43f46060de9597615b423c89a836035c
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
9 years agoRevert "Rename openDexFileNative to openDexFile."
Calin Juravle [Wed, 6 Aug 2014 19:07:41 +0000 (19:07 +0000)]
Revert "Rename openDexFileNative to openDexFile."

https://android-review.googlesource.com/#/c/103383/ introduces
absolute paths so we need back the old method name

Bug: 16644204

This reverts commit 350b626eb1cfbaee7619e9453a4c018c07aed003.

Change-Id: I10f430a536bb1906a8452fea5846ec9e725e84bd

9 years agoCheck for a NULL pointer, do not call Build.
Christopher Ferris [Tue, 5 Aug 2014 22:43:13 +0000 (15:43 -0700)]
Check for a NULL pointer, do not call Build.

When calling BacktraceMap::Create(), a NULL pointer is returned if Build
fails. Building twice can cause problems and might leak memory.

Change-Id: I38a4100e534ef15a19883703aa504e795a14b6de

9 years agoMerge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""
Brian Carlstrom [Wed, 6 Aug 2014 16:42:26 +0000 (16:42 +0000)]
Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""

9 years agoRevert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
Brian Carlstrom [Mon, 28 Jul 2014 23:12:58 +0000 (23:12 +0000)]
Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."

This reverts commit b1efe9746724f28773d185c7137c16ca8207ed47.

Change-Id: I5af2fae2c7b72e6ded72f00d3f7d4f306f6703ee

9 years agoMerge changes Ibe92d8b5,I9bada598
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.

9 years agoMake system use patchoat to relocate during runtime.
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

9 years agoTemporary fix for bad LIR generation in GenInlinedGet.
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

9 years agoMerge "Add test for equals and hashCode in ParameterizedType"
Piotr Jastrzebski [Thu, 7 Aug 2014 11:21:50 +0000 (11:21 +0000)]
Merge "Add test for equals and hashCode in ParameterizedType"

9 years agoAdd test for equals and hashCode in ParameterizedType
Piotr Jastrzebski [Wed, 6 Aug 2014 11:02:48 +0000 (12:02 +0100)]
Add test for equals and hashCode in ParameterizedType

and GenericArrayType.

Bug: 14590652
Bug: https://code.google.com/p/android/issues/detail?id=74060
Change-Id: Ic814bcc24b1461b42ac809eaaa7a41d9f5a60406

9 years agoMerge "Fix byte_cas to use uintptr_t Atomic."
Mathieu Chartier [Wed, 6 Aug 2014 01:12:05 +0000 (01:12 +0000)]
Merge "Fix byte_cas to use uintptr_t Atomic."

9 years agoFix 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

9 years agoMerge "Fix movw in x86_64 assembler."
Nicolas Geoffray [Tue, 5 Aug 2014 22:19:45 +0000 (22:19 +0000)]
Merge "Fix movw in x86_64 assembler."

9 years agoFix 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

9 years agoMerge "Revert "Rename openDexFileNative to openDexFile.""
Calin Juravle [Thu, 7 Aug 2014 09:57:40 +0000 (09:57 +0000)]
Merge "Revert "Rename openDexFileNative to openDexFile.""

9 years agoMerge "x86: Fix assembler for Pextr"
Ian Rogers [Tue, 5 Aug 2014 21:57:45 +0000 (21:57 +0000)]
Merge "x86: Fix assembler for Pextr"

9 years agoMerge "Fix analysis_attributes_ to update missing definitions."
Bill Buzbee [Thu, 7 Aug 2014 01:17:42 +0000 (01:17 +0000)]
Merge "Fix analysis_attributes_ to update missing definitions."

9 years agoMerge "AArch64: Implicit StackOverflow/NPE/Suspend checks."
Dave Allison [Thu, 7 Aug 2014 00:20:29 +0000 (00:20 +0000)]
Merge "AArch64: Implicit StackOverflow/NPE/Suspend checks."

9 years agoMerge "Fix art build script."
Ian Rogers [Thu, 7 Aug 2014 00:11:35 +0000 (00:11 +0000)]
Merge "Fix art build script."

9 years agoMerge "Fixed build breakage due to incorrect class TypeId."
Mathieu Chartier [Thu, 7 Aug 2014 00:02:15 +0000 (00:02 +0000)]
Merge "Fixed build breakage due to incorrect class TypeId."

9 years agoFixed build breakage due to incorrect class TypeId.
Fred Shih [Wed, 6 Aug 2014 23:44:22 +0000 (16:44 -0700)]
Fixed build breakage due to incorrect class TypeId.

Fixed incorrect type id being inserted in code buffer and got rid of
inefficient pointer wrapping in LoadClassType.

Change-Id: I7ee1d957ebcd816445c26199723ac50787d926d7

9 years agoMerge "Make patchoat use the sht_entsize when patching."
Nicolas Geoffray [Wed, 6 Aug 2014 23:37:02 +0000 (23:37 +0000)]
Merge "Make patchoat use the sht_entsize when patching."

9 years agoMake patchoat use the sht_entsize when patching.
Alex Light [Wed, 6 Aug 2014 20:37:23 +0000 (13:37 -0700)]
Make patchoat use the sht_entsize when patching.

This fixes an occasional problem with multiarch use of patchoat.

Change-Id: I80799de36774720bd985704f9b709a8378bb5af5

9 years agoAArch64: Implicit StackOverflow/NPE/Suspend checks.
Stuart Monteith [Wed, 11 Jun 2014 15:44:46 +0000 (16:44 +0100)]
AArch64: Implicit StackOverflow/NPE/Suspend checks.

This implements implicit stack overflow checks and null pointer exceptions
for AArch64.  Suspend checks are implemented but not switched on yet.

Change-Id: I2eb076f2c0c9d94793d5a898fea49cf409b4eb66
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
9 years agoMerge "ART: Remove test files after test"
Andreas Gampe [Wed, 6 Aug 2014 23:35:04 +0000 (23:35 +0000)]
Merge "ART: Remove test files after test"

9 years agoART: Remove test files after test
Andreas Gampe [Wed, 6 Aug 2014 21:53:03 +0000 (14:53 -0700)]
ART: Remove test files after test

The unix_file tests should remove files and directories when they
are done testing.

Bug: 16505797
Change-Id: Iff6856f64ee42ee9818b4ac23a6de3fe7eec6eae

9 years agoMerge "Added support for patching classes from different dex files."
Mathieu Chartier [Wed, 6 Aug 2014 22:04:33 +0000 (22:04 +0000)]
Merge "Added support for patching classes from different dex files."

9 years agoAdded support for patching classes from different dex files.
Fred Shih [Wed, 6 Aug 2014 17:46:37 +0000 (10:46 -0700)]
Added support for patching classes from different dex files.

Added support for class patching from different dex files and moved
ScopedObjectAccess from the quick compiler to driver. Slight refactoring
for clarity.

Bug: 16656190
Change-Id: I107fcbce75db42ca61321ea1c5d5f236680a1b3d

9 years agoRevert "Temporary fix for bad LIR generation in GenInlinedGet."
Fred Shih [Wed, 6 Aug 2014 17:42:17 +0000 (10:42 -0700)]
Revert "Temporary fix for bad LIR generation in GenInlinedGet."

This reverts commit eb76e11d836ea953b4e40a28e3e69d3b0f4c86fa.

Bug: 16656190
Change-Id: Ie2dd58436b28e79214ef3a7c7651f16fe46a60e8

9 years agoMerge "Make tools/art non-executable"
Nicolas Geoffray [Wed, 6 Aug 2014 23:32:15 +0000 (23:32 +0000)]
Merge "Make tools/art non-executable"

9 years agoMake tools/art non-executable
Alex Light [Wed, 6 Aug 2014 22:44:12 +0000 (15:44 -0700)]
Make tools/art non-executable

Change-Id: I11c2989020de14057ffbfc80bd5baac01234f54b

9 years agoMerge "ART: Build fix for dex_cache rework"
Andreas Gampe [Wed, 6 Aug 2014 23:30:52 +0000 (23:30 +0000)]
Merge "ART: Build fix for dex_cache rework"

9 years agoART: Build fix for dex_cache rework
Andreas Gampe [Wed, 6 Aug 2014 23:27:52 +0000 (16:27 -0700)]
ART: Build fix for dex_cache rework

A formerly public method is now private.

Change-Id: I9834cfcf651ab2f3553633cad45ea4ed05f3e4c7

9 years agoMerge "Fix SsaDeadPhiElimination in the presence of dependent phis."
Nicolas Geoffray [Wed, 6 Aug 2014 23:03:21 +0000 (23:03 +0000)]
Merge "Fix SsaDeadPhiElimination in the presence of dependent phis."

9 years agoFix SsaDeadPhiElimination in the presence of dependent phis.
Nicolas Geoffray [Wed, 6 Aug 2014 22:02:54 +0000 (23:02 +0100)]
Fix SsaDeadPhiElimination in the presence of dependent phis.

This fixes the problem of having a dead loop phi taking as back-edge
input a phi that also has this loop phi as input. Walking backwards
does not solve the problem because the loop phi will be visited last.

Most of the time, dex removes dead locals like this.

Change-Id: I797198cf9c15f8faa6585cca157810e23aaa4940

9 years agoMerge "ART: Add guards to the dex cache and its shortcuts"
Andreas Gampe [Wed, 6 Aug 2014 22:58:25 +0000 (22:58 +0000)]
Merge "ART: Add guards to the dex cache and its shortcuts"

9 years agoART: Add guards to the dex cache and its shortcuts
Andreas Gampe [Thu, 31 Jul 2014 23:23:49 +0000 (16:23 -0700)]
ART: Add guards to the dex cache and its shortcuts

Do not return fields, methods or classes if the (declaring) class is
erroneous.

Bug: 16692788
Change-Id: If43c2414ad0eb22db5eba7cf66396c7f16c26597

9 years agoMerge "ART: Generate chained compare-and-branch for short switches"
Andreas Gampe [Wed, 6 Aug 2014 20:05:02 +0000 (20:05 +0000)]
Merge "ART: Generate chained compare-and-branch for short switches"

9 years agoART: Generate chained compare-and-branch for short switches
Andreas Gampe [Wed, 6 Aug 2014 17:09:01 +0000 (10:09 -0700)]
ART: Generate chained compare-and-branch for short switches

Refactor Mir2Lir to generate chained compare-and-branch sequences
for short switches on all architectures.

Change-Id: Ie2a572ae69d462ba68a119e9fb93ae538cddd08f

9 years agoMerge "Implement TLAB fast paths in artAllocObjectFromCode."
Hiroshi Yamauchi [Wed, 6 Aug 2014 22:36:17 +0000 (22:36 +0000)]
Merge "Implement TLAB fast paths in artAllocObjectFromCode."

9 years agoImplement TLAB fast paths in artAllocObjectFromCode.
Hiroshi Yamauchi [Wed, 6 Aug 2014 19:41:15 +0000 (12:41 -0700)]
Implement TLAB fast paths in artAllocObjectFromCode.

GSS/TLAB GC speedup on N4 (ms):

MemAllocTest 2963 -> 2792
BinaryTrees  2205 -> 2113

Also, measured wth -XX:IgnoreMaxFootprint to invoke GC less often
(only when the bump pointer space is filled rather than based on the
target utilization):

MemAllocTest 2707 -> 2590
BinaryTrees  2023 -> 1906

TODO: implement fast paths for array allocations.

Bug: 9986565
Change-Id: I73ff6327b229704f8ae5924ae9b747443c229841

9 years agoMerge "X86: Assembler: Correct r8_form for some cases"
Ian Rogers [Tue, 5 Aug 2014 21:32:29 +0000 (21:32 +0000)]
Merge "X86: Assembler: Correct r8_form for some cases"

9 years agoMerge "ART: Fix lock max count definition"
Ian Rogers [Tue, 5 Aug 2014 21:44:41 +0000 (21:44 +0000)]
Merge "ART: Fix lock max count definition"

9 years agoMerge "ART: Enable x86_64 bit support for intrinsic for System.arraycopy(char[],...
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[], ..)"

9 years agoART: 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>
9 years agoMerge "Fix checks for kLiteral in local optimizations."
Dave Allison [Wed, 6 Aug 2014 19:40:49 +0000 (19:40 +0000)]
Merge "Fix checks for kLiteral in local optimizations."

9 years agoFix checks for kLiteral in local optimizations.
Dave Allison [Wed, 6 Aug 2014 04:32:46 +0000 (21:32 -0700)]
Fix checks for kLiteral in local optimizations.

The check for kLiteral (literal load) just checked the kLiteral
bit in the def mask.  The kEncodeAll mask has the kLiteral bit
set so this check was triggering.  The fix is to check for
only the kLiteral bit being set and no other special bits.

The semantics of the special bits in the use/def mask is that
only one of them can be set at the same time.

Bug: 16824330

Change-Id: I0f1c1157e017870414ffef11767e5433d1fd4401

9 years agoMerge "Add card table test."
Mathieu Chartier [Wed, 6 Aug 2014 18:35:57 +0000 (18:35 +0000)]
Merge "Add card table test."

9 years agoAdd card table test.
Mathieu Chartier [Wed, 6 Aug 2014 01:15:56 +0000 (18:15 -0700)]
Add card table test.

Tests some of the functionality supported by the card table.

Removed some logcat spam from monitor_pool.

Change-Id: I1423816a72572f78aca44552effa2b4c6aac46c8

9 years agoMerge "Fix proxy tracing and enable tests that now work with tracing."
Jeff Hao [Wed, 6 Aug 2014 19:53:18 +0000 (19:53 +0000)]
Merge "Fix proxy tracing and enable tests that now work with tracing."

9 years agoFix proxy tracing and enable tests that now work with tracing.
Jeff Hao [Thu, 24 Jul 2014 23:26:09 +0000 (16:26 -0700)]
Fix proxy tracing and enable tests that now work with tracing.

Also updates proxy_test to generate an image for GetQuickOatCodeFor.

Bug: 16386215
Change-Id: Ie7daad3d73ea7b60187bc1e7037ade0df8277107

9 years agoMerge "Revert "Temporary fix for bad LIR generation in GenInlinedGet.""
Mathieu Chartier [Wed, 6 Aug 2014 22:04:11 +0000 (22:04 +0000)]
Merge "Revert "Temporary fix for bad LIR generation in GenInlinedGet.""

9 years agoMerge "ART: Rework CFA frame initialization and writing code"
Andreas Gampe [Wed, 6 Aug 2014 21:20:31 +0000 (21:20 +0000)]
Merge "ART: Rework CFA frame initialization and writing code"

9 years agoART: Rework CFA frame initialization and writing code
Andreas Gampe [Wed, 6 Aug 2014 03:21:05 +0000 (20:21 -0700)]
ART: Rework CFA frame initialization and writing code

Move eh_frame initialization code and CFI writing code to
elf_writer_quick to remove hard-wired dependencies on specific
Quick-compiler backends.

Change-Id: I27ee8ce7245da33a20c90e0086b8d4fd0a2baf4d

9 years agoMerge "ART: Skip compiling redefined classes in apps"
Andreas Gampe [Wed, 6 Aug 2014 20:37:35 +0000 (20:37 +0000)]
Merge "ART: Skip compiling redefined classes in apps"

9 years agoART: Skip compiling redefined classes in apps
Andreas Gampe [Tue, 29 Jul 2014 01:38:57 +0000 (18:38 -0700)]
ART: Skip compiling redefined classes in apps

If for an app a class is defined in more than one dex file, skip
all classes after the first.

Bug: 16057120
Change-Id: Ifd71e6f462fd691ee23724a001190e9175988069

9 years agoMerge "ART: Use TMPDIR for test directories"
Andreas Gampe [Wed, 6 Aug 2014 20:28:43 +0000 (20:28 +0000)]
Merge "ART: Use TMPDIR for test directories"

9 years agoART: Use TMPDIR for test directories
Andreas Gampe [Wed, 6 Aug 2014 20:12:26 +0000 (13:12 -0700)]
ART: Use TMPDIR for test directories

Bug: 16499668
Change-Id: I0d3db4697ef7b1706807e7daa5e000bb89df14e0

9 years agoMerge "When performing a long jump, update SP last."
Jeff Hao [Wed, 6 Aug 2014 16:01:53 +0000 (16:01 +0000)]
Merge "When performing a long jump, update SP last."

9 years agoWhen performing a long jump, update SP last.
Jeff Hao [Wed, 6 Aug 2014 01:59:16 +0000 (18:59 -0700)]
When performing a long jump, update SP last.

Bug: 16571371

(cherry picked from commit 76a0723959c2185ace249e705774af9a679a0e0d)

Change-Id: Ib3a7bcda8aecdf7e92ea40a76de32aed83a42ee0

9 years agoMerge "Fix SIB for base + index addressing in x86_64 assembler."
Nicolas Geoffray [Wed, 6 Aug 2014 15:31:19 +0000 (15:31 +0000)]
Merge "Fix SIB for base + index addressing in x86_64 assembler."

9 years agoFix SIB for base + index addressing in x86_64 assembler.
Nicolas Geoffray [Tue, 5 Aug 2014 23:24:09 +0000 (00:24 +0100)]
Fix SIB for base + index addressing in x86_64 assembler.

Change-Id: Ib630bc28e6d694ffbe4a4a71cc988e36d00f6633

9 years agoMerge "Set REG0_USED on X86 Set8R instruction"
Ian Rogers [Tue, 5 Aug 2014 16:56:44 +0000 (16:56 +0000)]
Merge "Set REG0_USED on X86 Set8R instruction"

9 years agoSet 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>
9 years agoMerge "ART: Correct disassembling of 64bit immediates on x86_64"
Ian Rogers [Tue, 5 Aug 2014 14:57:33 +0000 (14:57 +0000)]
Merge "ART: Correct disassembling of 64bit immediates on x86_64"

9 years agoMerge "x86_64: Fix Test32RM"
Ian Rogers [Tue, 5 Aug 2014 14:53:08 +0000 (14:53 +0000)]
Merge "x86_64: Fix Test32RM"

9 years agox86_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>
9 years agoMerge "Use canonical paths when searching for dex files"
Calin Juravle [Tue, 5 Aug 2014 10:47:26 +0000 (10:47 +0000)]
Merge "Use canonical paths when searching for dex files"

9 years agoMerge "Create allocator adapter for using Arena in std containers."
Vladimir Marko [Tue, 5 Aug 2014 09:13:39 +0000 (09:13 +0000)]
Merge "Create allocator adapter for using Arena in std containers."

9 years agoCreate 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

9 years agoMerge "x86_64: Load double constant using core register"
Ian Rogers [Tue, 5 Aug 2014 20:38:02 +0000 (20:38 +0000)]
Merge "x86_64: Load double constant using core register"

9 years agox86_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>
9 years agoMerge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementat...
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."

9 years agoAdd x86_64 optimized __memcmp16 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>
9 years agoMerge "ART: Fix memory unmapped twice issue in ElfFile::Load(bool)"
Brian Carlstrom [Tue, 5 Aug 2014 05:45:06 +0000 (05:45 +0000)]
Merge "ART: Fix memory unmapped twice issue in ElfFile::Load(bool)"

9 years agoART: 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

9 years agoMerge "Use the uncached form of BacktraceMap::Create."
Christopher Ferris [Tue, 5 Aug 2014 02:56:06 +0000 (02:56 +0000)]
Merge "Use the uncached form of BacktraceMap::Create."

9 years agoUse 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

9 years agoMerge "ART: Refactor long ops in quick compiler"
Andreas Gampe [Tue, 5 Aug 2014 01:44:22 +0000 (01:44 +0000)]
Merge "ART: Refactor long ops in quick compiler"

9 years agoART: 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

9 years agoMerge "AArch64: Implement InexpensiveConstant methods."
Andreas Gampe [Mon, 4 Aug 2014 23:22:12 +0000 (23:22 +0000)]
Merge "AArch64: Implement InexpensiveConstant methods."

9 years agoAArch64: 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

9 years agoUse canonical paths when searching for dex files
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

9 years agoFix analysis_attributes_ to update missing definitions.
Junmo Park [Mon, 4 Aug 2014 08:57:57 +0000 (17:57 +0900)]
Fix analysis_attributes_ to update missing definitions.

There are some missing definitions for supporting vector opcodes.

Change-Id: Ifcddb8b8b7d9a6e93902864488f61721e65da972
Signed-off-by: Junmo Park <junmoz.park@samsung.com>
9 years agoFix art build script.
Junmo Park [Mon, 4 Aug 2014 08:19:29 +0000 (17:19 +0900)]
Fix art build script.

Use ART_BUILD_HOST_NDEBUG instead of ART_BUILD_NDEBUG.

Change-Id: I1fcca4c52e79bad93dcdd750989f6223df2b0df4
Signed-off-by: Junmo Park <junmoz.park@samsung.com>
9 years agoART: Fix lock max count definition
Dmitry Petrochenko [Mon, 28 Jul 2014 10:40:16 +0000 (17:40 +0700)]
ART: Fix lock max count definition

The lock max count should utilize 14 bits since 2 highest bits are reserved for lock state.

Change-Id: I9d562f7bca9c0853231800a706a8523204e8aa9d
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
9 years agoMerge "ART: Implement the easy long division/remainder by a constant"
Andreas Gampe [Mon, 4 Aug 2014 19:36:53 +0000 (19:36 +0000)]
Merge "ART: Implement the easy long division/remainder by a constant"

9 years agoART: 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>
9 years agoMerge "Move image classes options from art to AndroidRuntime [art]"
Brian Carlstrom [Mon, 4 Aug 2014 18:27:31 +0000 (18:27 +0000)]
Merge "Move image classes options from art to AndroidRuntime [art]"

9 years agoMerge "Add trampoline invoke and ART callback tests for native-bridge"
Andreas Gampe [Mon, 4 Aug 2014 23:32:31 +0000 (23:32 +0000)]
Merge "Add trampoline invoke and ART callback tests for native-bridge"