OSDN Git Service

android-x86/art.git
9 years agoam e18c9016: Merge "ART: Fix typo"
Andreas Gampe [Tue, 2 Sep 2014 18:08:15 +0000 (18:08 +0000)]
am e18c9016: Merge "ART: Fix typo"

* commit 'e18c901644cf8fdc012d0c852c97d77bb1f652ee':
  ART: Fix typo

9 years agoam 102d139c: am b373ba1b: ART: Fix typo
Andreas Gampe [Tue, 2 Sep 2014 17:49:48 +0000 (17:49 +0000)]
am 102d139c: am b373ba1b: ART: Fix typo

* commit '102d139c956b8f6dda1247dde3631b9accf3d67c':
  ART: Fix typo

9 years agoMerge "ART: Fix typo"
Andreas Gampe [Tue, 2 Sep 2014 17:43:07 +0000 (17:43 +0000)]
Merge "ART: Fix typo"

9 years agoam b373ba1b: ART: Fix typo
Andreas Gampe [Tue, 2 Sep 2014 17:41:57 +0000 (17:41 +0000)]
am b373ba1b: ART: Fix typo

* commit 'b373ba1bf7e67d4dd8286df08065ac76aa8ac1ee':
  ART: Fix typo

9 years agoART: Fix typo
Andreas Gampe [Tue, 2 Sep 2014 17:22:20 +0000 (10:22 -0700)]
ART: Fix typo

Bug: 17327877

(cherry picked from commit b373ba1bf7e67d4dd8286df08065ac76aa8ac1ee)

Change-Id: I6132a8afb4b69c8d22a01b477f6f324c789ed666

9 years agoART: Fix typo
Andreas Gampe [Tue, 2 Sep 2014 17:22:20 +0000 (10:22 -0700)]
ART: Fix typo

Bug: 17327877
Change-Id: I6132a8afb4b69c8d22a01b477f6f324c789ed666

9 years agoam e25b994c: Merge "ART: Fix dex file verifier type-list handling"
Andreas Gampe [Tue, 2 Sep 2014 16:44:38 +0000 (16:44 +0000)]
am e25b994c: Merge "ART: Fix dex file verifier type-list handling"

* commit 'e25b994ccf50e0c7abfab11785e231dfe70d7707':
  ART: Fix dex file verifier type-list handling

9 years agoam 3f4b1a54: am 277a7c7b: ART: Fix dex file verifier type-list handling
Andreas Gampe [Tue, 2 Sep 2014 16:43:53 +0000 (16:43 +0000)]
am 3f4b1a54: am 277a7c7b: ART: Fix dex file verifier type-list handling

* commit '3f4b1a540215f5390dfec1bd05765b75006c12c0':
  ART: Fix dex file verifier type-list handling

9 years agoam 277a7c7b: ART: Fix dex file verifier type-list handling
Andreas Gampe [Tue, 2 Sep 2014 16:31:44 +0000 (16:31 +0000)]
am 277a7c7b: ART: Fix dex file verifier type-list handling

* commit '277a7c7b4bb9c421380592fd3998d2e79e4035b3':
  ART: Fix dex file verifier type-list handling

9 years agoMerge "ART: Fix dex file verifier type-list handling"
Andreas Gampe [Tue, 2 Sep 2014 16:23:23 +0000 (16:23 +0000)]
Merge "ART: Fix dex file verifier type-list handling"

9 years agoART: Fix dex file verifier type-list handling
Andreas Gampe [Fri, 29 Aug 2014 23:07:49 +0000 (16:07 -0700)]
ART: Fix dex file verifier type-list handling

It is rare, but valid, to have an empty type list.

Bug: 17327877

(cherry picked from commit 277a7c7b4bb9c421380592fd3998d2e79e4035b3)

Change-Id: Ib3a8ff3e5ccd8fe7c04b1e97485bf3e6de72aa4d

9 years agoam 7c7686e6: Merge "Revert "Revert "ART: Prepare for ELF64."""
Nicolas Geoffray [Tue, 2 Sep 2014 09:29:44 +0000 (09:29 +0000)]
am 7c7686e6: Merge "Revert "Revert "ART: Prepare for ELF64."""

* commit '7c7686e62d262f1823876cebb3700e20f967dd56':
  Revert "Revert "ART: Prepare for ELF64.""

9 years agoMerge "Revert "Revert "ART: Prepare for ELF64."""
Nicolas Geoffray [Tue, 2 Sep 2014 08:12:44 +0000 (08:12 +0000)]
Merge "Revert "Revert "ART: Prepare for ELF64."""

9 years agoRevert "Revert "ART: Prepare for ELF64.""
Nicolas Geoffray [Tue, 2 Sep 2014 08:12:09 +0000 (08:12 +0000)]
Revert "Revert "ART: Prepare for ELF64.""

Fix was commited in "Fix frame size issue with 64-bit"

This reverts commit 7eebd95bddc7c6866ba29010d28b4f8251b43242.

Change-Id: I799b7fcab14ae24471d2f9d6d3a5e5cedd4aa7b8

9 years agoam dcea56f4: Merge "Fix frame size issue with 64-bit"
Narayan Kamath [Mon, 1 Sep 2014 16:13:11 +0000 (16:13 +0000)]
am dcea56f4: Merge "Fix frame size issue with 64-bit"

* commit 'dcea56f4132bc19abf867ee9ef01244d5283c2cf':
  Fix frame size issue with 64-bit

9 years agoMerge "Fix frame size issue with 64-bit"
Narayan Kamath [Mon, 1 Sep 2014 15:55:16 +0000 (15:55 +0000)]
Merge "Fix frame size issue with 64-bit"

9 years agoam 893600ce: Merge "Revert "ART: Prepare for ELF64.""
Nicolas Geoffray [Mon, 1 Sep 2014 15:37:45 +0000 (15:37 +0000)]
am 893600ce: Merge "Revert "ART: Prepare for ELF64.""

* commit '893600ce548fb4cf057e2bdcf8b305eae3338f7d':
  Revert "ART: Prepare for ELF64."

9 years agoMerge "Revert "ART: Prepare for ELF64.""
Nicolas Geoffray [Mon, 1 Sep 2014 15:14:16 +0000 (15:14 +0000)]
Merge "Revert "ART: Prepare for ELF64.""

9 years agoRevert "ART: Prepare for ELF64."
Nicolas Geoffray [Mon, 1 Sep 2014 15:13:00 +0000 (15:13 +0000)]
Revert "ART: Prepare for ELF64."

Build fails on arm64 with error message:
art/compiler/elf_writer_quick.cc:1083:1: error: the frame size of 2016 bytes is larger than 1728 bytes [-Werror=frame-larger-than=]

This reverts commit 45b8f1ab2782d02830c77751f883456de799dfb6.

Change-Id: I61b2e5f27ba4b2b32eacaec51fb5e5ed12fd8066

9 years agoresolved conflicts for merge of 5974d730 to lmp-dev-plus-aosp
Mathieu Chartier [Sat, 30 Aug 2014 18:34:52 +0000 (11:34 -0700)]
resolved conflicts for merge of 5974d730 to lmp-dev-plus-aosp

Change-Id: I415996d240a32c2ab7b66e25c824b42c908094dd

9 years agoART: Fix dex file verifier type-list handling
Andreas Gampe [Fri, 29 Aug 2014 23:07:49 +0000 (16:07 -0700)]
ART: Fix dex file verifier type-list handling

It is rare, but valid, to have an empty type list.

Bug: 17327877
Change-Id: Ib3a8ff3e5ccd8fe7c04b1e97485bf3e6de72aa4d

9 years agoam 645f9871: Merge "Add native memory accounting through custom allocator."
Mathieu Chartier [Sat, 30 Aug 2014 02:44:01 +0000 (02:44 +0000)]
am 645f9871: Merge "Add native memory accounting through custom allocator."

* commit '645f9871115e82ff836397f6470cca825befd245':
  Add native memory accounting through custom allocator.

9 years agoMerge "Add native memory accounting through custom allocator."
Mathieu Chartier [Sat, 30 Aug 2014 01:58:53 +0000 (01:58 +0000)]
Merge "Add native memory accounting through custom allocator."

9 years agoAdd native memory accounting through custom allocator.
Mathieu Chartier [Mon, 25 Aug 2014 20:08:22 +0000 (13:08 -0700)]
Add native memory accounting through custom allocator.

Added a custom allocator that lets you pass in a special tag which
specifices where the allocation came from. This is used when
dumping. The performance overhead is low since each allocation only
does a atomic add/sub for each allocation/free.

The measurements are dumped to traces.txt during SIGQUIT.

Example output:
I/art     (27274): AllocatorTagHeap active=120 max=120 total=168
I/art     (27274): AllocatorTagMonitorList active=1572 max=6240 total=11724
I/art     (27274): AllocatorTagClassTable active=185208 max=185208 total=268608
I/art     (27274): AllocatorTagInternTable active=430368 max=430368 total=436080
I/art     (27274): AllocatorTagMaps active=5616 max=6168 total=34392
I/art     (27274): AllocatorTagLOS active=1024 max=1536 total=2044
I/art     (27274): AllocatorTagSafeMap active=0 max=51936 total=533688
I/art     (27274): AllocatorTagLOSMaps active=144 max=1248 total=5760
I/art     (27274): AllocatorTagReferenceTable active=10944 max=11840 total=19136
I/art     (27274): AllocatorTagHeapBitmap active=32 max=40 total=56
I/art     (27274): AllocatorTagHeapBitmapLOS active=8 max=8 total=8
I/art     (27274): AllocatorTagVerifier active=0 max=18844 total=1073156
I/art     (27274): AllocatorTagModUnionCardSet active=5300 max=5920 total=56020
I/art     (27274): AllocatorTagModUnionReferenceArray active=24864 max=24864 total=24864
I/art     (27274): AllocatorTagJNILibrarires active=320 max=320 total=320
I/art     (27274): AllocatorTagOatFile active=1400 max=1400 total=5852

Change-Id: Ibb470ef2e9c9a24563bb46422d46a55799704d82

(cherry picked from commit 5369c40f75fdcb1be7a7c06db212ce965c83a164)

9 years agoam 20632daa: Merge "Add native memory accounting through custom allocator." into...
Mathieu Chartier [Sat, 30 Aug 2014 01:49:42 +0000 (01:49 +0000)]
am 20632daa: Merge "Add native memory accounting through custom allocator." into lmp-dev

* commit '20632daac36995947d2d1943f89f07ac277e61f0':
  Add native memory accounting through custom allocator.

9 years agoam 0772a9d9: Merge "ART: Fix accidental "1""
Andreas Gampe [Sat, 30 Aug 2014 01:42:09 +0000 (01:42 +0000)]
am 0772a9d9: Merge "ART: Fix accidental "1""

* commit '0772a9d99c8774463c9076824340eaa4eb66f47f':
  ART: Fix accidental "1"

9 years agoMerge "Add native memory accounting through custom allocator." into lmp-dev
Mathieu Chartier [Sat, 30 Aug 2014 01:17:19 +0000 (01:17 +0000)]
Merge "Add native memory accounting through custom allocator." into lmp-dev

9 years agoMerge "ART: Fix accidental "1""
Andreas Gampe [Sat, 30 Aug 2014 01:16:09 +0000 (01:16 +0000)]
Merge "ART: Fix accidental "1""

9 years agoART: Fix accidental "1"
Andreas Gampe [Sat, 30 Aug 2014 01:15:04 +0000 (18:15 -0700)]
ART: Fix accidental "1"

Should have been "0".

Change-Id: I9ad3cf1e6be6d0fcf4c8f3700ddeec4e6d5ce167

9 years agoresolved conflicts for merge of 2258d319 to lmp-dev-plus-aosp
Andreas Gampe [Sat, 30 Aug 2014 01:12:45 +0000 (18:12 -0700)]
resolved conflicts for merge of 2258d319 to lmp-dev-plus-aosp

Change-Id: I567c32c2111f3f36f26ec0b259c08c867bc34e28

9 years agoMerge "ART: Initialize fields of ParsedOptions"
Andreas Gampe [Sat, 30 Aug 2014 00:28:46 +0000 (00:28 +0000)]
Merge "ART: Initialize fields of ParsedOptions"

9 years agoAdd native memory accounting through custom allocator.
Mathieu Chartier [Mon, 25 Aug 2014 20:08:22 +0000 (13:08 -0700)]
Add native memory accounting through custom allocator.

Added a custom allocator that lets you pass in a special tag which
specifices where the allocation came from. This is used when
dumping. The performance overhead is low since each allocation only
does a atomic add/sub for each allocation/free.

The measurements are dumped to traces.txt during SIGQUIT.

Example output:
I/art     (27274): AllocatorTagHeap active=120 max=120 total=168
I/art     (27274): AllocatorTagMonitorList active=1572 max=6240 total=11724
I/art     (27274): AllocatorTagClassTable active=185208 max=185208 total=268608
I/art     (27274): AllocatorTagInternTable active=430368 max=430368 total=436080
I/art     (27274): AllocatorTagMaps active=5616 max=6168 total=34392
I/art     (27274): AllocatorTagLOS active=1024 max=1536 total=2044
I/art     (27274): AllocatorTagSafeMap active=0 max=51936 total=533688
I/art     (27274): AllocatorTagLOSMaps active=144 max=1248 total=5760
I/art     (27274): AllocatorTagReferenceTable active=10944 max=11840 total=19136
I/art     (27274): AllocatorTagHeapBitmap active=32 max=40 total=56
I/art     (27274): AllocatorTagHeapBitmapLOS active=8 max=8 total=8
I/art     (27274): AllocatorTagVerifier active=0 max=18844 total=1073156
I/art     (27274): AllocatorTagModUnionCardSet active=5300 max=5920 total=56020
I/art     (27274): AllocatorTagModUnionReferenceArray active=24864 max=24864 total=24864
I/art     (27274): AllocatorTagJNILibrarires active=320 max=320 total=320
I/art     (27274): AllocatorTagOatFile active=1400 max=1400 total=5852

Bug: 16238192

Change-Id: Ibb470ef2e9c9a24563bb46422d46a55799704d82

9 years agoam 59a00432: Merge "ART: Address issues with kIntrinsicMinMaxDouble for x86"
Ian Rogers [Fri, 29 Aug 2014 23:24:33 +0000 (23:24 +0000)]
am 59a00432: Merge "ART: Address issues with kIntrinsicMinMaxDouble for x86"

* commit '59a004328f42c32026a79b59e8eae0f3bf85b59b':
  ART: Address issues with kIntrinsicMinMaxDouble for x86

9 years agoam 5383613c: Merge "ART: Update CFG dumper to handle extended better"
Ian Rogers [Fri, 29 Aug 2014 23:24:32 +0000 (23:24 +0000)]
am 5383613c: Merge "ART: Update CFG dumper to handle extended better"

* commit '5383613c5deab8d92dcfb85c1b034594394c7cca':
  ART: Update CFG dumper to handle extended better

9 years agoFix frame size issue with 64-bit
Brian Carlstrom [Fri, 29 Aug 2014 23:20:48 +0000 (16:20 -0700)]
Fix frame size issue with 64-bit

Change-Id: Ib2f33dfb79952ba39f2d7e5303a2a2e6c4b0a0f6

9 years agoMerge "ART: Address issues with kIntrinsicMinMaxDouble for x86"
Ian Rogers [Fri, 29 Aug 2014 23:09:47 +0000 (23:09 +0000)]
Merge "ART: Address issues with kIntrinsicMinMaxDouble for x86"

9 years agoMerge "ART: Update CFG dumper to handle extended better"
Ian Rogers [Fri, 29 Aug 2014 23:04:06 +0000 (23:04 +0000)]
Merge "ART: Update CFG dumper to handle extended better"

9 years agoART: Initialize fields of ParsedOptions
Andreas Gampe [Fri, 29 Aug 2014 23:01:25 +0000 (16:01 -0700)]
ART: Initialize fields of ParsedOptions

Avoids certain paths where we touched uninitialized fields.

Bug: 17330858
Change-Id: Ia68161b12eefefacad6fc524f487f8e2caf6342a

9 years agoam 6b8e3b90: Merge "Fix master-art-host build by removing flakey test (temporarily)"
Dave Allison [Fri, 29 Aug 2014 21:40:21 +0000 (21:40 +0000)]
am 6b8e3b90: Merge "Fix master-art-host build by removing flakey test (temporarily)"

* commit '6b8e3b906dd310c649ffb4b73dc46a78b64f4a0f':
  Fix master-art-host build by removing flakey test (temporarily)

9 years agoam 923968e0: Merge "ART: Prepare for ELF64."
Brian Carlstrom [Fri, 29 Aug 2014 21:40:21 +0000 (21:40 +0000)]
am 923968e0: Merge "ART: Prepare for ELF64."

* commit '923968e08a582dcf2e9473ad1bea223e3baaa75f':
  ART: Prepare for ELF64.

9 years agoam f1260f19: Merge "Fix mac build and signal test"
Dave Allison [Fri, 29 Aug 2014 21:40:20 +0000 (21:40 +0000)]
am f1260f19: Merge "Fix mac build and signal test"

* commit 'f1260f1936239d0d8108852e1ad2baa0c333b6e6':
  Fix mac build and signal test

9 years agoMerge "Fix master-art-host build by removing flakey test (temporarily)"
Dave Allison [Fri, 29 Aug 2014 21:20:05 +0000 (21:20 +0000)]
Merge "Fix master-art-host build by removing flakey test (temporarily)"

9 years agoMerge "ART: Prepare for ELF64."
Brian Carlstrom [Fri, 29 Aug 2014 21:17:50 +0000 (21:17 +0000)]
Merge "ART: Prepare for ELF64."

9 years agoFix master-art-host build by removing flakey test (temporarily)
Dave Allison [Fri, 29 Aug 2014 21:09:19 +0000 (14:09 -0700)]
Fix master-art-host build by removing flakey test (temporarily)

Change-Id: I8c97e7a5339a6f7f5984a58ee1a7b41eab3cb2b1

9 years agoMerge "Fix mac build and signal test"
Dave Allison [Fri, 29 Aug 2014 20:09:53 +0000 (20:09 +0000)]
Merge "Fix mac build and signal test"

9 years agoFix mac build and signal test
Dave Allison [Fri, 29 Aug 2014 19:29:34 +0000 (12:29 -0700)]
Fix mac build and signal test

Change-Id: I58311285db9095ca6339ce29a9f15e841b7c822d

9 years agoam 2414f120: am 9bf1b088: Merge "Fix mips build for nested signal handler" into lmp-dev
Dave Allison [Fri, 29 Aug 2014 19:07:16 +0000 (19:07 +0000)]
am 2414f120: am 9bf1b088: Merge "Fix mips build for nested signal handler" into lmp-dev

* commit '2414f120cbdcd66c9ebd7a35b0d3bd0f16840429':
  Fix mips build for nested signal handler

9 years agoam 0ca8ab6b: am 496cd337: Fix segfault if running without image.
Alex Light [Fri, 29 Aug 2014 19:07:06 +0000 (19:07 +0000)]
am 0ca8ab6b: am 496cd337: Fix segfault if running without image.

* commit '0ca8ab6ba37a25d13a2893932d73e307a982e327':
  Fix segfault if running without image.

9 years agoam 799ddafd: Merge "Fix mips build for nested signal handler"
Dave Allison [Fri, 29 Aug 2014 18:53:30 +0000 (18:53 +0000)]
am 799ddafd: Merge "Fix mips build for nested signal handler"

* commit '799ddafdcc30783471698b7a9a05eeac8ef6f141':
  Fix mips build for nested signal handler

9 years agoam 6d0fa0e4: am 2cc42e30: Merge "Quick compiler: Fix MIPS build" into lmp-dev
buzbee [Fri, 29 Aug 2014 18:52:09 +0000 (18:52 +0000)]
am 6d0fa0e4: am 2cc42e30: Merge "Quick compiler: Fix MIPS build" into lmp-dev

* commit '6d0fa0e48c19ff2790c04e14e3ae1af751a0b4d5':
  Quick compiler: Fix MIPS build

9 years agoam c09af433: am 8ac3356d: Avoid null pointer dereference when sending JDWP packets
Sebastien Hertz [Fri, 29 Aug 2014 18:50:33 +0000 (18:50 +0000)]
am c09af433: am 8ac3356d: Avoid null pointer dereference when sending JDWP packets

* commit 'c09af433d353713440b19601db2cabb78332c9aa':
  Avoid null pointer dereference when sending JDWP packets

9 years agoam 8dc2b9e3: am 6a6a8965: Fix Mac build
Brian Carlstrom [Fri, 29 Aug 2014 18:49:15 +0000 (18:49 +0000)]
am 8dc2b9e3: am 6a6a8965: Fix Mac build

* commit '8dc2b9e37b630dd1f60eb5d172f80dcf6978b25b':
  Fix Mac build

9 years agoam cb747bf9: am 6c050b5f: Fix incorect variable name.
Alex Light [Fri, 29 Aug 2014 18:47:40 +0000 (18:47 +0000)]
am cb747bf9: am 6c050b5f: Fix incorect variable name.

* commit 'cb747bf945396c013308428723832de6e601fa66':
  Fix incorect variable name.

9 years agoam b0fc290d: (-s ours) am 1f019816: Change /dalvik-cache to be owned by root.
Alex Light [Fri, 29 Aug 2014 18:47:39 +0000 (18:47 +0000)]
am b0fc290d: (-s ours) am 1f019816: Change /dalvik-cache to be owned by root.

* commit 'b0fc290d8f0ae980754ce7740fa17667251b6aca':
  Change /dalvik-cache to be owned by root.

9 years agoam 9bf1b088: Merge "Fix mips build for nested signal handler" into lmp-dev
Dave Allison [Fri, 29 Aug 2014 18:31:09 +0000 (18:31 +0000)]
am 9bf1b088: Merge "Fix mips build for nested signal handler" into lmp-dev

* commit '9bf1b088e4e12121037090dd9c92393fbe805cb6':
  Fix mips build for nested signal handler

9 years agoMerge "Fix mips build for nested signal handler"
Dave Allison [Fri, 29 Aug 2014 18:29:06 +0000 (18:29 +0000)]
Merge "Fix mips build for nested signal handler"

9 years agoam eb9266cb: Merge "Fix segfault if running without image."
Brian Carlstrom [Fri, 29 Aug 2014 18:24:38 +0000 (18:24 +0000)]
am eb9266cb: Merge "Fix segfault if running without image."

* commit 'eb9266cb953f15f0101da33f0d5a94590b1bd14b':
  Fix segfault if running without image.

9 years agoFix mips build for nested signal handler
Dave Allison [Fri, 29 Aug 2014 18:05:17 +0000 (11:05 -0700)]
Fix mips build for nested signal handler

Bug: 17006816

(cherry picked from commit 5a18dde067daeb55f1368d5791c61e315bfa1d99)

Change-Id: Ia538e30012fed46cefba33092395c5361c571062

9 years agoMerge "Fix mips build for nested signal handler" into lmp-dev
Dave Allison [Fri, 29 Aug 2014 18:18:53 +0000 (18:18 +0000)]
Merge "Fix mips build for nested signal handler" into lmp-dev

9 years agoam 496cd337: Fix segfault if running without image.
Alex Light [Fri, 29 Aug 2014 18:18:23 +0000 (18:18 +0000)]
am 496cd337: Fix segfault if running without image.

* commit '496cd337c19ca8386fec24633160f82c01993bbd':
  Fix segfault if running without image.

9 years agoFix mips build for nested signal handler
Dave Allison [Fri, 29 Aug 2014 18:05:17 +0000 (11:05 -0700)]
Fix mips build for nested signal handler

Bug: 17006816

Change-Id: If41c6d7a2f12f1822ca36d9e2f0f22b3ca854098

9 years agoFix segfault if running without image.
Alex Light [Fri, 29 Aug 2014 17:28:25 +0000 (10:28 -0700)]
Fix segfault if running without image.

Bug: 17325091

(cherry picked from commit 7adb7ac3913364de8cc57b8934024dd12e1d3bea)

Change-Id: I343099543ce0abf02219da84d61d9ce2dfc47980

9 years agoMerge "Fix segfault if running without image."
Brian Carlstrom [Fri, 29 Aug 2014 18:02:02 +0000 (18:02 +0000)]
Merge "Fix segfault if running without image."

9 years agoam f0174a01: Merge "Fix signal chain to allow for signal() call to be used"
Dave Allison [Fri, 29 Aug 2014 17:59:43 +0000 (17:59 +0000)]
am f0174a01: Merge "Fix signal chain to allow for signal() call to be used"

* commit 'f0174a016915037f954f98ea1c910536686b83c5':
  Fix signal chain to allow for signal() call to be used

9 years agoMerge "Fix signal chain to allow for signal() call to be used"
Dave Allison [Fri, 29 Aug 2014 17:39:38 +0000 (17:39 +0000)]
Merge "Fix signal chain to allow for signal() call to be used"

9 years agoFix segfault if running without image.
Alex Light [Fri, 29 Aug 2014 17:28:25 +0000 (10:28 -0700)]
Fix segfault if running without image.

Bug: 17325091
Change-Id: I343099543ce0abf02219da84d61d9ce2dfc47980

9 years agoART: Prepare for ELF64.
Tong Shen [Wed, 27 Aug 2014 17:39:02 +0000 (10:39 -0700)]
ART: Prepare for ELF64.

Make ElfWriterQuick a template class. No functionality change.

Change-Id: I62b60dc9795c4795027e80f0bee6b54622ea49e9

9 years agoam 2cc42e30: Merge "Quick compiler: Fix MIPS build" into lmp-dev
buzbee [Fri, 29 Aug 2014 17:07:52 +0000 (17:07 +0000)]
am 2cc42e30: Merge "Quick compiler: Fix MIPS build" into lmp-dev

* commit '2cc42e3029182ad6c6443376c1a4cbf9c1e6a784':
  Quick compiler: Fix MIPS build

9 years agoMerge "Quick compiler: Fix MIPS build" into lmp-dev
buzbee [Fri, 29 Aug 2014 16:59:46 +0000 (16:59 +0000)]
Merge "Quick compiler: Fix MIPS build" into lmp-dev

9 years agoART: Address issues with kIntrinsicMinMaxDouble for x86
Razvan A Lupusoru [Thu, 14 Aug 2014 05:49:57 +0000 (13:49 +0800)]
ART: Address issues with kIntrinsicMinMaxDouble for x86

This patch fixes the following issues:
- Makes sure that invoke-static/range is considered for analysis
path that decides whether base of code register is needed.
- Invalidates the code pointer register in intrinsic implementations
of min/max for FP since generated code has diamond shape and Quick
does not correctly handle control flow merges.
- Reverts the clobbering of base of code register from constant
loading path since it reduces performance in linear code that
needs the register.
- Ensures that no assumption is made on whether base of code register
exists in cases like 64-bit where rip register may be used.

Change-Id: I96463ae1197e5cfa2a8bd3571163b38fb338a340
Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Signed-off-by: Haitao Feng <haitao.feng@intel.com>
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
9 years agoART: Update CFG dumper to handle extended better
Razvan A Lupusoru [Fri, 22 Aug 2014 22:39:50 +0000 (15:39 -0700)]
ART: Update CFG dumper to handle extended better

Change-Id: I0df8ece13deadf247a425beac0c08b2be5d773f9
Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
9 years agoQuick compiler: Fix MIPS build
buzbee [Thu, 28 Aug 2014 20:48:56 +0000 (13:48 -0700)]
Quick compiler: Fix MIPS build

b/16484538

In debug builds, the Quick compiler frequently runs a sanity checker
over the register pool.  Among other things, it attempts to verify
consistent representation of register pairs.  However, a register's
"wide" flag is meaningful only when the register pair is associated
with a Dalvik wide value (sreg != INVALID_SREG) rather than a temp
wide value.

The MIPS build was tripping over this bad assertion.  Fixed here.

Note related cl/105461

(cherry-picked from commit sha 3a658077af2a931e5d7f6cd22b777c57112c19df)

Change-Id: Id726ff1ea0f5cbcc8dba6fa3aacb3fd4fc043a63

9 years agoam 8ac3356d: Avoid null pointer dereference when sending JDWP packets
Sebastien Hertz [Fri, 29 Aug 2014 12:27:00 +0000 (12:27 +0000)]
am 8ac3356d: Avoid null pointer dereference when sending JDWP packets

* commit '8ac3356db74f5e38c70406cc5f5e65a49ff41fd7':
  Avoid null pointer dereference when sending JDWP packets

9 years agoam c84b7c54: Merge "ART: Check for no gaps only when we will have an immune region"
Andreas Gampe [Fri, 29 Aug 2014 11:39:59 +0000 (11:39 +0000)]
am c84b7c54: Merge "ART: Check for no gaps only when we will have an immune region"

* commit 'c84b7c54c2251344018a4b4e78b122caf7c03b64':
  ART: Check for no gaps only when we will have an immune region

9 years agoam 519af184: Merge "Fix Mac build"
Brian Carlstrom [Fri, 29 Aug 2014 11:39:58 +0000 (11:39 +0000)]
am 519af184: Merge "Fix Mac build"

* commit '519af184ae2d1245ed73004c1a1a457a400f66d5':
  Fix Mac build

9 years agoam 9ca7d1a9: Merge "Fix incorect variable name."
Brian Carlstrom [Fri, 29 Aug 2014 11:39:16 +0000 (11:39 +0000)]
am 9ca7d1a9: Merge "Fix incorect variable name."

* commit '9ca7d1a973f463f6c53f0b9975c500370ab50ef4':
  Fix incorect variable name.

9 years agoam 4eab6436: Merge "Change /dalvik-cache to be owned by root."
Brian Carlstrom [Fri, 29 Aug 2014 11:39:15 +0000 (11:39 +0000)]
am 4eab6436: Merge "Change /dalvik-cache to be owned by root."

* commit '4eab6436fc68105363178cc5b50dd5eefb807386':
  Change /dalvik-cache to be owned by root.

9 years agoam f843a4fd: Merge "Honor the read barrier option in IRT::Get()."
Hiroshi Yamauchi [Fri, 29 Aug 2014 11:39:14 +0000 (11:39 +0000)]
am f843a4fd: Merge "Honor the read barrier option in IRT::Get()."

* commit 'f843a4fd87dd289aea75235feb27f253de90ab60':
  Honor the read barrier option in IRT::Get().

9 years agoam d84be7ed: Merge "Fix issue with Thread.setName hanging after Thread.start"
Brian Carlstrom [Fri, 29 Aug 2014 11:39:13 +0000 (11:39 +0000)]
am d84be7ed: Merge "Fix issue with Thread.setName hanging after Thread.start"

* commit 'd84be7edd31cbcb42ffaf0c6a51f9b48974552b0':
  Fix issue with Thread.setName hanging after Thread.start

9 years agoam 0ed6c6f7: Merge "Move the glibc unlimited stack hack into GetThreadStack."
Elliott Hughes [Fri, 29 Aug 2014 11:39:12 +0000 (11:39 +0000)]
am 0ed6c6f7: Merge "Move the glibc unlimited stack hack into GetThreadStack."

* commit '0ed6c6f72eea586c684cb3e2bc7037deff87d1ba':
  Move the glibc unlimited stack hack into GetThreadStack.

9 years agoam 14515d73: Merge "Fix an assert failure in art::DumpNativeStack()."
Hiroshi Yamauchi [Fri, 29 Aug 2014 11:39:11 +0000 (11:39 +0000)]
am 14515d73: Merge "Fix an assert failure in art::DumpNativeStack()."

* commit '14515d738dadf88e3e00b7dd1bd69899c4df4b91':
  Fix an assert failure in art::DumpNativeStack().

9 years agoam 79e909bc: Merge "Quick compiler: Fix MIPS build"
buzbee [Fri, 29 Aug 2014 11:39:10 +0000 (11:39 +0000)]
am 79e909bc: Merge "Quick compiler: Fix MIPS build"

* commit '79e909bc9d95c3952be85af846ba8bda344531f5':
  Quick compiler: Fix MIPS build

9 years agoam 6950ae42: Merge "Filling hole between subclass and superclass."
Mathieu Chartier [Fri, 29 Aug 2014 11:39:08 +0000 (11:39 +0000)]
am 6950ae42: Merge "Filling hole between subclass and superclass."

* commit '6950ae42dc0f64c825bf61cb13c0bfb254ad97bd':
  Filling hole between subclass and superclass.

9 years agoam 063f73c2: Merge "Prevent exception bugs in class linker"
Mathieu Chartier [Fri, 29 Aug 2014 11:39:07 +0000 (11:39 +0000)]
am 063f73c2: Merge "Prevent exception bugs in class linker"

* commit '063f73c2678f91ec0292b31b2dba0021cb911f3e':
  Prevent exception bugs in class linker

9 years agoam 83c11593: Merge "Avoid null pointer dereference when sending JDWP packets"
Sebastien Hertz [Fri, 29 Aug 2014 11:39:05 +0000 (11:39 +0000)]
am 83c11593: Merge "Avoid null pointer dereference when sending JDWP packets"

* commit '83c115930b403db2b6b38d9dcb4828e31feb792f':
  Avoid null pointer dereference when sending JDWP packets

9 years agoAvoid null pointer dereference when sending JDWP packets
Sebastien Hertz [Thu, 28 Aug 2014 16:50:36 +0000 (18:50 +0200)]
Avoid null pointer dereference when sending JDWP packets

Bug: 16218394

(cherry picked from commit 60ed7da4d193e0f90b05c4236af77d3b276c0ea4)

Change-Id: I4882b3b6bb97facb8fca4c7ece65f4c7c96c57fe

9 years agoMerge "ART: Check for no gaps only when we will have an immune region"
Andreas Gampe [Fri, 29 Aug 2014 08:21:35 +0000 (08:21 +0000)]
Merge "ART: Check for no gaps only when we will have an immune region"

9 years agoam 6a6a8965: Fix Mac build
Brian Carlstrom [Fri, 29 Aug 2014 05:46:55 +0000 (05:46 +0000)]
am 6a6a8965: Fix Mac build

* commit '6a6a896572a76e3871f5f6b2901e3bb5dec1e2f3':
  Fix Mac build

9 years agoFix Mac build
Brian Carlstrom [Fri, 29 Aug 2014 05:17:13 +0000 (22:17 -0700)]
Fix Mac build

Bug: 17000769,16875245

(cherry picked from commit debdda0262bfbcb966a89e693d933cc74eb412ac)

Change-Id: I158f090c89587f176813a15e9edad917bd134cd0

9 years agoMerge "Fix Mac build"
Brian Carlstrom [Fri, 29 Aug 2014 05:29:14 +0000 (05:29 +0000)]
Merge "Fix Mac build"

9 years agoFix Mac build
Brian Carlstrom [Fri, 29 Aug 2014 05:17:13 +0000 (22:17 -0700)]
Fix Mac build

Bug: 17000769,16875245
Change-Id: Id5ff133e0c6c56db6972a187773c7e873b7062ee

9 years agoART: Check for no gaps only when we will have an immune region
Andreas Gampe [Wed, 27 Aug 2014 18:01:09 +0000 (11:01 -0700)]
ART: Check for no gaps only when we will have an immune region

In dex2oat, for example, this is not necessary. This CL enables running
dex2oat under valgrind.

Change-Id: Ia25c7bfb4903a613c80f4685030970b2a48e24f9

9 years agoam 6c050b5f: Fix incorect variable name.
Alex Light [Fri, 29 Aug 2014 03:34:25 +0000 (03:34 +0000)]
am 6c050b5f: Fix incorect variable name.

* commit '6c050b5f782b61a16083ae35c98931a2d51d0a33':
  Fix incorect variable name.

9 years agoam 1f019816: Change /dalvik-cache to be owned by root.
Alex Light [Fri, 29 Aug 2014 03:34:19 +0000 (03:34 +0000)]
am 1f019816: Change /dalvik-cache to be owned by root.

* commit '1f0198162044d015072cbb7824f4a6688d0300ee':
  Change /dalvik-cache to be owned by root.

9 years agoFix signal chain to allow for signal() call to be used
Dave Allison [Thu, 28 Aug 2014 23:12:40 +0000 (16:12 -0700)]
Fix signal chain to allow for signal() call to be used

Bug: 17320614
Change-Id: Ia917307fb1b593644f524518e11e295b3c64be01

9 years agoFix incorect variable name.
Alex Light [Thu, 28 Aug 2014 23:23:48 +0000 (16:23 -0700)]
Fix incorect variable name.

Bug: 16875245
(cherry picked from commit 1291e9bc87edc8fde56434bc66bef0c62d44a8e6)
Change-Id: Idd0f7ac677568a53569308a67f1ad613584949a5

9 years agoChange /dalvik-cache to be owned by root.
Alex Light [Wed, 27 Aug 2014 22:37:23 +0000 (15:37 -0700)]
Change /dalvik-cache to be owned by root.

Also prune the dalvik-cache during startup if we need to generate or
relocate an image.

Bug: 17000769,16875245

(cherry picked from commit 2539613be94f599c1713627f80c7398028d1a6aa)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66

9 years agoMerge "Fix incorect variable name."
Brian Carlstrom [Thu, 28 Aug 2014 23:27:53 +0000 (23:27 +0000)]
Merge "Fix incorect variable name."

9 years agoFix incorect variable name.
Alex Light [Thu, 28 Aug 2014 23:23:48 +0000 (16:23 -0700)]
Fix incorect variable name.

Bug: 16875245
Change-Id: Idd0f7ac677568a53569308a67f1ad613584949a5

9 years agoMerge "Change /dalvik-cache to be owned by root."
Brian Carlstrom [Thu, 28 Aug 2014 23:17:01 +0000 (23:17 +0000)]
Merge "Change /dalvik-cache to be owned by root."