OSDN Git Service
Sebastien Hertz [Thu, 26 Jun 2014 10:36:21 +0000 (10:36 +0000)]
am
e5f8f78d: am
0c173466: Merge "Fix memory leak in JDWP object registry"
* commit '
e5f8f78d285fc723567bca1325d27f21ec600e16':
Fix memory leak in JDWP object registry
Andreas Gampe [Thu, 26 Jun 2014 10:36:20 +0000 (10:36 +0000)]
am
404283f0: am
8803c1cb: Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
* commit '
404283f0390dcfea62695fd13177b5ffe7091f8c':
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
Sebastien Hertz [Thu, 26 Jun 2014 10:30:46 +0000 (10:30 +0000)]
am
0c173466: Merge "Fix memory leak in JDWP object registry"
* commit '
0c1734665c38b3116e38a90ad06c3f152d9316c5':
Fix memory leak in JDWP object registry
Andreas Gampe [Thu, 26 Jun 2014 10:30:45 +0000 (10:30 +0000)]
am
8803c1cb: Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
* commit '
8803c1cb633de1b0e0a48ffea30ddd8fac201a0e':
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
Andreas Gampe [Thu, 26 Jun 2014 03:10:27 +0000 (03:10 +0000)]
am
ff786b91: am
8a9f3ee5: Merge "ART: Native support for multidex"
* commit '
ff786b917dbb86989c888a5f1563f47457d7bff8':
ART: Native support for multidex
Andreas Gampe [Thu, 26 Jun 2014 03:05:50 +0000 (03:05 +0000)]
am
8a9f3ee5: Merge "ART: Native support for multidex"
* commit '
8a9f3ee5c955e4ff7cf9af6551fd432b454c4b13':
ART: Native support for multidex
Brian Carlstrom [Wed, 25 Jun 2014 21:39:07 +0000 (21:39 +0000)]
am
48e29b00: am
b849f6dd: Merge "Fix linux build."
* commit '
48e29b00b6dfcad2588f79fa67f6317d9d34008e':
Fix linux build.
Brian Carlstrom [Wed, 25 Jun 2014 21:35:38 +0000 (21:35 +0000)]
am
b849f6dd: Merge "Fix linux build."
* commit '
b849f6dd638fd1246724160cd5c01ab1a5ff33bd':
Fix linux build.
Brian Carlstrom [Wed, 25 Jun 2014 21:03:54 +0000 (21:03 +0000)]
am
663ab27f: am
e334cca5: Merge "Further refine gtest dependencies."
* commit '
663ab27f1598042dd266b196124c735e0c45882c':
Further refine gtest dependencies.
Andreas Gampe [Wed, 25 Jun 2014 20:58:42 +0000 (20:58 +0000)]
am
2ae11512: am
b0947fcc: Merge "Copyright assignment"
* commit '
2ae11512a5ce3db3275f824223262689efc80c84':
Copyright assignment
Brian Carlstrom [Wed, 25 Jun 2014 20:58:25 +0000 (20:58 +0000)]
am
e334cca5: Merge "Further refine gtest dependencies."
* commit '
e334cca5b9840a123a298efd1a00956f621341e4':
Further refine gtest dependencies.
Andreas Gampe [Wed, 25 Jun 2014 20:54:43 +0000 (20:54 +0000)]
am
b0947fcc: Merge "Copyright assignment"
* commit '
b0947fcc8257da852dafb6337bd41dab568c7ba5':
Copyright assignment
Ian Rogers [Wed, 25 Jun 2014 20:45:51 +0000 (20:45 +0000)]
am
21b3a87f: am
3ee7b367: Merge "Fix the Mac build on x86-64."
* commit '
21b3a87fd01c1925aec1d3184cc285be3e66473c':
Fix the Mac build on x86-64.
Ian Rogers [Wed, 25 Jun 2014 19:07:49 +0000 (19:07 +0000)]
am
3ee7b367: Merge "Fix the Mac build on x86-64."
* commit '
3ee7b36798d0f3042ca6198124186cb5e6b7f2bc':
Fix the Mac build on x86-64.
Sebastien Hertz [Wed, 25 Jun 2014 17:36:31 +0000 (17:36 +0000)]
am
e7248f2f: Merge "Really use GCC for ARM64"
* commit '
e7248f2f1835ed194296d4f989c56251d03b834b':
Really use GCC for ARM64
Brian Carlstrom [Wed, 25 Jun 2014 20:52:19 +0000 (20:52 +0000)]
Merge "Further refine gtest dependencies."
Brian Carlstrom [Wed, 25 Jun 2014 20:23:00 +0000 (13:23 -0700)]
Further refine gtest dependencies.
(cherry picked from commit
4ac5c69266a7deab188e65df0e528eadc66e1c06)
Change-Id: I3603776efbc697bae21e79f6976afbd21baf150d
Andreas Gampe [Thu, 26 Jun 2014 04:59:51 +0000 (04:59 +0000)]
Merge "ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests"
Andreas Gampe [Thu, 26 Jun 2014 00:22:59 +0000 (17:22 -0700)]
ART: Use ANDROID_HOST_OUT for ANDROID_ROOT in Runtime tests
On the host, if ANDROID_ROOT is not set, first try ANDROID_HOST_OUT.
This will ensure that builds with OUT_DIR_COMMON_BASE will run the
gtests correctly, as icu will use ANDROID_ROOT to look for a file.
Change-Id: I8988901be32249c1c79f96b36947a647df5de041
Andreas Gampe [Thu, 26 Jun 2014 02:57:02 +0000 (02:57 +0000)]
Merge "ART: Native support for multidex"
Andreas Gampe [Thu, 22 May 2014 01:46:59 +0000 (18:46 -0700)]
ART: Native support for multidex
Native support for zip files with multiple classesX.dex.
Works by explicitly looking for those files in ascending order. As
these files have no file system representation for themselves,
introduce synthetic dex locations: the name of the originating file
plus a colon plus the name of the dex file, e.g., test.jar:classes2.dex.
Opening a zip dex file will return all dex files in this way. This
keeps the changes to dex2oat minimal.
To hide multidex/synthetic names from the Java layer, let the handle
of dalvik.system.DexFile refer to a vector of DexFile objects. When
opening a location, test possible synthetic names and add them to the
vector. Thus, the original multidex jar in the classpath will be
associated with all embedded dex files.
Change-Id: I0de107e1369cbc94416c544aca3b17525c9eac8b
Brian Carlstrom [Wed, 25 Jun 2014 21:23:35 +0000 (21:23 +0000)]
Merge "Fix linux build."
Brian Carlstrom [Wed, 25 Jun 2014 21:11:45 +0000 (14:11 -0700)]
Fix linux build.
Change-Id: Ic480b454fe7ecd435d1b2292971f2a59bd26d2bd
Andreas Gampe [Wed, 25 Jun 2014 20:39:13 +0000 (20:39 +0000)]
Merge "Copyright assignment"
Bernhard Rosenkraenzer [Wed, 25 Jun 2014 20:36:44 +0000 (22:36 +0200)]
Copyright assignment
Reassign the copyright on the Linaro-written file to the
Android Open Source Project
Change-Id: I0194056207567f51950c5a3acc46857409c66727
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Brian Carlstrom [Wed, 25 Jun 2014 20:34:43 +0000 (20:34 +0000)]
Merge "Further refine gtest dependencies."
Brian Carlstrom [Wed, 25 Jun 2014 20:23:00 +0000 (13:23 -0700)]
Further refine gtest dependencies.
Change-Id: I9af90d2b7f5b499cfe6f8378cf5bac52ea1a7dad
Sebastien Hertz [Wed, 25 Jun 2014 18:47:00 +0000 (18:47 +0000)]
am
d5ee86ec: am
e7248f2f: Merge "Really use GCC for ARM64"
* commit '
d5ee86ecf38915abc5ec90204a9d7354f9828353':
Really use GCC for ARM64
Brian Carlstrom [Wed, 25 Jun 2014 18:46:59 +0000 (18:46 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 18:46:57 +0000 (18:46 +0000)]
am
54708050: am
ebeaf8f7: Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
* commit '
547080500bc5eb6856254df077aaf4eadca471f4':
Treat larger than jint capacity in NewDirectByteBuffer as an error
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:52 +0000 (18:14 +0000)]
am
1d61b33b: am
fe6bfba3: Merge "Revert "Re-enable tests with the optimizing compiler.""
* commit '
1d61b33b9a7d50e7f9910677beb897443d43e96e':
Revert "Re-enable tests with the optimizing compiler."
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:51 +0000 (18:14 +0000)]
am
5da93ae1: am
84691ba2: Merge "Re-enable tests with the optimizing compiler."
* commit '
5da93ae1355ccedb47d90b33fe53c4b9fd36368a':
Re-enable tests with the optimizing compiler.
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:50 +0000 (18:14 +0000)]
am
d5201be5: am
ae43e2b1: Merge "Fix test-art-target error"
* commit '
d5201be5e1990879ec3d839121a9e8d395aa55ce':
Fix test-art-target error
Nicolas Geoffray [Wed, 25 Jun 2014 18:14:49 +0000 (18:14 +0000)]
am
bd19364b: am
89522f4b: Merge "Fix a bug in LiveInterval::FirstRegisterUseAfter."
* commit '
bd19364b90c385a8989b80a1a0ace8ad47bc7c88':
Fix a bug in LiveInterval::FirstRegisterUseAfter.
Brian Carlstrom [Wed, 25 Jun 2014 18:14:47 +0000 (18:14 +0000)]
am
a2aa5cfb: am
b5dc9444: Merge "Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS"
* commit '
a2aa5cfb1ca3096ed8eccab1a746d357daac89f8':
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
Brian Carlstrom [Wed, 25 Jun 2014 18:14:46 +0000 (18:14 +0000)]
am
29282d82: am
e043deb5: Merge "Add libjavacore dependency for oat tests"
* commit '
29282d8291847f9e13a32194640fc5a488ab5fdc':
Add libjavacore dependency for oat tests
Ian Rogers [Wed, 25 Jun 2014 18:14:45 +0000 (18:14 +0000)]
am
64eaccb3: am
3153895d: Merge "Weaken condition to dump a thread\'s stack in a debug build."
* commit '
64eaccb3dbbc7523c1c070d33b0c3f1610f8cd35':
Weaken condition to dump a thread's stack in a debug build.
Ian Rogers [Wed, 25 Jun 2014 18:14:44 +0000 (18:14 +0000)]
am
90b19dab: am
ece10dbe: Merge "Define run-test targets."
* commit '
90b19dab1f94d1adfcd89217158ea382b2f7fdbe':
Define run-test targets.
Ian Rogers [Wed, 25 Jun 2014 18:14:43 +0000 (18:14 +0000)]
am
a4bce9e0: am
b9d11f7e: Merge "x86_64: Fix wide argument increment"
* commit '
a4bce9e0e61c66ded36c903a6f480922517772b9':
x86_64: Fix wide argument increment
Ian Rogers [Wed, 25 Jun 2014 18:14:42 +0000 (18:14 +0000)]
am
7896d11c: am
c6f0f60b: Merge "x86_64: int-to-long should ensure that int in kCoreReg"
* commit '
7896d11ce3fbadf3026fe6572513ee2682fa32bf':
x86_64: int-to-long should ensure that int in kCoreReg
Ian Rogers [Wed, 25 Jun 2014 18:10:23 +0000 (11:10 -0700)]
resolved conflicts for merge of
4153a39a to master
Change-Id: I7e2fa9d5a8ebaa653dd4f25b26d68e13e6abaa27
Andreas Gampe [Wed, 25 Jun 2014 20:22:43 +0000 (20:22 +0000)]
Merge "Revert "Quick compiler: remove temporary workaround.""
Andreas Gampe [Wed, 25 Jun 2014 20:20:36 +0000 (20:20 +0000)]
Revert "Quick compiler: remove temporary workaround."
This reverts commit
47d2fe6c3d6352e7dafd720865457e84c409591a.
Leads to errors in 32b zygote on 64b device.
Change-Id: I6f6c43274f095e15a28bc5617661ff69371f708e
Brian Carlstrom [Wed, 25 Jun 2014 17:04:06 +0000 (17:04 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 16:37:50 +0000 (16:37 +0000)]
am
ebeaf8f7: Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
* commit '
ebeaf8f7c88af0917f4b7b1137dd78d56d66dd59':
Treat larger than jint capacity in NewDirectByteBuffer as an error
Nicolas Geoffray [Wed, 25 Jun 2014 14:24:36 +0000 (14:24 +0000)]
am
fe6bfba3: Merge "Revert "Re-enable tests with the optimizing compiler.""
* commit '
fe6bfba3153ab55dab3ec0d644d628136e5ff0a4':
Revert "Re-enable tests with the optimizing compiler."
Nicolas Geoffray [Wed, 25 Jun 2014 13:48:55 +0000 (13:48 +0000)]
am
84691ba2: Merge "Re-enable tests with the optimizing compiler."
* commit '
84691ba238225dd77c7b498a153db4dd306e9712':
Re-enable tests with the optimizing compiler.
Nicolas Geoffray [Wed, 25 Jun 2014 13:23:33 +0000 (13:23 +0000)]
am
ae43e2b1: Merge "Fix test-art-target error"
* commit '
ae43e2b11cc5af5b632700a9e4e4d9ed436b24dc':
Fix test-art-target error
Nicolas Geoffray [Wed, 25 Jun 2014 13:23:32 +0000 (13:23 +0000)]
am
89522f4b: Merge "Fix a bug in LiveInterval::FirstRegisterUseAfter."
* commit '
89522f4be204812d6efec245f4846f1285678b97':
Fix a bug in LiveInterval::FirstRegisterUseAfter.
Brian Carlstrom [Wed, 25 Jun 2014 09:56:24 +0000 (09:56 +0000)]
am
b5dc9444: Merge "Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS"
* commit '
b5dc9444777bb027b070d3ff3fcf7a2a3fb7e3dc':
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
Brian Carlstrom [Wed, 25 Jun 2014 09:56:22 +0000 (09:56 +0000)]
am
e043deb5: Merge "Add libjavacore dependency for oat tests"
* commit '
e043deb5e5e878ca11ca84fbc58a55a33546ef8a':
Add libjavacore dependency for oat tests
Ian Rogers [Wed, 25 Jun 2014 09:56:21 +0000 (09:56 +0000)]
am
3153895d: Merge "Weaken condition to dump a thread\'s stack in a debug build."
* commit '
3153895d020038cd89311ed6ee241ce9b9f18a59':
Weaken condition to dump a thread's stack in a debug build.
Ian Rogers [Wed, 25 Jun 2014 09:56:20 +0000 (09:56 +0000)]
am
ece10dbe: Merge "Define run-test targets."
* commit '
ece10dbe1ed59cf125d91401674b71626ae1e240':
Define run-test targets.
Ian Rogers [Wed, 25 Jun 2014 09:56:14 +0000 (09:56 +0000)]
am
b9d11f7e: Merge "x86_64: Fix wide argument increment"
* commit '
b9d11f7e2f60bdebfd2ece34e01ecc789921837d':
x86_64: Fix wide argument increment
Ian Rogers [Wed, 25 Jun 2014 09:56:13 +0000 (09:56 +0000)]
am
c6f0f60b: Merge "x86_64: int-to-long should ensure that int in kCoreReg"
* commit '
c6f0f60bf3d4e3402c6e30bb4a4b88b345530954':
x86_64: int-to-long should ensure that int in kCoreReg
Ian Rogers [Wed, 25 Jun 2014 09:56:10 +0000 (09:56 +0000)]
am
10fdc6af: Merge "Fix various test dependencies."
* commit '
10fdc6af15a8464fd10bd558a19f6395cf12345a':
Fix various test dependencies.
Brian Carlstrom [Wed, 25 Jun 2014 08:39:05 +0000 (01:39 -0700)]
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
Change-Id: I8fc711238a3d94033c01b45b6da386f122fa0f78
Brian Carlstrom [Wed, 25 Jun 2014 07:57:36 +0000 (00:57 -0700)]
Add libjavacore dependency for oat tests
Change-Id: Iac616faacf80f64dde02df79933d21b44959f7d2
Ian Rogers [Wed, 25 Jun 2014 06:15:34 +0000 (23:15 -0700)]
Define run-test targets.
Addressing review comment on https://android-review.googlesource.com/#/c/98456/11
(cherry picked from commit
bf66bce894595c2d197c636e28d2c3a8044925e2)
Change-Id: I6582378f2e41692bd0dae86133578cb4c17427cf
Ian Rogers [Wed, 25 Jun 2014 04:34:09 +0000 (21:34 -0700)]
Fix various test dependencies.
(cherry picked from commit
665de8a1710d2418f60d3bffdc99bdac32252530)
Change-Id: I461b1a963262d48b5caa0e3492b7b923b29755c8
Brian Carlstrom [Wed, 25 Jun 2014 16:57:09 +0000 (16:57 +0000)]
Brian Carlstrom [Wed, 25 Jun 2014 16:30:52 +0000 (09:30 -0700)]
Address comments on change
45d26c86b00580593067ca42091ad66cf7dc4f7c
Change-Id: Ibb559ae41654660064f4a8df71274c4e4f16807a
Brian Carlstrom [Wed, 25 Jun 2014 08:15:52 +0000 (08:15 +0000)]
Merge "Add libjavacore dependency for oat tests"
Brian Carlstrom [Wed, 25 Jun 2014 07:57:36 +0000 (00:57 -0700)]
Add libjavacore dependency for oat tests
(cherry picked from commit
979942f123a2a9d1949f8be6672ff14101d9f214)
Change-Id: I8f29665259634226ed78fb26b35fb92323310698
Ian Rogers [Wed, 25 Jun 2014 06:21:28 +0000 (06:21 +0000)]
Merge "Define run-test targets."
Ian Rogers [Wed, 25 Jun 2014 06:15:34 +0000 (23:15 -0700)]
Define run-test targets.
Addressing review comment on https://android-review.googlesource.com/#/c/98456/11
Change-Id: I6ad031dcf53b63506ebb738e9c26cc15f0f10107
Ian Rogers [Wed, 25 Jun 2014 04:45:01 +0000 (04:45 +0000)]
Merge "Fix various test dependencies."
Ian Rogers [Wed, 25 Jun 2014 04:34:09 +0000 (21:34 -0700)]
Fix various test dependencies.
Change-Id: I2e4761f4cc061f74319a7b64ebe67c553d5297df
Ian Rogers [Wed, 25 Jun 2014 18:59:31 +0000 (18:59 +0000)]
Merge "Fix the Mac build on x86-64."
Ian Rogers [Wed, 25 Jun 2014 18:52:14 +0000 (11:52 -0700)]
Fix the Mac build on x86-64.
Change-Id: I4ed3783a96d844de0b0a295df26d0a48c02a3726
Brian Carlstrom [Wed, 25 Jun 2014 16:29:31 +0000 (16:29 +0000)]
Merge "Treat larger than jint capacity in NewDirectByteBuffer as an error"
Brian Carlstrom [Wed, 25 Jun 2014 06:36:28 +0000 (23:36 -0700)]
Treat larger than jint capacity in NewDirectByteBuffer as an error
Bug:
15854028
Change-Id: If78921f4ba2b38a9d0bb421acf9c8bca962ed42a
Brian Carlstrom [Wed, 25 Jun 2014 08:43:53 +0000 (08:43 +0000)]
Merge "Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS"
Brian Carlstrom [Wed, 25 Jun 2014 08:39:05 +0000 (01:39 -0700)]
Fix names of TEST_ART_TIMING_SENSITIVE_RUN_TESTS
(cherry picked from commit
c87deb01815638c69e30fa6787b0a9ea91ea8c29)
Change-Id: Iceff40c3bd22b5dacbdc9550ec894003c758fd86
Ian Rogers [Wed, 25 Jun 2014 06:22:30 +0000 (06:22 +0000)]
Merge "Weaken condition to dump a thread's stack in a debug build."
Ian Rogers [Wed, 25 Jun 2014 05:48:01 +0000 (22:48 -0700)]
Weaken condition to dump a thread's stack in a debug build.
If the current thread isn't suspended its also ok to dump the stack.
Bug:
14229281
Change-Id: I2810ea79bc4330bb6e9616436d74076b5997c20b
Ian Rogers [Wed, 25 Jun 2014 05:27:36 +0000 (05:27 +0000)]
Merge "x86_64: Fix wide argument increment"
Ian Rogers [Wed, 25 Jun 2014 05:11:55 +0000 (05:11 +0000)]
Merge "x86_64: int-to-long should ensure that int in kCoreReg"
Serguei Katkov [Tue, 24 Jun 2014 17:25:35 +0000 (00:25 +0700)]
x86_64: int-to-long should ensure that int in kCoreReg
it is possible that int in xmm so implementation of int-to-long
should ensure that src in core reg before usage of move with
sign extension which does not support xmm case.
Change-Id: Ibab9df7564f0f1c1f3e1f5ff67c38f1a5e3cdb69
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Ian Rogers [Wed, 25 Jun 2014 00:29:01 +0000 (00:29 +0000)]
am
92181f57: am
d377971c: Merge "Multilib ART host."
* commit '
92181f57396373764eea845aa742d8623d6c1349':
Multilib ART host.
Andreas Gampe [Wed, 25 Jun 2014 00:28:57 +0000 (00:28 +0000)]
am
7caeeb0e: am
ba778fae: Merge "AArch64: Add memcmp.S for Arm64."
* commit '
7caeeb0e7a1966cda439b64c84823721e97d9e23':
AArch64: Add memcmp.S for Arm64.
Hiroshi Yamauchi [Wed, 25 Jun 2014 00:28:49 +0000 (00:28 +0000)]
am
b55a3309: am
685d3526: Merge "Add more read barriers to the class linker."
* commit '
b55a3309a93421d09c3c08ca8cc2bb041aace44f':
Add more read barriers to the class linker.
Mathieu Chartier [Wed, 25 Jun 2014 00:28:46 +0000 (00:28 +0000)]
am
541644fb: am
fe7aee2d: Merge "More advanced timing loggers."
* commit '
541644fb06e37cd118ddac01882853391a10850b':
More advanced timing loggers.
Mathieu Chartier [Wed, 25 Jun 2014 00:28:43 +0000 (00:28 +0000)]
am
59cf754a: am
1f47b4d8: Merge "Add logging to monitor deflation."
* commit '
59cf754a58905f78d915a100befcfcef50d45775':
Add logging to monitor deflation.
Andreas Gampe [Wed, 25 Jun 2014 00:28:42 +0000 (00:28 +0000)]
am
cf5f5dac: am
27113be9: Merge "Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"""
* commit '
cf5f5dacfccdd4777cc145afafe33a63aa678606':
Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
Ian Rogers [Tue, 24 Jun 2014 23:58:39 +0000 (23:58 +0000)]
am
d377971c: Merge "Multilib ART host."
* commit '
d377971c505e8cfacc878b8c632cc40fcf7d88c5':
Multilib ART host.
Andreas Gampe [Tue, 24 Jun 2014 23:38:11 +0000 (23:38 +0000)]
am
ba778fae: Merge "AArch64: Add memcmp.S for Arm64."
* commit '
ba778fae99ec3b38d4f98262e6b7072bab0e9de4':
AArch64: Add memcmp.S for Arm64.
Hiroshi Yamauchi [Tue, 24 Jun 2014 22:43:16 +0000 (22:43 +0000)]
am
685d3526: Merge "Add more read barriers to the class linker."
* commit '
685d3526f5be8f5d0ffce67a04ecf35fb2b07b1d':
Add more read barriers to the class linker.
Mathieu Chartier [Tue, 24 Jun 2014 22:38:41 +0000 (22:38 +0000)]
am
fe7aee2d: Merge "More advanced timing loggers."
* commit '
fe7aee2d20b47dad6029a588e0c7394f0c75d080':
More advanced timing loggers.
Mathieu Chartier [Tue, 24 Jun 2014 22:10:50 +0000 (22:10 +0000)]
am
1f47b4d8: Merge "Add logging to monitor deflation."
* commit '
1f47b4d8c20e443fac7e8b8b7a77c723fb0be3a1':
Add logging to monitor deflation.
Andreas Gampe [Tue, 24 Jun 2014 22:06:18 +0000 (22:06 +0000)]
am
27113be9: Merge "Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"""
* commit '
27113be940950155164ca4513bc9f7b1fe050dac':
Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
Brian Carlstrom [Tue, 24 Jun 2014 21:15:46 +0000 (21:15 +0000)]
am
7c256ead: resolved conflicts for merge of
50e7d733 to klp-modular-dev-plus-aosp
* commit '
7c256eada7a8a8eb81296b0b992cf6b69eda75f1':
Update black list for klp-modular-dev
Brian Carlstrom [Tue, 24 Jun 2014 21:09:49 +0000 (14:09 -0700)]
resolved conflicts for merge of
50e7d733 to klp-modular-dev-plus-aosp
Change-Id: I7f12783da2f656fd2b8d53de737399b3f7f6b524
Chao-ying Fu [Tue, 24 Jun 2014 20:24:36 +0000 (13:24 -0700)]
x86_64: Fix wide argument increment
This patch fixes to always increment the index for a wide argument,
and fixes the index upper bound.
Otherwise, the mapping may be incorrect.
Change-Id: I0116d8fd0a0a5c1270a23129c73a9e3651132977
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Brian Carlstrom [Tue, 24 Jun 2014 19:38:56 +0000 (19:38 +0000)]
am
b133d43e: am
9658d24d: Merge "Fixed ImageWriter timings not being written out."
* commit '
b133d43eee6b759b8117c5b1a2a2a2df8c6acd4f':
Fixed ImageWriter timings not being written out.
Andreas Gampe [Tue, 24 Jun 2014 19:38:55 +0000 (19:38 +0000)]
am
1c84b817: am
fbd18f19: Merge "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
* commit '
1c84b817679f6b901711f611eb22049d4ad0e2a7':
Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"
Andreas Gampe [Tue, 24 Jun 2014 19:38:54 +0000 (19:38 +0000)]
am
cae687e5: am
7e47f713: Merge "ART: Split out more cases of Load/StoreRef, volatile as parameter"
* commit '
cae687e585848f7bb4cfe544fc174f0c6ac04382':
ART: Split out more cases of Load/StoreRef, volatile as parameter
Dave Allison [Tue, 24 Jun 2014 19:38:53 +0000 (19:38 +0000)]
am
40b591bb: am
1528b02c: Merge "Add some more instruction support to optimizing compiler."
* commit '
40b591bb694b87595cd0797781cd63cf3bed9bd1':
Add some more instruction support to optimizing compiler.
Brian Carlstrom [Tue, 24 Jun 2014 19:35:36 +0000 (19:35 +0000)]
am
9658d24d: Merge "Fixed ImageWriter timings not being written out."
* commit '
9658d24deaa9bd07781bfac860d2a6dd89066d55':
Fixed ImageWriter timings not being written out.
Andreas Gampe [Tue, 24 Jun 2014 19:35:35 +0000 (19:35 +0000)]
am
fbd18f19: Merge "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
* commit '
fbd18f1923334f3208cfe6ba5f1d4f9eb421b063':
Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"
OSDN Git Service
