OSDN Git Service

android-x86/art.git
9 years agoam cf599de3: am fe092ab1: Merge "Added repe_cmpsq instruction to x86_64 assembler"
Vladimir Marko [Tue, 4 Aug 2015 11:36:20 +0000 (11:36 +0000)]
am cf599de3: am fe092ab1: Merge "Added repe_cmpsq instruction to x86_64 assembler"

* commit 'cf599de3cd4ca0cdd54bef2588af7cfdb19b71db':
  Added repe_cmpsq instruction to x86_64 assembler

9 years agoam fe092ab1: Merge "Added repe_cmpsq instruction to x86_64 assembler"
Vladimir Marko [Tue, 4 Aug 2015 11:28:43 +0000 (11:28 +0000)]
am fe092ab1: Merge "Added repe_cmpsq instruction to x86_64 assembler"

* commit 'fe092ab1e3cfc106216aa5518393a55786f9ab0b':
  Added repe_cmpsq instruction to x86_64 assembler

9 years agoMerge "Added repe_cmpsq instruction to x86_64 assembler"
Vladimir Marko [Tue, 4 Aug 2015 11:20:31 +0000 (11:20 +0000)]
Merge "Added repe_cmpsq instruction to x86_64 assembler"

9 years agoam 721d5cf7: am 718a2451: Merge "ARM/ARM64: Implement numberOfLeadingZeros intrinsic."
Vladimir Marko [Tue, 4 Aug 2015 09:58:21 +0000 (09:58 +0000)]
am 721d5cf7: am 718a2451: Merge "ARM/ARM64: Implement numberOfLeadingZeros intrinsic."

* commit '721d5cf7b2eaacfcb0c83401224b243ff1b90648':
  ARM/ARM64: Implement numberOfLeadingZeros intrinsic.

9 years agoam 718a2451: Merge "ARM/ARM64: Implement numberOfLeadingZeros intrinsic."
Vladimir Marko [Tue, 4 Aug 2015 09:51:57 +0000 (09:51 +0000)]
am 718a2451: Merge "ARM/ARM64: Implement numberOfLeadingZeros intrinsic."

* commit '718a24514b736c3db49eac9f5b39a097a6c74856':
  ARM/ARM64: Implement numberOfLeadingZeros intrinsic.

9 years agoMerge "ARM/ARM64: Implement numberOfLeadingZeros intrinsic."
Vladimir Marko [Tue, 4 Aug 2015 09:05:51 +0000 (09:05 +0000)]
Merge "ARM/ARM64: Implement numberOfLeadingZeros intrinsic."

9 years agoARM/ARM64: Implement numberOfLeadingZeros intrinsic.
Scott Wakeling [Fri, 10 Jul 2015 10:42:06 +0000 (11:42 +0100)]
ARM/ARM64: Implement numberOfLeadingZeros intrinsic.

Change-Id: I4042fb7a0b75140475dcfca23e8f79d310f5333b

9 years agoAdded repe_cmpsq instruction to x86_64 assembler
agicsaki [Tue, 4 Aug 2015 03:14:29 +0000 (20:14 -0700)]
Added repe_cmpsq instruction to x86_64 assembler

Change-Id: I9085694fd3313581b2775a8267ccda58fec19a1a

9 years agoam 2b643092: am 0c9c5bbd: Merge "ART: Fix stub_test"
Andreas Gampe [Mon, 3 Aug 2015 22:26:42 +0000 (22:26 +0000)]
am 2b643092: am 0c9c5bbd: Merge "ART: Fix stub_test"

* commit '2b6430920410451574da7123b3e33dba205949f7':
  ART: Fix stub_test

9 years agoam 0c9c5bbd: Merge "ART: Fix stub_test"
Andreas Gampe [Mon, 3 Aug 2015 22:15:50 +0000 (22:15 +0000)]
am 0c9c5bbd: Merge "ART: Fix stub_test"

* commit '0c9c5bbdd6976c21602b92d9b455e6fe5d769fb0':
  ART: Fix stub_test

9 years agoMerge "ART: Fix stub_test"
Andreas Gampe [Mon, 3 Aug 2015 22:07:15 +0000 (22:07 +0000)]
Merge "ART: Fix stub_test"

9 years agoam 0ebe6918: am e3d598e2: Merge "cleanup: Replace pointers with out-parameters and...
Igor Murashkin [Mon, 3 Aug 2015 21:43:24 +0000 (21:43 +0000)]
am 0ebe6918: am e3d598e2: Merge "cleanup: Replace pointers with out-parameters and fix-up formatting"

* commit '0ebe69184c7b09b3f5caff5ebc6524840104cf6d':
  cleanup: Replace pointers with out-parameters and fix-up formatting

9 years agoam e3d598e2: Merge "cleanup: Replace pointers with out-parameters and fix-up formatting"
Igor Murashkin [Mon, 3 Aug 2015 21:33:49 +0000 (21:33 +0000)]
am e3d598e2: Merge "cleanup: Replace pointers with out-parameters and fix-up formatting"

* commit 'e3d598e240dd9ac26b4894dbb1312f42c4047fb3':
  cleanup: Replace pointers with out-parameters and fix-up formatting

9 years agoMerge "cleanup: Replace pointers with out-parameters and fix-up formatting"
Igor Murashkin [Mon, 3 Aug 2015 21:27:27 +0000 (21:27 +0000)]
Merge "cleanup: Replace pointers with out-parameters and fix-up formatting"

9 years agoam 8751f3b6: am 743e9625: Merge "Optimizing: Add Non Temporal Move support for x86"
Aart Bik [Mon, 3 Aug 2015 18:11:14 +0000 (18:11 +0000)]
am 8751f3b6: am 743e9625: Merge "Optimizing: Add Non Temporal Move support for x86"

* commit '8751f3b68b14f3632bf2285cb1a3a167492a1cfb':
  Optimizing: Add Non Temporal Move support for x86

9 years agoam 743e9625: Merge "Optimizing: Add Non Temporal Move support for x86"
Aart Bik [Mon, 3 Aug 2015 17:59:44 +0000 (17:59 +0000)]
am 743e9625: Merge "Optimizing: Add Non Temporal Move support for x86"

* commit '743e9625bd4b9bddc8752170e647660986c53f08':
  Optimizing: Add Non Temporal Move support for x86

9 years agoMerge "Optimizing: Add Non Temporal Move support for x86"
Aart Bik [Mon, 3 Aug 2015 17:48:11 +0000 (17:48 +0000)]
Merge "Optimizing: Add Non Temporal Move support for x86"

9 years agoART: Fix stub_test
Andreas Gampe [Mon, 3 Aug 2015 17:25:06 +0000 (10:25 -0700)]
ART: Fix stub_test

Clobber another register on arm32.

Change-Id: I0d355f69dfa7e6d86cb7c211f6ac2cb56f995d9d

9 years agoam aa16bf2d: am e238414e: Merge "Optimizing: Use more X86 3 operand multiplies"
Roland Levillain [Mon, 3 Aug 2015 15:10:52 +0000 (15:10 +0000)]
am aa16bf2d: am e238414e: Merge "Optimizing: Use more X86 3 operand multiplies"

* commit 'aa16bf2db808625f73f4c7bb43b8aefb06630984':
  Optimizing: Use more X86 3 operand multiplies

9 years agoam 90d7bc05: am bc576cfd: Merge "Revert "Optimizing String.Equals as an intrinsic...
Roland Levillain [Mon, 3 Aug 2015 15:10:50 +0000 (15:10 +0000)]
am 90d7bc05: am bc576cfd: Merge "Revert "Optimizing String.Equals as an intrinsic (x86)""

* commit '90d7bc0546059e58e8ff76a3b973473b4f5b1801':
  Revert "Optimizing String.Equals as an intrinsic (x86)"

9 years agoam e238414e: Merge "Optimizing: Use more X86 3 operand multiplies"
Roland Levillain [Mon, 3 Aug 2015 15:04:32 +0000 (15:04 +0000)]
am e238414e: Merge "Optimizing: Use more X86 3 operand multiplies"

* commit 'e238414eee3ec933a4ceb1894666c9ef331ace0c':
  Optimizing: Use more X86 3 operand multiplies

9 years agoam bc576cfd: Merge "Revert "Optimizing String.Equals as an intrinsic (x86)""
Roland Levillain [Mon, 3 Aug 2015 15:04:30 +0000 (15:04 +0000)]
am bc576cfd: Merge "Revert "Optimizing String.Equals as an intrinsic (x86)""

* commit 'bc576cfd9c85a285f15b8c33a2cc7f947d999f49':
  Revert "Optimizing String.Equals as an intrinsic (x86)"

9 years agoMerge "Optimizing: Use more X86 3 operand multiplies"
Roland Levillain [Mon, 3 Aug 2015 14:57:38 +0000 (14:57 +0000)]
Merge "Optimizing: Use more X86 3 operand multiplies"

9 years agoMerge "Revert "Optimizing String.Equals as an intrinsic (x86)""
Roland Levillain [Mon, 3 Aug 2015 14:55:11 +0000 (14:55 +0000)]
Merge "Revert "Optimizing String.Equals as an intrinsic (x86)""

9 years agoRevert "Optimizing String.Equals as an intrinsic (x86)"
Roland Levillain [Mon, 3 Aug 2015 14:54:45 +0000 (14:54 +0000)]
Revert "Optimizing String.Equals as an intrinsic (x86)"

Reverted as it breaks the compilation of boot.{oat,art} on x86 (although this CL may not be the culprit, as the issue seems to come from Optimizing's register allocator).

This reverts commit 8ab7bd6c8b10ad58758c33a1dc9326212bd200e9.

Change-Id: If7c8b6258d1e690f4d2a06bcc82c92563ac6cdef

9 years agoam adcc1f20: am 855223fa: Merge "Fix ambiguous phrasing in tests comments regarding $."
Roland Levillain [Mon, 3 Aug 2015 14:49:32 +0000 (14:49 +0000)]
am adcc1f20: am 855223fa: Merge "Fix ambiguous phrasing in tests comments regarding $."

* commit 'adcc1f20fe01134301b13769b9595fd78e4ffc35':
  Fix ambiguous phrasing in tests comments regarding $opt$.

9 years agoam 855223fa: Merge "Fix ambiguous phrasing in tests comments regarding $."
Roland Levillain [Mon, 3 Aug 2015 14:42:46 +0000 (14:42 +0000)]
am 855223fa: Merge "Fix ambiguous phrasing in tests comments regarding $."

* commit '855223fa12fc1efc926c068ea5c536663f30030d':
  Fix ambiguous phrasing in tests comments regarding $opt$.

9 years agoMerge "Fix ambiguous phrasing in tests comments regarding $opt$."
Roland Levillain [Mon, 3 Aug 2015 14:34:42 +0000 (14:34 +0000)]
Merge "Fix ambiguous phrasing in tests comments regarding $opt$."

9 years agoFix ambiguous phrasing in tests comments regarding $opt$.
Roland Levillain [Mon, 3 Aug 2015 14:20:02 +0000 (15:20 +0100)]
Fix ambiguous phrasing in tests comments regarding $opt$.

Change-Id: I78e6bccbe35288df5de30700d3877bbcdef37d65

9 years agoam a63809f1: am 7a58566d: Merge "Optimizing String.Equals as an intrinsic (x86)"
Roland Levillain [Mon, 3 Aug 2015 09:54:07 +0000 (09:54 +0000)]
am a63809f1: am 7a58566d: Merge "Optimizing String.Equals as an intrinsic (x86)"

* commit 'a63809f1e6d8a6333e60d35996ac16fea5645947':
  Optimizing String.Equals as an intrinsic (x86)

9 years agoam 7a58566d: Merge "Optimizing String.Equals as an intrinsic (x86)"
Roland Levillain [Mon, 3 Aug 2015 09:45:20 +0000 (09:45 +0000)]
am 7a58566d: Merge "Optimizing String.Equals as an intrinsic (x86)"

* commit '7a58566d2b0ad051b8ccaf5614ad986979af8ef4':
  Optimizing String.Equals as an intrinsic (x86)

9 years agoMerge "Optimizing String.Equals as an intrinsic (x86)"
Roland Levillain [Mon, 3 Aug 2015 08:48:11 +0000 (08:48 +0000)]
Merge "Optimizing String.Equals as an intrinsic (x86)"

9 years agoam 70b593a4: am 7879f711: Merge "ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID"
Andreas Gampe [Sat, 1 Aug 2015 04:23:40 +0000 (04:23 +0000)]
am 70b593a4: am 7879f711: Merge "ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID"

* commit '70b593a4754b09df15bba2a3bf90bfa964d47c8f':
  ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID

9 years agoam 7879f711: Merge "ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID"
Andreas Gampe [Sat, 1 Aug 2015 04:20:08 +0000 (04:20 +0000)]
am 7879f711: Merge "ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID"

* commit '7879f7119d7a88a71f6c31c9b8eac27cdba8a123':
  ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID

9 years agoMerge "ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID"
Andreas Gampe [Sat, 1 Aug 2015 04:14:14 +0000 (04:14 +0000)]
Merge "ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID"

9 years agoART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID
Andreas Gampe [Fri, 31 Jul 2015 20:36:10 +0000 (13:36 -0700)]
ART: Check a RETURN_VOID_NO_BARRIER like a RETURN_VOID

RETURN_VOID_NO_BARRIER is used in all methods with return-void,
as long as they're not a constructor and have been quickened. As
such, do the regular checking of the return type.

Bug: https://code.google.com/p/android/issues/detail?id=181700
Bug: 22871329
Change-Id: I11bcf7bffd91fc01995b703a99e603ddb370016e

9 years agocleanup: Replace pointers with out-parameters and fix-up formatting
Igor Murashkin [Sat, 1 Aug 2015 00:35:52 +0000 (17:35 -0700)]
cleanup: Replace pointers with out-parameters and fix-up formatting

Cleans all of oat_file.h/.cc, parsed_options.h./cc, runtime.h/.cc

Other files are touched only incidentally to use outof(x) instead of &x.

Change-Id: I0bb15111149d53bb21aac2199ef33bd35333b0ca

9 years agoam 43498ce6: am 66c50ccc: Merge "runtime: cleanup class_linker out-parameters and...
Igor Murashkin [Fri, 31 Jul 2015 23:14:15 +0000 (23:14 +0000)]
am 43498ce6: am 66c50ccc: Merge "runtime: cleanup class_linker out-parameters and formatting"

* commit '43498ce63eefeb2c3fad59592ce240c42d655441':
  runtime: cleanup class_linker out-parameters and formatting

9 years agoam 9b0483d5: am 5cdee205: Merge "Revert "runtime: cleanup class_linker out-parameters...
Igor Murashkin [Fri, 31 Jul 2015 23:14:14 +0000 (23:14 +0000)]
am 9b0483d5: am 5cdee205: Merge "Revert "runtime: cleanup class_linker out-parameters and formatting""

* commit '9b0483d5ac74f846c0cbd45779e758c942085ee5':
  Revert "runtime: cleanup class_linker out-parameters and formatting"

9 years agoam 0c607a99: am 9c977b92: Merge "runtime: cleanup class_linker out-parameters and...
Igor Murashkin [Fri, 31 Jul 2015 23:14:13 +0000 (23:14 +0000)]
am 0c607a99: am 9c977b92: Merge "runtime: cleanup class_linker out-parameters and formatting"

* commit '0c607a9956b934f2716e2687de22e52624152def':
  runtime: cleanup class_linker out-parameters and formatting

9 years agoam 66c50ccc: Merge "runtime: cleanup class_linker out-parameters and formatting"
Igor Murashkin [Fri, 31 Jul 2015 23:07:30 +0000 (23:07 +0000)]
am 66c50ccc: Merge "runtime: cleanup class_linker out-parameters and formatting"

* commit '66c50cccd9dda431b2017ad04dc72b0c0f17d74e':
  runtime: cleanup class_linker out-parameters and formatting

9 years agoam 5cdee205: Merge "Revert "runtime: cleanup class_linker out-parameters and formatting""
Igor Murashkin [Fri, 31 Jul 2015 23:07:28 +0000 (23:07 +0000)]
am 5cdee205: Merge "Revert "runtime: cleanup class_linker out-parameters and formatting""

* commit '5cdee205231993c5f3a5f815f614d9d460448615':
  Revert "runtime: cleanup class_linker out-parameters and formatting"

9 years agoam 9c977b92: Merge "runtime: cleanup class_linker out-parameters and formatting"
Igor Murashkin [Fri, 31 Jul 2015 23:07:27 +0000 (23:07 +0000)]
am 9c977b92: Merge "runtime: cleanup class_linker out-parameters and formatting"

* commit '9c977b9260927d14c6d6c5bbdd7d16e1aebbf2fa':
  runtime: cleanup class_linker out-parameters and formatting

9 years agoMerge "runtime: cleanup class_linker out-parameters and formatting"
Igor Murashkin [Fri, 31 Jul 2015 23:03:58 +0000 (23:03 +0000)]
Merge "runtime: cleanup class_linker out-parameters and formatting"

9 years agoruntime: cleanup class_linker out-parameters and formatting
Igor Murashkin [Thu, 30 Jul 2015 23:39:45 +0000 (16:39 -0700)]
runtime: cleanup class_linker out-parameters and formatting

* Use out<T> instead of parameters
* Fixes up some other signatures to be more correct
* Reformat parameters to be one per line if they can't fit on one line
* Reformat locks to be one per line if they can't fit on the decl line

Change-Id: Ib71b08707d3ed0bb85299406c0b23a1de4e92a1c

9 years agoMerge "Revert "runtime: cleanup class_linker out-parameters and formatting""
Igor Murashkin [Fri, 31 Jul 2015 23:02:50 +0000 (23:02 +0000)]
Merge "Revert "runtime: cleanup class_linker out-parameters and formatting""

9 years agoRevert "runtime: cleanup class_linker out-parameters and formatting"
Igor Murashkin [Fri, 31 Jul 2015 23:02:30 +0000 (23:02 +0000)]
Revert "runtime: cleanup class_linker out-parameters and formatting"

This reverts commit 0de694ed3efe8412b83622a24074831edcc7e384.

Change-Id: I4b185584d6e47918179b16d76709cc3366872f3c

9 years agoMerge "runtime: cleanup class_linker out-parameters and formatting"
Igor Murashkin [Fri, 31 Jul 2015 23:02:04 +0000 (23:02 +0000)]
Merge "runtime: cleanup class_linker out-parameters and formatting"

9 years agoOptimizing String.Equals as an intrinsic (x86)
agicsaki [Mon, 27 Jul 2015 17:25:10 +0000 (10:25 -0700)]
Optimizing String.Equals as an intrinsic (x86)

The third implementation of String.Equals.  I added an intrinsic
in x86 which is similar to the original java implementation of
String.equals: an instanceof check, null check, length check, and
reference equality check followed by a loop comparing strings
character by character.

Interesting Benchmarking Values:

Optimizing Compiler on Nexus Player
Intrinsic 15-30 Character Strings: 177 ns
Original 15-30 Character Strings: 275 ns
Intrinsic Null Argument: 59 ns
Original Null Argument: 137 ns
Intrinsic 100-1000 Character Strings: 1812 ns
Original 100-1000 Character Strings: 6334 ns

Bug: 21481923
Change-Id: Ia386e19b9dbfe0dac688b20ec93d8f90f67af47e

9 years agoam f48bd295: am 0d72ce0b: Merge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER...
Andreas Gampe [Fri, 31 Jul 2015 22:31:57 +0000 (22:31 +0000)]
am f48bd295: am 0d72ce0b: Merge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors""

* commit 'f48bd295919676d53e206f477e87d9ab38d9192e':
  Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

9 years agoruntime: cleanup class_linker out-parameters and formatting
Igor Murashkin [Thu, 30 Jul 2015 23:39:45 +0000 (16:39 -0700)]
runtime: cleanup class_linker out-parameters and formatting

* Use out<T> instead of parameters
* Fixes up some other signatures to be more correct
* Reformat parameters to be one per line if they can't fit on one line
* Reformat locks to be one per line if they can't fit on the decl line

Change-Id: I1031cf4edc41f95b89edb343d43ef93e15384206

9 years agoam 0d72ce0b: Merge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside construc...
Andreas Gampe [Fri, 31 Jul 2015 20:35:29 +0000 (20:35 +0000)]
am 0d72ce0b: Merge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors""

* commit '0d72ce0b4f9eaf0f60c70a2901198099086795e0':
  Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

9 years agoMerge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors""
Andreas Gampe [Fri, 31 Jul 2015 20:31:40 +0000 (20:31 +0000)]
Merge "Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors""

9 years agoRevert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"
Andreas Gampe [Fri, 31 Jul 2015 20:31:24 +0000 (20:31 +0000)]
Revert "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

This reverts commit e93505f599682a2e95c4dac1c8633dec79c602bc.

This isn't the right thing to do, actually.

Bug: 22871329
Change-Id: I0a0a5a86c7c8d8afdf417444ca7d73e56e040515

9 years agoam e344f24b: am 7423f0b6: Merge "ART: Do not allow RETURN_VOID_NO_BARRIER outside...
Andreas Gampe [Fri, 31 Jul 2015 19:30:03 +0000 (19:30 +0000)]
am e344f24b: am 7423f0b6: Merge "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

* commit 'e344f24bed7d3379c4e327987329fbed13404dde':
  ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors

9 years agoam 7423f0b6: Merge "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"
Andreas Gampe [Fri, 31 Jul 2015 19:11:46 +0000 (19:11 +0000)]
am 7423f0b6: Merge "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

* commit '7423f0b66060711cddcdbc7ba5b0dd3f2df36718':
  ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors

9 years agoMerge "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"
Andreas Gampe [Fri, 31 Jul 2015 19:04:29 +0000 (19:04 +0000)]
Merge "ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors"

9 years agoART: Do not allow RETURN_VOID_NO_BARRIER outside constructors
Andreas Gampe [Fri, 31 Jul 2015 18:34:24 +0000 (11:34 -0700)]
ART: Do not allow RETURN_VOID_NO_BARRIER outside constructors

Let the verifier fail non-constructor methods using the no-barrier
variant of return. This is a quickened return purely to avoid the
constructor barrier for final fields, and cannot be used as a stand-in
for a regular return.

Bug: https://code.google.com/p/android/issues/detail?id=181700
Bug: 22871329
Change-Id: I9559c6a1599c20ce526582527ebed73b25242767

9 years agoam ebf2ade8: Merge branch \'stage-aosp-master\' of https://googleplex-android.googles...
Elliott Hughes [Fri, 31 Jul 2015 18:07:31 +0000 (18:07 +0000)]
am ebf2ade8: Merge branch \'stage-aosp-master\' of https://googleplex-android.googlesource.com/_direct/platform/art into stage-aosp-master

* commit 'ebf2ade8226fe9bcdd4ef6f7560aa329c458d2ea':
  ART: Remove unique-numbered labels from arm64 assembly

9 years agoam c548ae75: ART: Remove unique-numbered labels from arm64 assembly
Chih-Hung Hsieh [Fri, 31 Jul 2015 18:07:29 +0000 (18:07 +0000)]
am c548ae75: ART: Remove unique-numbered labels from arm64 assembly

* commit 'c548ae756a3131b1a7c9abc387697218837e29d3':
  ART: Remove unique-numbered labels from arm64 assembly

9 years agoMerge branch 'stage-aosp-master' of https://googleplex-android.googlesource.com/_dire...
Elliott Hughes [Fri, 31 Jul 2015 18:01:15 +0000 (18:01 +0000)]
Merge branch 'stage-aosp-master' of https://googleplex-android.googlesource.com/_direct/platform/art into stage-aosp-master

9 years agoART: Remove unique-numbered labels from arm64 assembly
Chih-Hung Hsieh [Mon, 27 Jul 2015 17:10:44 +0000 (10:10 -0700)]
ART: Remove unique-numbered labels from arm64 assembly

Use local labels like 1, 2, 3 in macros. Clang does not support
the unique counter variable \@.

Bug: 22799850
Change-Id: I9ef1859be40b875ef4d7ae74ec1af52ad05f7352

9 years agoam 8d72e5d9: Merge "ART: Remove unique-numbered labels from arm64 assembly"
Andreas Gampe [Fri, 31 Jul 2015 18:00:55 +0000 (18:00 +0000)]
am 8d72e5d9: Merge "ART: Remove unique-numbered labels from arm64 assembly"

* commit '8d72e5d9cb61c9517d2e96776e4443427c66fd0d':
  ART: Remove unique-numbered labels from arm64 assembly

9 years agoam dee5a875: am 68c5640a: Merge "Added repe_cmpsl instruction to x86, x86_64 assemblers"
Andreas Gampe [Fri, 31 Jul 2015 18:00:07 +0000 (18:00 +0000)]
am dee5a875: am 68c5640a: Merge "Added repe_cmpsl instruction to x86, x86_64 assemblers"

* commit 'dee5a875cf48d4eb6579ddcf9b7bd13919cd3bd2':
  Added repe_cmpsl instruction to x86, x86_64 assemblers

9 years agoam 68c5640a: Merge "Added repe_cmpsl instruction to x86, x86_64 assemblers"
Andreas Gampe [Fri, 31 Jul 2015 17:52:49 +0000 (17:52 +0000)]
am 68c5640a: Merge "Added repe_cmpsl instruction to x86, x86_64 assemblers"

* commit '68c5640a71cfb37f8741eeafbfc13b2a40ccefa1':
  Added repe_cmpsl instruction to x86, x86_64 assemblers

9 years agoMerge "ART: Remove unique-numbered labels from arm64 assembly"
Andreas Gampe [Fri, 31 Jul 2015 17:52:19 +0000 (17:52 +0000)]
Merge "ART: Remove unique-numbered labels from arm64 assembly"

9 years agoART: Remove unique-numbered labels from arm64 assembly
Chih-Hung Hsieh [Mon, 27 Jul 2015 17:10:44 +0000 (10:10 -0700)]
ART: Remove unique-numbered labels from arm64 assembly

Use local labels like 1, 2, 3 in macros. Clang does not support
the unique counter variable \@.

Bug: 22799850
Change-Id: I9ef1859be40b875ef4d7ae74ec1af52ad05f7352

9 years agoMerge "Added repe_cmpsl instruction to x86, x86_64 assemblers"
Andreas Gampe [Fri, 31 Jul 2015 17:46:52 +0000 (17:46 +0000)]
Merge "Added repe_cmpsl instruction to x86, x86_64 assemblers"

9 years agoAdded repe_cmpsl instruction to x86, x86_64 assemblers
agicsaki [Fri, 31 Jul 2015 17:31:14 +0000 (10:31 -0700)]
Added repe_cmpsl instruction to x86, x86_64 assemblers

Support for this instruction has already been added to the disassembler
in commit 124b392d.

Change-Id: I6e8401a7b814618758427f5cc6b4992e265f937c

9 years agoam daa4eb26: am 5a898e67: Merge "Optimizing: Replace x86 xchg use with xor sequence"
Roland Levillain [Fri, 31 Jul 2015 17:22:07 +0000 (17:22 +0000)]
am daa4eb26: am 5a898e67: Merge "Optimizing: Replace x86 xchg use with xor sequence"

* commit 'daa4eb267379e23d752b869777476a92689d9092':
  Optimizing: Replace x86 xchg use with xor sequence

9 years agoam 5a898e67: Merge "Optimizing: Replace x86 xchg use with xor sequence"
Roland Levillain [Fri, 31 Jul 2015 17:14:58 +0000 (17:14 +0000)]
am 5a898e67: Merge "Optimizing: Replace x86 xchg use with xor sequence"

* commit '5a898e67bb0dec1fc7f2d9b5b32eb8c956a84804':
  Optimizing: Replace x86 xchg use with xor sequence

9 years agoMerge "Optimizing: Replace x86 xchg use with xor sequence"
Roland Levillain [Fri, 31 Jul 2015 17:09:10 +0000 (17:09 +0000)]
Merge "Optimizing: Replace x86 xchg use with xor sequence"

9 years agoam 6c835368: am b669c6ee: Merge "ART: Change stream output kNone intrinsic"
David Brazdil [Fri, 31 Jul 2015 16:39:45 +0000 (16:39 +0000)]
am 6c835368: am b669c6ee: Merge "ART: Change stream output kNone intrinsic"

* commit '6c835368072c115bc07cf6c495396c998061bbfa':
  ART: Change stream output kNone intrinsic

9 years agoam b669c6ee: Merge "ART: Change stream output kNone intrinsic"
David Brazdil [Fri, 31 Jul 2015 16:32:51 +0000 (16:32 +0000)]
am b669c6ee: Merge "ART: Change stream output kNone intrinsic"

* commit 'b669c6ee7a942bdf103be8eae7e19590a4419db4':
  ART: Change stream output kNone intrinsic

9 years agoMerge "ART: Change stream output kNone intrinsic"
David Brazdil [Fri, 31 Jul 2015 16:28:03 +0000 (16:28 +0000)]
Merge "ART: Change stream output kNone intrinsic"

9 years agoART: Change stream output kNone intrinsic
David Brazdil [Fri, 31 Jul 2015 16:10:43 +0000 (17:10 +0100)]
ART: Change stream output kNone intrinsic

Name of intrinsics is dumped with C1visualizer and checked with
Checker whose attributes should not contain whitespace. This patch
changes the output printed for non-intrinsified invokes.

Change-Id: I3e565e8c9e26eb61026e7a13823eab20409dd63a

9 years agoam 43cb410c: am cb34698f: Merge "Do not use -DUSE_*MALLOC for host build"
Shinichiro Hamaji [Fri, 31 Jul 2015 06:16:42 +0000 (06:16 +0000)]
am 43cb410c: am cb34698f: Merge "Do not use -DUSE_*MALLOC for host build"

* commit '43cb410c355ec9f637b5cae09891f519cc01ec70':
  Do not use -DUSE_*MALLOC for host build

9 years agoam cb34698f: Merge "Do not use -DUSE_*MALLOC for host build"
Shinichiro Hamaji [Fri, 31 Jul 2015 06:09:53 +0000 (06:09 +0000)]
am cb34698f: Merge "Do not use -DUSE_*MALLOC for host build"

* commit 'cb34698f42ed688ec98bf3c9562075237ee72490':
  Do not use -DUSE_*MALLOC for host build

9 years agoMerge "Do not use -DUSE_*MALLOC for host build"
Shinichiro Hamaji [Fri, 31 Jul 2015 06:03:10 +0000 (06:03 +0000)]
Merge "Do not use -DUSE_*MALLOC for host build"

9 years agoam 9176fac9: am 8e568d07: Merge "Added disassembler support for repe_cmpsw instructio...
Andreas Gampe [Thu, 30 Jul 2015 23:44:37 +0000 (23:44 +0000)]
am 9176fac9: am 8e568d07: Merge "Added disassembler support for repe_cmpsw instruction in x86, x86_64"

* commit '9176fac916dd06c7f98a951c8114caec28d363ce':
  Added disassembler support for repe_cmpsw instruction in x86, x86_64

9 years agoam 8a0da1d8: am ad697bda: Merge "base: replace raw pointers for out-parameters with...
Igor Murashkin [Thu, 30 Jul 2015 23:44:35 +0000 (23:44 +0000)]
am 8a0da1d8: am ad697bda: Merge "base: replace raw pointers for out-parameters with safer out<T>"

* commit '8a0da1d8f43d4106d20d25e598fc6b5d87024013':
  base: replace raw pointers for out-parameters with safer out<T>

9 years agoam 8e568d07: Merge "Added disassembler support for repe_cmpsw instruction in x86...
Andreas Gampe [Thu, 30 Jul 2015 23:38:51 +0000 (23:38 +0000)]
am 8e568d07: Merge "Added disassembler support for repe_cmpsw instruction in x86, x86_64"

* commit '8e568d079b052db118d83e6e89ea36ab4fa4bfb1':
  Added disassembler support for repe_cmpsw instruction in x86, x86_64

9 years agoam ad697bda: Merge "base: replace raw pointers for out-parameters with safer out<T>"
Igor Murashkin [Thu, 30 Jul 2015 23:38:49 +0000 (23:38 +0000)]
am ad697bda: Merge "base: replace raw pointers for out-parameters with safer out<T>"

* commit 'ad697bda14eae8615e2b6110aec0118625983acd':
  base: replace raw pointers for out-parameters with safer out<T>

9 years agoMerge "Added disassembler support for repe_cmpsw instruction in x86, x86_64"
Andreas Gampe [Thu, 30 Jul 2015 23:31:39 +0000 (23:31 +0000)]
Merge "Added disassembler support for repe_cmpsw instruction in x86, x86_64"

9 years agoMerge "base: replace raw pointers for out-parameters with safer out<T>"
Igor Murashkin [Thu, 30 Jul 2015 23:31:12 +0000 (23:31 +0000)]
Merge "base: replace raw pointers for out-parameters with safer out<T>"

9 years agoam 10ee11ab: am 59c59d07: Merge "Don\'t dump stack when deleting an invalid local...
Mathieu Chartier [Thu, 30 Jul 2015 22:09:16 +0000 (22:09 +0000)]
am 10ee11ab: am 59c59d07: Merge "Don\'t dump stack when deleting an invalid local ref"

* commit '10ee11ab3b269e300229f658764c7038a1aec08e':
  Don't dump stack when deleting an invalid local ref

9 years agoam 59c59d07: Merge "Don\'t dump stack when deleting an invalid local ref"
Mathieu Chartier [Thu, 30 Jul 2015 22:02:51 +0000 (22:02 +0000)]
am 59c59d07: Merge "Don\'t dump stack when deleting an invalid local ref"

* commit '59c59d07900e639ec7eeffe9e3f54ec30a2fb43f':
  Don't dump stack when deleting an invalid local ref

9 years agoMerge "Don't dump stack when deleting an invalid local ref"
Mathieu Chartier [Thu, 30 Jul 2015 21:57:12 +0000 (21:57 +0000)]
Merge "Don't dump stack when deleting an invalid local ref"

9 years agoam 2ada67b3: Don\'t dump stack when deleting an invalid local ref
Mathieu Chartier [Thu, 30 Jul 2015 21:46:35 +0000 (21:46 +0000)]
am 2ada67b3: Don\'t dump stack when deleting an invalid local ref

* commit '2ada67b3145d38b352297bdb9d0546f58882e208':
  Don't dump stack when deleting an invalid local ref

9 years agoDon't dump stack when deleting an invalid local ref
Mathieu Chartier [Thu, 30 Jul 2015 18:41:04 +0000 (11:41 -0700)]
Don't dump stack when deleting an invalid local ref

Bug: 21724724

(cherry picked from commit 2ada67b3145d38b352297bdb9d0546f58882e208)

Change-Id: Ifa99df9ee9f3265038a0c0f7944e834e42c498d4

9 years agobase: replace raw pointers for out-parameters with safer out<T>
Igor Murashkin [Thu, 23 Jul 2015 23:53:53 +0000 (16:53 -0700)]
base: replace raw pointers for out-parameters with safer out<T>

Add a zero-cost type-safe abstraction for representing "out" parameters
(i.e. when the calling function has to return multiple results out
by-reference into the argument slots instead of using the return slot).

Change-Id: I33a941e4863b6bed71d2bfa43d7f48e9b111f83f

9 years agoAdded disassembler support for repe_cmpsw instruction in x86, x86_64
agicsaki [Thu, 30 Jul 2015 20:40:13 +0000 (13:40 -0700)]
Added disassembler support for repe_cmpsw instruction in x86, x86_64

Also included support for repe_cmpsl instruction. This is a follow up to
commit 71311f868e2 which added support for repe_cmpsw in the x86 and
x86_64 assemblers.

Change-Id: I2beac05a57341539acf96cdf77062facd031a864

9 years agoDon't dump stack when deleting an invalid local ref
Mathieu Chartier [Thu, 30 Jul 2015 18:41:04 +0000 (11:41 -0700)]
Don't dump stack when deleting an invalid local ref

Bug: 21724724
Change-Id: Ifa99df9ee9f3265038a0c0f7944e834e42c498d4

9 years agoam 57d92494: am 8433bb8a: Merge "ART: Fix gtest after GraphChecker CL"
David Brazdil [Thu, 30 Jul 2015 17:32:14 +0000 (17:32 +0000)]
am 57d92494: am 8433bb8a: Merge "ART: Fix gtest after GraphChecker CL"

* commit '57d924942f5cac9d7d15ecabe634970ca3ae244a':
  ART: Fix gtest after GraphChecker CL

9 years agoam 8433bb8a: Merge "ART: Fix gtest after GraphChecker CL"
David Brazdil [Thu, 30 Jul 2015 17:27:38 +0000 (17:27 +0000)]
am 8433bb8a: Merge "ART: Fix gtest after GraphChecker CL"

* commit '8433bb8a3120d064de97a692d98341d9bc29a985':
  ART: Fix gtest after GraphChecker CL

9 years agoMerge "ART: Fix gtest after GraphChecker CL"
David Brazdil [Thu, 30 Jul 2015 17:23:05 +0000 (17:23 +0000)]
Merge "ART: Fix gtest after GraphChecker CL"

9 years agoART: Fix gtest after GraphChecker CL
David Brazdil [Thu, 30 Jul 2015 17:21:41 +0000 (18:21 +0100)]
ART: Fix gtest after GraphChecker CL

Change-Id: Ia85cb9622b3927c401325d87f2d7a52096b7fe5d

9 years agoMerge "resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp" into mnc-dev...
Roland Levillain [Thu, 30 Jul 2015 17:19:09 +0000 (17:19 +0000)]
Merge "resolved conflicts for merge of 8f96df84 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp

9 years agoam 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"
Andreas Gampe [Thu, 30 Jul 2015 16:59:56 +0000 (16:59 +0000)]
am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"

* commit '430dd633e3334c6d684c17218435a881ef4510c4':
  ART: Use __ANDROID__ instead of HAVE_ANDROID_OS

9 years agoam 5fa76856: am a302e913: Merge "ART: Store and check exceptional predecessors"
David Brazdil [Thu, 30 Jul 2015 16:59:54 +0000 (16:59 +0000)]
am 5fa76856: am a302e913: Merge "ART: Store and check exceptional predecessors"

* commit '5fa76856e271ea6820013a4f6e67324069474e0e':
  ART: Store and check exceptional predecessors