OSDN Git Service
Nicolas Geoffray [Thu, 7 Aug 2014 05:50:09 +0000 (05:50 +0000)]
Nicolas Geoffray [Thu, 7 Aug 2014 05:50:08 +0000 (05:50 +0000)]
am
756f5721: am
eba098fe: am
5e1e8eeb: am
1cad41d9: Merge "Support fields in optimizing compiler."
* commit '
756f572115618d5ff5c5ac95805696105750b7ae':
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:28 +0000 (05:31 +0000)]
am
d1ef1c7f: am
53583ade: am
3914a79d: Merge "Add two phi pruning phases."
* commit '
d1ef1c7ff67233bd0d0c43b5502817251695163f':
Add two phi pruning phases.
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:27 +0000 (05:31 +0000)]
am
eba098fe: am
5e1e8eeb: am
1cad41d9: Merge "Support fields in optimizing compiler."
* commit '
eba098fe690f2287bc73a9dd934abe8a4eb14d61':
Support fields in optimizing compiler.
Bill Buzbee [Thu, 7 Aug 2014 01:25:26 +0000 (01:25 +0000)]
am
70c3e111: Merge "Fix analysis_attributes_ to update missing definitions."
* commit '
70c3e111652e8031351b31b9fcb704c2925a711d':
Fix analysis_attributes_ to update missing definitions.
Dave Allison [Thu, 7 Aug 2014 00:35:15 +0000 (00:35 +0000)]
am
81550fa9: Merge "AArch64: Implicit StackOverflow/NPE/Suspend checks."
* commit '
81550fa92a02f6c656d13b12dc188fc73ac0fb39':
AArch64: Implicit StackOverflow/NPE/Suspend checks.
Ian Rogers [Thu, 7 Aug 2014 00:31:37 +0000 (00:31 +0000)]
am
b30d8584: Merge "Fix art build script."
* commit '
b30d8584bea83eb713b7a6b097225087d42828ff':
Fix art build script.
Mathieu Chartier [Thu, 7 Aug 2014 00:10:10 +0000 (00:10 +0000)]
am
9c597674: Merge "Fixed build breakage due to incorrect class TypeId."
* commit '
9c597674fb99025a48476aff90de0fc81e44036a':
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."
Nicolas Geoffray [Wed, 6 Aug 2014 23:56:28 +0000 (23:56 +0000)]
am
255916da: Merge "Make patchoat use the sht_entsize when patching."
* commit '
255916da6a778d66f4b577ea7c2046f5deb4653e':
Make patchoat use the sht_entsize when patching.
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
Dave Allison [Thu, 7 Aug 2014 00:20:29 +0000 (00:20 +0000)]
Merge "AArch64: Implicit StackOverflow/NPE/Suspend checks."
Ian Rogers [Thu, 7 Aug 2014 00:11:35 +0000 (00:11 +0000)]
Merge "Fix art build script."
Nicolas Geoffray [Wed, 6 Aug 2014 23:37:02 +0000 (23:37 +0000)]
Merge "Make patchoat use the sht_entsize when patching."
Andreas Gampe [Wed, 6 Aug 2014 23:42:30 +0000 (23:42 +0000)]
am
4d110c25: Merge "ART: Remove test files after test"
* commit '
4d110c25bbcc3ed4603e94968ee02db7b2c9db8c':
ART: Remove test files after test
Nicolas Geoffray [Wed, 6 Aug 2014 23:42:29 +0000 (23:42 +0000)]
am
68b84b78: Merge "Make tools/art non-executable"
* commit '
68b84b78c72824667b66e6b93caab6abf3736f35':
Make tools/art non-executable
Andreas Gampe [Wed, 6 Aug 2014 23:38:51 +0000 (23:38 +0000)]
am
f441aafa: Merge "ART: Build fix for dex_cache rework"
* commit '
f441aafad053157b71fad2eeaf699cfbb6bda1a5':
ART: Build fix for dex_cache rework
Nicolas Geoffray [Wed, 6 Aug 2014 23:12:55 +0000 (23:12 +0000)]
am
8b2e9cde: Merge "Fix SsaDeadPhiElimination in the presence of dependent phis."
* commit '
8b2e9cde4aa3dc96b903c9eee3a7b3b7ee8422e4':
Fix SsaDeadPhiElimination in the presence of dependent phis.
Andreas Gampe [Wed, 6 Aug 2014 23:05:03 +0000 (23:05 +0000)]
am
269c3360: Merge "ART: Add guards to the dex cache and its shortcuts"
* commit '
269c3360f8e69e9faf8bc8a51fd87ae7adadfb59':
ART: Add guards to the dex cache and its shortcuts
Hiroshi Yamauchi [Wed, 6 Aug 2014 22:44:43 +0000 (22:44 +0000)]
am
2524ffd7: Merge "Implement TLAB fast paths in artAllocObjectFromCode."
* commit '
2524ffd731a3d173c9b0ad8f7b3e4a89d692aab6':
Implement TLAB fast paths in artAllocObjectFromCode.
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
Mathieu Chartier [Wed, 6 Aug 2014 22:12:04 +0000 (22:12 +0000)]
am
57cd9d3b: Merge "Added support for patching classes from different dex files."
* commit '
57cd9d3bda952ee2c2cf977fb1e26a0a954e1bab':
Added support for patching classes from different dex files.
Mathieu Chartier [Wed, 6 Aug 2014 22:12:03 +0000 (22:12 +0000)]
am
cf73835a: Merge "Revert "Temporary fix for bad LIR generation in GenInlinedGet.""
* commit '
cf73835af1421b3346a180c4eb2236d373bf2f2f':
Revert "Temporary fix for bad LIR generation in GenInlinedGet."
Andreas Gampe [Wed, 6 Aug 2014 21:25:48 +0000 (21:25 +0000)]
am
0f56c9ca: Merge "ART: Rework CFA frame initialization and writing code"
* commit '
0f56c9cae0f570483a1d420172377b1754331025':
ART: Rework CFA frame initialization and writing code
Andreas Gampe [Wed, 6 Aug 2014 20:44:40 +0000 (20:44 +0000)]
am
e564bded: Merge "ART: Skip compiling redefined classes in apps"
* commit '
e564bded1862fb97b64517fb78a8c5c5df467850':
ART: Skip compiling redefined classes in apps
Andreas Gampe [Wed, 6 Aug 2014 20:38:39 +0000 (20:38 +0000)]
am
d009c20d: Merge "ART: Use TMPDIR for test directories"
* commit '
d009c20d828c80204e34c1860df54ae871447f83':
ART: Use TMPDIR for test directories
Andreas Gampe [Wed, 6 Aug 2014 20:38:34 +0000 (20:38 +0000)]
am
1b192268: Merge "ART: Generate chained compare-and-branch for short switches"
* commit '
1b192268f167f603fc372f02f9067f3ce5d82daf':
ART: Generate chained compare-and-branch for short switches
Jeff Hao [Wed, 6 Aug 2014 20:38:33 +0000 (20:38 +0000)]
am
e71d5971: Merge "Fix proxy tracing and enable tests that now work with tracing."
* commit '
e71d59715a2f0adb0aa539639b83b8d410fc679f':
Fix proxy tracing and enable tests that now work with tracing.
Dave Allison [Wed, 6 Aug 2014 19:52:42 +0000 (19:52 +0000)]
am
a947ebc4: Merge "Fix checks for kLiteral in local optimizations."
* commit '
a947ebc45d2785522b3c9d3295be68fd35d548be':
Fix checks for kLiteral in local optimizations.
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>
Mathieu Chartier [Wed, 6 Aug 2014 18:43:17 +0000 (18:43 +0000)]
am
860feb0a: Merge "Add card table test."
* commit '
860feb0a60d0fe9311f28bd590058f6660d130b1':
Add card table test.
Andreas Gampe [Wed, 6 Aug 2014 23:30:52 +0000 (23:30 +0000)]
Merge "ART: 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
Nicolas Geoffray [Wed, 6 Aug 2014 23:03:21 +0000 (23:03 +0000)]
Merge "Fix 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
Andreas Gampe [Wed, 6 Aug 2014 22:58:25 +0000 (22:58 +0000)]
Merge "ART: 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
Andreas Gampe [Wed, 6 Aug 2014 21:20:31 +0000 (21:20 +0000)]
Merge "ART: 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
Brian Carlstrom [Wed, 6 Aug 2014 16:54:52 +0000 (16:54 +0000)]
am
484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""
* commit '
484e2c2d3531e5bb36f0e1e12f26c708939c6579':
Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
Jeff Hao [Wed, 6 Aug 2014 16:08:55 +0000 (16:08 +0000)]
am
38449637: Merge "When performing a long jump, update SP last."
* commit '
38449637b1ee8209e2eb81b3f27f40bb9ab3934f':
When performing a long jump, update SP last.
Jeff Hao [Wed, 6 Aug 2014 16:08:09 +0000 (16:08 +0000)]
am
cd0d9b5a: Merge "When performing a long jump, update SP last." into lmp-dev
* commit '
cd0d9b5aaec7125dd62775d9f970151a1e0eab90':
When performing a long jump, update SP last.
Nicolas Geoffray [Wed, 6 Aug 2014 15:38:41 +0000 (15:38 +0000)]
am
1d5c4953: Merge "Fix SIB for base + index addressing in x86_64 assembler."
* commit '
1d5c4953fa8cfa5c7276ab1a2d2c12c1baacbf08':
Fix SIB for base + index addressing in x86_64 assembler.
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.
Mathieu Chartier [Wed, 6 Aug 2014 22:04:33 +0000 (22:04 +0000)]
Merge "Added 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
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
Andreas Gampe [Wed, 6 Aug 2014 20:37:35 +0000 (20:37 +0000)]
Merge "ART: 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
Andreas Gampe [Wed, 6 Aug 2014 20:28:43 +0000 (20:28 +0000)]
Merge "ART: 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
Andreas Gampe [Wed, 6 Aug 2014 20:05:02 +0000 (20:05 +0000)]
Merge "ART: 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
Jeff Hao [Wed, 6 Aug 2014 15:59:26 +0000 (15:59 +0000)]
Merge "When performing a long jump, update SP last." into lmp-dev
Jeff Hao [Wed, 6 Aug 2014 01:59:16 +0000 (18:59 -0700)]
When performing a long jump, update SP last.
Bug:
16571371
Change-Id: I719d9880a64e277330a2da698d5f6f7d320014d0
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: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: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 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: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: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: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: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: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
Bill Buzbee [Thu, 7 Aug 2014 01:17:42 +0000 (01:17 +0000)]
Merge "Fix analysis_attributes_ to update missing definitions."
Mathieu Chartier [Wed, 6 Aug 2014 18:35:57 +0000 (18:35 +0000)]
Merge "Add 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
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
Brian Carlstrom [Wed, 6 Aug 2014 16:42:26 +0000 (16:42 +0000)]
Merge "Revert "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
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
Andreas Gampe [Wed, 6 Aug 2014 23:35:04 +0000 (23:35 +0000)]
Merge "ART: 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
Nicolas Geoffray [Wed, 6 Aug 2014 23:32:15 +0000 (23:32 +0000)]
Merge "Make tools/art non-executable"