OSDN Git Service
Brian Carlstrom [Tue, 24 Aug 2010 16:03:08 +0000 (09:03 -0700)]
am
39796a6a: am
30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
Merge commit '
39796a6aa79f687ac0b1254f6a8be048ad1243d8'
* commit '
39796a6aa79f687ac0b1254f6a8be048ad1243d8': (26 commits)
Remove an assertion that cannot be guaranteed.
Always support debugging and profiling.
Fix a critical space leak introduced by concurrent sweeping.
Add a little bit of paranoia to the odex data reader.
Nudge a couple of log messages.
Fix build breakage caused by the countInstancesOfClass change.
Add a method for counting the extant instances of a class.
Added fsync call to dexopt.
JIT: Fix for armv5te-VFP bug [Issue
2916682]
Cast to a byte pointer before performing arithmetic.
Limit scanning to cards within the committed region of the heap.
Remove a malfunctioning predicate used only in assertions.
Remove debugging code and stale comments from the sweep callback.
Fix build breakage caused by a bad merge from master.
JIT: Correct conversion of cb[n]z to cmp/cond_br pair
Print callee information in the JIT profile outout
JIT: Fix for lightweight assembler retry mechanism.
JIT: Fix for
2898397 assert in JIT (chain cell offset)
More SMP fixes.
Fix some potential SMP issues.
...
Brian Carlstrom [Sun, 22 Aug 2010 18:13:56 +0000 (11:13 -0700)]
libdl should not be included in the simulator build
Change-Id: Ib286e74d4baf035f6427bb00468171c8c86b6879
Jesse Wilson [Sat, 21 Aug 2010 16:36:30 +0000 (09:36 -0700)]
am
1310319f: am
3e9bfe0b: Support dalvikvm on a Linux x86 host
Merge commit '
1310319f0f89c1fc2890657aaa1f0b0ac30e099f'
* commit '
1310319f0f89c1fc2890657aaa1f0b0ac30e099f':
Support dalvikvm on a Linux x86 host
Jean-Baptiste Queru [Sat, 21 Aug 2010 01:53:43 +0000 (18:53 -0700)]
manual merge
Change-Id: I8f680ec1b2e29bd0acde675a2ab4ffd65c7ce84e
Brian Carlstrom [Fri, 20 Aug 2010 20:52:14 +0000 (13:52 -0700)]
am
30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
Merge commit '
30febfdf4abe39f99dec100de968cb831b555b27' into gingerbread-plus-aosp
* commit '
30febfdf4abe39f99dec100de968cb831b555b27': (34 commits)
Remove an assertion that cannot be guaranteed.
Always support debugging and profiling.
Fix a critical space leak introduced by concurrent sweeping.
Add a little bit of paranoia to the odex data reader.
Nudge a couple of log messages.
Fix build breakage caused by the countInstancesOfClass change.
Add a method for counting the extant instances of a class.
Added fsync call to dexopt.
JIT: Fix for armv5te-VFP bug [Issue
2916682]
Cast to a byte pointer before performing arithmetic.
Limit scanning to cards within the committed region of the heap.
Remove a malfunctioning predicate used only in assertions.
Remove debugging code and stale comments from the sweep callback.
Fix build breakage caused by a bad merge from master.
JIT: Correct conversion of cb[n]z to cmp/cond_br pair
Sweep concurrently.
Implement card table verification.
Fix the ordering of lock acquisition in the heap worker.
Print callee information in the JIT profile outout
JIT: Fix for lightweight assembler retry mechanism.
...
Brian Carlstrom [Thu, 19 Aug 2010 18:21:12 +0000 (11:21 -0700)]
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-gingerbread
Also includes cherry-pick of
07ecdc0b5d92099364eebdaee9aec297c4bbad72
Change-Id: Ie1744d78683f2f66dd1586f453f8bdd56ad2e9a5
Carl Shapiro [Thu, 19 Aug 2010 01:10:05 +0000 (18:10 -0700)]
Remove an assertion that cannot be guaranteed.
The intention of this assert was to check that the address range
spanned by the mark bitmap was a proper superset of the live bitmap.
Because allocations can occur before these bitmaps are prepared, the
live bitmap may legitimately expand beyond the range of the mark
bitmap. As such, this check is not reliable.
Change-Id: I2f23e9e7f3716a61ecf155ba81fd8baa5a82100d
Jesse Wilson [Thu, 19 Aug 2010 06:00:52 +0000 (23:00 -0700)]
am
3e9bfe0b: Support dalvikvm on a Linux x86 host
Merge commit '
3e9bfe0bed2f27d01efdb03a71025c421d321956' into gingerbread-plus-aosp
* commit '
3e9bfe0bed2f27d01efdb03a71025c421d321956':
Support dalvikvm on a Linux x86 host
Jesse Wilson [Wed, 18 Aug 2010 18:35:23 +0000 (11:35 -0700)]
Support dalvikvm on a Linux x86 host
Change-Id: Id166ab03a01833e06ec1a9aa0059e4eb28ec04ce
Xavier Ducrohet [Thu, 19 Aug 2010 00:31:34 +0000 (17:31 -0700)]
am
ac830fea: Fix dx launching script to use the new platform-tools location.
Merge commit '
ac830feace28957c9e84ce2cb0ed2a565bc24c99' into gingerbread-plus-aosp
* commit '
ac830feace28957c9e84ce2cb0ed2a565bc24c99':
Fix dx launching script to use the new platform-tools location.
Xavier Ducrohet [Wed, 18 Aug 2010 22:42:19 +0000 (15:42 -0700)]
Fix dx launching script to use the new platform-tools location.
Change-Id: Ia4d316b0fb5193dc412aa5374fc270c5b10f70e5
Andy McFadden [Wed, 18 Aug 2010 19:19:51 +0000 (12:19 -0700)]
Always support debugging and profiling.
This eliminates the use of the WITH_DEBUGGER and WITH_PROFILER
conditional compilation flags. We've never shipped a device without
these features, and it's unlikely we ever will. They're not worth
the code clutter they cause.
As usual, since I can't test the x86-atom code I left that alone and
added an item to the TODO list.
Bug
2923442.
Change-Id: I335ebd5193bc86f7641513b1b41c0378839be1fe
Andy McFadden [Wed, 18 Aug 2010 14:45:17 +0000 (07:45 -0700)]
Merge "Nudge a couple of log messages." into dalvik-dev
Carl Shapiro [Wed, 18 Aug 2010 05:47:23 +0000 (22:47 -0700)]
Merge "Fix a critical space leak introduced by concurrent sweeping." into dalvik-dev
Carl Shapiro [Wed, 18 Aug 2010 01:33:56 +0000 (18:33 -0700)]
Fix a critical space leak introduced by concurrent sweeping.
When computing the bitmaps for each heap, the live bitmap was assumed
to have greater extent than the mark bitmap. With the concurrent
sweep the mark and live bitmaps are swapped before the sweep bitmaps
are computed. As such, the live bitmap extent is always less than or
equal to the mark bitmap. A benchmark which loops creating objects
just to drop them on the floor will exclude most objects in the heap
as candidates for sweeping and will exhaust the heap.
The change fixes the extent computation and reintroduces an assert to
check that the bitmap we assume to be the largest is the largest.
Change-Id: I78694d2a0550de70c85e2087d482050a147a207a
Dan Bornstein [Tue, 17 Aug 2010 22:06:15 +0000 (15:06 -0700)]
Merge "Add a little bit of paranoia to the odex data reader." into dalvik-dev
Dan Bornstein [Tue, 17 Aug 2010 00:11:06 +0000 (17:11 -0700)]
Add a little bit of paranoia to the odex data reader.
This prevents some potential segfaults when working with (e.g., trying
to run) corrupted dex files, turning them into more informative error
messages.
Change-Id: Ie6845087bb17a5f65fafbd6f9ff335b6af489996
Andy McFadden [Tue, 17 Aug 2010 00:04:01 +0000 (17:04 -0700)]
Nudge a couple of log messages.
Also, don't show errno on a short read.
Related to bug
2916809.
Change-Id: I163906d47b698ac5e77202c323db5823196169bb
Carl Shapiro [Tue, 17 Aug 2010 20:30:48 +0000 (13:30 -0700)]
Fix build breakage caused by the countInstancesOfClass change.
There is an apparent visibility skew between passion-eng and sim-eng
builds. On sim-eng, the contents of Heap.h are globally visible but
on passion-eng this is not the case. To resolve this issue, I have
moved the offending declarations to alloc/Alloc.h which is directly
exported from Dalvik.h.
Change-Id: Iaf6f167964f81f24fa0817aa4a84b9fb4ff9a9a0
Carl Shapiro [Tue, 17 Aug 2010 19:24:44 +0000 (12:24 -0700)]
Merge "Add a method for counting the extant instances of a class." into dalvik-dev
Carl Shapiro [Tue, 17 Aug 2010 19:22:49 +0000 (12:22 -0700)]
Add a method for counting the extant instances of a class.
This facility should supersede the use of finalizers in computing
instance counts for the "adb shell dumpsys meminfo" reports.
Change-Id: I026e7083e39aa296bbbcf665231ec20d6b37cdf6
Andy McFadden [Tue, 17 Aug 2010 17:06:58 +0000 (10:06 -0700)]
Merge "Added fsync call to dexopt." into dalvik-dev
Andy McFadden [Mon, 16 Aug 2010 23:14:06 +0000 (16:14 -0700)]
Added fsync call to dexopt.
If various system-level things go wrong you might end up with a
correctly-written .odex header but an incomplete file, which ideally
would never happen. This adds an fsync() call before we write the
header to make this less likely.
Change-Id: Ie5ac67dc7185ca9a4995710688e1219e46477c12
Ben Cheng [Mon, 16 Aug 2010 22:31:48 +0000 (15:31 -0700)]
am
bce36059: am
52d4cd28: Rename registers on inlined instructions that use wide operands.
Merge commit '
bce36059dd1021b0cd06c02c3a9849ae6da4741b' into dalvik-dev
* commit '
bce36059dd1021b0cd06c02c3a9849ae6da4741b':
Rename registers on inlined instructions that use wide operands.
Ben Cheng [Mon, 16 Aug 2010 22:19:46 +0000 (15:19 -0700)]
am
52d4cd28: Rename registers on inlined instructions that use wide operands.
Merge commit '
52d4cd28a5d6d946934704e11e1d41450c10aa05'
* commit '
52d4cd28a5d6d946934704e11e1d41450c10aa05':
Rename registers on inlined instructions that use wide operands.
Ben Cheng [Mon, 16 Aug 2010 21:08:49 +0000 (14:08 -0700)]
Rename registers on inlined instructions that use wide operands.
For example, v1 in the callee should be v7 in the caller.
Before:
div-double v7, v8, v10
iput-wide-quick (C) v1, v6, (#136) <- v1 should be renamed
invoke-virtual-quick (PI) v6, v7, v8
After:
div-double v7, v8, v10
iput-wide-quick (C) v7, v6, (#136)
invoke-virtual-quick (PI) v6, v7, v8
Bug:
2907602
Change-Id: I21b9a45f8e422148d45de98c1ec9acbfd9783cc6
buzbee [Sat, 14 Aug 2010 00:52:46 +0000 (17:52 -0700)]
JIT: Fix for armv5te-VFP bug [Issue
2916682]
Temp register was clobbered after explicit use rather than before.
Affects only armv5te-vfp builds.
Change-Id: I0a1c3f69a299f31bd50f3ec95ae83681b89ae6f1
Carl Shapiro [Thu, 12 Aug 2010 20:55:06 +0000 (13:55 -0700)]
Cast to a byte pointer before performing arithmetic.
Change-Id: I1efd3b327b8c0a052c975ed07ee0db648ba84581
Carl Shapiro [Thu, 12 Aug 2010 18:24:44 +0000 (11:24 -0700)]
Limit scanning to cards within the committed region of the heap.
The initial implementation of the card scanning routine scanned all
cards in the card table. For heaps that are less than the maximum
allowed size time was wasted scanning cards that are never dirtied.
Change-Id: I599c53a1777bf38b4d7b19438eb7584f9ba578ec
Carl Shapiro [Wed, 11 Aug 2010 02:23:22 +0000 (19:23 -0700)]
Merge "Remove a malfunctioning predicate used only in assertions." into dalvik-dev
Carl Shapiro [Wed, 11 Aug 2010 01:07:44 +0000 (18:07 -0700)]
Remove a malfunctioning predicate used only in assertions.
This check thought it filtered pointers aligned on 4-byte boundaries
and inclusion in the heap but actually checked for pointers on 8-byte
boundaries. Both checks surround storing method call return values
which are gauranteed to be stack allocated.
Change-Id: I9cfd9eb06c5bd1d5cf55b372771da20425c56406
Carl Shapiro [Wed, 11 Aug 2010 00:28:12 +0000 (17:28 -0700)]
Remove debugging code and stale comments from the sweep callback.
Change-Id: Idf5e26354179a0d8c519c85880ad218603878722
Carl Shapiro [Wed, 11 Aug 2010 00:20:15 +0000 (17:20 -0700)]
Fix build breakage caused by a bad merge from
Change-Id: I2da195733b3c78fea2865b0bdc0b5a5bf9ec60fe
buzbee [Tue, 10 Aug 2010 23:26:24 +0000 (16:26 -0700)]
Merge "JIT: Correct conversion of cb[n]z to cmp/cond_br pair" into dalvik-dev
Carl Shapiro [Tue, 10 Aug 2010 23:16:57 +0000 (16:16 -0700)]
am
8881a809: Sweep concurrently.
Merge commit '
8881a8098e259a1faf392d20c1fefc1ee4a63b20' into dalvik-dev
* commit '
8881a8098e259a1faf392d20c1fefc1ee4a63b20':
Sweep concurrently.
buzbee [Tue, 10 Aug 2010 22:50:34 +0000 (15:50 -0700)]
JIT: Correct conversion of cb[n]z to cmp/cond_br pair
This fixes the regression introduced in the fast assembly retry
that was causing excessive bailouts. The good news is that with
this fix, we're seeing a ~5% boost in Linpack because of the
cb[n]z usage.
Change-Id: Ib4a48dcba809af4343456eae49a90b4a1e3aee9d
Carl Shapiro [Tue, 10 Aug 2010 22:55:45 +0000 (15:55 -0700)]
Sweep concurrently.
After marking, exchange the mark and live bitmaps and resume all
threads. The sweep proceeds concurrently viewing the new live bitmap
as the old mark bitmap thereby permitting allocations performed while
sweeping to update the live bitmap.
Change-Id: I9c307190a14ce417413175db016be41c38aeeaf3
Carl Shapiro [Tue, 10 Aug 2010 03:10:35 +0000 (20:10 -0700)]
am
cb7c47d0: am
d012d06b: Fix the ordering of lock acquisition in the heap worker.
Merge commit '
cb7c47d047f80952a69f1d2a7200c589754b4870' into dalvik-dev
* commit '
cb7c47d047f80952a69f1d2a7200c589754b4870':
Fix the ordering of lock acquisition in the heap worker.
Dan Bornstein [Tue, 10 Aug 2010 03:10:30 +0000 (20:10 -0700)]
am
577a8269: am
34bfe020: Fix a couple copyright headers that aren\'t in the prescribed format.
Merge commit '
577a826937acddadafd9b901dbafdec27d4613fc' into dalvik-dev
* commit '
577a826937acddadafd9b901dbafdec27d4613fc':
Fix a couple copyright headers that aren't in the prescribed format.
Carl Shapiro [Tue, 10 Aug 2010 02:57:04 +0000 (19:57 -0700)]
am
d012d06b: Fix the ordering of lock acquisition in the heap worker.
Merge commit '
d012d06b0673c3da9d23b1816ff5a325576eb9b3'
* commit '
d012d06b0673c3da9d23b1816ff5a325576eb9b3':
Fix the ordering of lock acquisition in the heap worker.
Dan Bornstein [Tue, 10 Aug 2010 02:57:01 +0000 (19:57 -0700)]
am
34bfe020: Fix a couple copyright headers that aren\'t in the prescribed format.
Merge commit '
34bfe020eccbe4034322c5952012612b0540acb3'
* commit '
34bfe020eccbe4034322c5952012612b0540acb3':
Fix a couple copyright headers that aren't in the prescribed format.
Carl Shapiro [Fri, 6 Aug 2010 22:17:46 +0000 (15:17 -0700)]
Fix the ordering of lock acquisition in the heap worker.
A feature of the concurrent GC is that gcHeapLock is released while
roots are traced through. This complicates the heap worker thread as
it assumes that when the gcHeapLock can be acquired no threads are
contending for the heapWorkerLock. However, the concurrent GC holds
heapWorkerLock for the duration of a GC. If the heap worker thread
becomes active while the GC temporarily release gcHeapLock it may
deadlock the GC by acquring the gcHeapLock, needed by the GC during
its final pause, and wait for the heapWorkerLock held by the GC.
This change attempts to resolve this issue by checking to see if after
a transition into running whether the GC has become active. If so, it
releases gcHeapLock and reacquires it after the GC has signaled
completion. This must be done in a loop as there is no guarantee that
the GC has not become active when heap worker is rescheduled.
Dan Bornstein [Wed, 4 Aug 2010 01:09:42 +0000 (18:09 -0700)]
Fix a couple copyright headers that aren't in the prescribed format.
Change-Id: I4de4dc69d8989f1add431e58533c7e633f67e550
Carl Shapiro [Mon, 9 Aug 2010 21:18:01 +0000 (14:18 -0700)]
am
ff3cc1d1: Merge "Fix the ordering of lock acquisition in the heap worker."
Merge commit '
ff3cc1d1dfb03da6065879d26089d6f2ca129dcc' into dalvik-dev
* commit '
ff3cc1d1dfb03da6065879d26089d6f2ca129dcc':
Fix the ordering of lock acquisition in the heap worker.
Carl Shapiro [Mon, 9 Aug 2010 21:15:11 +0000 (14:15 -0700)]
Merge "Fix the ordering of lock acquisition in the heap worker."
Carl Shapiro [Mon, 9 Aug 2010 20:40:12 +0000 (13:40 -0700)]
am
5ba39376: Implement card table verification.
Merge commit '
5ba39376c5b7a5878f234a689a51c74783583b4b' into dalvik-dev
* commit '
5ba39376c5b7a5878f234a689a51c74783583b4b':
Implement card table verification.
Carl Shapiro [Sat, 7 Aug 2010 00:07:53 +0000 (17:07 -0700)]
Implement card table verification.
Card table verification occurs just before scanning the card table
during a concurrent GC. Each object in the bitmap is visited and the
number of white (unmarked) references are counted. If an object has
unmarked objects it is by definition gray and must reside on a dirty
card. If the object is not on a dirty card, the verification routine
aborts the VM.
Because the processing of weak roots and references has yet to occur,
reachable reference objects with unmarked referents and weak interned
strings may still be gray. These objects are checked during the card
table scan and ignored if their card is not dirty.
Change-Id: I64d145aa4719fb52eb9e3bb91efaf4dcfacd6e0c
Ben Cheng [Mon, 9 Aug 2010 18:30:50 +0000 (11:30 -0700)]
Merge "Print callee information in the JIT profile outout" into dalvik-dev
Carl Shapiro [Sat, 7 Aug 2010 01:54:29 +0000 (18:54 -0700)]
am
6a7a5c24: Merge "Remove stale comments."
Merge commit '
6a7a5c2475f7d6c179cb671778d08461e585dbd3' into dalvik-dev
* commit '
6a7a5c2475f7d6c179cb671778d08461e585dbd3':
Remove stale comments.
Carl Shapiro [Sat, 7 Aug 2010 01:54:25 +0000 (18:54 -0700)]
am
1ff61c3d: Merge "Rename verifyHeap and eliminate its bogus function-level comment."
Merge commit '
1ff61c3df16591b6b2022e287862c7a38009b4c7' into dalvik-dev
* commit '
1ff61c3df16591b6b2022e287862c7a38009b4c7':
Rename verifyHeap and eliminate its bogus function-level comment.
Carl Shapiro [Fri, 6 Aug 2010 22:17:46 +0000 (15:17 -0700)]
Fix the ordering of lock acquisition in the heap worker.
A feature of the concurrent GC is that gcHeapLock is released while
roots are traced through. This complicates the heap worker thread as
it assumes that when the gcHeapLock can be acquired no threads are
contending for the heapWorkerLock. However, the concurrent GC holds
heapWorkerLock for the duration of a GC. If the heap worker thread
becomes active while the GC temporarily release gcHeapLock it may
deadlock the GC by acquring the gcHeapLock, needed by the GC during
its final pause, and wait for the heapWorkerLock held by the GC.
This change attempts to resolve this issue by checking to see if after
a transition into running whether the GC has become active. If so, it
releases gcHeapLock and reacquires it after the GC has signaled
completion. This must be done in a loop as there is no guarantee that
the GC has not become active when heap worker is rescheduled.
Change-Id: Ia30481cc597cea837529eab4f85ba86b02691efe
Ben Cheng [Fri, 6 Aug 2010 23:42:50 +0000 (16:42 -0700)]
Print callee information in the JIT profile outout
For example:
TRACEPROFILE 0x48bbb2d4 11057 0.55% [0x45d(+1), 14011] ...
-> Ljava/util/HashMap$HashIterator;hasNext;()Z
It means the trace ends with a call to hasNext(), and inlining
probably won't help the overall performance more than 0.55%.
Change-Id: I9bf2a79c48d6cb569a9fe2e329022edf968664bb
buzbee [Fri, 6 Aug 2010 21:27:18 +0000 (14:27 -0700)]
Merge "JIT: Fix for lightweight assembler retry mechanism." into dalvik-dev
buzbee [Fri, 6 Aug 2010 21:20:14 +0000 (14:20 -0700)]
JIT: Fix for lightweight assembler retry mechanism.
Removed a special path in the assembler that took in sideband
info on some instructions and used it to modify pc-relative load
addresses. This mechanism (used in some older chaining cells) is
no longer needed, and was causing a problem for the new lightweight
assembler retry mechanism.
Change-Id: I1cca5b719bcdea0810831d889ebe2f935c61966f
Andy McFadden [Fri, 6 Aug 2010 18:26:45 +0000 (11:26 -0700)]
Merge "Fix some potential SMP issues." into dalvik-dev
Carl Shapiro [Fri, 6 Aug 2010 18:16:30 +0000 (11:16 -0700)]
Merge "Remove stale comments."
Carl Shapiro [Fri, 6 Aug 2010 18:16:21 +0000 (11:16 -0700)]
Merge "Rename verifyHeap and eliminate its bogus function-level comment."
buzbee [Thu, 5 Aug 2010 23:34:36 +0000 (16:34 -0700)]
JIT: Fix for
2898397 assert in JIT (chain cell offset)
My previous change to allow for lightweight assembler retries neglected
to restore a sanity check cookie when re-assembling without fully rebuilding
the trace.
Change-Id: Ief7eb76263e272b9cd79345f8344bd35926f5b10
Andy McFadden [Thu, 5 Aug 2010 21:34:26 +0000 (14:34 -0700)]
More SMP fixes.
Convert some ANDROID_MEMBAR_FULL uses into equivalent atomic ops. A
couple of "bool" had to convert to "int" since we don't have atomic
ops for bools.
Replaced a local implementation of atomic inc with a call to the
atomic inc function.
Change-Id: I948b8080d743552bde014d3a6e716ed2c30ebef8
Carl Shapiro [Fri, 6 Aug 2010 05:11:37 +0000 (22:11 -0700)]
am
b0691476: Remove stale overwritefree flag.
Merge commit '
b0691476e24deae014dadbdbbceabc72d5a96ae6' into dalvik-dev
* commit '
b0691476e24deae014dadbdbbceabc72d5a96ae6':
Remove stale overwritefree flag.
Carl Shapiro [Fri, 6 Aug 2010 04:49:07 +0000 (21:49 -0700)]
Rename verifyHeap and eliminate its bogus function-level comment.
Change-Id: I09870de2710d03059faf6abce016e282865d2227
Andy McFadden [Wed, 4 Aug 2010 23:09:10 +0000 (16:09 -0700)]
Fix some potential SMP issues.
Wandered through Thread.c looking for SMP trouble spots. Changed a
couple of stores to android_atomic_release_store, and added some
comments.
Also, wrapped the self-suspend stuff that's in the thread status change
code so it only happens if we're actually going to suspend the thread.
Change-Id: I2d3feae7ce8937eada9111bd31928b61875a86d3
Carl Shapiro [Fri, 6 Aug 2010 03:21:42 +0000 (20:21 -0700)]
Remove stale overwritefree flag.
Change-Id: If14998128245245c908b2390acfe28b82339f8bf
Carl Shapiro [Fri, 6 Aug 2010 03:07:50 +0000 (20:07 -0700)]
am
f98e0ed5: Merge "Add const qualifier to the dvmComputeStringHash signature."
Merge commit '
f98e0ed527d4b0b489bd714bb4e8606dde53973d' into dalvik-dev
* commit '
f98e0ed527d4b0b489bd714bb4e8606dde53973d':
Add const qualifier to the dvmComputeStringHash signature.
Carl Shapiro [Fri, 6 Aug 2010 03:01:52 +0000 (20:01 -0700)]
Merge "Add const qualifier to the dvmComputeStringHash signature."
Carl Shapiro [Fri, 6 Aug 2010 02:55:11 +0000 (19:55 -0700)]
Add const qualifier to the dvmComputeStringHash signature.
Change-Id: Icc963f324ca738438c069e99f346826d7f301095
Carl Shapiro [Fri, 6 Aug 2010 02:53:09 +0000 (19:53 -0700)]
Remove stale comments.
Change-Id: I7b7d822784ebf3b18ee8af6bd6acee220c285508
buzbee [Thu, 5 Aug 2010 21:04:54 +0000 (14:04 -0700)]
Tweaks to x86 mterp periodic checks [issue
2634642]
Update the x86 mterp main interpetation loop to match Arm and the portable
interpreter by checking for debugger/profiler after suspends. Also,
enable ability to skip a load when checking for active debugger (both
Arm and x86).
Related cl: https://android-git.corp.google.com/g/#change,50229
Change-Id: Ic5d0f102b2250393eaf4405e4cafb7678b1a563e
Brian Carlstrom [Thu, 5 Aug 2010 19:17:45 +0000 (12:17 -0700)]
am
ce82d2d1: am
c9153114: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
Merge commit '
ce82d2d1642e55ae62932003187cabc3f5db9e84' into dalvik-dev
* commit '
ce82d2d1642e55ae62932003187cabc3f5db9e84':
Brian Carlstrom [Thu, 5 Aug 2010 19:12:44 +0000 (12:12 -0700)]
am
c9153114: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
Merge commit '
c915311408e45b4687d230641382e025cf38805d'
* commit '
c915311408e45b4687d230641382e025cf38805d':
Add a missing branch for inlined direct getters.
Implement method inlining for getters/setters
Switch -Xjnitrace over to using a custom JNI bridge.
Change dvmHeapBitmapXorWalk to dvmHeapBitmapSweepWalk.
Break apart the swapping of the mark and live bitmaps and zeroing of
Fix a crash during VM shutdown.
Update the atomics test for the new atomics API.
Allow the VM to suspend while the heap worker initializes.
buzbee [Thu, 5 Aug 2010 18:09:07 +0000 (11:09 -0700)]
Merge "JIT: Support for shift field in disassembler [issue
2465170]" into dalvik-dev
buzbee [Thu, 5 Aug 2010 18:01:12 +0000 (11:01 -0700)]
JIT: Support for shift field in disassembler [issue
2465170]
Many Thumb2 instructions allow for an optional shift to be applied to
operand 2. This cl enhances the disassembler to show a non-zero shift
in the dump output.
Change-Id: I6cbfec46cd45e3f2acc9553f880e80764a1eb65d
Andy McFadden [Thu, 5 Aug 2010 14:42:01 +0000 (07:42 -0700)]
Merge "Move dvmFreeClassInnards responsibility." into dalvik-dev
buzbee [Wed, 4 Aug 2010 22:25:06 +0000 (15:25 -0700)]
JIT: Reworked the assembler to be smarter about short instruction forms
Previously, the JIT wasn't generating short-form compare and branch on
zero/not zero instructions for Thumb2. The reason was that these only
allow a 1-byte displacement, and when they didn't reach the assembler would
abort the trace, split it in half and try again. This change re-enables
cbz, cbnz generation and introduces a relatively lightweight retry
mechanism.
Also includes changes for Thumb2 to always generate large displacement
literal loads and conditional branches to minimize the number of retry
attempts.
Change-Id: Icf066836fad203f5c0fcbbb2ae8e1aa73d1cf816
Brian Carlstrom [Wed, 4 Aug 2010 22:37:09 +0000 (15:37 -0700)]
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-gingerbread
Ben Cheng [Wed, 4 Aug 2010 20:23:09 +0000 (13:23 -0700)]
Bug fixes for JIT loop detection and formation
Specifically:
- Don't apply loop optimization if the basic induction variable is
manipulated (ie excluding cases like "i+=0")
- Fix a case where variables reloaded with constants in the body are
not considered as loop invariants
Bug:
2804188
Change-Id: Ia5ebb29bc6814b1be069e23794585f8313900b7d
buzbee [Wed, 4 Aug 2010 21:11:11 +0000 (14:11 -0700)]
am
baf196a7: Fix for
2892472 jit spew: No free temp registers
Merge commit '
baf196a7b259704137cccf4058b78da15d4c3998' into dalvik-dev
* commit '
baf196a7b259704137cccf4058b78da15d4c3998':
Fix for
2892472 jit spew: No free temp registers
Andy McFadden [Wed, 4 Aug 2010 19:47:21 +0000 (12:47 -0700)]
Move dvmFreeClassInnards responsibility.
The GC has been responsible for ensuring that the "innards" of a
class object are freed before the ClassObject itself is discarded.
Since we don't currently unload classes, this situation can only arise
if something went wrong during the loading of a class (e.g. memory
alloc failure part way through), or another thread loaded the same
class at the same time and won the race. It makes more sense to
have the cleanup occur at the point we decide that our class object
is not useful.
For the most part this was already being done, but there were a couple
of places where it wasn't.
This change
- adds the missing dvmFreeClassInnards calls
- changes the GC code to warn without taking action
- enables the GC code only when assertions are enabled
The code in MarkSweep.c looks like it merits further rearranging, but
I'll leave that to Team GC.
Also, "dalvik_assert" is now only printed on the VM features line when
assertions are enabled.
For bug
2751668.
Change-Id: I90e4455e830766f94f921c7f23b44b423bce3321
buzbee [Wed, 4 Aug 2010 17:13:15 +0000 (10:13 -0700)]
Fix for
2892472 jit spew: No free temp registers
Neglected some register allocation hygene, which caused a
problem on armv5te builds.
Change-Id: I666b39b88822c4d3d3d7f0e84386aca2920bb9f1
Andy McFadden [Wed, 4 Aug 2010 14:23:15 +0000 (07:23 -0700)]
Merge "New material for JNI Tips doc." into dalvik-dev
Andy McFadden [Tue, 20 Jul 2010 23:54:48 +0000 (16:54 -0700)]
New material for JNI Tips doc.
Added three new "FAQ" sections, covering the questions that come up
most frequently on the android-ndk mailing list.
Augmented the "Unsupported Features" section with a list of items
that didn't used to work, and noted when they started working.
Various minor updates.
Change-Id: I9acb22e70f6dae1d9b5011da0eab08b6e739d5f9
Ben Cheng [Tue, 3 Aug 2010 19:54:00 +0000 (12:54 -0700)]
Add a missing branch for inlined direct getters.
Change-Id: Ie11925b1856b32aeb6855601195e8a13d23c4e94
Ben Cheng [Mon, 7 Jun 2010 20:44:23 +0000 (13:44 -0700)]
Implement method inlining for getters/setters
Changes include:
1) Force the trace that ends with an invoke instruction to include
the next instruction if it is a move-result (because both need
to be turned into no-ops if callee is inlined).
2) Interpreter entry point/trace builder changes so that return
target won't automatically be considered as trace starting points
(to avoid duplicate traces that include the move result
instructions).
3) Codegen changes to handle getters/setters invoked from both
monomorphic and polymorphic callsites.
4) Extend/fix self-verification to form identical trace regions and
handle traces with inlined callees.
5) Apply touchups to the method based parsing - still not in use.
Change-Id: I116b934df01bf9ada6d5a25187510e352bccd13c
Carl Shapiro [Sat, 31 Jul 2010 02:49:45 +0000 (19:49 -0700)]
am
4dc622c5: Remove the dvmHeapSizeChanged no-op routine.
Merge commit '
4dc622c5b4ce48b5f2f0a0f92f316dd557fc950f' into dalvik-dev
* commit '
4dc622c5b4ce48b5f2f0a0f92f316dd557fc950f':
Remove the dvmHeapSizeChanged no-op routine.
Carl Shapiro [Sat, 31 Jul 2010 02:37:22 +0000 (19:37 -0700)]
Remove the dvmHeapSizeChanged no-op routine.
Change-Id: I6deb4ea858610edee6e7aa44d49d91cae5a25404
Carl Shapiro [Sat, 31 Jul 2010 01:03:29 +0000 (18:03 -0700)]
am
6fa09f77: Fix the format conversions, again.
Merge commit '
6fa09f77cda8be8505897881a74821886c5aa116' into dalvik-dev
* commit '
6fa09f77cda8be8505897881a74821886c5aa116':
Fix the format conversions, again.
Carl Shapiro [Sat, 31 Jul 2010 01:00:01 +0000 (18:00 -0700)]
Fix the format conversions, again.
Change-Id: I6e46d882bad1e3264caeffec6196ce6ed07299ef
Carl Shapiro [Sat, 31 Jul 2010 00:49:42 +0000 (17:49 -0700)]
am
4d529be0: Fix log message format conversions and remove uneeded newlines.
Merge commit '
4d529be041b5a8c25647da505aed109d5f3f4e69' into dalvik-dev
* commit '
4d529be041b5a8c25647da505aed109d5f3f4e69':
Fix log message format conversions and remove uneeded newlines.
Carl Shapiro [Fri, 30 Jul 2010 04:47:54 +0000 (21:47 -0700)]
Fix log message format conversions and remove uneeded newlines.
Change-Id: Iae538c643d86522e8f0a52e6f01e411bbdea892b
Carl Shapiro [Fri, 30 Jul 2010 23:20:33 +0000 (16:20 -0700)]
am
5488c8b2: Merge "Change dvmHeapBitmapXorWalk to dvmHeapBitmapSweepWalk."
Merge commit '
5488c8b2a6f4254cdfa4abbb655784fb5d632008' into dalvik-dev
* commit '
5488c8b2a6f4254cdfa4abbb655784fb5d632008':
Change dvmHeapBitmapXorWalk to dvmHeapBitmapSweepWalk.
Carl Shapiro [Fri, 30 Jul 2010 23:18:47 +0000 (16:18 -0700)]
Merge "Change dvmHeapBitmapXorWalk to dvmHeapBitmapSweepWalk."
buzbee [Fri, 30 Jul 2010 23:15:33 +0000 (16:15 -0700)]
am
f3e71ffb: Merge "JIT: Fix for Issue
2881687 - fix volatiles and re-enable JIT"
Merge commit '
f3e71ffb84adfb0401e5b0d164e505ae3df22c01' into dalvik-dev
* commit '
f3e71ffb84adfb0401e5b0d164e505ae3df22c01':
JIT: Fix for Issue
2881687 - fix volatiles and re-enable JIT
buzbee [Fri, 30 Jul 2010 23:12:55 +0000 (16:12 -0700)]
Merge "JIT: Fix for Issue
2881687 - fix volatiles and re-enable JIT"
Barry Hayes [Wed, 21 Jul 2010 19:03:02 +0000 (12:03 -0700)]
Change dvmHeapBitmapXorWalk to dvmHeapBitmapSweepWalk.
Concurrent sweeping will require the callback to process objects which
are live and not marked, while the client code continues to allocate
and set bits. Since dvmHeapBitmapXorWalk was only used to sweep, it
seemed easiest to make it learn its true purpose.
Elliott Hughes [Fri, 30 Jul 2010 22:56:19 +0000 (15:56 -0700)]
Merge "Switch -Xjnitrace over to using a custom JNI bridge." into dalvik-dev
Elliott Hughes [Fri, 30 Jul 2010 20:34:49 +0000 (13:34 -0700)]
Switch -Xjnitrace over to using a custom JNI bridge.
This now works without needing to specify -Xint:portable, and no longer needs
to be manually enabled at compile-time.
If you're using -Xjnitrace, you'll pay to look up the real JNI bridge on every
invocation of a native method, but doing so leads to a really simple
implementation, and you're writing to the log on every invocation anyway, so
-Xjnitrace and performance don't go together anyway.
Bug:
2846017
Change-Id: I3108c4f35f27b72e8849c41077ae3e8768550e96
Carl Shapiro [Fri, 30 Jul 2010 22:46:26 +0000 (15:46 -0700)]
am
79a76f30: Remove the seldom used overwrite free code.
Merge commit '
79a76f30a7fe513e08b82464b68e00d77b170f54' into dalvik-dev
* commit '
79a76f30a7fe513e08b82464b68e00d77b170f54':
Remove the seldom used overwrite free code.
Carl Shapiro [Fri, 30 Jul 2010 02:57:30 +0000 (19:57 -0700)]
Remove the seldom used overwrite free code.
This is being done in preparation of a change that will eliminate the
property handler from AndroidRuntime.cpp.
Change-Id: I05e43dab2e6e195048642e51d01986ed63472d21
Carl Shapiro [Fri, 30 Jul 2010 22:43:32 +0000 (15:43 -0700)]
am
a20a9929: Move LIKELY and UNLIKELY to a public header file.
Merge commit '
a20a99298b45b4b6c7c9c528066a3e055e601535' into dalvik-dev
* commit '
a20a99298b45b4b6c7c9c528066a3e055e601535':
Move LIKELY and UNLIKELY to a public header file.
Carl Shapiro [Fri, 30 Jul 2010 04:22:12 +0000 (21:22 -0700)]
Move LIKELY and UNLIKELY to a public header file.
Change-Id: I6c4429277f50ff34021bd2ef836834605323b9bd