OSDN Git Service

android-x86/art.git
9 years agoam 1f09d08e: am f16ca6a7: am 2eb5168b: Merge "Revert "Revert "Re-enable one thread...
Andreas Gampe [Sat, 28 Feb 2015 05:53:46 +0000 (05:53 +0000)]
am 1f09d08e: am f16ca6a7: am 2eb5168b: Merge "Revert "Revert "Re-enable one thread dumping the native stack of another."""

* commit '1f09d08e1fdce423006da45eeae813b64af665bc':
  Revert "Revert "Re-enable one thread dumping the native stack of another.""

9 years agoam f16ca6a7: am 2eb5168b: Merge "Revert "Revert "Re-enable one thread dumping the...
Andreas Gampe [Sat, 28 Feb 2015 05:47:25 +0000 (05:47 +0000)]
am f16ca6a7: am 2eb5168b: Merge "Revert "Revert "Re-enable one thread dumping the native stack of another."""

* commit 'f16ca6a74d8cdccbe90ed8d2586b641cc141b0ae':
  Revert "Revert "Re-enable one thread dumping the native stack of another.""

9 years agoam 2eb5168b: Merge "Revert "Revert "Re-enable one thread dumping the native stack...
Andreas Gampe [Sat, 28 Feb 2015 05:41:46 +0000 (05:41 +0000)]
am 2eb5168b: Merge "Revert "Revert "Re-enable one thread dumping the native stack of another."""

* commit '2eb5168bd9e43b80452eaee5be32c063e124886e':
  Revert "Revert "Re-enable one thread dumping the native stack of another.""

9 years agoMerge "Revert "Revert "Re-enable one thread dumping the native stack of another."""
Andreas Gampe [Sat, 28 Feb 2015 05:37:17 +0000 (05:37 +0000)]
Merge "Revert "Revert "Re-enable one thread dumping the native stack of another."""

9 years agoam df516343: am 98f50457: am f90316e0: Merge "ART: Allow dex2oat for apps only with...
Andreas Gampe [Sat, 28 Feb 2015 04:30:46 +0000 (04:30 +0000)]
am df516343: am 98f50457: am f90316e0: Merge "ART: Allow dex2oat for apps only with image"

* commit 'df5163431c7aaf17d7ea7979a9ab1be1be5c3de6':
  ART: Allow dex2oat for apps only with image

9 years agoam 98f50457: am f90316e0: Merge "ART: Allow dex2oat for apps only with image"
Andreas Gampe [Sat, 28 Feb 2015 04:25:30 +0000 (04:25 +0000)]
am 98f50457: am f90316e0: Merge "ART: Allow dex2oat for apps only with image"

* commit '98f5045798f3c892dd32665d6a888ab1423c8fba':
  ART: Allow dex2oat for apps only with image

9 years agoam f90316e0: Merge "ART: Allow dex2oat for apps only with image"
Andreas Gampe [Sat, 28 Feb 2015 04:21:10 +0000 (04:21 +0000)]
am f90316e0: Merge "ART: Allow dex2oat for apps only with image"

* commit 'f90316e06e1c7b7b4a4ebea8de0a1b4d72228fd6':
  ART: Allow dex2oat for apps only with image

9 years agoMerge "ART: Allow dex2oat for apps only with image"
Andreas Gampe [Sat, 28 Feb 2015 04:17:23 +0000 (04:17 +0000)]
Merge "ART: Allow dex2oat for apps only with image"

9 years agoART: Allow dex2oat for apps only with image
Andreas Gampe [Sat, 28 Feb 2015 03:35:46 +0000 (19:35 -0800)]
ART: Allow dex2oat for apps only with image

Do not allow a runtime without image when compiling an app. This
avoids the current abort when we then try to run out of the (missing)
boot classpath.

Bug: 19100590
Change-Id: Ic269dc2fa807d003215ea134cb42fe4c4d78124e

9 years agoRevert "Revert "Re-enable one thread dumping the native stack of another.""
Andreas Gampe [Fri, 27 Feb 2015 21:35:39 +0000 (13:35 -0800)]
Revert "Revert "Re-enable one thread dumping the native stack of another.""

This reverts commit edfdaf37d5520a3c3a858b6b3fba4f759c60dadc.

Tests seem to succeed. Might be helpful to understand some deadlock/timeout
situations.

Bug: 15446488
Bug: 18713034
Change-Id: I5be225363f698556221576b5827d9501e26799f3

9 years agoam 83c200b9: am e0358544: am 2d0af8da: Merge "ART: Fix Mips disassembler for some...
Andreas Gampe [Sat, 28 Feb 2015 00:30:49 +0000 (00:30 +0000)]
am 83c200b9: am e0358544: am 2d0af8da: Merge "ART: Fix Mips disassembler for some floating point instructions."

* commit '83c200b938b105702b70fd5d194f6ed91e914e9d':
  ART: Fix Mips disassembler for some floating point instructions.

9 years agoam 803c3e77: am 6877e897: am c2de38ab: Merge "Change JIT to not use PIC"
Mathieu Chartier [Sat, 28 Feb 2015 00:24:48 +0000 (00:24 +0000)]
am 803c3e77: am 6877e897: am c2de38ab: Merge "Change JIT to not use PIC"

* commit '803c3e77223cfe9ca18fb8a6ecb265bd9d0c9c84':
  Change JIT to not use PIC

9 years agoam e0358544: am 2d0af8da: Merge "ART: Fix Mips disassembler for some floating point...
Andreas Gampe [Sat, 28 Feb 2015 00:24:43 +0000 (00:24 +0000)]
am e0358544: am 2d0af8da: Merge "ART: Fix Mips disassembler for some floating point instructions."

* commit 'e03585443757f178395f243b3a5665aed06d4206':
  ART: Fix Mips disassembler for some floating point instructions.

9 years agoam 6877e897: am c2de38ab: Merge "Change JIT to not use PIC"
Mathieu Chartier [Sat, 28 Feb 2015 00:18:44 +0000 (00:18 +0000)]
am 6877e897: am c2de38ab: Merge "Change JIT to not use PIC"

* commit '6877e8972903e58ba2b7f4c6edc7f607872f620f':
  Change JIT to not use PIC

9 years agoam 2d0af8da: Merge "ART: Fix Mips disassembler for some floating point instructions."
Andreas Gampe [Sat, 28 Feb 2015 00:18:39 +0000 (00:18 +0000)]
am 2d0af8da: Merge "ART: Fix Mips disassembler for some floating point instructions."

* commit '2d0af8daecb4eb38ef43f7f37a1c569ec02b10a2':
  ART: Fix Mips disassembler for some floating point instructions.

9 years agoMerge "ART: Fix Mips disassembler for some floating point instructions."
Andreas Gampe [Sat, 28 Feb 2015 00:12:02 +0000 (00:12 +0000)]
Merge "ART: Fix Mips disassembler for some floating point instructions."

9 years agoam c2de38ab: Merge "Change JIT to not use PIC"
Mathieu Chartier [Sat, 28 Feb 2015 00:11:55 +0000 (00:11 +0000)]
am c2de38ab: Merge "Change JIT to not use PIC"

* commit 'c2de38ab428f76280d83aa71c25a73eb11048721':
  Change JIT to not use PIC

9 years agoART: Fix Mips disassembler for some floating point instructions.
Douglas Leung [Sat, 14 Feb 2015 00:55:57 +0000 (16:55 -0800)]
ART: Fix Mips disassembler for some floating point instructions.

Change-Id: I2b661a8dae4cd924c081df85f570007cf645769c

9 years agoMerge "Change JIT to not use PIC"
Mathieu Chartier [Sat, 28 Feb 2015 00:07:07 +0000 (00:07 +0000)]
Merge "Change JIT to not use PIC"

9 years agoChange JIT to not use PIC
Mathieu Chartier [Fri, 27 Feb 2015 22:24:37 +0000 (14:24 -0800)]
Change JIT to not use PIC

Motivation: PIC is currenly slower and disables a lot of JIT
friendly optimizations.

EvaluateAndApplyChanges N5 eng interpreter + jit:
Before: 2540ms
After: 2350ms

Bug: 17950037

Change-Id: I3de3e7bcccfc53e49cb78370443c514248ec78d7

9 years agoam a8f8c544: am f6461fff: am 0d1ef55d: Merge "Change JIT tests to use interpreter...
Mathieu Chartier [Fri, 27 Feb 2015 23:31:10 +0000 (23:31 +0000)]
am a8f8c544: am f6461fff: am 0d1ef55d: Merge "Change JIT tests to use interpreter image"

* commit 'a8f8c5446dd401f67aa2313aafbea0444ca71f09':
  Change JIT tests to use interpreter image

9 years agoam e1392623: am 61397adc: am 8376830b: Merge "Handle another untyped dex CONST issue"
buzbee [Fri, 27 Feb 2015 23:31:09 +0000 (23:31 +0000)]
am e1392623: am 61397adc: am 8376830b: Merge "Handle another untyped dex CONST issue"

* commit 'e1392623125646399ccc0e00f16a63ab652b8418':
  Handle another untyped dex CONST issue

9 years agoam f6461fff: am 0d1ef55d: Merge "Change JIT tests to use interpreter image"
Mathieu Chartier [Fri, 27 Feb 2015 23:24:25 +0000 (23:24 +0000)]
am f6461fff: am 0d1ef55d: Merge "Change JIT tests to use interpreter image"

* commit 'f6461fff44689b67519378643c478f2f02f9ccad':
  Change JIT tests to use interpreter image

9 years agoam 61397adc: am 8376830b: Merge "Handle another untyped dex CONST issue"
buzbee [Fri, 27 Feb 2015 23:24:24 +0000 (23:24 +0000)]
am 61397adc: am 8376830b: Merge "Handle another untyped dex CONST issue"

* commit '61397adcc76e4ccd1d8036caaddc10666f259021':
  Handle another untyped dex CONST issue

9 years agoam 0d1ef55d: Merge "Change JIT tests to use interpreter image"
Mathieu Chartier [Fri, 27 Feb 2015 23:19:16 +0000 (23:19 +0000)]
am 0d1ef55d: Merge "Change JIT tests to use interpreter image"

* commit '0d1ef55dd46ecd0309f8e9e6b30625cde9473fc8':
  Change JIT tests to use interpreter image

9 years agoam 8376830b: Merge "Handle another untyped dex CONST issue"
buzbee [Fri, 27 Feb 2015 23:19:10 +0000 (23:19 +0000)]
am 8376830b: Merge "Handle another untyped dex CONST issue"

* commit '8376830b762fbe974a9ddd2d43c640655883c7ab':
  Handle another untyped dex CONST issue

9 years agoMerge "Change JIT tests to use interpreter image"
Mathieu Chartier [Fri, 27 Feb 2015 22:33:30 +0000 (22:33 +0000)]
Merge "Change JIT tests to use interpreter image"

9 years agoChange JIT tests to use interpreter image
Mathieu Chartier [Fri, 27 Feb 2015 21:21:15 +0000 (13:21 -0800)]
Change JIT tests to use interpreter image

Bug: 19528920
Change-Id: I079cfcca7bb57e492c82a44f104e41228cb33b4f

9 years agoMerge "Handle another untyped dex CONST issue"
buzbee [Fri, 27 Feb 2015 21:29:54 +0000 (21:29 +0000)]
Merge "Handle another untyped dex CONST issue"

9 years agoam 60658262: am a64dcc61: am 02abb507: Merge "Fix jit tests"
Mathieu Chartier [Fri, 27 Feb 2015 21:19:56 +0000 (21:19 +0000)]
am 60658262: am a64dcc61: am 02abb507: Merge "Fix jit tests"

* commit '606582625259406cda4abae2a3c5f777b380788e':
  Fix jit tests

9 years agoam a64dcc61: am 02abb507: Merge "Fix jit tests"
Mathieu Chartier [Fri, 27 Feb 2015 21:12:37 +0000 (21:12 +0000)]
am a64dcc61: am 02abb507: Merge "Fix jit tests"

* commit 'a64dcc61c03c688870640aa5a0514dfe5562fb91':
  Fix jit tests

9 years agoam 02abb507: Merge "Fix jit tests"
Mathieu Chartier [Fri, 27 Feb 2015 21:08:41 +0000 (21:08 +0000)]
am 02abb507: Merge "Fix jit tests"

* commit '02abb5075f3085e69c0c81fb5724c066f6c845b7':
  Fix jit tests

9 years agoMerge "Fix jit tests"
Mathieu Chartier [Fri, 27 Feb 2015 20:55:16 +0000 (20:55 +0000)]
Merge "Fix jit tests"

9 years agoFix jit tests
Mathieu Chartier [Fri, 27 Feb 2015 18:39:48 +0000 (10:39 -0800)]
Fix jit tests

Missing image suffix was missing causing tests to fail.
Also added missing phony targets.

Bug: 19524713
Change-Id: Ib40d39b1fc16e1adfdc01744a199ae9b0b562664

9 years agoam 425d8e28: am fa4ae14a: am 242026e2: Merge "Fix JIT direct call to interpreter...
Mathieu Chartier [Fri, 27 Feb 2015 16:47:32 +0000 (16:47 +0000)]
am 425d8e28: am fa4ae14a: am 242026e2: Merge "Fix JIT direct call to interpreter bridge"

* commit '425d8e289a95fa3089b864fbb91e4d0fa849d81a':
  Fix JIT direct call to interpreter bridge

9 years agoam fa4ae14a: am 242026e2: Merge "Fix JIT direct call to interpreter bridge"
Mathieu Chartier [Fri, 27 Feb 2015 16:40:00 +0000 (16:40 +0000)]
am fa4ae14a: am 242026e2: Merge "Fix JIT direct call to interpreter bridge"

* commit 'fa4ae14a9f4cacfaf912a51555954d8586cf29c3':
  Fix JIT direct call to interpreter bridge

9 years agoam 242026e2: Merge "Fix JIT direct call to interpreter bridge"
Mathieu Chartier [Fri, 27 Feb 2015 16:33:25 +0000 (16:33 +0000)]
am 242026e2: Merge "Fix JIT direct call to interpreter bridge"

* commit '242026e246a8b9efe098a0cce008fd525e011e5b':
  Fix JIT direct call to interpreter bridge

9 years agoMerge "Fix JIT direct call to interpreter bridge"
Mathieu Chartier [Fri, 27 Feb 2015 02:58:48 +0000 (02:58 +0000)]
Merge "Fix JIT direct call to interpreter bridge"

9 years agoFix JIT direct call to interpreter bridge
Mathieu Chartier [Fri, 27 Feb 2015 02:28:07 +0000 (18:28 -0800)]
Fix JIT direct call to interpreter bridge

FormulaEvaluationActions.EvaluateAndApplyChanges on hammerhead eng:
Before: 3550ms
After: 2540

Bug: 17950037
Change-Id: If7acaea20d4adb5418d00ef13192e2d4c29032af

9 years agoam 4f1b656a: am 66746ef8: am 0a575f25: Merge "Change card cache mod-union table to...
Mathieu Chartier [Thu, 26 Feb 2015 23:32:49 +0000 (23:32 +0000)]
am 4f1b656a: am 66746ef8: am 0a575f25: Merge "Change card cache mod-union table to use bitmaps"

* commit '4f1b656ad35b2808a0a4890388f231ece4808a25':
  Change card cache mod-union table to use bitmaps

9 years agoam 065727d5: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android...
Hiroshi Yamauchi [Thu, 26 Feb 2015 23:25:40 +0000 (23:25 +0000)]
am 065727d5: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-mr1-dev-plus-aosp

* commit '065727d56f00a9f0985f10219e455363e71a3399':
  ART: Check image size when opening

9 years agoam 178bc6b4: am 8546ba39: am e111f112: Merge "Add standard gc log for transition...
Hiroshi Yamauchi [Thu, 26 Feb 2015 23:25:38 +0000 (23:25 +0000)]
am 178bc6b4: am 8546ba39: am e111f112: Merge "Add standard gc log for transition collections."

* commit '178bc6b454352d7f499e74a3aa3dfe8fce6e64bd':
  Add standard gc log for transition collections.

9 years agoam 66746ef8: am 0a575f25: Merge "Change card cache mod-union table to use bitmaps"
Mathieu Chartier [Thu, 26 Feb 2015 23:23:34 +0000 (23:23 +0000)]
am 66746ef8: am 0a575f25: Merge "Change card cache mod-union table to use bitmaps"

* commit '66746ef8b2be4c5c7786965ec29774b6e482877b':
  Change card cache mod-union table to use bitmaps

9 years agoMerge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com...
Hiroshi Yamauchi [Thu, 26 Feb 2015 23:18:49 +0000 (23:18 +0000)]
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-mr1-dev-plus-aosp

9 years agoam 73ffc3e5: ART: Check image size when opening
Andreas Gampe [Thu, 26 Feb 2015 23:16:09 +0000 (23:16 +0000)]
am 73ffc3e5: ART: Check image size when opening

* commit '73ffc3e5b59bbc2ff5439d705b0876531ecb645b':
  ART: Check image size when opening

9 years agoam 8546ba39: am e111f112: Merge "Add standard gc log for transition collections."
Hiroshi Yamauchi [Thu, 26 Feb 2015 23:14:57 +0000 (23:14 +0000)]
am 8546ba39: am e111f112: Merge "Add standard gc log for transition collections."

* commit '8546ba39ac0880ecc4d922524409afb5b3267feb':
  Add standard gc log for transition collections.

9 years agoam 0a575f25: Merge "Change card cache mod-union table to use bitmaps"
Mathieu Chartier [Thu, 26 Feb 2015 23:13:35 +0000 (23:13 +0000)]
am 0a575f25: Merge "Change card cache mod-union table to use bitmaps"

* commit '0a575f25c56c8fff485a1dd497ed1efb1b5d3ea9':
  Change card cache mod-union table to use bitmaps

9 years agoMerge "Change card cache mod-union table to use bitmaps"
Mathieu Chartier [Thu, 26 Feb 2015 23:04:02 +0000 (23:04 +0000)]
Merge "Change card cache mod-union table to use bitmaps"

9 years agoChange card cache mod-union table to use bitmaps
Mathieu Chartier [Fri, 23 Jan 2015 21:18:53 +0000 (13:18 -0800)]
Change card cache mod-union table to use bitmaps

Previously used card sets, using bitmaps saves memory and slightly
increases performance.

Added mod union table test.

Performance EvaluateAndApplyChanges (minimal changes):

Before (card cache image mu table):
UpdateAndMarkImageModUnionTable: Avg: 524.320us
ImageModUnionClearCards: Avg: 54.580us
Native PSS: ~67500kB

After (card cache image mu table):
UpdateAndMarkImageModUnionTable: Avg: 515.600us
ImageModUnionClearCards: Avg: 53.780us
Native PSS: ~66014kB

Native PSS was higher before since the mod_union_table->SetCards()
which happens pre zygote fork was allocating a large amount of
std::nodes.

Bug: 11859910

Change-Id: I956b7e51d5572feec1393ffa618b7b7d8c147b28

9 years agoam e111f112: Merge "Add standard gc log for transition collections."
Hiroshi Yamauchi [Thu, 26 Feb 2015 22:28:14 +0000 (22:28 +0000)]
am e111f112: Merge "Add standard gc log for transition collections."

* commit 'e111f1128c4d7cf34e30c4c3c7e682a682e262c4':
  Add standard gc log for transition collections.

9 years agoMerge "Add standard gc log for transition collections."
Hiroshi Yamauchi [Thu, 26 Feb 2015 21:12:25 +0000 (21:12 +0000)]
Merge "Add standard gc log for transition collections."

9 years agoAdd standard gc log for transition collections.
Hiroshi Yamauchi [Thu, 26 Feb 2015 20:53:45 +0000 (12:53 -0800)]
Add standard gc log for transition collections.

Factor out the gc log logic into a function.

Note we still don't log in background as before but do for things like
OOME compactions in foreground.

Change-Id: Ifd35a796cf26aba2fba83bf07e72902357d91f8b

9 years agoam 243f0969: am 0a96e78b: am 0644b2da: Merge "Add missing JIT stuff in make files"
Mathieu Chartier [Thu, 26 Feb 2015 19:51:49 +0000 (19:51 +0000)]
am 243f0969: am 0a96e78b: am 0644b2da: Merge "Add missing JIT stuff in make files"

* commit '243f09699dcd0a4644328a79a8492b23195386a6':
  Add missing JIT stuff in make files

9 years agoam 0a96e78b: am 0644b2da: Merge "Add missing JIT stuff in make files"
Mathieu Chartier [Thu, 26 Feb 2015 19:44:57 +0000 (19:44 +0000)]
am 0a96e78b: am 0644b2da: Merge "Add missing JIT stuff in make files"

* commit '0a96e78bf1a072938f6f48d7f635b3b898117440':
  Add missing JIT stuff in make files

9 years agoam 0644b2da: Merge "Add missing JIT stuff in make files"
Mathieu Chartier [Thu, 26 Feb 2015 19:38:47 +0000 (19:38 +0000)]
am 0644b2da: Merge "Add missing JIT stuff in make files"

* commit '0644b2dae97d13bec14840cccb11b54697c34a34':
  Add missing JIT stuff in make files

9 years agoMerge "Add missing JIT stuff in make files"
Mathieu Chartier [Thu, 26 Feb 2015 19:30:35 +0000 (19:30 +0000)]
Merge "Add missing JIT stuff in make files"

9 years agoAdd missing JIT stuff in make files
Mathieu Chartier [Thu, 26 Feb 2015 18:58:08 +0000 (10:58 -0800)]
Add missing JIT stuff in make files

Was causing core.oat to not be created.

Bug: 19524713
Change-Id: I5da005fd36f9682623fdda9931280997b59c2681

9 years agoam 0c48c62e: am d21e1253: am f5c224cc: Merge "Update expectations for volantis."
Nicolas Geoffray [Thu, 26 Feb 2015 15:29:11 +0000 (15:29 +0000)]
am 0c48c62e: am d21e1253: am f5c224cc: Merge "Update expectations for volantis."

* commit '0c48c62e84e292d5f3a8d24ee56a3362054358ed':
  Update expectations for volantis.

9 years agoam d21e1253: am f5c224cc: Merge "Update expectations for volantis."
Nicolas Geoffray [Thu, 26 Feb 2015 15:23:25 +0000 (15:23 +0000)]
am d21e1253: am f5c224cc: Merge "Update expectations for volantis."

* commit 'd21e1253730d0d22771f51c6270163d034664f18':
  Update expectations for volantis.

9 years agoam f5c224cc: Merge "Update expectations for volantis."
Nicolas Geoffray [Thu, 26 Feb 2015 15:16:13 +0000 (15:16 +0000)]
am f5c224cc: Merge "Update expectations for volantis."

* commit 'f5c224cca603ef1dba9bb80952613facc22598fa':
  Update expectations for volantis.

9 years agoMerge "Update expectations for volantis."
Nicolas Geoffray [Thu, 26 Feb 2015 15:11:58 +0000 (15:11 +0000)]
Merge "Update expectations for volantis."

9 years agoUpdate expectations for volantis.
Nicolas Geoffray [Thu, 26 Feb 2015 14:53:03 +0000 (14:53 +0000)]
Update expectations for volantis.

Change-Id: Icd4aecd9b7a274febfd99bad6432bb9d46f9e1d3

9 years agoam cd5b8520: am 429731fd: am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."
Vladimir Marko [Thu, 26 Feb 2015 12:35:16 +0000 (12:35 +0000)]
am cd5b8520: am 429731fd: am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."

* commit 'cd5b8520be63a60108ad5b781e6b4d847199880b':
  ARM: Fix LIR flags in encoding map.

9 years agoam 429731fd: am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."
Vladimir Marko [Thu, 26 Feb 2015 12:29:02 +0000 (12:29 +0000)]
am 429731fd: am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."

* commit '429731fd8d7adfe45f7f7c7987f9183129da84e0':
  ARM: Fix LIR flags in encoding map.

9 years agoam 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."
Vladimir Marko [Thu, 26 Feb 2015 12:22:42 +0000 (12:22 +0000)]
am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."

* commit '2433d1a12dadb90a1b1c1140156aaf72f5b52c5e':
  ARM: Fix LIR flags in encoding map.

9 years agoMerge "ARM: Fix LIR flags in encoding map."
Vladimir Marko [Thu, 26 Feb 2015 12:17:57 +0000 (12:17 +0000)]
Merge "ARM: Fix LIR flags in encoding map."

9 years agoam 22161b7a: am 15a8ac41: am ff9b7475: Merge "JDWP: fix thread state on event suspension"
Sebastien Hertz [Thu, 26 Feb 2015 06:39:30 +0000 (06:39 +0000)]
am 22161b7a: am 15a8ac41: am ff9b7475: Merge "JDWP: fix thread state on event suspension"

* commit '22161b7a43279ceb01e066462ef0fc148df853d1':
  JDWP: fix thread state on event suspension

9 years agoam 15a8ac41: am ff9b7475: Merge "JDWP: fix thread state on event suspension"
Sebastien Hertz [Thu, 26 Feb 2015 06:32:24 +0000 (06:32 +0000)]
am 15a8ac41: am ff9b7475: Merge "JDWP: fix thread state on event suspension"

* commit '15a8ac41e67fd1bfa425b096b7199f41035ebfdf':
  JDWP: fix thread state on event suspension

9 years agoam ff9b7475: Merge "JDWP: fix thread state on event suspension"
Sebastien Hertz [Thu, 26 Feb 2015 06:21:57 +0000 (06:21 +0000)]
am ff9b7475: Merge "JDWP: fix thread state on event suspension"

* commit 'ff9b747588e77f04b07dc76b2d39a82cbfc60441':
  JDWP: fix thread state on event suspension

9 years agoMerge "JDWP: fix thread state on event suspension"
Sebastien Hertz [Thu, 26 Feb 2015 06:17:12 +0000 (06:17 +0000)]
Merge "JDWP: fix thread state on event suspension"

9 years agoARM: Fix LIR flags in encoding map.
Ningsheng Jian [Wed, 4 Feb 2015 06:13:45 +0000 (14:13 +0800)]
ARM: Fix LIR flags in encoding map.

Also correct memory reference type for PC relative load.

Change-Id: I7a5258f2ed718448dc3e6e7fda6569b3f0c2fe46

9 years agoam 9750b5a3: am c9f2d050: am f16fe893: Merge "Fix method_verifier_test with the SS...
Hiroshi Yamauchi [Thu, 26 Feb 2015 02:58:46 +0000 (02:58 +0000)]
am 9750b5a3: am c9f2d050: am f16fe893: Merge "Fix method_verifier_test with the SS collector."

* commit '9750b5a3a6be681903d30db8eaa4b4e7488b9cca':
  Fix method_verifier_test with the SS collector.

9 years agoam c9f2d050: am f16fe893: Merge "Fix method_verifier_test with the SS collector."
Hiroshi Yamauchi [Thu, 26 Feb 2015 02:51:09 +0000 (02:51 +0000)]
am c9f2d050: am f16fe893: Merge "Fix method_verifier_test with the SS collector."

* commit 'c9f2d050cb3d2a85a484436f5d8b1cc3fab3e474':
  Fix method_verifier_test with the SS collector.

9 years agoam 990b1c76: am f7496f4c: am b1de6a4d: Merge "Change already inline error to warning"
Mathieu Chartier [Thu, 26 Feb 2015 02:28:20 +0000 (02:28 +0000)]
am 990b1c76: am f7496f4c: am b1de6a4d: Merge "Change already inline error to warning"

* commit '990b1c76193133a0ea1c9489634e88b42e6a7658':
  Change already inline error to warning

9 years agoam 097ed172: am 4942d7f0: am 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"
Mathieu Chartier [Thu, 26 Feb 2015 02:27:26 +0000 (02:27 +0000)]
am 097ed172: am 4942d7f0: am 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"

* commit '097ed1724f964a81c560d61229f9f9f4a3eb9b8c':
  Fix JIT for vmdebug test 99

9 years agoam ce1bf9e9: am 4caeca79: am b491375a: Merge "[MIPS] Fix mips32 trampoline problem."
Andreas Gampe [Thu, 26 Feb 2015 02:27:23 +0000 (02:27 +0000)]
am ce1bf9e9: am 4caeca79: am b491375a: Merge "[MIPS] Fix mips32 trampoline problem."

* commit 'ce1bf9e9a0488c7b8db77b28dbd7f968ba753759':
  [MIPS] Fix mips32 trampoline problem.

9 years agoam 9caae09c: am 9be3dd2f: am 42cfbb0a: Merge "Fix argument register allocation for...
Andreas Gampe [Thu, 26 Feb 2015 02:27:21 +0000 (02:27 +0000)]
am 9caae09c: am 9be3dd2f: am 42cfbb0a: Merge "Fix argument register allocation for mips32."

* commit '9caae09c34872dcc37ffad0e3464249af5cd3220':
  Fix argument register allocation for mips32.

9 years agoam f16fe893: Merge "Fix method_verifier_test with the SS collector."
Hiroshi Yamauchi [Thu, 26 Feb 2015 02:22:10 +0000 (02:22 +0000)]
am f16fe893: Merge "Fix method_verifier_test with the SS collector."

* commit 'f16fe893139345dad8b05b3db3e717c6f8d079d0':
  Fix method_verifier_test with the SS collector.

9 years agoMerge "Fix method_verifier_test with the SS collector."
Hiroshi Yamauchi [Thu, 26 Feb 2015 02:12:01 +0000 (02:12 +0000)]
Merge "Fix method_verifier_test with the SS collector."

9 years agoam f7496f4c: am b1de6a4d: Merge "Change already inline error to warning"
Mathieu Chartier [Thu, 26 Feb 2015 01:56:12 +0000 (01:56 +0000)]
am f7496f4c: am b1de6a4d: Merge "Change already inline error to warning"

* commit 'f7496f4c16ded70405741976c6b6064ee383fb46':
  Change already inline error to warning

9 years agoam b1de6a4d: Merge "Change already inline error to warning"
Mathieu Chartier [Thu, 26 Feb 2015 01:49:35 +0000 (01:49 +0000)]
am b1de6a4d: Merge "Change already inline error to warning"

* commit 'b1de6a4db50444530a459ad17987c50000eaa53a':
  Change already inline error to warning

9 years agoMerge "Change already inline error to warning"
Mathieu Chartier [Thu, 26 Feb 2015 01:41:57 +0000 (01:41 +0000)]
Merge "Change already inline error to warning"

9 years agoFix method_verifier_test with the SS collector.
Hiroshi Yamauchi [Wed, 25 Feb 2015 20:52:34 +0000 (12:52 -0800)]
Fix method_verifier_test with the SS collector.

Rename art_default_gc_type to ART_DEFAULT_GC_TYPE.

Bug: 19514492

Change-Id: I3c7920e7a84327c5908462e51e21199b89fb187d

9 years agoChange already inline error to warning
Mathieu Chartier [Thu, 26 Feb 2015 01:17:37 +0000 (17:17 -0800)]
Change already inline error to warning

There is a race condition in the JIT where the JIT and another
running thread can both verify the same method at the same time.
This causes the inline method to be added twice and the LOG(ERROR)
was causing occasional test failures.

Bug: 17950037
Bug: 18713034
Change-Id: I7f94384106ca5c621a5cf7d2ba36910d923d110c

9 years agoam 4942d7f0: am 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"
Mathieu Chartier [Thu, 26 Feb 2015 01:13:29 +0000 (01:13 +0000)]
am 4942d7f0: am 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"

* commit '4942d7f0115da89495f1edfe2effd88069f9654c':
  Fix JIT for vmdebug test 99

9 years agoam 4caeca79: am b491375a: Merge "[MIPS] Fix mips32 trampoline problem."
Andreas Gampe [Thu, 26 Feb 2015 01:13:28 +0000 (01:13 +0000)]
am 4caeca79: am b491375a: Merge "[MIPS] Fix mips32 trampoline problem."

* commit '4caeca7964134a2d327033dd660f53a841b1463f':
  [MIPS] Fix mips32 trampoline problem.

9 years agoam 9be3dd2f: am 42cfbb0a: Merge "Fix argument register allocation for mips32."
Andreas Gampe [Thu, 26 Feb 2015 01:13:26 +0000 (01:13 +0000)]
am 9be3dd2f: am 42cfbb0a: Merge "Fix argument register allocation for mips32."

* commit '9be3dd2f9f0bf362ffbf3fa2034adf6a3bd81573':
  Fix argument register allocation for mips32.

9 years agoam 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"
Mathieu Chartier [Thu, 26 Feb 2015 01:07:17 +0000 (01:07 +0000)]
am 4f9bbe2a: Merge "Fix JIT for vmdebug test 99"

* commit '4f9bbe2a654165aedab62041101ae41d54c04e39':
  Fix JIT for vmdebug test 99

9 years agoam b491375a: Merge "[MIPS] Fix mips32 trampoline problem."
Andreas Gampe [Thu, 26 Feb 2015 01:07:09 +0000 (01:07 +0000)]
am b491375a: Merge "[MIPS] Fix mips32 trampoline problem."

* commit 'b491375af0ffa7f0ee534b30d606d8748f7ad15f':
  [MIPS] Fix mips32 trampoline problem.

9 years agoam 42cfbb0a: Merge "Fix argument register allocation for mips32."
Andreas Gampe [Thu, 26 Feb 2015 01:07:06 +0000 (01:07 +0000)]
am 42cfbb0a: Merge "Fix argument register allocation for mips32."

* commit '42cfbb0afe15f425753e6b5e6c6c90fa73f2bbef':
  Fix argument register allocation for mips32.

9 years agoMerge "Fix JIT for vmdebug test 99"
Mathieu Chartier [Thu, 26 Feb 2015 00:34:11 +0000 (00:34 +0000)]
Merge "Fix JIT for vmdebug test 99"

9 years agoMerge "[MIPS] Fix mips32 trampoline problem."
Andreas Gampe [Thu, 26 Feb 2015 00:00:40 +0000 (00:00 +0000)]
Merge "[MIPS] Fix mips32 trampoline problem."

9 years agoMerge "Fix argument register allocation for mips32."
Andreas Gampe [Wed, 25 Feb 2015 23:58:29 +0000 (23:58 +0000)]
Merge "Fix argument register allocation for mips32."

9 years ago[MIPS] Fix mips32 trampoline problem.
Nikola Veljkovic [Fri, 20 Feb 2015 16:21:15 +0000 (17:21 +0100)]
[MIPS] Fix mips32 trampoline problem.

Reserve argument slots (for $a0-$a3) on the stack in the
InvokeTrampoline() function, for entrypoints that contain direct
reference to native implementation. Called function may use this
space to store $a0-$a3 regs.

This fixes the Settings app crash on mips32, when navigating to:
Settings->Apps->(swipe) On SD card.

Change-Id: If53ce822fd3ef6ef9839c89b556f76fac0792190

9 years agoFix JIT for vmdebug test 99
Mathieu Chartier [Wed, 25 Feb 2015 21:22:57 +0000 (13:22 -0800)]
Fix JIT for vmdebug test 99

Test was flaky due to JIT re-compiliation after deoptimization
resulting in some invalid PC offsets.

Bug: 17950037
Change-Id: I276c84c918579259ce47ef873892c3c5dcf0c977

9 years agoam 54de973c: am b52d449d: am 8db3d76b: Merge "ART: oatdump enhancements"
Andreas Gampe [Wed, 25 Feb 2015 20:10:04 +0000 (20:10 +0000)]
am 54de973c: am b52d449d: am 8db3d76b: Merge "ART: oatdump enhancements"

* commit '54de973cdc9ba1502507868390f868afd46e7756':
  ART: oatdump enhancements

9 years agoam b52d449d: am 8db3d76b: Merge "ART: oatdump enhancements"
Andreas Gampe [Wed, 25 Feb 2015 20:05:54 +0000 (20:05 +0000)]
am b52d449d: am 8db3d76b: Merge "ART: oatdump enhancements"

* commit 'b52d449d43602f3ad1cd3aaf650afad811565989':
  ART: oatdump enhancements

9 years agoam 8db3d76b: Merge "ART: oatdump enhancements"
Andreas Gampe [Wed, 25 Feb 2015 19:59:24 +0000 (19:59 +0000)]
am 8db3d76b: Merge "ART: oatdump enhancements"

* commit '8db3d76ba7061da80f5eb58079830c796e4dea61':
  ART: oatdump enhancements

9 years agoFix argument register allocation for mips32.
Douglas Leung [Sat, 14 Feb 2015 00:53:03 +0000 (16:53 -0800)]
Fix argument register allocation for mips32.

Change-Id: Ic21b0371d7cafb9b67217b92bb2edb735a43d1b0

9 years agoMerge "ART: oatdump enhancements"
Andreas Gampe [Wed, 25 Feb 2015 19:51:12 +0000 (19:51 +0000)]
Merge "ART: oatdump enhancements"