OSDN Git Service
Andreas Gampe [Sat, 9 Aug 2014 06:15:57 +0000 (06:15 +0000)]
am
8c18c2aa: ART: Generate chained compare-and-branch for short switches
* commit '
8c18c2aaedb171f9b03ec49c94b0e33449dc411b':
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.
Bug:
16241558
(cherry picked from commit
48971b3242e5126bcd800cc9c68df64596b43d13)
Change-Id: I0bb3071b8676523e90e0258e9b0e3fd69c1237f4
Andreas Gampe [Sat, 9 Aug 2014 05:54:46 +0000 (05:54 +0000)]
am
9f642e83: Merge "ART: Use TMPDIR for test directories" into lmp-dev
* commit '
9f642e83c176fec52e496be0ae4b0b97fb2905b4':
ART: Use TMPDIR for test directories
Brian Carlstrom [Sat, 9 Aug 2014 05:46:30 +0000 (05:46 +0000)]
am
2d48bb71: Remove clang detected warning on tautological comparison
* commit '
2d48bb7109802c8a7a4580288f3a5bde270f062f':
Remove clang detected warning on tautological comparison
Brian Carlstrom [Sat, 9 Aug 2014 04:29:02 +0000 (21:29 -0700)]
Remove clang detected warning on tautological comparison
Bug:
16903117
(cherry picked from commit
c991107a90698012c2b0babc030b8ab85491d1e3)
Change-Id: I94d36d8d26d4090b4c2ad128fde9dab2b1173533
Andreas Gampe [Sat, 9 Aug 2014 04:43:13 +0000 (04:43 +0000)]
am
3a56e4d0: Merge "ART: Do not check interface being subclass for member access" into lmp-dev
* commit '
3a56e4d089b58bcb61e0c5b7c0ebdcc266a89d82':
ART: Do not check interface being subclass for member access
Andreas Gampe [Sat, 9 Aug 2014 04:39:14 +0000 (04:39 +0000)]
am
f8969650: ART: Remove test files after test
* commit '
f896965072343a2d6ad64d46a61112b10b3645dd':
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
(cherry picked from commit
7747c8de402f64e3009ca3bcccebddbb70f617ee)
Change-Id: I9c3c8f1a80ec0d37628a742193267e182c25b0cd
Andreas Gampe [Sat, 9 Aug 2014 04:39:58 +0000 (04:39 +0000)]
Merge "ART: Do not check interface being subclass for member access" into lmp-dev
Andreas Gampe [Sat, 9 Aug 2014 02:55:37 +0000 (19:55 -0700)]
ART: Do not check interface being subclass for member access
When checking access to a protected member, do not try to see
whether an interface is a subclass of the declaring class.
Bug:
16904661
Change-Id: I3e1fa4ce9753e0a96633fff0fba807d72bc0b19d
Andreas Gampe [Sat, 9 Aug 2014 05:52:17 +0000 (05:52 +0000)]
Merge "ART: Use TMPDIR for test directories" into lmp-dev
Andreas Gampe [Wed, 6 Aug 2014 20:12:26 +0000 (13:12 -0700)]
ART: Use TMPDIR for test directories
Bug:
16499668
(cherry picked from commit
5a79fdecffbea657ebecd4cf19078925239eb1c3)
Change-Id: I6981f707862bf4a9cc79800db85b0416f30115af
Andreas Gampe [Fri, 8 Aug 2014 22:14:57 +0000 (22:14 +0000)]
am
4ef12f5b: ART: Add guards to the dex cache and its shortcuts
* commit '
4ef12f5b0e26c6016c87866f6a33da5ed8e98d74':
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
(cherry picked from commit
58a5af8568d224ca7eccf2483396ff9862f8d1ee)
Change-Id: I7d3e4cb8113e2e764ed7433eed25e1031e6a0f14
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:21:27 +0000 (21:21 +0000)]
am
47ba978e: Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
* commit '
47ba978e95896c932300fb3236ce5eb4b438d971':
Fix a SIGSEGV at background-to-foreground collector transition.
Andreas Gampe [Fri, 8 Aug 2014 19:47:17 +0000 (19:47 +0000)]
am
f0d30ed8: ART: Make assembler_test less chatty
* commit '
f0d30ed8fcffc839ceb91359a547c0efb7641d53':
ART: Make assembler_test less chatty
Andreas Gampe [Wed, 6 Aug 2014 22:31:06 +0000 (15:31 -0700)]
ART: Make assembler_test less chatty
Do not save temporaries in case we use a different encoding than
the host assembler.
Bug:
16505797
(cherry picked from commit
54e15de4a3ea869488d50694fa01138901e70c4e)
Change-Id: I9508d9b09d930db70587a69c04bb3c8950339d79
Narayan Kamath [Fri, 8 Aug 2014 15:50:43 +0000 (15:50 +0000)]
am
31fa14fd: Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
* commit '
31fa14fdbbccfcd9b50bc6db6aae6168b4fc2249':
Use the right instruction set for checking dex-cache staleness.
Vladimir Marko [Fri, 8 Aug 2014 15:17:01 +0000 (15:17 +0000)]
am
4bb93277: Fix performance regression in OatFile::GetOatDexFile().
* commit '
4bb932773e47b1ce04602d81ffa5a8a7d863eb10':
Fix performance regression in OatFile::GetOatDexFile().
Vladimir Marko [Thu, 7 Aug 2014 17:07:18 +0000 (18:07 +0100)]
Fix performance regression in OatFile::GetOatDexFile().
Try to avoid calculating the canonical location of the
dex file if possible and when we have to calculate it,
cache the lookup result for subsequent lookups.
Bug:
16828525
Bug:
16859671
(cherry picked from commit
3f5838d7d0b9fc63db0ccc35c2ea05ed29264986)
Change-Id: Ifd9a45dada2cc724382fd03c10f6437a6b71e666
Zheng Xu [Thu, 7 Aug 2014 21:53:03 +0000 (21:53 +0000)]
am
fa9c8ec3: Add arraycopy intrinsic for arm and arm64.
* commit '
fa9c8ec37c66574654e448513e1bb59af7cb9365':
Add arraycopy intrinsic for arm and arm64.
Zheng Xu [Thu, 7 Aug 2014 06:05:23 +0000 (14:05 +0800)]
Add arraycopy intrinsic for arm and arm64.
Implement intrinsic for
java.lang.System.arraycopy(char[], int, char[], int, int).
Bug:
16241558
(cherry picked from commit
947717a2b085f36ea007ac64f728e19ff1c8db0b)
Change-Id: I8199f5c9ce9827f869f0f93aaff7ec359a84d922
Christopher Ferris [Thu, 7 Aug 2014 21:17:09 +0000 (21:17 +0000)]
am
35388e93: Check for a NULL pointer, do not call Build.
* commit '
35388e93f7dc45257bbffc675710728aeb663394':
Check 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.
(cherry picked from commit
836572a07142627ff291d686a4e9e03a0988344b)
Change-Id: I59d29bb6e5324de6eb099916045c2ab1d9e56630
Narayan Kamath [Fri, 8 Aug 2014 15:48:07 +0000 (15:48 +0000)]
Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
Narayan Kamath [Fri, 8 Aug 2014 15:19:44 +0000 (16:19 +0100)]
Use the right instruction set for checking dex-cache staleness.
We should use the instruction set we're asked to use, and not
the instruction set of the current runtime.
bug:
16876489
Change-Id: Ic2a30b7e7d23192b0189c1f868b73c5f4c7eb8f9
Stuart Monteith [Thu, 7 Aug 2014 18:15:54 +0000 (18:15 +0000)]
am
7204c04d: AArch64: Implicit StackOverflow/NPE/Suspend checks.
* commit '
7204c04dd86ae8ce05690e38737b2abf017a0a69':
AArch64: Implicit StackOverflow/NPE/Suspend checks.
Dave Allison [Thu, 7 Aug 2014 18:15:53 +0000 (18:15 +0000)]
am
a7894cdb: Fix checks for kLiteral in local optimizations.
* commit '
a7894cdb063edb88f1420a42207e0c4bd27ab4f9':
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.
Bug:
16256184
Change-Id: I2eb076f2c0c9d94793d5a898fea49cf409b4eb66
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
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
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:17:06 +0000 (21:17 +0000)]
Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
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.
Cherry pick commit
c1276c838d1d0896048b8c14458432b94274e869.
Bug:
16854263
Change-Id: Ide2545d92bcafd3a095ac7f0c89c5b43d6dd78de
Brian Carlstrom [Thu, 7 Aug 2014 06:08:38 +0000 (23:08 -0700)]
Merge from goog/lmp-dev goog/lmp-ub-dev
Change-Id: I04c4169910fe5200532fcb9e3df8e22b77922e5d
Ian Rogers [Thu, 7 Aug 2014 05:31:31 +0000 (05:31 +0000)]
am
97e2c638: am
ce5b5219: am
267b1f22: Merge "Make generate-operator-out.py compatible with Python 3.x"
* commit '
97e2c638dc6ed95d8e59158d376edf777707436e':
Make generate-operator-out.py compatible with Python 3.x
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:29 +0000 (05:31 +0000)]
am
18dadbc7: am
c26efd15: am
c35c60ff: Merge "Bailout if the field access is not supported."
* commit '
18dadbc741e2f63fe58c257641a1ad3155eee549':
Bailout if the field access is not supported.
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.
Brian Carlstrom [Wed, 6 Aug 2014 21:32:22 +0000 (14:32 -0700)]
Reset goog/lmp-dev to goog/master
Change-Id: If30071b5f86bfe723abf799c9248397e8840a8a0
Mathieu Chartier [Wed, 6 Aug 2014 18:46:51 +0000 (18:46 +0000)]
am
56a49adb: am
860feb0a: Merge "Add card table test."
* commit '
56a49adb43fa1c8c8485f7ce07286d3b3829ee7d':
Add card table test.
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.
Brian Carlstrom [Wed, 6 Aug 2014 17:40:57 +0000 (17:40 +0000)]
am
82ec2f07: am
484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""
* commit '
82ec2f0790eb59a7ed71490d503a9b7cdef25ce4':
Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
Jeff Hao [Wed, 6 Aug 2014 17:40:41 +0000 (17:40 +0000)]
am
c75dc324: am
38449637: Merge "When performing a long jump, update SP last."
* commit '
c75dc3242ab3d1a1d8684b049b6299a4b2ca57cf':
When performing a long jump, update SP last.
Jeff Hao [Wed, 6 Aug 2014 17:40:40 +0000 (17:40 +0000)]
am
dc6414fe: am
cd0d9b5a: Merge "When performing a long jump, update SP last." into lmp-dev
* commit '
dc6414fe6b56f2854dacbaac82c2b0b4b57d1e6f':
When performing a long jump, update SP last.
Nicolas Geoffray [Wed, 6 Aug 2014 17:40:23 +0000 (17:40 +0000)]
am
da113966: am
1d5c4953: Merge "Fix SIB for base + index addressing in x86_64 assembler."
* commit '
da113966c3a06facd1073e71436c12a4d470f12b':
Fix SIB for base + index addressing in x86_64 assembler.
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
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.
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
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
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"