OSDN Git Service
Nicolas Geoffray [Wed, 2 Jul 2014 15:11:01 +0000 (15:11 +0000)]
am
395fa728: Merge "Support longs in the register allocator for x86_64."
* commit '
395fa7286ca2c6cd3dd55c0eab5b0f69dc063fb8':
Support longs in the register allocator for x86_64.
Nicolas Geoffray [Wed, 2 Jul 2014 14:11:51 +0000 (14:11 +0000)]
am
d6ab0464: Merge "Fix art-host rule and art script after build changes."
* commit '
d6ab04646d8eec6f24b200f8649f3d942d9ad17e':
Fix art-host rule and art script after build changes.
Calin Juravle [Wed, 2 Jul 2014 13:23:22 +0000 (13:23 +0000)]
am
ea7ead2d: Merge "Relax limits for profiler based compilation options."
* commit '
ea7ead2d98d812a4a8967934630cacfba41dc552':
Relax limits for profiler based compilation options.
Andreas Gampe [Wed, 2 Jul 2014 02:22:03 +0000 (02:22 +0000)]
am
1a7d4bfe: Merge "ART: Fix size error reported by ARM64 backend"
* commit '
1a7d4bfeabc5987e95ff8e102f600360c264cf5a':
ART: Fix size error reported by ARM64 backend
Andreas Gampe [Tue, 1 Jul 2014 23:26:47 +0000 (23:26 +0000)]
am
7a59a249: Merge "ART: FPU instructions support in disassembler"
* commit '
7a59a24987beb52877b72b4e3f841e406413bb6d':
ART: FPU instructions support in disassembler
Andreas Gampe [Tue, 1 Jul 2014 22:33:44 +0000 (22:33 +0000)]
am
6f9dbb8d: Merge "ART: Quick compiler: More size checks, add TargetReg variants"
* commit '
6f9dbb8d4aa72c9b24ea45358751123b6e4c7488':
ART: Quick compiler: More size checks, add TargetReg variants
Andreas Gampe [Tue, 1 Jul 2014 21:50:00 +0000 (21:50 +0000)]
am
e03e5a3c: Merge "x86_64: Simplify FlushIns"
* commit '
e03e5a3c90565155e04e4a877f6353d83c9e888d':
x86_64: Simplify FlushIns
Andreas Gampe [Tue, 1 Jul 2014 21:39:50 +0000 (21:39 +0000)]
Merge "x86_64: Simplify FlushIns"
Dmitry Petrochenko [Fri, 27 Jun 2014 05:25:01 +0000 (12:25 +0700)]
x86_64: Simplify FlushIns
This change simplifies FlushIns for x86_64.
Change-Id: I2b41fae32603e0951e3847cc1e4f9c6bfab349a0
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Andreas Gampe [Tue, 1 Jul 2014 18:18:03 +0000 (18:18 +0000)]
am
9bb24166: Merge "ART: Rework Generic JNI, add ARM version"
* commit '
9bb241663a7e15ac8faaac24e9b6e42986a4bda8':
ART: Rework Generic JNI, add ARM version
Vladimir Marko [Tue, 1 Jul 2014 18:03:52 +0000 (18:03 +0000)]
am
73904fed: Merge "Add test for https://android-review.googlesource.com/99853 ."
* commit '
73904fed884bf216b51acdc64402c427cc34725b':
Add test for https://android-review.googlesource.com/99853 .
Calin Juravle [Wed, 2 Jul 2014 13:15:17 +0000 (13:15 +0000)]
Merge "Relax limits for profiler based compilation options."
Calin Juravle [Wed, 2 Jul 2014 13:00:33 +0000 (14:00 +0100)]
Relax limits for profiler based compilation options.
Change-Id: I57a7b11588f5c5b5f12217239ecf58f59ae02e2b
Nicolas Geoffray [Wed, 2 Jul 2014 15:01:40 +0000 (15:01 +0000)]
Merge "Support longs in the register allocator for x86_64."
Nicolas Geoffray [Thu, 19 Jun 2014 09:00:34 +0000 (10:00 +0100)]
Support longs in the register allocator for x86_64.
Change-Id: I7fb6dfb761bc5cf9e5705682032855a0a70ca867
Nicolas Geoffray [Wed, 2 Jul 2014 14:05:06 +0000 (14:05 +0000)]
Merge "Fix art-host rule and art script after build changes."
Nicolas Geoffray [Wed, 2 Jul 2014 13:57:53 +0000 (14:57 +0100)]
Fix art-host rule and art script after build changes.
Change-Id: Ideb6a83d71cda126d94ad01965b2dcf5005d449a
Vladimir Marko [Tue, 1 Jul 2014 17:52:19 +0000 (17:52 +0000)]
Merge "Add test for https://android-review.googlesource.com/99853 ."
Vladimir Marko [Tue, 1 Jul 2014 17:40:16 +0000 (18:40 +0100)]
Add test for https://android-review.googlesource.com/99853 .
Change-Id: I5a1614bf8bd92f21a9b15aa8ccb4cd5fe92a025a
Andreas Gampe [Tue, 1 Jul 2014 17:24:21 +0000 (17:24 +0000)]
am
34dcc887: Merge "ART: Add arch-specific directories to host-oat-cleaning rule"
* commit '
34dcc88745e2442872f965ca96e1b96daa9cf18c':
ART: Add arch-specific directories to host-oat-cleaning rule
Vladimir Marko [Tue, 1 Jul 2014 16:44:14 +0000 (16:44 +0000)]
am
da52cd3b: Merge "AArch64: Fix OpRegRegImm64 add/sub for large negative imm."
* commit '
da52cd3be2e27e3ef1c30caf58dafc45f4f7445e':
AArch64: Fix OpRegRegImm64 add/sub for large negative imm.
Andreas Gampe [Tue, 1 Jul 2014 22:24:22 +0000 (22:24 +0000)]
Merge "ART: Quick compiler: More size checks, add TargetReg variants"
Andreas Gampe [Tue, 1 Jul 2014 05:24:53 +0000 (22:24 -0700)]
ART: Quick compiler: More size checks, add TargetReg variants
Add variants for TargetReg for requesting specific register usage,
e.g., wide and ref. More register size checks.
With code adapted from https://android-review.googlesource.com/#/c/98605/.
Change-Id: I852d3be509d4dcd242c7283da702a2a76357278d
Andreas Gampe [Wed, 2 Jul 2014 02:12:35 +0000 (02:12 +0000)]
Merge "ART: Fix size error reported by ARM64 backend"
Andreas Gampe [Wed, 2 Jul 2014 02:00:09 +0000 (19:00 -0700)]
ART: Fix size error reported by ARM64 backend
Also removes a spurious LOG in dex2oat.
Change-Id: Ia264fbfb3cb8d59978f3a61e814eb6940e272ece
Andreas Gampe [Tue, 1 Jul 2014 23:21:10 +0000 (23:21 +0000)]
Merge "ART: FPU instructions support in disassembler"
Vladimir Kostyukov [Tue, 24 Jun 2014 09:40:19 +0000 (16:40 +0700)]
ART: FPU instructions support in disassembler
This patch extends the disassembler with new FPU instructions:
- fstsw
- fucompp
- fprem
Change-Id: I9458510bc17f2b3b286edec102552f64be05147e
Signed-off-by: Vladimir Kostyukov <vladimir.kostyukov@intel.com>
Nicolas Geoffray [Tue, 1 Jul 2014 10:30:16 +0000 (10:30 +0000)]
am
ec01b768: Merge "The host build has changed from lib32/lib to lib/lib64."
* commit '
ec01b768a6c5fc984a235a25e9a49c651d21354a':
The host build has changed from lib32/lib to lib/lib64.
Andreas Gampe [Tue, 1 Jul 2014 18:07:14 +0000 (18:07 +0000)]
Merge "ART: Rework Generic JNI, add ARM version"
Andreas Gampe [Tue, 17 Jun 2014 01:39:09 +0000 (18:39 -0700)]
ART: Rework Generic JNI, add ARM version
Refactors and optimizes Generic JNI. This version uses TwoWordReturn
to avoid writing to / loading from the bottom of the alloca.
Change-Id: I3287007c976f79c9fd32d3b3a43f2d1371bf4cd3
Andreas Gampe [Tue, 1 Jul 2014 17:13:50 +0000 (17:13 +0000)]
Merge "ART: Add arch-specific directories to host-oat-cleaning rule"
Andreas Gampe [Tue, 1 Jul 2014 15:25:19 +0000 (08:25 -0700)]
ART: Add arch-specific directories to host-oat-cleaning rule
Change-Id: Ia1c5b613067ba6c6648706b346258d0a155906be
Andreas Gampe [Mon, 30 Jun 2014 22:31:57 +0000 (22:31 +0000)]
am
8b115448: Merge "AArch64: Add memcmp16() for Arm64; ensure xSELF not clobbered"
* commit '
8b11544881ad6c8aeb50ba7c6a594363c2b684ec':
AArch64: Add memcmp16() for Arm64; ensure xSELF not clobbered
Brian Carlstrom [Mon, 30 Jun 2014 21:45:04 +0000 (21:45 +0000)]
am
8df113f2: Merge "We can no longer use "adb shell sh -c ..." internally"
* commit '
8df113f2787769a5088639766c2f8812427865b6':
We can no longer use "adb shell sh -c ..." internally
Elliott Hughes [Mon, 30 Jun 2014 18:12:20 +0000 (18:12 +0000)]
am
29978887: Merge "Fix the x86 textrel and remove -Wl,--no-fatal-warnings."
* commit '
29978887552542e3b7e7792070dad06392377648':
Fix the x86 textrel and remove -Wl,--no-fatal-warnings.
Andreas Gampe [Mon, 30 Jun 2014 15:30:09 +0000 (15:30 +0000)]
am
595248a0: Merge "AArch64: Rename A64_/A32_ register prefix to x/w."
* commit '
595248a0d9b96a4b442bb0cd3fecd55ae630b03f':
AArch64: Rename A64_/A32_ register prefix to x/w.
Andreas Gampe [Mon, 30 Jun 2014 15:25:38 +0000 (15:25 +0000)]
am
5ea18555: Merge "x86_64: Fix GenArrayBoundsCheck"
* commit '
5ea18555c3e413aea86bbb5ff6a320c4ea1f925c':
x86_64: Fix GenArrayBoundsCheck
Elliott Hughes [Mon, 30 Jun 2014 18:04:16 +0000 (18:04 +0000)]
Merge "Fix the x86 textrel and remove -Wl,--no-fatal-warnings."
Andreas Gampe [Mon, 30 Jun 2014 15:21:53 +0000 (15:21 +0000)]
Merge "AArch64: Rename A64_/A32_ register prefix to x/w."
Calin Juravle [Mon, 30 Jun 2014 11:34:03 +0000 (11:34 +0000)]
am
2c3b68a3: Merge "Fix a string uint conversion bug in profiler"
* commit '
2c3b68a3c99fb7d5f456b424c55848ff53b6efc5':
Fix a string uint conversion bug in profiler
Zheng Xu [Mon, 30 Jun 2014 06:26:50 +0000 (14:26 +0800)]
AArch64: Rename A64_/A32_ register prefix to x/w.
A64/A32 look like architecture name, but they are all for arm64.
Use lower-case to name the registers defined in "ARM ARM" which can
also be directly used in assembly file.
Use upper-case to name the registers which are other aliases.
Change-Id: I0ac38ed75f977fdc362288b01179b84feaee5614
Brian Carlstrom [Sun, 29 Jun 2014 22:40:58 +0000 (22:40 +0000)]
am
9295d7da: Merge "Make ART_HOST_EXECUTABLES and ART_TARGET_SUPPORTED_ARCH include dalvikvm32 and dalvikvm64 as needed"
* commit '
9295d7da1410f4c38c609d4a52f4f5ed923cff27':
Make ART_HOST_EXECUTABLES and ART_TARGET_SUPPORTED_ARCH include dalvikvm32 and dalvikvm64 as needed
Brian Carlstrom [Sat, 28 Jun 2014 20:36:21 +0000 (20:36 +0000)]
am
642fa1e7: Merge "Fixed gdb support and added some ElfFile functions"
* commit '
642fa1e747b7a97b62267cf04959eb0e7543de3f':
Fixed gdb support and added some ElfFile functions
Elliott Hughes [Sat, 28 Jun 2014 00:20:59 +0000 (17:20 -0700)]
Fix the x86 textrel and remove -Wl,--no-fatal-warnings.
Bug:
11358761
Change-Id: I825cecce121a9011f74c5fdf77d1fbecd30adbc7
Andreas Gampe [Mon, 30 Jun 2014 22:21:18 +0000 (22:21 +0000)]
Merge "AArch64: Add memcmp16() for Arm64; ensure xSELF not clobbered"
Serban Constantinescu [Thu, 19 Jun 2014 15:17:56 +0000 (16:17 +0100)]
AArch64: Add memcmp16() for Arm64; ensure xSELF not clobbered
This patch modifies memcmp() to memcmp16(). Please note that this
implementation of memcmp16() is based on the bionic's memcmp().
However, to reflect a recent specification change, the file has been
modified to respect the new String.compareTo() behavior.
A test for memcmp16() has been added. The string_compareto test in
stub_test has been changed to invoke __memcmp16 in assembly stubs.
Add artIsAssignableFromCode to the list of native downcalls to
store and reload x18. Remove CheckSuspendFromCode, as it is unused.
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Change-Id: Ie0b5425ecfb62906d29a5d02e84c7e07ffb34a11
Brian Carlstrom [Mon, 30 Jun 2014 21:35:36 +0000 (21:35 +0000)]
Merge "We can no longer use "adb shell sh -c ..." internally"
Brian Carlstrom [Fri, 27 Jun 2014 06:10:37 +0000 (23:10 -0700)]
We can no longer use "adb shell sh -c ..." internally
Change-Id: I9357ca59f73b79fa56686d221c83e024137eee35
Nicolas Geoffray [Sat, 28 Jun 2014 11:18:19 +0000 (11:18 +0000)]
am
7325d473: Merge "Add the dalvikvm symlink to the art-host rule."
* commit '
7325d4734e3f5936ea7eef1d2a89cfa0622cbd9e':
Add the dalvikvm symlink to the art-host rule.
Ian Rogers [Sat, 28 Jun 2014 00:44:26 +0000 (00:44 +0000)]
am
3db4f092: Merge "Avoid segvs if LOG(FATAL) is called during runtime start-up."
* commit '
3db4f0922ea9bf931a2393476278c8b18f852c9e':
Avoid segvs if LOG(FATAL) is called during runtime start-up.
Ian Rogers [Sat, 28 Jun 2014 00:39:56 +0000 (00:39 +0000)]
am
2789dd9d: Merge "Create a dalvik symlink on the host."
* commit '
2789dd9d3469a284f21a5363c3d145b09a37a73c':
Create a dalvik symlink on the host.
Brian Carlstrom [Sun, 29 Jun 2014 22:31:19 +0000 (22:31 +0000)]
Merge "Make ART_HOST_EXECUTABLES and ART_TARGET_SUPPORTED_ARCH include dalvikvm32 and dalvikvm64 as needed"
Brian Carlstrom [Sun, 29 Jun 2014 22:03:29 +0000 (15:03 -0700)]
Make ART_HOST_EXECUTABLES and ART_TARGET_SUPPORTED_ARCH include dalvikvm32 and dalvikvm64 as needed
Change-Id: Ica949eb73c081f10d28cc2fcfeb8e968eb1d52bb
Hiroshi Yamauchi [Fri, 27 Jun 2014 23:48:24 +0000 (23:48 +0000)]
am
bf1c8135: Merge "Fix use-art-*."
* commit '
bf1c813532db9c61537b08c14b4a2c22d9dadea0':
Fix use-art-*.
Hiroshi Yamauchi [Fri, 27 Jun 2014 23:14:00 +0000 (23:14 +0000)]
am
baa1323d: Merge "Add read barriers to the constant roots."
* commit '
baa1323d66a05fd2d7b9c6c131b232945b0a4ebb':
Add read barriers to the constant roots.
Bill Buzbee [Fri, 27 Jun 2014 19:31:40 +0000 (19:31 +0000)]
am
5703029d: Merge "AArch64: Enable GenSpecialCase."
* commit '
5703029de6c56c6f85b3ecbd4e2eee80e025772d':
AArch64: Enable GenSpecialCase.
Andreas Gampe [Fri, 27 Jun 2014 18:56:08 +0000 (18:56 +0000)]
am
5e2ccd4c: Merge "ART: Bump runtime version to 2.1.0"
* commit '
5e2ccd4c739135e9a2c232fe647de7bdc5b77d9e':
ART: Bump runtime version to 2.1.0
Bill Buzbee [Fri, 27 Jun 2014 17:52:06 +0000 (17:52 +0000)]
am
6bec6cb7: Merge "Fix quick mode bugs for Mips."
* commit '
6bec6cb70460251c5230e23ec0393241e791d497':
Fix quick mode bugs for Mips.
Bill Buzbee [Fri, 27 Jun 2014 17:52:02 +0000 (17:52 +0000)]
am
a64d7288: Merge "AArch64: implement easy division and reminder."
* commit '
a64d728836712e9295ada7de44d8cc3165d595a8':
AArch64: implement easy division and reminder.
Mathieu Chartier [Fri, 27 Jun 2014 17:48:31 +0000 (17:48 +0000)]
am
3084d78f: Merge "Don\'t allow negative GetFreeMemory."
* commit '
3084d78fe86854d5105987ef9739e77e8399434c':
Don't allow negative GetFreeMemory.
Andreas Gampe [Mon, 30 Jun 2014 15:18:34 +0000 (15:18 +0000)]
Merge "x86_64: Fix GenArrayBoundsCheck"
Serguei Katkov [Mon, 23 Jun 2014 17:50:02 +0000 (00:50 +0700)]
x86_64: Fix GenArrayBoundsCheck
The GenArrayBoundsCheck uses args registers to put array_length and
index as a parameter to out call. To ensure that we do not corrupt
register values there is a check whether need arg is not busy.
We need to use reg num comparison instead of reg comparison.
Change-Id: I260f02d1c155b69be8652dee2e89f3b63d15297c
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Ian Rogers [Sat, 28 Jun 2014 00:35:04 +0000 (00:35 +0000)]
Merge "Avoid segvs if LOG(FATAL) is called during runtime start-up."
Ian Rogers [Sat, 28 Jun 2014 00:32:56 +0000 (17:32 -0700)]
Avoid segvs if LOG(FATAL) is called during runtime start-up.
Change-Id: I8b054d0ff2084411ab49ebba83799eb79da879f6
Ian Rogers [Thu, 26 Jun 2014 04:32:30 +0000 (21:32 -0700)]
Create a dalvik symlink on the host.
Change-Id: I6cf331141a118d7248fd4eff68cce302dcd7bcca
Ian Rogers [Sat, 28 Jun 2014 00:28:03 +0000 (00:28 +0000)]
Merge "Create a dalvik symlink on the host."
Hiroshi Yamauchi [Fri, 27 Jun 2014 23:05:38 +0000 (23:05 +0000)]
Merge "Add read barriers to the constant roots."
Hiroshi Yamauchi [Wed, 25 Jun 2014 21:30:41 +0000 (14:30 -0700)]
Add read barriers to the constant roots.
This change makes it possible to concurrently scan the constant roots
(the roots visited by Runtime::VisitConstantRoots()) such as the class
of java.lang.Class by adding read barriers.
Bug:
12687968
Change-Id: If1afea471c4e1093688d2db37b7f1fc2742edeef
Dave Allison [Fri, 27 Jun 2014 16:52:33 +0000 (16:52 +0000)]
am
e313d165: Merge "Fix off-by-one errors in limit checking for ldr/str instructions."
* commit '
e313d1651fffe0d181473d2c8c385b7bc37a8829':
Fix off-by-one errors in limit checking for ldr/str instructions.
Andreas Gampe [Fri, 27 Jun 2014 16:23:55 +0000 (16:23 +0000)]
am
d5a4a2f9: Merge "ART: ARM64 fp return reg locations are FP"
* commit '
d5a4a2f96e6f082eea299f52d3373d6573ca06ca':
ART: ARM64 fp return reg locations are FP
Brian Carlstrom [Sat, 28 Jun 2014 20:27:03 +0000 (20:27 +0000)]
Merge "Fixed gdb support and added some ElfFile functions"
Alex Light [Wed, 18 Jun 2014 17:35:45 +0000 (10:35 -0700)]
Fixed gdb support and added some ElfFile functions
Fixed gdb support so that it would continue working even when debug
symbols or other sections are included in the elf file. Also made it
actually read parts of the DWARF information so it should work even if
there are minor changes to how and where DWARF information is written
out.
Added a dwarf.h file with the dwarf constants.
Added a FindSectionByName function, a FindDynamicSymbol function, and
the ability to specify the mmap protection and flags directly if we are
mapping in the whole file.
Modified elf_writer_quick.cc to use the dwarf constants from dwarf.h.
Change-Id: I09e15c425fab252b331a2e4719863552e8b6b137
Calin Juravle [Fri, 27 Jun 2014 14:50:25 +0000 (14:50 +0000)]
am
aec31aae: Merge "Add a new type of profile data in ART profiler"
* commit '
aec31aaef2750c620528a35491fd4d9a23f5be7c':
Add a new type of profile data in ART profiler
Vladimir Marko [Fri, 27 Jun 2014 14:22:51 +0000 (14:22 +0000)]
am
a94d7fd1: Merge "Fix topological ordering and use it for optimizations."
* commit '
a94d7fd18a11dc14fe43c5f814115b73d48846c2':
Fix topological ordering and use it for optimizations.
Sebastien Hertz [Fri, 27 Jun 2014 10:01:38 +0000 (10:01 +0000)]
am
6c22b193: Merge "Fix JNI ToReflectedMethod for constructor"
* commit '
6c22b193fb5fe71124846fa2c1d73f1670419476':
Fix JNI ToReflectedMethod for constructor
Bill Buzbee [Fri, 27 Jun 2014 17:44:58 +0000 (17:44 +0000)]
Merge "Fix quick mode bugs for Mips."
Douglas Leung [Wed, 25 Jun 2014 23:02:55 +0000 (16:02 -0700)]
Fix quick mode bugs for Mips.
This patch enable quick mode for Mips and allows the emulator to boot.
However the emulator is still not 100% functional. It still have problems
launching some apps.
Change-Id: Id46a39a649a2fd431a9f13b06ecf34cbd1d20930
Signed-off-by: Douglas Leung <douglas@mips.com>
Andreas Gampe [Fri, 27 Jun 2014 18:47:39 +0000 (18:47 +0000)]
Merge "ART: Bump runtime version to 2.1.0"
Andreas Gampe [Thu, 26 Jun 2014 15:09:17 +0000 (08:09 -0700)]
ART: Bump runtime version to 2.1.0
Bump the version of ART to 2.1.0 to reflect recent changes like
native MultiDex support.
Change-Id: Idcff71faac932c2b30359fbe13a975fb818ecb0e
Bill Buzbee [Fri, 27 Jun 2014 17:42:48 +0000 (17:42 +0000)]
Merge "AArch64: implement easy division and reminder."
Nicolas Geoffray [Tue, 1 Jul 2014 10:11:01 +0000 (10:11 +0000)]
Merge "The host build has changed from lib32/lib to lib/lib64."
Nicolas Geoffray [Tue, 1 Jul 2014 09:46:31 +0000 (10:46 +0100)]
The host build has changed from lib32/lib to lib/lib64.
Use the correct build variable for library dependency.
Change-Id: I2f12d13b595d97b2806eb709613e2cc358f4cad4
Calin Juravle [Fri, 27 Jun 2014 14:41:59 +0000 (14:41 +0000)]
Merge "Add a new type of profile data in ART profiler"
Wei Jin [Fri, 20 Jun 2014 22:56:53 +0000 (15:56 -0700)]
Add a new type of profile data in ART profiler
This CL allows the ART profiler to collect bounded stack information
that contains only method signature and dex pc on the current stack
frames to a bounded depth. The type of the profile data is by
default disabled, and can be enabled by setting the option
"-Xprofile-type:stack". The bound is controlled by the option
"-Xprofile-max-stack-depth:integervalue".
Change-Id: Ieab789951018b2263c4d140b40b6c73bffc6a549
Sebastien Hertz [Fri, 27 Jun 2014 07:01:15 +0000 (07:01 +0000)]
Merge "Fix JNI ToReflectedMethod for constructor"
Vladimir Marko [Fri, 27 Jun 2014 14:12:03 +0000 (14:12 +0000)]
Merge "Fix topological ordering and use it for optimizations."
Vladimir Marko [Tue, 1 Jul 2014 16:33:48 +0000 (16:33 +0000)]
Merge "AArch64: Fix OpRegRegImm64 add/sub for large negative imm."
Vladimir Marko [Tue, 1 Jul 2014 16:21:18 +0000 (17:21 +0100)]
AArch64: Fix OpRegRegImm64 add/sub for large negative imm.
Bug:
15837964
Change-Id: I401edf687352fae3dca03c0a807dac5750e454f6
Calin Juravle [Mon, 30 Jun 2014 11:25:46 +0000 (11:25 +0000)]
Merge "Fix a string uint conversion bug in profiler"
Wei Jin [Sat, 28 Jun 2014 00:44:18 +0000 (17:44 -0700)]
Fix a string uint conversion bug in profiler
This CL fixes a potential string to uint32_t conversion bug caused by
using atoi. The bug can be trigger when the dex_pc or count pass
2^31 - 1. The CL replaces all string uint32_t conversions in profiler to
stroul.
Change-Id: I54f1aea9c5f5053d79813ea83050ace3749691d6
Andreas Gampe [Thu, 26 Jun 2014 21:14:46 +0000 (21:14 +0000)]
am
cdda4e5b: Merge "ART: Change sprintf to snprintf"
* commit '
cdda4e5b6616cc3f2b11c4539e208092f0e263a2':
ART: Change sprintf to snprintf
Jeff Hao [Thu, 26 Jun 2014 20:37:06 +0000 (20:37 +0000)]
am
b2c369f7: Merge "Expanded native code to use arraycopy for specific data types."
* commit '
b2c369f74f5e4b3bae1cd4b0e251e17e26254f86':
Expanded native code to use arraycopy for specific data types.
Dave Allison [Thu, 26 Jun 2014 19:48:43 +0000 (19:48 +0000)]
am
fee5586d: Merge "Support additional instructions in ARM and thumb assemblers"
* commit '
fee5586dac3bf22a31dbbffe7b4ca7e978e53185':
Support additional instructions in ARM and thumb assemblers
Bill Buzbee [Fri, 27 Jun 2014 19:23:31 +0000 (19:23 +0000)]
Merge "AArch64: Enable GenSpecialCase."
Zheng Xu [Mon, 23 Jun 2014 10:33:08 +0000 (18:33 +0800)]
AArch64: Enable GenSpecialCase.
With the following fixes:
1. Map reference register to 64-bit argument register.
2. Set max_mapped_in_ to the index of last in. (Originally it was the
low part of the wide register)
Change-Id: If41de654a004a0561396e349d1f150517a72ab2f
Nicolas Geoffray [Sat, 28 Jun 2014 11:07:11 +0000 (11:07 +0000)]
Merge "Add the dalvikvm symlink to the art-host rule."
Nicolas Geoffray [Sat, 28 Jun 2014 11:05:23 +0000 (12:05 +0100)]
Add the dalvikvm symlink to the art-host rule.
The art script requires it.
Change-Id: I60bc7dbd57e7415089f5b14bf470ceffa1dcb581
Hiroshi Yamauchi [Fri, 27 Jun 2014 23:38:28 +0000 (23:38 +0000)]
Merge "Fix use-art-*."
Hiroshi Yamauchi [Fri, 27 Jun 2014 23:08:17 +0000 (16:08 -0700)]
Fix use-art-*.
Apply s/ART_DALVIK_CACHE_DIR/ART_TARGET_DALVIK_CACHE_DIR/.
Change-Id: Ie052b824826c5e919c5526763aa4eb5a3e49cbec
Mathieu Chartier [Fri, 27 Jun 2014 17:37:18 +0000 (17:37 +0000)]
Merge "Don't allow negative GetFreeMemory."