OSDN Git Service

android-x86/art.git
10 years agoam eab674a8: Merge "Fix missing single-step event"
Sebastien Hertz [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am eab674a8: Merge "Fix missing single-step event"

* commit 'eab674a87b32794ae2c5e7d238292e56804de09d':
  Fix missing single-step event

10 years agoam 49ab79da: Merge "Revert "Revert "Revert "Add intrinsic for Reference.get()""""
Sebastien Hertz [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am 49ab79da: Merge "Revert "Revert "Revert "Add intrinsic for Reference.get()""""

* commit '49ab79da140b9ae79f9efca70c42eeaa84e361ff':
  Revert "Revert "Revert "Add intrinsic for Reference.get()"""

10 years agoam 6a1f4ad1: Merge "Revert "Revert "Revert "Add implicit null and stack checks for...
Nicolas Geoffray [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am 6a1f4ad1: Merge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""

* commit '6a1f4ad192e596b6bf43b39c26846300f401a692':
  Revert "Revert "Revert "Add implicit null and stack checks for x86"""

10 years agoam bd6b5dd3: Merge "Revert "Fix mac build""
Nicolas Geoffray [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am bd6b5dd3: Merge "Revert "Fix mac build""

* commit 'bd6b5dd3ce0f4d5454334d4848a97b00120b235e':
  Revert "Fix mac build"

10 years agoam 03c672f1: Merge "Revert "Revert "Add intrinsic for Reference.get()"""
Christopher Ferris [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am 03c672f1: Merge "Revert "Revert "Add intrinsic for Reference.get()"""

* commit '03c672f1a8e6cc5bef0348f1d321afb9b26ed53a':
  Revert "Revert "Add intrinsic for Reference.get()""

10 years agoam 75cb5a24: Merge "ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64"
Andreas Gampe [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am 75cb5a24: Merge "ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64"

* commit '75cb5a2468dfa79600cec8668fc2e85bbc7334a7':
  ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64

10 years agoam 7ee5cd17: Merge "Revert "Add intrinsic for Reference.get()""
Christopher Ferris [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am 7ee5cd17: Merge "Revert "Add intrinsic for Reference.get()""

* commit '7ee5cd1789b098c72010cd26a873f1cd2513e1b1':
  Revert "Add intrinsic for Reference.get()"

10 years agoam 1190e0e4: Merge "Fix mac build"
Dave Allison [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am 1190e0e4: Merge "Fix mac build"

* commit '1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4':
  Fix mac build

10 years agoam e2ebfb4c: Merge "Add intrinsic for Reference.get()"
Mathieu Chartier [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am e2ebfb4c: Merge "Add intrinsic for Reference.get()"

* commit 'e2ebfb4c7c90863c8dae72723030bf1e2e0e4589':
  Add intrinsic for Reference.get()

10 years agoam 9e5f302b: Merge "Change default heap maximum size to be 256m."
Mathieu Chartier [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am 9e5f302b: Merge "Change default heap maximum size to be 256m."

* commit '9e5f302becd4fddb8e5a785e6522cb8602469730':
  Change default heap maximum size to be 256m.

10 years agoam 9245c392: Merge "Fix race condition in release pages."
Mathieu Chartier [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am 9245c392: Merge "Fix race condition in release pages."

* commit '9245c39291a4618f04687bdb970def80ae7061bd':
  Fix race condition in release pages.

10 years agoam 18363662: Merge "Updates to help classes derived from X86Mir2Lir"
Ian Rogers [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am 18363662: Merge "Updates to help classes derived from X86Mir2Lir"

* commit '183636622546ce73c8b67e586e0bc0799fe9c905':
  Updates to help classes derived from X86Mir2Lir

10 years agoam da8a6975: Merge "Revert "Revert "Add implicit null and stack checks for x86"""
Dave Allison [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am da8a6975: Merge "Revert "Revert "Add implicit null and stack checks for x86"""

* commit 'da8a6975db267926bd5b8d5136144a822dac8e29':
  Revert "Revert "Add implicit null and stack checks for x86""

10 years agoam 93279da4: Merge "ART: Do not dump hidden basic blocks and add a counter to file...
Ian Rogers [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am 93279da4: Merge "ART: Do not dump hidden basic blocks and add a counter to file naming"

* commit '93279da4a8475d187a0a2e75d50c88def5b4b8a5':
  ART: Do not dump hidden basic blocks and add a counter to file naming

10 years agoam 5a8ecafb: Merge "x86_64: Enable fp-reg promotion"
Andreas Gampe [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am 5a8ecafb: Merge "x86_64: Enable fp-reg promotion"

* commit '5a8ecafb7fa63cf3ebb448bb1c904858e9c29717':
  x86_64: Enable fp-reg promotion

10 years agoam 0d2d031c: Merge "Improve the OOME fragmentation message."
Hiroshi Yamauchi [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am 0d2d031c: Merge "Improve the OOME fragmentation message."

* commit '0d2d031c61e305b95b1fe3a8c70fd6aa5306a4c5':
  Improve the OOME fragmentation message.

10 years agoam 477eea4f: Merge "ART: Add Invokes to DecodedInstruction"
Ian Rogers [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am 477eea4f: Merge "ART: Add Invokes to DecodedInstruction"

* commit '477eea4feb1dffdfc7a66376b9bcdf339dbe6c66':
  ART: Add Invokes to DecodedInstruction

10 years agoam fe12035e: Merge "ART: Handle Extended MIRs in a uniform manner"
Ian Rogers [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am fe12035e: Merge "ART: Handle Extended MIRs in a uniform manner"

* commit 'fe12035ea434be9b24f578cf51e53c3bb34d945c':
  ART: Handle Extended MIRs in a uniform manner

10 years agoam 49b874b6: Merge "ART: Detached blocks should not be processed by compiler"
Ian Rogers [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am 49b874b6: Merge "ART: Detached blocks should not be processed by compiler"

* commit '49b874b65412a95f3bf0b1e6f60f3d457dca68da':
  ART: Detached blocks should not be processed by compiler

10 years agoam f894f639: Merge "ART: Rename CallInlining to SpecialMethodInliner"
Vladimir Marko [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am f894f639: Merge "ART: Rename CallInlining to SpecialMethodInliner"

* commit 'f894f6394fcbcac1b000157939bf536985abeeec':
  ART: Rename CallInlining to SpecialMethodInliner

10 years agoam adce33da: Merge "Make CAS operations in Object use art::Atomic."
Ian Rogers [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am adce33da: Merge "Make CAS operations in Object use art::Atomic."

* commit 'adce33da293b0eeaaf52673338770f22be71ca5d':
  Make CAS operations in Object use art::Atomic.

10 years agoam cba6b1fc: Merge "ART: Enable some ARM64 optimizations."
Andreas Gampe [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am cba6b1fc: Merge "ART: Enable some ARM64 optimizations."

* commit 'cba6b1fc88fd54c35211fd49a7a7501cfcdaa170':
  ART: Enable some ARM64 optimizations.

10 years agoam 5fa647d5: Merge "Slow path for iget should expect return in core reg"
Andreas Gampe [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am 5fa647d5: Merge "Slow path for iget should expect return in core reg"

* commit '5fa647d5f663033e4ed3d398aece1f8211d7f460':
  Slow path for iget should expect return in core reg

10 years agoam fb16129c: Merge "Global Value Numbering."
Vladimir Marko [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am fb16129c: Merge "Global Value Numbering."

* commit 'fb16129c3c62f73d00ab7570e147e497e787eaad':
  Global Value Numbering.

10 years agoam b26d1905: Merge "ART: Refactor frontend.cc"
Andreas Gampe [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am b26d1905: Merge "ART: Refactor frontend.cc"

* commit 'b26d19057eb1ef931164859704ba7cab9cb7243a':
  ART: Refactor frontend.cc

10 years agoam 50fb2436: Merge "Handle potential <clinit>() correctly in LVN."
Vladimir Marko [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am 50fb2436: Merge "Handle potential <clinit>() correctly in LVN."

* commit '50fb243619d337d20b56d2713d861166d48cb491':
  Handle potential <clinit>() correctly in LVN.

10 years agoam 723b2fc3: Merge "Faster deduplication in OatWriter."
Vladimir Marko [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am 723b2fc3: Merge "Faster deduplication in OatWriter."

* commit '723b2fc3848bce9f26c54c7080099eba2fdb06ea':
  Faster deduplication in OatWriter.

10 years agoam b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."
Ian Rogers [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."

* commit 'b2bc3c9791e093330be98bc6ca8fb92c41757cb1':
  Fix GC to use art::Atomic rather than compiler intrinsics.

10 years agoam c4f72ec4: Merge "Use memory chunks for monitors on LP64"
Andreas Gampe [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am c4f72ec4: Merge "Use memory chunks for monitors on LP64"

* commit 'c4f72ec44660f804b595bfaf2b959f46fd2ff00d':
  Use memory chunks for monitors on LP64

10 years agoam af4cf5d7: Merge "Missed use of android_atomic and thread state_."
Ian Rogers [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am af4cf5d7: Merge "Missed use of android_atomic and thread state_."

* commit 'af4cf5d72a2bf77f0e442bedb208f9227f262c89':
  Missed use of android_atomic and thread state_.

10 years agoam 070dfc4c: Merge "Fix tracing."
Ian Rogers [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am 070dfc4c: Merge "Fix tracing."

* commit '070dfc4cebb9772a646382be9751d8f4c6b7d69a':
  Fix tracing.

10 years agoam d8079288: Merge "art: fix host dex2oat runtime args"
Colin Cross [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am d8079288: Merge "art: fix host dex2oat runtime args"

* commit 'd807928876744231ebbe2f07d17439f84d4e0185':
  art: fix host dex2oat runtime args

10 years agoam 62526c37: Merge "Move thread state to art::Atomic."
Ian Rogers [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am 62526c37: Merge "Move thread state to art::Atomic."

* commit '62526c377fe5242a723f154a373eccf5b9db416d':
  Move thread state to art::Atomic.

10 years agoam 43b6fe02: Merge "Move another field away from android_atomic_cas."
Ian Rogers [Sat, 12 Jul 2014 01:42:07 +0000 (01:42 +0000)]
am 43b6fe02: Merge "Move another field away from android_atomic_cas."

* commit '43b6fe0270477cd47f8dd8b064d006961a44be54':
  Move another field away from android_atomic_cas.

10 years agoam 672f8367: Merge "Revert "Add implicit null and stack checks for x86""
Dave Allison [Sat, 12 Jul 2014 01:42:07 +0000 (01:42 +0000)]
am 672f8367: Merge "Revert "Add implicit null and stack checks for x86""

* commit '672f8367f74e5db7d26714cd6fa1a13fa2a6c59f':
  Revert "Add implicit null and stack checks for x86"

10 years agoam 4770a2e6: Merge "Remove legacy CAS implementations from mutex."
Ian Rogers [Sat, 12 Jul 2014 01:42:07 +0000 (01:42 +0000)]
am 4770a2e6: Merge "Remove legacy CAS implementations from mutex."

* commit '4770a2e6d56398a6b4398fcce14fea43394e0d1b':
  Remove legacy CAS implementations from mutex.

10 years agoam bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."
Mathieu Chartier [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."

* commit 'bcb3b29095817ce8987d8310d4db87271f5114ad':
  Add notion of released vs empty pages to ROSAlloc.

10 years agoam 5de52242: Merge "Add implicit null and stack checks for x86"
Dave Allison [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am 5de52242: Merge "Add implicit null and stack checks for x86"

* commit '5de52242f3934f1604083d7215cdde1d0cc8ba7a':
  Add implicit null and stack checks for x86

10 years agoam 2929490d: Merge "Move card table away from android_atomic_cas."
Ian Rogers [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am 2929490d: Merge "Move card table away from android_atomic_cas."

* commit '2929490de9374c2a052cff4cf6957852ebf06d98':
  Move card table away from android_atomic_cas.

10 years agoam 5472edce: Merge "CW on Master: Propagate or throw exception when no class found...
Brian Carlstrom [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am 5472edce: Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."

* commit '5472edce3697721099ead9e16427e0e7ace90754':
  CW on Master: Propagate or throw exception when no class found happens in interpreter.

10 years agoam b288a5ad: Merge "Use the icu4c headers from the new location."
Elliott Hughes [Sat, 12 Jul 2014 01:42:05 +0000 (01:42 +0000)]
am b288a5ad: Merge "Use the icu4c headers from the new location."

* commit 'b288a5ad024f99d593aef55e352b46c1a2868af7':
  Use the icu4c headers from the new location.

10 years agoam 91db19b5: Merge "ART: Add simple tests for inlining of CAS"
Andreas Gampe [Sat, 12 Jul 2014 01:42:05 +0000 (01:42 +0000)]
am 91db19b5: Merge "ART: Add simple tests for inlining of CAS"

* commit '91db19b5f14e32878e0a70fa8d43f3412586b821':
  ART: Add simple tests for inlining of CAS

10 years agoam ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."
Mathieu Chartier [Sat, 12 Jul 2014 01:42:05 +0000 (01:42 +0000)]
am ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."

* commit 'ef9b94cc83595bc0c95b0edd5131187998919c7a':
  Add easy way to ensure the next allocation does GC.

10 years agoam b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"
Dave Allison [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"

* commit 'b796d1bfac8cfaf4dc98f411ae6157f964d4a325':
  Remove incorrect check for sa_mask in signal chaining

10 years agoam c21dc06a: Merge "ART: Check slow_paths_.Size() every time"
Ian Rogers [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am c21dc06a: Merge "ART: Check slow_paths_.Size() every time"

* commit 'c21dc06adc8c8447561208a3fb72ccf6d0443613':
  ART: Check slow_paths_.Size() every time

10 years agoam 68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit...
Ian Rogers [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am 68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"

* commit '68e5f4421001a2ba885d822971c375368520ea8c':
  x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets

10 years agoam a76dc41f: Merge "Allow method tracing for run-test"
Ian Rogers [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am a76dc41f: Merge "Allow method tracing for run-test"

* commit 'a76dc41fb21b6fba74f70188fdc53e1a5bf2c2cb':
  Allow method tracing for run-test

10 years agoam 0f635b10: Merge "Fix method tracing from command-line"
Ian Rogers [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am 0f635b10: Merge "Fix method tracing from command-line"

* commit '0f635b103c1fff6439d47bdae363afeffe7327fd':
  Fix method tracing from command-line

10 years agoam 32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"
Ian Rogers [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am 32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"

* commit '32710dd4a0232149002a5ae7bde1c640cdffd564':
  x86_64: enable Peek and Poke intrinsics

10 years agoam 62f28f94: Merge "Fix a compile assert name with inverted meaning."
Vladimir Marko [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am 62f28f94: Merge "Fix a compile assert name with inverted meaning."

* commit '62f28f943e2da2873c7a09096c292f01a21c6478':
  Fix a compile assert name with inverted meaning.

10 years agoam 665f6810: Merge "Workaround for invalid monitor-exit catch ranges."
Vladimir Marko [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am 665f6810: Merge "Workaround for invalid monitor-exit catch ranges."

* commit '665f681020ec313d6aea1aa26db582176d780079':
  Workaround for invalid monitor-exit catch ranges.

10 years agoam 8078b294: Merge "Revert "ART: Key-Value Store in Oat header""
Nicolas Geoffray [Sat, 12 Jul 2014 01:42:02 +0000 (01:42 +0000)]
am 8078b294: Merge "Revert "ART: Key-Value Store in Oat header""

* commit '8078b294e8001abff5a6c8637e844b55a65fff4b':
  Revert "ART: Key-Value Store in Oat header"

10 years agoam 608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
Ian Rogers [Sat, 12 Jul 2014 01:41:59 +0000 (01:41 +0000)]
am 608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."

* commit '608520c8ba1adc7d8d0623b021b7ea509b00751c':
  Adds PGO_GEN and PGO_USE for libart and libart-compiler.

10 years agoam 2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"
Ian Rogers [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am 2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"

* commit '2cfe30bd592cb6ae63bb4c28ccaf4b069d6ab565':
  X86 Backend support for vectorized float and byte 16x16 operations

10 years agoam 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"
Ian Rogers [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"

* commit '7b68fb3b9b421d4b20c1993704986d637f1cab91':
  x86_64: Clean-up after cmp-long fix

10 years agoam dfc56e68: Merge "Clean-up call_x86.cc"
Ian Rogers [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am dfc56e68: Merge "Clean-up call_x86.cc"

* commit 'dfc56e681beb055801491792026cb9976d8566e8':
  Clean-up call_x86.cc

10 years agoam 251a057f: Merge "ART: Fix FP promotion"
Andreas Gampe [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am 251a057f: Merge "ART: Fix FP promotion"

* commit '251a057f52946452ac1c485b38d4ebafcf3bc5ad':
  ART: Fix FP promotion

10 years agoam dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
Brian Carlstrom [Sat, 12 Jul 2014 01:41:57 +0000 (01:41 +0000)]
am dac3f4af: Merge "Whitelist another exception during dex2oat resolving."

* commit 'dac3f4afe1a3f5626836b6921230c150b68b9d34':
  Whitelist another exception during dex2oat resolving.

10 years agoam 6e524ddc: Merge "Make dex2oat heap size product configurable [art]"
Brian Carlstrom [Sat, 12 Jul 2014 01:41:57 +0000 (01:41 +0000)]
am 6e524ddc: Merge "Make dex2oat heap size product configurable [art]"

* commit '6e524ddc060f10a493dc63fa5b6dde0deef22219':
  Make dex2oat heap size product configurable [art]

10 years agoam 3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"
Andreas Gampe [Sat, 12 Jul 2014 01:41:57 +0000 (01:41 +0000)]
am 3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"

* commit '3d30b073541f19470e8b5dddef9377411fa587c3':
  ART: Do not emit load when inlining unused Thread.currentThread()

10 years agoam 8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."
Ian Rogers [Sat, 12 Jul 2014 01:41:56 +0000 (01:41 +0000)]
am 8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."

* commit '8746860d056e64dcc832264e74bda9d511e86e2d':
  Only allow instance-of to improve knowledge of a type for downcasts.

10 years agoam c16fc5fc: am 09341a57: Merge "ART: Key-Value Store in Oat header"
Andreas Gampe [Fri, 11 Jul 2014 17:29:06 +0000 (17:29 +0000)]
am c16fc5fc: am 09341a57: Merge "ART: Key-Value Store in Oat header"

* commit 'c16fc5fc1aa19fae40d48b03604610c1f59e34c0':
  ART: Key-Value Store in Oat header

10 years agoam 4c5e832c: am b63727cd: Merge "ART: Update Monitor::Wait so it releases monitor_loc...
Andreas Gampe [Fri, 11 Jul 2014 17:29:05 +0000 (17:29 +0000)]
am 4c5e832c: am b63727cd: Merge "ART: Update Monitor::Wait so it releases monitor_lock_ before throwing an exception"

* commit '4c5e832c385d7ad813ddcf25fd95d8f4d7457913':
  ART: Update Monitor::Wait so it releases monitor_lock_ before throwing an exception

10 years agoam 5f8d472a: am 1f3a9465: Merge "Remove Dbg::VisitRoots()."
Hiroshi Yamauchi [Fri, 11 Jul 2014 17:29:04 +0000 (17:29 +0000)]
am 5f8d472a: am 1f3a9465: Merge "Remove Dbg::VisitRoots()."

* commit '5f8d472a1958328489693fd07d82c4bf550d9cc3':
  Remove Dbg::VisitRoots().

10 years agoam c0d6dd51: am e8a30f37: Merge "Fix some style nitpicks"
Brian Carlstrom [Fri, 11 Jul 2014 16:19:22 +0000 (16:19 +0000)]
am c0d6dd51: am e8a30f37: Merge "Fix some style nitpicks"

* commit 'c0d6dd512722ae36242924bcdc8fcde58dd5c959':
  Fix some style nitpicks

10 years agoam c6c0a402: am 50dffeee: Merge "Fix local reference leaks in debugger and use a...
Mathieu Chartier [Fri, 11 Jul 2014 16:19:11 +0000 (16:19 +0000)]
am c6c0a402: am 50dffeee: Merge "Fix local reference leaks in debugger and use a cache."

* commit 'c6c0a402fe2e7e51e9ba7dd8817eb44696f00347':
  Fix local reference leaks in debugger and use a cache.

10 years agoam aac7b7dd: am c4c601b6: Merge "Add kIntrinsicIsStatic flag for System.arraycopy()."
Vladimir Marko [Fri, 11 Jul 2014 16:19:10 +0000 (16:19 +0000)]
am aac7b7dd: am c4c601b6: Merge "Add kIntrinsicIsStatic flag for System.arraycopy()."

* commit 'aac7b7dde7dfb2273644b6f86928078f7ef357c6':
  Add kIntrinsicIsStatic flag for System.arraycopy().

10 years agoam a5690945: am f55159c1: Merge "Fix style issue."
Vladimir Marko [Fri, 11 Jul 2014 16:19:04 +0000 (16:19 +0000)]
am a5690945: am f55159c1: Merge "Fix style issue."

* commit 'a569094513c296f13cff1031b9f807fbc6ec4cfd':
  Fix style issue.

10 years agoam db123b00: am 74d8348c: Merge "Check invoke type for intrinsic method invokes."
Vladimir Marko [Fri, 11 Jul 2014 16:19:03 +0000 (16:19 +0000)]
am db123b00: am 74d8348c: Merge "Check invoke type for intrinsic method invokes."

* commit 'db123b00424017b3cc9ec9f444c6265fc960c263':
  Check invoke type for intrinsic method invokes.

10 years agoam 0c8537e5: am 751dee37: Merge "BaseMutex::IsExclusiveHeld should only be called...
Ian Rogers [Fri, 11 Jul 2014 16:18:59 +0000 (16:18 +0000)]
am 0c8537e5: am 751dee37: Merge "BaseMutex::IsExclusiveHeld should only be called on self."

* commit '0c8537e59096b5e8034dd3384af78e182b30ebc1':
  BaseMutex::IsExclusiveHeld should only be called on self.

10 years agoam 6939ba7f: am a3ed7f87: Merge "JNI dlsym lookup fixes."
Ian Rogers [Fri, 11 Jul 2014 16:18:58 +0000 (16:18 +0000)]
am 6939ba7f: am a3ed7f87: Merge "JNI dlsym lookup fixes."

* commit '6939ba7f2b553348c4ed3b5199fc66a79970ad7b':
  JNI dlsym lookup fixes.

10 years agoam d343c221: am e60658e8: Merge "Enable compiler testing for ARM64 and x86-64."
Ian Rogers [Fri, 11 Jul 2014 16:18:58 +0000 (16:18 +0000)]
am d343c221: am e60658e8: Merge "Enable compiler testing for ARM64 and x86-64."

* commit 'd343c221d9f7f17b66fad6c8ed703946a85a4b99':
  Enable compiler testing for ARM64 and x86-64.

10 years agoam 23b39cec: am 464ef7a7: Merge "ART: Intrinsic implementation for java.lang.System...
Ian Rogers [Fri, 11 Jul 2014 16:18:57 +0000 (16:18 +0000)]
am 23b39cec: am 464ef7a7: Merge "ART: Intrinsic implementation for java.lang.System.arraycopy."

* commit '23b39cec938869dc7c17cd0e9820c28cc425a7dc':
  ART: Intrinsic implementation for java.lang.System.arraycopy.

10 years agoam 53dbd90d: am a1d1781e: Merge "Fix dex file dependencies for oat tests."
Ian Rogers [Fri, 11 Jul 2014 16:18:48 +0000 (16:18 +0000)]
am 53dbd90d: am a1d1781e: Merge "Fix dex file dependencies for oat tests."

* commit '53dbd90d9398486b299ac4f5d75604b32ca7e1c7':
  Fix dex file dependencies for oat tests.

10 years agoMerge "Fix race condition in release pages."
Mathieu Chartier [Fri, 11 Jul 2014 00:31:37 +0000 (00:31 +0000)]
Merge "Fix race condition in release pages."

10 years agoFix race condition in release pages.
Mathieu Chartier [Thu, 10 Jul 2014 17:16:44 +0000 (10:16 -0700)]
Fix race condition in release pages.

There was a race condition where another thread could coalesce the
free page run before we acquired the lock. In that case
free_page_runs_.find will not find a run starting at fpr. Added a
condition to handle this case. Also added handling for free page
runs with begin with released pages but end with empty pages.

Bug: 16191993
Change-Id: Ib12fdac8c246eae29c36f6a6728eb11d85553bbb

10 years agoMerge "ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64"
Andreas Gampe [Fri, 11 Jul 2014 06:12:08 +0000 (06:12 +0000)]
Merge "ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64"

10 years agoART: Fix GenSelect and GenFusedLongCmpBranch for ARM64
Andreas Gampe [Thu, 10 Jul 2014 10:23:41 +0000 (03:23 -0700)]
ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64

Depending on the result, we need to issue a wide csel. Also need
to handle constants, and src and dest being the same.

In GenFusedLongCmpBranch there is an ordering issue. If we swap
the inputs, we did not Load the second one.

Change-Id: Icb9876ca1288602d078b9fb89ea964ec2c910e0c

10 years agoMerge "Revert "Add intrinsic for Reference.get()""
Christopher Ferris [Fri, 11 Jul 2014 04:45:03 +0000 (04:45 +0000)]
Merge "Revert "Add intrinsic for Reference.get()""

10 years agoRevert "Add intrinsic for Reference.get()"
Christopher Ferris [Fri, 11 Jul 2014 04:18:58 +0000 (04:18 +0000)]
Revert "Add intrinsic for Reference.get()"

This reverts commit 460503b13bc894828a2d2d47d09e5534b3e91aa1.

Change-Id: Ie63f43049307e02e3b90f4e034abc9ea54ca4e24

10 years agoMerge "ART: Do not dump hidden basic blocks and add a counter to file naming"
Ian Rogers [Thu, 10 Jul 2014 21:20:14 +0000 (21:20 +0000)]
Merge "ART: Do not dump hidden basic blocks and add a counter to file naming"

10 years agoMerge "x86_64: Enable fp-reg promotion"
Andreas Gampe [Thu, 10 Jul 2014 21:12:02 +0000 (21:12 +0000)]
Merge "x86_64: Enable fp-reg promotion"

10 years agoMerge "Add intrinsic for Reference.get()"
Mathieu Chartier [Fri, 11 Jul 2014 01:54:07 +0000 (01:54 +0000)]
Merge "Add intrinsic for Reference.get()"

10 years agoMerge "Change default heap maximum size to be 256m."
Mathieu Chartier [Fri, 11 Jul 2014 01:47:39 +0000 (01:47 +0000)]
Merge "Change default heap maximum size to be 256m."

10 years agoChange default heap maximum size to be 256m.
Mathieu Chartier [Fri, 11 Jul 2014 00:50:34 +0000 (17:50 -0700)]
Change default heap maximum size to be 256m.

Useful for command line benchmarks.

Change-Id: Ie525863cd8eff93c64ce76639b1108fbdad91633

10 years agoMerge "Updates to help classes derived from X86Mir2Lir"
Ian Rogers [Thu, 10 Jul 2014 22:00:23 +0000 (22:00 +0000)]
Merge "Updates to help classes derived from X86Mir2Lir"

10 years agoUpdates to help classes derived from X86Mir2Lir
Mark Mendell [Fri, 4 Jul 2014 01:34:41 +0000 (21:34 -0400)]
Updates to help classes derived from X86Mir2Lir

Just a couple of extra changes to help me out.  These changes won't
affect anyone else.

Change-Id: I0e0985a4f16822d5cbfabbf81c9902d34ebdb5da
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
10 years agoMerge "Revert "Revert "Add implicit null and stack checks for x86"""
Dave Allison [Thu, 10 Jul 2014 21:25:05 +0000 (21:25 +0000)]
Merge "Revert "Revert "Add implicit null and stack checks for x86"""

10 years agoRevert "Revert "Add implicit null and stack checks for x86""
Dave Allison [Thu, 10 Jul 2014 02:05:10 +0000 (02:05 +0000)]
Revert "Revert "Add implicit null and stack checks for x86""

Fixes x86_64 cross compile issue.  Removes command line options
and property to set implicit checks - this is hard coded now.

This reverts commit 3d14eb620716e92c21c4d2c2d11a95be53319791.

Change-Id: I5404473b5aaf1a9c68b7181f5952cb174d93a90d

10 years agoMerge "Revert "Revert "Add intrinsic for Reference.get()"""
Christopher Ferris [Fri, 11 Jul 2014 07:09:25 +0000 (07:09 +0000)]
Merge "Revert "Revert "Add intrinsic for Reference.get()"""

10 years agoRevert "Revert "Add intrinsic for Reference.get()""
Christopher Ferris [Fri, 11 Jul 2014 06:44:39 +0000 (06:44 +0000)]
Revert "Revert "Add intrinsic for Reference.get()""

This reverts commit a9b870b73a155ce70c867d5b3f9758fab0b45f07.

Change-Id: Ic2a9b47f2b911bef4b764d10bc33cf000e4b4211

10 years agoMerge "Fix mac build"
Dave Allison [Fri, 11 Jul 2014 03:42:17 +0000 (03:42 +0000)]
Merge "Fix mac build"

10 years agoFix mac build
Dave Allison [Thu, 10 Jul 2014 22:29:28 +0000 (15:29 -0700)]
Fix mac build

Fixes x86 fault handler, sigchain and quick_entrypoints for x86_64.

Bug: 16215218
Change-Id: I5e58660ea815042968444e6352c57a5f53314cfd

10 years agox86_64: Enable fp-reg promotion
Serguei Katkov [Tue, 8 Jul 2014 10:21:53 +0000 (17:21 +0700)]
x86_64: Enable fp-reg promotion

Patch introduces 4 register XMM12-15 available for promotion of
fp virtual registers.

Change-Id: I3f89ad07fc8ae98b70f550eada09be7b693ffb67
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
10 years agoMerge "Revert "Revert "Revert "Add intrinsic for Reference.get()""""
Sebastien Hertz [Fri, 11 Jul 2014 10:11:12 +0000 (10:11 +0000)]
Merge "Revert "Revert "Revert "Add intrinsic for Reference.get()""""

10 years agoRevert "Revert "Revert "Add intrinsic for Reference.get()"""
Sebastien Hertz [Fri, 11 Jul 2014 10:09:13 +0000 (10:09 +0000)]
Revert "Revert "Revert "Add intrinsic for Reference.get()"""

This reverts commit d4415e8bd04c4a9367744ff0149597b4f37a0e0a.

Change-Id: I34553ccbdcfea35c7742d21be2a74dc7085ab2a0

10 years agoMerge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
Nicolas Geoffray [Fri, 11 Jul 2014 08:27:55 +0000 (08:27 +0000)]
Merge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""

10 years agoRevert "Revert "Revert "Add implicit null and stack checks for x86"""
Nicolas Geoffray [Fri, 11 Jul 2014 08:26:40 +0000 (08:26 +0000)]
Revert "Revert "Revert "Add implicit null and stack checks for x86"""

Broke the build.

This reverts commit 7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.

Change-Id: I9df0e7446ff0913a0e1276a558b2ccf6c8f4c949

10 years agoMerge "Fix missing single-step event"
Sebastien Hertz [Fri, 11 Jul 2014 13:36:05 +0000 (13:36 +0000)]
Merge "Fix missing single-step event"

10 years agoMerge "Revert "Fix mac build""
Nicolas Geoffray [Fri, 11 Jul 2014 08:26:20 +0000 (08:26 +0000)]
Merge "Revert "Fix mac build""