OSDN Git Service
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
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: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
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
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
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."
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
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
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
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
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>
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
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
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
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
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 [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
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."
Mathieu Chartier [Fri, 27 Jun 2014 17:37:18 +0000 (17:37 +0000)]
Merge "Don't allow negative GetFreeMemory."
Mathieu Chartier [Fri, 27 Jun 2014 16:57:12 +0000 (09:57 -0700)]
Don't allow negative GetFreeMemory.
The max allowed footprint is only updated after the GC. But we can
still allocate even if bytes_allocated > max_allowed_footprint_.
This means that we used to be able to get a negative value if
bytes_allocated > max_allowed_footprint_.
External bug:
https://code.google.com/p/android/issues/detail?id=72221
Change-Id: I4ef9a534e29211786e82cdcb2582c11ab37a348a
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
Dave Allison [Fri, 27 Jun 2014 16:44:15 +0000 (16:44 +0000)]
Merge "Fix off-by-one errors in limit checking for ldr/str instructions."
Dave Allison [Fri, 27 Jun 2014 00:57:36 +0000 (17:57 -0700)]
Fix off-by-one errors in limit checking for ldr/str instructions.
The LDR/STR encoder in the thumb assembler had an off-by-one
error for limit checking for immediates. This resulted in an
assertion failure for things like 'ldr rx,[ry,#128]'
Bug:
15876206
Change-Id: Ic866212e2feae94e0bd4c753724898d84f5cb944
Andreas Gampe [Fri, 27 Jun 2014 16:15:37 +0000 (16:15 +0000)]
Merge "ART: ARM64 fp return reg locations are FP"
Andreas Gampe [Fri, 27 Jun 2014 15:43:05 +0000 (08:43 -0700)]
ART: ARM64 fp return reg locations are FP
Change-Id: Ica14b63ebde8efda113a146939309a6c37adc9aa
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."
Dave Allison [Thu, 26 Jun 2014 18:24:26 +0000 (18:24 +0000)]
Merge "Support additional instructions in ARM and thumb assemblers"
Andreas Gampe [Thu, 26 Jun 2014 21:06:47 +0000 (21:06 +0000)]
Merge "ART: Change sprintf to snprintf"
Andreas Gampe [Thu, 26 Jun 2014 20:49:36 +0000 (13:49 -0700)]
ART: Change sprintf to snprintf
Use of sprintf is discouraged. Change to snprintf in utils.cc. Avoids
a warning with GCC 4.9.
Change-Id: I03cc13a0f00dff07e8b775584ece9c4e4a64e590
Jeff Hao [Thu, 26 Jun 2014 20:27:27 +0000 (20:27 +0000)]
Merge "Expanded native code to use arraycopy for specific data types."
Dave Allison [Wed, 25 Jun 2014 19:37:10 +0000 (12:37 -0700)]
Support additional instructions in ARM and thumb assemblers
This adds the following support for the ARM and thumb assemblers:
1. Shifting by a register.
2. LDR/STR with a register offset, possibly shifted.
3. LDR(literal).
4. STR PC relative.
Also adds tests for them in the thumb assembler gtest.
Change-Id: Ie467e3c1d06b699cacbdef3482ed9a92e4f1809b
Sebastien Hertz [Thu, 26 Jun 2014 12:45:07 +0000 (14:45 +0200)]
Fix JNI ToReflectedMethod for constructor
Returns java.lang.reflect.Constructor object for <init> and <clinit> methods.
Bug: https://code.google.com/p/android/issues/detail?id=72312
Bug:
15885285
Change-Id: I2f4a266b2d9574659673dc6966104860578d709e
Mathieu Chartier [Tue, 24 Jun 2014 22:30:11 +0000 (22:30 +0000)]
Merge "More advanced timing loggers."
Mathieu Chartier [Fri, 20 Jun 2014 17:37:54 +0000 (10:37 -0700)]
More advanced timing loggers.
The new timing loggers have lower overhead since they only push into
a vector. The new format has two types, a start timing and a stop
timing. You can thing of these as brackets associated with a
timestamp. It uses these to construct various statistics when needed,
such as: Total time, exclusive time, and nesting depth.
Changed PrettyDuration to have a default of 3 digits after the decimal
point.
Exaple of a GC dump with exclusive / total times and indenting:
I/art (23546): GC iteration timing logger [Exclusive time] [Total time]
I/art (23546): 0ms InitializePhase
I/art (23546): 0.305ms/167.746ms MarkingPhase
I/art (23546): 0ms BindBitmaps
I/art (23546): 0ms FindDefaultSpaceBitmap
I/art (23546): 0ms/1.709ms ProcessCards
I/art (23546): 0.183ms ImageModUnionClearCards
I/art (23546): 0.916ms ZygoteModUnionClearCards
I/art (23546): 0.610ms AllocSpaceClearCards
I/art (23546): 1.373ms AllocSpaceClearCards
I/art (23546): 0.305ms/6.318ms MarkRoots
I/art (23546): 2.106ms MarkRootsCheckpoint
I/art (23546): 0.153ms MarkNonThreadRoots
I/art (23546): 4.287ms MarkConcurrentRoots
I/art (23546): 43.461ms UpdateAndMarkImageModUnionTable
I/art (23546): 0ms/112.712ms RecursiveMark
I/art (23546): 112.712ms ProcessMarkStack
I/art (23546): 0.610ms/2.777ms PreCleanCards
I/art (23546): 0.305ms/0.855ms ProcessCards
I/art (23546): 0.153ms ImageModUnionClearCards
I/art (23546): 0.610ms ZygoteModUnionClearCards
I/art (23546): 0.610ms AllocSpaceClearCards
I/art (23546): 0.549ms AllocSpaceClearCards
I/art (23546): 0.549ms MarkRootsCheckpoint
I/art (23546): 0.610ms MarkNonThreadRoots
I/art (23546): 0ms MarkConcurrentRoots
I/art (23546): 0.610ms ScanGrayImageSpaceObjects
I/art (23546): 0.305ms ScanGrayZygoteSpaceObjects
I/art (23546): 0.305ms ScanGrayAllocSpaceObjects
I/art (23546): 1.129ms ScanGrayAllocSpaceObjects
I/art (23546): 0ms ProcessMarkStack
I/art (23546): 0ms/0.977ms (Paused)PausePhase
I/art (23546): 0.244ms ReMarkRoots
I/art (23546): 0.672ms (Paused)ScanGrayObjects
I/art (23546): 0ms (Paused)ProcessMarkStack
I/art (23546): 0ms/0.610ms SwapStacks
I/art (23546): 0.610ms RevokeAllThreadLocalAllocationStacks
I/art (23546): 0ms PreSweepingGcVerification
I/art (23546): 0ms/10.621ms ReclaimPhase
I/art (23546): 0.610ms/0.702ms ProcessReferences
I/art (23546): 0.214ms/0.641ms EnqueueFinalizerReferences
I/art (23546): 0.427ms ProcessMarkStack
I/art (23546): 0.488ms SweepSystemWeaks
I/art (23546): 0.824ms/9.400ms Sweep
I/art (23546): 0ms SweepMallocSpace
I/art (23546): 0.214ms SweepZygoteSpace
I/art (23546): 0.122ms SweepMallocSpace
I/art (23546): 6.226ms SweepMallocSpace
I/art (23546): 0ms SweepMallocSpace
I/art (23546): 2.144ms SweepLargeObjects
I/art (23546): 0.305ms SwapBitmaps
I/art (23546): 0ms UnBindBitmaps
I/art (23546): 0.275ms FinishPhase
I/art (23546): GC iteration timing logger: end, 178.971ms
Change-Id: Ia55b65609468f212b3cd65cda66b843da42be645
Mathieu Chartier [Tue, 24 Jun 2014 22:00:32 +0000 (22:00 +0000)]
Merge "Add logging to monitor deflation."
Mathieu Chartier [Tue, 24 Jun 2014 18:21:59 +0000 (11:21 -0700)]
Add logging to monitor deflation.
Change-Id: I0251ff19e0a3c3b9edc7c7e296f15eb3229f8f7c
Sebastien Hertz [Thu, 26 Jun 2014 06:49:48 +0000 (06:49 +0000)]
Merge "Fix memory leak in JDWP object registry"
Sebastien Hertz [Wed, 25 Jun 2014 20:06:12 +0000 (22:06 +0200)]
Fix memory leak in JDWP object registry
Deletes ObjectRegistryEntry objects before clearing the maps.
Change-Id: Iaa30941fb8768b7294366a8f9855580cb29dadf5
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
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 [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 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
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 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
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: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 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 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 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
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>
Ian Rogers [Tue, 24 Jun 2014 23:48:11 +0000 (23:48 +0000)]
Merge "Multilib ART host."
Ian Rogers [Tue, 17 Jun 2014 15:21:54 +0000 (08:21 -0700)]
Multilib ART host.
Build ART for the host as a multilib project with dalvikvm32 and dalvikvm64
running as 32 or 64-bit repsectfully. Note, currently multilib host builds
are not the default, you make the so by setting BUILD_HOST_64bit=1.
Extend tests to execute in both 32 and 64-bit modes. By default both 32 and
64-bit tests are run, add 32 or 64 to the end of a test name to run it in
purely that flavor.
Given the extra spam, modify oat tests to only generate console output when
the test fails.
Change the test harness so that common commands are run when a test should be
skipped, when it passes or when it fails. Use these commands to generate a
summary of passing, skipped and failing tests. Tests will be skipped if they
are known to be broken or if a test has already failed. Setting the variable
TEST_ART_KEEP_GOING=true will force working tests not to be skipped.
In this change all tests running on the optimizing compiler are marked broken
due to breakages running them in a multilib environment.
Break apart Android.common.mk into its constituent parts, along with other
pieces of reorganization.
Stylistic nit, we refer to make rule targets as targets thereby overloading
the term target. While consistent with make's terminology, its confusing with
the Android notion of target. I've switched to just calling targets rules to
avoid confusion in host tests.
Change-Id: I5190fc3de46800a949fbb06b3f4c258ca89ccde9
Andreas Gampe [Tue, 24 Jun 2014 23:27:32 +0000 (23:27 +0000)]
Merge "AArch64: Add memcmp.S for Arm64."
Hiroshi Yamauchi [Tue, 24 Jun 2014 22:34:17 +0000 (22:34 +0000)]
Merge "Add more read barriers to the class linker."
Hiroshi Yamauchi [Tue, 24 Jun 2014 21:31:37 +0000 (14:31 -0700)]
Add more read barriers to the class linker.
This change makes it possible to concurrently scan the remaining roots
in the class linker (the non-class-table roots that are visited by
ClassLinker::VisitRoots()) by adding read barriers.
Bug:
12687968
Change-Id: I66fecf7a303eee7537429e018f38da8270b18c67
Nicolas Geoffray [Thu, 26 Jun 2014 12:39:51 +0000 (12:39 +0000)]
Merge "Return "false" instead of "nullptr" in bool DexFile::Open."
Alexander Ivchenko [Thu, 26 Jun 2014 12:32:11 +0000 (16:32 +0400)]
Return "false" instead of "nullptr" in bool DexFile::Open.
Otherwise on 4.10 the following error appears:
"error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]"
Here is the detailed description with links:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52174
Change-Id: I77c6571b557dde55f4e19a79db7bf997303ede3b
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>