OSDN Git Service
Andreas Gampe [Fri, 4 Jul 2014 18:34:18 +0000 (18:34 +0000)]
am
827477ad: Merge "Aarch64: fix encoding map for kA64Fmov2xS."
* commit '
827477ad5ff20d0b2ca70828f3f56dea6fa8dddd':
Aarch64: fix encoding map for kA64Fmov2xS.
Sebastien Hertz [Fri, 4 Jul 2014 09:29:33 +0000 (09:29 +0000)]
am
13f89cb9: Merge "Add make rule to debug interpreter-only mode"
* commit '
13f89cb9930ea799c21559020da43c3845536da5':
Add make rule to debug interpreter-only mode
Nicolas Geoffray [Fri, 4 Jul 2014 09:24:00 +0000 (09:24 +0000)]
am
dda2f058: Merge "Do not attempt to compile on architectures we do not support."
* commit '
dda2f058db00deb1074ac44380c4637fc4417a0f':
Do not attempt to compile on architectures we do not support.
Sebastien Hertz [Fri, 4 Jul 2014 09:23:59 +0000 (09:23 +0000)]
am
d83ee1e2: Merge "More checks in JNI RegisterNatives"
* commit '
d83ee1e26f68409f904c3cf0d582c18738e1f39b':
More checks in JNI RegisterNatives
Andreas Gampe [Fri, 4 Jul 2014 09:22:47 +0000 (09:22 +0000)]
am
ef505256: Merge "x86_64: Turn on promotion optimization"
* commit '
ef505256e530951033a705e84a0682e7adcedf30':
x86_64: Turn on promotion optimization
Andreas Gampe [Fri, 4 Jul 2014 01:48:37 +0000 (01:48 +0000)]
am
05b8893f: Merge "x86_64: Fix intrinsics"
* commit '
05b8893fedf121d6a8813d40647bad8456518c58':
x86_64: Fix intrinsics
Andreas Gampe [Fri, 4 Jul 2014 00:52:53 +0000 (00:52 +0000)]
am
03cbed6d: Merge "AArch64: Add few more inline functions"
* commit '
03cbed6dfbd2750a243363ee4033c425d58cac6e':
AArch64: Add few more inline functions
Andreas Gampe [Thu, 3 Jul 2014 23:33:48 +0000 (23:33 +0000)]
am
c72966a2: Merge "ART: FF-opcodes are target-specific"
* commit '
c72966a25c205a3914164f586e44e586e5715468':
ART: FF-opcodes are target-specific
Andreas Gampe [Thu, 3 Jul 2014 21:54:54 +0000 (21:54 +0000)]
am
ca8ff32b: Merge "x86_64: TargetReg update for x86"
* commit '
ca8ff32bbb1f034b3b1f25de1fe20a9015bc87ec':
x86_64: TargetReg update for x86
Andreas Gampe [Thu, 3 Jul 2014 20:58:29 +0000 (20:58 +0000)]
am
3ee86bcb: Merge "Load 64 bit constant into GPR by single instruction for 64bit mode"
* commit '
3ee86bcbbc29f17b0243954a52dcda96b09411e0':
Load 64 bit constant into GPR by single instruction for 64bit mode
Andreas Gampe [Thu, 3 Jul 2014 20:19:18 +0000 (20:19 +0000)]
am
aa079560: Merge "Register promotion support for 64-bit targets"
* commit '
aa079560f65a89ec83591f61ae3a39341f00509e':
Register promotion support for 64-bit targets
Nicolas Geoffray [Thu, 3 Jul 2014 09:44:41 +0000 (09:44 +0000)]
am
2bc6813a: Merge "Fix build-art-target and build-art-host rules."
* commit '
2bc6813a990894b88a392a3cded13ddff2f14d04':
Fix build-art-target and build-art-host rules.
Andreas Gampe [Fri, 4 Jul 2014 05:36:52 +0000 (05:36 +0000)]
Merge "x86_64: Turn on promotion optimization"
Dmitry Petrochenko [Sat, 28 Jun 2014 03:59:19 +0000 (10:59 +0700)]
x86_64: Turn on promotion optimization
This CL turns on the promotion optimization (longs).
The 64-bit references support is disabled in x86_64 backend.
Change-Id: I62723388f549b51bae41c8a6b334228b2d782610
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Andreas Gampe [Thu, 3 Jul 2014 20:48:11 +0000 (20:48 +0000)]
Merge "Load 64 bit constant into GPR by single instruction for 64bit mode"
Andreas Gampe [Fri, 4 Jul 2014 18:24:39 +0000 (18:24 +0000)]
Merge "Aarch64: fix encoding map for kA64Fmov2xS."
Matteo Franchin [Fri, 4 Jul 2014 16:57:21 +0000 (17:57 +0100)]
Aarch64: fix encoding map for kA64Fmov2xS.
Change-Id: I5127a4443969dc2322461a4b4a34d6c39a0ffd64
Sebastien Hertz [Fri, 4 Jul 2014 09:07:47 +0000 (09:07 +0000)]
Merge "Add make rule to debug interpreter-only mode"
Sebastien Hertz [Fri, 4 Jul 2014 08:53:22 +0000 (10:53 +0200)]
Add make rule to debug interpreter-only mode
Adds "use-artd-interpret-only" make rule to run interpreter-only mode with
libartd.so.
Change-Id: Ib9fbcdbdcc79a89900ee751b5dc2ad554f834127
Nicolas Geoffray [Fri, 4 Jul 2014 09:00:17 +0000 (09:00 +0000)]
Merge "Do not attempt to compile on architectures we do not support."
Nicolas Geoffray [Fri, 4 Jul 2014 08:43:26 +0000 (09:43 +0100)]
Do not attempt to compile on architectures we do not support.
Change-Id: I431edff0a753a7fa37c79bdf7ab918d6747667a4
Sebastien Hertz [Fri, 4 Jul 2014 08:11:20 +0000 (08:11 +0000)]
Merge "More checks in JNI RegisterNatives"
Sebastien Hertz [Thu, 3 Jul 2014 07:39:53 +0000 (09:39 +0200)]
More checks in JNI RegisterNatives
Throws NoSuchMethodError (and returns JNI_ERR) when given method name, method
signature or native function is null.
Bug: https://code.google.com/p/android/issues/detail?id=72293
Bug:
15886341
Change-Id: I1c0582d54031eaa58a6025a2417d65090a2a622a
Andreas Gampe [Thu, 3 Jul 2014 21:46:10 +0000 (21:46 +0000)]
Merge "x86_64: TargetReg update for x86"
Chao-ying Fu [Wed, 2 Jul 2014 00:43:41 +0000 (17:43 -0700)]
x86_64: TargetReg update for x86
Also includes changes in common code. Elimination of use of TargetReg
with one parameter and direct access to special target registers.
Change-Id: Ied2c1f87d4d1e4345248afe74bca40487a46a371
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Andreas Gampe [Thu, 3 Jul 2014 20:10:57 +0000 (20:10 +0000)]
Merge "Register promotion support for 64-bit targets"
buzbee [Sat, 21 Jun 2014 22:31:01 +0000 (15:31 -0700)]
Register promotion support for 64-bit targets
Not sufficiently tested for 64-bit targets, but should be
fairly close.
A significant amount of refactoring could stil be done, (in
later CLs).
With this change we are not making any changes to the vmap
scheme. As a result, it is a requirement that if a vreg
is promoted to both a 32-bit view and the low half of a
64-bit view it must share the same physical register. We
may change this restriction later on to allow for more flexibility
for 32-bit Arm.
For example, if v4, v5, v4/v5 and v5/v6 are all hot enough to
promote, we'd end up with something like:
v4 (as an int) -> r10
v4/v5 (as a long) -> r10
v5 (as an int) -> r11
v5/v6 (as a long) -> r11
Fix a couple of ARM64 bugs on the way...
Change-Id: I6a152b9c164d9f1a053622266e165428045362f3
Nicolas Geoffray [Thu, 3 Jul 2014 08:01:16 +0000 (08:01 +0000)]
Merge "Fix build-art-target and build-art-host rules."
Andreas Gampe [Fri, 4 Jul 2014 01:38:56 +0000 (01:38 +0000)]
Merge "x86_64: Fix intrinsics"
nikolay serdjuk [Tue, 10 Jun 2014 10:07:10 +0000 (17:07 +0700)]
x86_64: Fix intrinsics
The following intrinsics have been ported:
- Abs(double/long/int/float)
- String.indexOf/charAt/compareTo/is_empty/length
- Float.floatToRawIntBits, Float.intBitsToFloat
- Double.doubleToRawLongBits, Double.longBitsToDouble
- Thread.currentThread
- Unsafe.getInt/Long/Object, Unsafe.putInt/Long/Object
- Math.sqrt, Math.max, Math.min
- Long.reverseBytes
Math.min and max for longs have been implemented for x86_64.
Commented out until good tests available:
- Memory.peekShort/Int/Long, Memory.pokeShort/Int/Long
Turned off on x86-64 as reported having problems
- Cas
Change-Id: I934bc9c90fdf953be0d3836a17b6ee4e7c98f244
Andreas Gampe [Fri, 4 Jul 2014 00:42:46 +0000 (00:42 +0000)]
Merge "AArch64: Add few more inline functions"
Serban Constantinescu [Wed, 2 Jul 2014 15:13:38 +0000 (16:13 +0100)]
AArch64: Add few more inline functions
This patch adds inlining support for the following functions:
* Math.max/min(long, long)
* Math.max/min(float, float)
* Math.max/min(double, double)
* Integer.reverse(int)
* Long.reverse(long)
Change-Id: Ia2b1619fd052358b3a0d23e5fcbfdb823d2029b9
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Andreas Gampe [Thu, 3 Jul 2014 23:24:49 +0000 (23:24 +0000)]
Merge "ART: FF-opcodes are target-specific"
Vladimir Kostyukov [Mon, 30 Jun 2014 08:44:12 +0000 (15:44 +0700)]
ART: FF-opcodes are target-specific
Some of the FF-opcodes' (i.e., push, call, jmp) register names
depend on the the target (32-bit vs 64-bit). This patch makes
such opcodes target-specific.
Change-Id: I4fa0b7ee5310e14f4022850ac2160c21be5d1c99
Signed-off-by: Vladimir Kostyukov <vladimir.kostyukov@intel.com>
Brian Carlstrom [Wed, 2 Jul 2014 17:39:36 +0000 (17:39 +0000)]
am
555377d5: Merge "Add a local elf.h"
* commit '
555377d55c37db860583e0655f63a1dacb589921':
Add a local elf.h
Andreas Gampe [Wed, 2 Jul 2014 16:55:15 +0000 (16:55 +0000)]
am
ffcdd9f1: Merge "x86_64: Unify 64-bit check in x86 compiler"
* commit '
ffcdd9f13daba70a64bb85688726ae23aa7a6eda':
x86_64: Unify 64-bit check in x86 compiler
Nicolas Geoffray [Wed, 2 Jul 2014 16:54:33 +0000 (17:54 +0100)]
Fix build-art-target and build-art-host rules.
They did not build the right libjavacore.so for 64bits builds.
Change-Id: I8475f73588ffd17933aac4591d19f8803741ef8a
Nicolas Geoffray [Wed, 2 Jul 2014 15:37:57 +0000 (15:37 +0000)]
am
02c9d40c: Merge "Fix art script for \'clean\' environments."
* commit '
02c9d40cb30ce88444b7852114b47b0805517fd8':
Fix art script for 'clean' environments.
Andreas Gampe [Wed, 2 Jul 2014 15:37:56 +0000 (15:37 +0000)]
am
bcf40221: Merge "ART: JNI ExceptionDescribe crashes if no exception occurred"
* commit '
bcf40221d747c05be7cb78d92a20caff240291d5':
ART: JNI ExceptionDescribe crashes if no exception occurred
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.
Yixin Shou [Tue, 1 Jul 2014 17:48:17 +0000 (13:48 -0400)]
Load 64 bit constant into GPR by single instruction for 64bit mode
This patch load 64 bit constant into a register by a single movabsq
instruction on 64 bit bit instead of previous mov, shift, add
instruction sequences.
Change-Id: I9d013c4f6c0b5c2e43bd125f91436263c7e6028c
Signed-off-by: Yixin Shou <yixin.shou@intel.com>
Andreas Gampe [Wed, 2 Jul 2014 16:45:07 +0000 (16:45 +0000)]
Merge "x86_64: Unify 64-bit check in x86 compiler"
Elena Sayapina [Tue, 1 Jul 2014 11:39:52 +0000 (18:39 +0700)]
x86_64: Unify 64-bit check in x86 compiler
Update x86-specific Gen64Bit() check with the CompilationUnit target64 field
which is set using unified Is64BitInstructionSet(InstructionSet) check.
Change-Id: Ic00ac863ed19e4543d7ea878d6c6c76d0bd85ce8
Signed-off-by: Elena Sayapina <elena.v.sayapina@intel.com>
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 [Wed, 2 Jul 2014 15:27:18 +0000 (15:27 +0000)]
Merge "ART: JNI ExceptionDescribe crashes if no exception occurred"
Alexei Zavjalov [Wed, 25 Jun 2014 09:04:55 +0000 (16:04 +0700)]
ART: JNI ExceptionDescribe crashes if no exception occurred
Some tests are calling ExceptionDescribe without checking if
we have an exception occurred. The most JVM's like Dalvik can
handle this in a good way, but art crashes with JNI error.
This adds a check in art::ExceptionDescribe for a case when it
called without exception.
Change-Id: Id9eddcc73e78b1197109be5a6340f9ff60940c74
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
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 .
Nicolas Geoffray [Wed, 2 Jul 2014 15:28:16 +0000 (15:28 +0000)]
Merge "Fix art script for 'clean' environments."
Nicolas Geoffray [Wed, 2 Jul 2014 15:25:12 +0000 (16:25 +0100)]
Fix art script for 'clean' environments.
We need to define ANDROID_HOST_OUT in the script before using it.
Change-Id: I6b415d8de5fb6001bc579b013683957abb33f394
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
Brian Carlstrom [Wed, 2 Jul 2014 17:30:38 +0000 (17:30 +0000)]
Merge "Add a local elf.h"
Brian Carlstrom [Wed, 2 Jul 2014 06:54:20 +0000 (23:54 -0700)]
Add a local elf.h
Change-Id: Ic2d449bfdd3c95e393c083c9e1022adc4e9c06b8
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 [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>
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
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"