OSDN Git Service

android-x86/art.git
9 years agoInitialize art::Atomic's value to 0.
Dan Albert [Tue, 12 Aug 2014 18:48:34 +0000 (11:48 -0700)]
Initialize art::Atomic's value to 0.

art::Mutex and art::ConditionVariable were DCHECKing that the value was
zero on entering the constructor without ever initializing the value.
Since 0 is a sensible default, make it the default for art::Atomic
rather than initializing for each use.

Bug: 16301104

(cherry picked from commit 6a3f8d93ddf09b5f6667820089e488958cba8361)

Change-Id: Iab69bccac9f904111a72eff8162c7f0ca979a08a

9 years agoReduce stack usage for overflow checks
Dave Allison [Fri, 25 Jul 2014 23:15:27 +0000 (16:15 -0700)]
Reduce stack usage for overflow checks

This reduces the stack space reserved for overflow checks to 12K, split
into an 8K gap and a 4K protected region.  GC needs over 8K when running
in a stack overflow situation.

Also prevents signal runaway by detecting a signal inside code that
resulted from a signal handler invokation.  And adds a max signal count to
the SignalTest to prevent it running forever.

Also reduces the number of iterations for the InterfaceTest as this was
taking (almost) forever with the --trace option on run-test.

Bug: 15435566

Change-Id: Id4fd46f22d52d42a9eb431ca07948673e8fda694

Conflicts:
compiler/optimizing/code_generator_x86_64.cc
runtime/arch/x86/fault_handler_x86.cc
runtime/arch/x86_64/quick_entrypoints_x86_64.S

9 years agoMerge "Avoid use of std::string where we have const char*." into lmp-dev
Ian Rogers [Wed, 13 Aug 2014 21:34:53 +0000 (21:34 +0000)]
Merge "Avoid use of std::string where we have const char*." into lmp-dev

9 years agoAdd allocation rate tracking to systrace.
Mathieu Chartier [Wed, 13 Aug 2014 17:08:05 +0000 (10:08 -0700)]
Add allocation rate tracking to systrace.

Bug: 16956980

Change-Id: I7074f4ae0f75d1bb58e9860ded4e17ce6978d74e

9 years agoAvoid use of std::string where we have const char*.
Ian Rogers [Tue, 12 Aug 2014 09:30:58 +0000 (02:30 -0700)]
Avoid use of std::string where we have const char*.

Removing the ClassHelper caused std::string creation for all calls to
Class::GetDescriptor and a significant performance regression. Make the
std::string an out argument so the caller can maintain it and its life time
while allowing GetDescriptor to return the common const char* case.

Don't generate GC maps when compilation is disabled.

Remove other uses of std::string that are occuring on critical paths.
Use the cheaper SkipClass in CompileMethod in CompilerDriver.
Specialize the utf8 as utf16 comparison code for the common shorter byte
encoding.
Force a bit of inlining, remove some UNLIKELYs (they are prone to pessimizing
code), add some LIKELYs.

x86-64 host 1-thread interpret-only of 57 apks:
Before: 29.539s
After: 23.467s

Regular compile:
Before: 1m35.347s
After: 1m20.056s

Bug: 16853450
Change-Id: Ic705ea24784bee24ab80084d06174cbf87d557ad

Conflicts:
runtime/utils.cc

9 years agoAdd implicit checks for x86_64 architecture.
Dave Allison [Wed, 16 Jul 2014 23:04:32 +0000 (16:04 -0700)]
Add implicit checks for x86_64 architecture.

This combines the x86 and x86_64 fault handlers into one.  It also
merges in the change to the entrypoints for X86_64.

Replaces generic instruction length calculator with one that only
works with the specific instructions we use.

Bug: 16256184

Change-Id: I1e8ab5ad43f46060de9597615b423c89a836035c
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
9 years agoART: Don't leave rex_ & length_ uninitialized
Andreas Gampe [Wed, 13 Aug 2014 06:24:16 +0000 (23:24 -0700)]
ART: Don't leave rex_ & length_ uninitialized

Don't leave fields uninitialized in the x86-64 utils assembler.

Bug: 16993295

(cherry picked from commit 181211de89df5615395a55114fe551b08e86bc4d)

Change-Id: I2d648991fc2a6a4d5f518eb9ef0bb10857f6318a

9 years agoMerge "Fix crash in VirtualMachine.AllThreads JDWP command" into lmp-dev
Sebastien Hertz [Wed, 13 Aug 2014 06:09:49 +0000 (06:09 +0000)]
Merge "Fix crash in VirtualMachine.AllThreads JDWP command" into lmp-dev

9 years agoMerge "Change FreeMemory and TotalMemory behavior." into lmp-dev
Mathieu Chartier [Tue, 12 Aug 2014 17:39:22 +0000 (17:39 +0000)]
Merge "Change FreeMemory and TotalMemory behavior." into lmp-dev

9 years agoMake method tracing deoptimize on startup.
Jeff Hao [Tue, 12 Aug 2014 01:00:29 +0000 (18:00 -0700)]
Make method tracing deoptimize on startup.

Bug: 16848366

(cherry picked from commit bc678bba8ec45dfcb1865676dd6d8188da9e56fc)

Change-Id: Idf75288026a837b95f4619acadec57e38bacbd7b

9 years agoChange FreeMemory and TotalMemory behavior.
Mathieu Chartier [Thu, 7 Aug 2014 00:06:33 +0000 (17:06 -0700)]
Change FreeMemory and TotalMemory behavior.

TotalMemory is now equal to the footprint limit (around when the
next GC will occur).
FreeMemory is now equal to TotalMemory() - bytes_allocated_.
Also added more memory dumping info to DumpGcPerformanceInfo.

Bug: 16520008
Bug: 15819878

(cherry picked from commit dd162fb5990cedf80a5093ecc0e77df82af5f754)

Change-Id: I68239a5295cc1372b3995eb781d67b9e25d6eaed

9 years agoFix crash in VirtualMachine.AllThreads JDWP command
Sebastien Hertz [Tue, 12 Aug 2014 07:09:37 +0000 (09:09 +0200)]
Fix crash in VirtualMachine.AllThreads JDWP command

When collecting all the started threads, we may encounter a thread in the
process of being started from Java code (Thread.start) in the threads list. The
crash occurs when we attempt to access the java.lang.Thread peer (calling
Thread::GetPeer) but the JNI global reference to it (Thread::jpeer) has not
been destroyed yet (which is verified with a check). This only happens when the
thread is starting up.

We now check the thread finished starting up before accessing the Java peer.
This also prevents from returning non-started threads in the reply.

Bug: 16660101

Change-Id: I9e445e5da3a6951143d6c3c9a0d4f136398fde2f

9 years agoAArch64: Fix art_quick_string_compareto.
Zheng Xu [Tue, 12 Aug 2014 09:19:12 +0000 (17:19 +0800)]
AArch64: Fix art_quick_string_compareto.

Though __memcmp16() is implemented in the same module as the caller, it
is still possible that the toolchain would put __memcmp16() into plt. In
that case, IP registers can be trashed when loading the function address.
Use x14/x15 to replace IP0/IP1.

Bug: 16974467

(cherry picked from commit 62ddb328860e907eb76ccd3abed63ba75438fea8)

Change-Id: I40e39d075860bc78624ce6ef8b4f8e33e57fc58c

9 years agoRevert "Rename openDexFileNative to openDexFile."
Calin Juravle [Wed, 6 Aug 2014 19:07:41 +0000 (19:07 +0000)]
Revert "Rename openDexFileNative to openDexFile."

https://android-review.googlesource.com/#/c/103383/ introduces
absolute paths so we need back the old method name

Bug: 16644204
Bug: 16930747

This reverts commit 350b626eb1cfbaee7619e9453a4c018c07aed003.

(cherry picked from commit a2069c7152eb46e8c64b4c8d7e19e5fab5de6df4)

Change-Id: I55c8cb31bb79b1ed8ea51f63ec504d77f76a582a

9 years agoMerge "ART: Skip compiling redefined classes in apps" into lmp-dev
Andreas Gampe [Mon, 11 Aug 2014 15:03:15 +0000 (15:03 +0000)]
Merge "ART: Skip compiling redefined classes in apps" into lmp-dev

9 years agoFix the Mac build.
Dan Albert [Sun, 10 Aug 2014 06:43:10 +0000 (23:43 -0700)]
Fix the Mac build.

Apparently Mac uses a different assembler directive for .hidden.

Change-Id: Ic2adb6bef82e376c3e5f4a29258a85a0dac00cd5

9 years agoProper fix after -Bsymbolic change.
Dan Albert [Sun, 10 Aug 2014 01:12:10 +0000 (18:12 -0700)]
Proper fix after -Bsymbolic change.

Marking the offending symbols as hidden allows the linker to resolve
them at build time.

Bug: 16853291
Change-Id: I1480c1520c23f81e42831a66737bba7bdf3433c2

9 years agoART: Skip compiling redefined classes in apps
Andreas Gampe [Tue, 29 Jul 2014 01:38:57 +0000 (18:38 -0700)]
ART: Skip compiling redefined classes in apps

If for an app a class is defined in more than one dex file, skip
all classes after the first.

Bug: 16057120

(cherry picked from commit de7b43626c49567cefb258669aac70a289b74b85)

Change-Id: I461942f762354b696c305dcae3a0d1c7de40f9df

9 years agoMerge "Workaround for test failures after Bsymbolic fix." into lmp-dev
Dan Albert [Sat, 9 Aug 2014 06:47:01 +0000 (06:47 +0000)]
Merge "Workaround for test failures after Bsymbolic fix." into lmp-dev

9 years agoMerge "ART: Turn on dex2oat watchdog on target" into lmp-dev
Andreas Gampe [Sat, 9 Aug 2014 06:30:49 +0000 (06:30 +0000)]
Merge "ART: Turn on dex2oat watchdog on target" into lmp-dev

9 years agoART: Turn on dex2oat watchdog on target
Andreas Gampe [Thu, 17 Jul 2014 17:18:46 +0000 (10:18 -0700)]
ART: Turn on dex2oat watchdog on target

Activates the watchdog on device.

Bug: 16364458

(cherry picked from commit bf40ddb83e1ea05ba4bc101149cd79f0160c8996)

Change-Id: I06deafa4436991f07bce44ecc6fd9df333f905ee

9 years agoART: 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

9 years agoMerge "ART: Use TMPDIR for test directories" into lmp-dev
Andreas Gampe [Sat, 9 Aug 2014 05:52:17 +0000 (05:52 +0000)]
Merge "ART: Use TMPDIR for test directories" into lmp-dev

9 years agoRemove 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

9 years agoART: Use TMPDIR for test directories
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

9 years agoMerge "ART: Do not check interface being subclass for member access" into lmp-dev
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

9 years agoART: Do not check interface being subclass for member access
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

9 years agoART: 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

9 years agoART: 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

9 years agoWorkaround for test failures after Bsymbolic fix.
Dan Albert [Fri, 8 Aug 2014 00:39:34 +0000 (17:39 -0700)]
Workaround for test failures after Bsymbolic fix.

Bug: 16853291
Change-Id: I0c2e2efbeb5060d4ec5ba706dab422b3c2caaa96
(cherry picked from commit 3bed41cf3ace3105686f626fed2ac802376852f3)

9 years agoAdd 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

9 years agoCheck 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

9 years agoAArch64: Implicit StackOverflow/NPE/Suspend checks.
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>
9 years agoFix checks for kLiteral in local optimizations.
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

9 years agoMerge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
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

9 years agoART: 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

9 years agoFix a SIGSEGV at background-to-foreground collector transition.
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

9 years agoMerge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
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

9 years agoUse the right instruction set for checking dex-cache staleness.
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

9 years agoFix 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

9 years agoReset goog/lmp-dev to goog/master
Brian Carlstrom [Wed, 6 Aug 2014 21:32:22 +0000 (14:32 -0700)]
Reset goog/lmp-dev to goog/master

Change-Id: If30071b5f86bfe723abf799c9248397e8840a8a0

9 years agoam 56a49adb: am 860feb0a: Merge "Add card table test."
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.

9 years agoam 860feb0a: Merge "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.

9 years agoam 82ec2f07: am 484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPEN...
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."

9 years agoam c75dc324: am 38449637: Merge "When performing a long jump, update SP last."
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.

9 years agoam dc6414fe: am cd0d9b5a: Merge "When performing a long jump, update SP last." into...
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.

9 years agoam da113966: am 1d5c4953: Merge "Fix SIB for base + index addressing in x86_64 assemb...
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.

9 years agoam a84690e3: am 0a1143de: Merge "Add x86_64 optimized __memcmp16 implementation;...
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.

9 years agoam 0b8c1530: am a1227a18: Fix byte_cas to use uintptr_t Atomic.
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.

9 years agoam 5ce0921f: am 4853f940: Merge "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.

9 years agoam 1d874ca3: am ae5092fc: Merge "Fix movw in x86_64 assembler."
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.

9 years agoam c598f8f8: am 4b6d27c2: Merge "x86: Fix assembler for Pextr"
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

9 years agoam 1622baf3: am cbb5747b: Merge "ART: Fix lock max count definition"
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

9 years agoam 484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""
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."

9 years agoam 38449637: Merge "When performing a long jump, update SP last."
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.

9 years agoam cd0d9b5a: Merge "When performing a long jump, update SP last." into lmp-dev
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.

9 years agoam 1d5c4953: Merge "Fix SIB for base + index addressing in x86_64 assembler."
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.

9 years agoam 0a1143de: Merge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32...
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.

9 years agoam c276c14f: am f768db4c: Merge "X86: Assembler: Correct r8_form for some cases"
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

9 years agoam b74629b7: am f6e8d030: Merge "x86_64: Load double constant using core register"
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

9 years agoam 277c6bb7: am 6175442a: Merge changes Ibe92d8b5,I9bada598
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.

9 years agoMake system use patchoat to relocate during runtime.
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

9 years agoMerge "When performing a long jump, update SP last." into lmp-dev
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

9 years agoWhen performing a long jump, update SP last.
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

9 years agoam e94cddb6: am a7975e0d: Merge "ART: Enable x86_64 bit support for intrinsic for...
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[], ..)

9 years agoam a1227a18: Fix byte_cas to use uintptr_t Atomic.
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.

9 years agoam 4853f940: Merge "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.

9 years agoFix 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

9 years agoam ae5092fc: Merge "Fix movw in x86_64 assembler."
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.

9 years agoam 4b6d27c2: Merge "x86: Fix assembler for Pextr"
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

9 years agoam cbb5747b: Merge "ART: Fix lock max count definition"
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

9 years agoam f768db4c: Merge "X86: Assembler: Correct r8_form for some cases"
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

9 years agoam f6e8d030: Merge "x86_64: Load double constant using core register"
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

9 years agoam 6175442a: Merge changes Ibe92d8b5,I9bada598
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.

9 years agoam a7975e0d: Merge "ART: Enable x86_64 bit support for intrinsic for System.arraycopy...
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[], ..)

9 years agoMerge "Fix byte_cas to use uintptr_t Atomic."
Mathieu Chartier [Wed, 6 Aug 2014 01:12:05 +0000 (01:12 +0000)]
Merge "Fix byte_cas to use uintptr_t Atomic."

9 years agoFix 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

9 years agoMerge "Fix movw in x86_64 assembler."
Nicolas Geoffray [Tue, 5 Aug 2014 22:19:45 +0000 (22:19 +0000)]
Merge "Fix movw in x86_64 assembler."

9 years agoFix 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

9 years agoam 29c1a6d5: am 35d9a38d: Merge "Set REG0_USED on X86 Set8R instruction"
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

9 years agoam 35d9a38d: Merge "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

9 years agoam 420d6990: am 09f60a9f: Merge "Use canonical paths when searching for dex files...
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

9 years agoam 09f60a9f: Merge "Use canonical paths when searching for dex files" into lmp-dev
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

9 years agoam f6735280: resolved conflicts for merge of ac304133 to lmp-dev-plus-aosp
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)

9 years agoresolved conflicts for merge of ac304133 to lmp-dev-plus-aosp
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

9 years agoam d77c40a8: am 6bdbec76: Merge "ART: Correct disassembling of 64bit immediates on...
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

9 years agoam 2fb8b8b9: am 4d3401e8: Merge "x86_64: Fix Test32RM"
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

9 years agoam 6bdbec76: Merge "ART: Correct disassembling of 64bit immediates on x86_64"
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

9 years agoam 4d3401e8: Merge "x86_64: Fix Test32RM"
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

9 years agoam 3c1a3200: am 32155e0a: Merge "Use canonical paths when searching for dex files"
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

9 years agoam 582d9367: am 3513cd30: Merge "Create allocator adapter for using Arena in std...
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.

9 years agoam e339cbfe: am 8f1dc7a2: Merge "ART: Fix memory unmapped twice issue in ElfFile...
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)

9 years agoam 32155e0a: Merge "Use canonical paths when searching for dex files"
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

9 years agoam 3513cd30: Merge "Create allocator adapter for using Arena in std containers."
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.

9 years agoam 8f1dc7a2: Merge "ART: Fix memory unmapped twice issue in ElfFile::Load(bool)"
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)

9 years agoART: 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

9 years agoam 940cb994: am b5c5646b: Merge "Use the uncached form of BacktraceMap::Create."
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.

9 years agoam b5c5646b: Merge "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.

9 years agoam f0bddada: am 27a10f61: 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.

9 years agoam 27a10f61: 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.