OSDN Git Service
Charlie Groves [Sun, 11 Mar 2012 07:40:47 +0000 (23:40 -0800)]
Compact merged dexes on their byte aligned size
Previously, if a merged dex had too much free space, the compaction step
would subtract the unused space from the section sizes generated by
adding the merged dexes section sizes. The merged sizes weren't 4-byte
aligned, which meant if a section had been bumped in size for the
boundary, the compaction would fail when loading into a section eg
'Section limit
3665072 exceeded by string data'.
This gets the compacted section size from the actual used space instead
of from the non-aligned estimate, so everything fits.
Change-Id: I1aee1abd721ec21998bb3ea78f6f424e7421b614
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:23:40 +0000 (14:23 -0800)]
Merge "Add a test for a dalvikvm 'switch' bug."
Elliott Hughes [Fri, 10 Feb 2012 23:15:39 +0000 (15:15 -0800)]
Add a test for a dalvikvm 'switch' bug.
Bug: http://code.google.com/p/android/issues/detail?id=22344
Change-Id: I3bf9f8a0732876d758bc5378c5d25ad0c8a71684
Jean-Baptiste Queru [Wed, 1 Feb 2012 16:41:43 +0000 (08:41 -0800)]
Merge "Updates to the VM tests."
Elliott Hughes [Wed, 1 Feb 2012 01:55:18 +0000 (17:55 -0800)]
Updates to the VM tests.
Bug: http://code.google.com/p/android/issues/detail?id=21599
Bug: http://code.google.com/p/android/issues/detail?id=21597
Change-Id: I9c6d67cd18943eb6fa68104f0ec2fbec5ea9e0ec
Jean-Baptiste Queru [Tue, 17 Jan 2012 23:26:45 +0000 (15:26 -0800)]
Merge "cleanup redundant interfaces from iftable to avoid excessive LinearAlloc use"
Jean-Baptiste Queru [Fri, 13 Jan 2012 15:49:24 +0000 (07:49 -0800)]
Merge "fix dvmDbgOutputAllInterfaces to include only direct super-interfaces"
Johannes Rudolph [Fri, 13 Jan 2012 07:18:17 +0000 (08:18 +0100)]
cleanup redundant interfaces from iftable to avoid excessive LinearAlloc use
In deep interface hierarchies super-interfaces are recursively concatenated
to create the iftable. There was no checking for duplicated entries so that the
iftable could get pretty large with just a few layers of interfaces up to the
point where the LinearAlloc was exceeded completely.
This change scans the iftable linearly for existing entries before it adds another
one.
Issue: http://code.google.com/p/android/issues/detail?id=22586
Change-Id: Idb4a13ca7a52f390661629cf2539930242526876
Signed-off-by: Johannes Rudolph <johannes.rudolph@gmail.com>
Johannes Rudolph [Thu, 12 Jan 2012 09:53:48 +0000 (10:53 +0100)]
fix dvmDbgOutputAllInterfaces to include only direct super-interfaces
As the javadoc and the spec say dvmDbgOutputAllInterfaces should output only
the directly implemented interfaces. This can be achieved by just iterating
over the `clazz->interfaces`.
Issue: http://code.google.com/p/android/issues/detail?id=21422
Change-Id: I1779e2cc2ada7afaaf4a1e2e5c7861d61d9ea014
Signed-off-by: Johannes Rudolph <johannes.rudolph@gmail.com>
The Android Open Source Project [Thu, 8 Dec 2011 18:21:27 +0000 (10:21 -0800)]
Reconcile with ics-mr1-release
Change-Id: I61fc74707db482c4600aaa34b751a665c75ffcec
The Android Automerger [Fri, 2 Dec 2011 00:45:10 +0000 (16:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ben Cheng [Thu, 1 Dec 2011 20:24:49 +0000 (12:24 -0800)]
Initialize the vC field of inlined getters/setters.
To eliminate a benign Valgrind warning.
Change-Id: I5f0ae53b8c86fe476f0b7ddfb6589191aea464f6
Ben Cheng [Wed, 30 Nov 2011 18:43:09 +0000 (10:43 -0800)]
Initialize the JNI indirect ref table to make Valgrind happy.
Specifically, this is to eliminate the benign warning about the
'serial' field being uninitialized.
BUG:
5542417
Change-Id: I8550972e70db94f24c47c4e5dea0b59cc5840b48
The Android Automerger [Thu, 10 Nov 2011 14:45:54 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andy McFadden [Tue, 8 Nov 2011 00:57:54 +0000 (16:57 -0800)]
DO NOT MERGE Further refinement of card table clear
We're currently using memset() to clear cards out to the growth
limit, which on a device configured for 48MB/128MB process caps
means we're sitting on 384KB or 1MB of pages. We can reduce that
substantially.
This change attempts to reduce the memset() length to the currently
active portion of the card table, based on the placement of objects
in the "live objects" bitmap. This should avoid faulting in card
pages that we don't actually need.
This is suboptimal when parts of the card table are used briefly
and then ignored for a while. An alternative implementation, which
uses madvise(DONTNEED) aggressively, is also included (#ifdefed out).
Bug
5567332
(cherry-pick from master)
Change-Id: I6b181de20a0c8b6307acaebbc5d6dac20422f25d
The Android Automerger [Sun, 6 Nov 2011 14:45:27 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Elliott Hughes [Sat, 5 Nov 2011 00:22:17 +0000 (17:22 -0700)]
Merge "Don't pay for filename/line number lookup unless you need to." into ics-mr1
Elliott Hughes [Sat, 5 Nov 2011 00:22:01 +0000 (17:22 -0700)]
Merge "Knock ::self() out of the ParseXml profile." into ics-mr1
Andy McFadden [Fri, 4 Nov 2011 23:46:14 +0000 (16:46 -0700)]
Merge "Reduce Dalvik card table overhead" into ics-mr1
Andy McFadden [Fri, 4 Nov 2011 22:58:37 +0000 (15:58 -0700)]
Don't decr profiling count without incr
The failure cleanup code in dvmMethodTraceStart() was assuming
that profiling had already been started, which was true until my
previous change. The code in the interpreter isn't too picky, but
updateActiveProfilers() is trying to keep an accurate acount, and
gets upset. If you pass in a bad filename, we disable something that
was never enabled, and the VM gets confused and aborts out of spite.
Related to bug
5564440
Change-Id: I17fd8bf4654c29f49efb10142d222a91c190b6ed
Andy McFadden [Fri, 4 Nov 2011 19:56:55 +0000 (12:56 -0700)]
Reduce Dalvik card table overhead
The VM has a "growth limit" (e.g. 48MB) that is used to cap normal
apps, and a "max heap" (e.g. 128MB) that is used for apps with unusual
high-memory requirements. The Dalvik GC uses a 128:1 "card table"
that spans the entire managed heap, out to the "max heap" limit.
The table is erased during every concurrent GC. The first time
we do that post-zygote, the copy-on-write behavior causes physical
pages to be allocated. We're currently clearing out to the heap max,
not the growth limit, which means we have a bunch of physical memory
allocated for pages that will never be used.
This changes it so we only clear out to the growth limit. If the
growth limit is removed by the app, we clear out to the heap max.
On devices with a 128MB max heap, this reduces the private/dirty
usage for most apps by 640KB.
Bug
5567332
Change-Id: Iac633017c128d63b284d48016e47d40cc46df1de
Elliott Hughes [Fri, 4 Nov 2011 01:17:19 +0000 (18:17 -0700)]
Don't pay for filename/line number lookup unless you need to.
This wasn't a regression; the code's always been like this. But this shows up
in profiles of anything doing a lot of synchronized stuff, even when there's
no contention.
There are two awkward cases. One is that the old code used to offer a variety
of special-case messages for failures to find the current frame, save area,
and Method*. I assume this was just to help in debugging and shouldn't happen
in practice, so I don't think we've lost anything there. The other case was
that on unlocking, we used to explicitly say "unlocked". But I'm not sure we
could get into a situation where we'd be reporting contention on a monitor
that wasn't locked when we tried to lock it. So I think that's okay too.
Change-Id: Ib4401c771f717e9c8cc9c4e5346ec7a5f46a1636
Elliott Hughes [Thu, 3 Nov 2011 21:07:24 +0000 (14:07 -0700)]
Knock ::self() out of the ParseXml profile.
New profile (>=0.6, which is where the original seems to have cut off):
47 11.0070 dvmCallJNIMethod(unsigned int const*, JValue*, Method const*, Thread*)
30 7.0258 dvmChangeStatus(Thread*, ThreadStatus)
29 6.7916 addLocalReference(Thread*, Object*)
26 6.0890 dexDecodeDebugInfo(DexFile const*, DexCode const*, char const*, unsigned int, unsigned int, int (*)(void*, unsigned int, unsigned int), void (*)(void*, unsigned short, unsigned int, unsigned int, char const*, char const*, char const*), void*)
22 5.1522 dalvik_inst
15 3.5129 lockMonitor(Thread*, Monitor*)
14 3.2787 dvmLineNumFromPC
13 3.0445 javaLangString_equals(unsigned int, unsigned int, unsigned int, unsigned int, JValue*)
13 3.0445 scanObject(Object const*, GcMarkContext*)
12 2.8103 ScopedJniThreadState::ScopedJniThreadState(_JNIEnv*)
12 2.8103 common_invokeMethodNoRange
12 2.8103 dvmDecodeIndirectRef(Thread*, _jobject*)
9 2.1077 IndirectRefTable::add(unsigned int, Object*)
9 2.1077 ReleasePrimitiveArrayCritical(_JNIEnv*, _jarray*, void*, int)
9 2.1077 markObjectNonNull(Object const*, GcMarkContext*, bool)
9 2.1077 unpinPrimitiveArray(ArrayObject*)
8 1.8735 getCodeAddrCommon(unsigned short const*, bool)
7 1.6393 dexStringByTypeIdx(DexFile const*, unsigned int)
7 1.6393 dvmHeapSourceAlloc(unsigned int)
6 1.4052 GetPrimitiveArrayCritical(_JNIEnv*, _jarray*, unsigned char*)
6 1.4052 dvmPlatformInvoke
6 1.4052 pinPrimitiveArray(ArrayObject*)
6 1.4052 readUnsignedLeb128(unsigned char const**)
6 1.4052 scanFields(Object const*, GcMarkContext*)
5 1.1710 IndirectRefTable::get(void*) const
5 1.1710 dvmFindInReferenceTable(ReferenceTable const*, Object**, Object*)
4 0.9368 common_returnFromMethod
4 0.9368 dvmAddToReferenceTable(ReferenceTable*, Object*)
4 0.9368 dvmHeapBitmapScanWalk(HeapBitmap*, void (*)(Object*, void*, void*), void*)
4 0.9368 dvmInterpret(Thread*, Method const*, JValue*)
4 0.9368 dvmLockObject
4 0.9368 dvmMalloc(unsigned int, int)
4 0.9368 findPackedSwitchIndex(unsigned short const*, int, int)
4 0.9368 readStringIdx(DexFile const*, unsigned char const**)
4 0.9368 unlockMonitor(Thread*, Monitor*)
3 0.7026 dvmSetFinalizable
Change-Id: Ic5c36859f6810413bd0b48aad1d99da7daa6e8ba
Andy McFadden [Thu, 3 Nov 2011 21:13:24 +0000 (14:13 -0700)]
Start profiling after state prep
The updateActiveProfilers() call was happening before the profiler
state setup was completed, creating a race that could lead to a
native crash.
Bug
5564440
Change-Id: I8c030fc87f106aa8b2a67876d604a5bd79e05175
Elliott Hughes [Thu, 3 Nov 2011 17:59:19 +0000 (10:59 -0700)]
Merge "DO NOT MERGE: Optimize IndirectRefTable." into ics-mr1
Andy McFadden [Wed, 2 Nov 2011 22:26:39 +0000 (15:26 -0700)]
Don't malloc between fork and exec
This was causing hangs in DEX file loading.
Bug
5329833
Change-Id: I19e9e0624f3823cc771c71a4b4ac177d57343c58
The Android Automerger [Wed, 2 Nov 2011 13:45:25 +0000 (06:45 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Andy McFadden [Tue, 1 Nov 2011 23:34:39 +0000 (23:34 +0000)]
am
3931f798: Fix cleanup (cherry-picked from ics-mr1)
* commit '
3931f79801b67577bf8ac12d0b3fb5b4aeaaf766':
Fix cleanup (cherry-picked from ics-mr1)
Andy McFadden [Tue, 1 Nov 2011 18:04:46 +0000 (11:04 -0700)]
Fix cleanup
(cherry-picked from ics-mr1)
The code was attempting to null out a struct member after freeing
the struct.
Also, changed the order of directory permission tests so that
writable comes first. Somehow "dalvik-cache directory not
writable" seems more direct than "not readable", since the code
isn't generally interested in reading the directory.
Bug
5549907
Change-Id: If737ab822b356aae98e47292d21946e33a04342b
Ben Cheng [Tue, 1 Nov 2011 22:05:11 +0000 (22:05 +0000)]
am
e3d9cde4: Disable JIT single-stepping resume mode.
* commit '
e3d9cde40f96bf40dd4ad3d495949869bde5dd1e':
Disable JIT single-stepping resume mode.
Ben Cheng [Tue, 1 Nov 2011 20:53:39 +0000 (13:53 -0700)]
Disable JIT single-stepping resume mode.
BUG:
5551114
Change-Id: Id8ee75be5e71ee258994235952871ad181024e56
Andy McFadden [Tue, 1 Nov 2011 18:04:46 +0000 (11:04 -0700)]
Fix cleanup
The code was attempting to null out a struct member after freeing
the struct.
Also, changed the order of directory permission tests so that
writable comes first. Somehow "dalvik-cache directory not
writable" seems more direct than "not readable", since the code
isn't generally interested in reading the directory.
Bug
5549907
Change-Id: Ie412ff6c0870357b92e53606f70cb9407e04e7cf
Jeff Brown [Thu, 27 Oct 2011 00:04:54 +0000 (17:04 -0700)]
DO NOT MERGE: Optimize IndirectRefTable.
Removed unused debugging code that maintained pointers to the
4 previous objects in each slot.
Promoted the serial number property of a slot to be first class.
This is a sufficiently cheap and useful check to perform that we
might as well always do it.
Changed get() and remove() so they check the validity of the
references at the same time as they retrieve them. They're
also a bit smarter about checking the reference kind given
that they can assume that the table will only contain references
of one kind. The checks are now much more consistent.
For example, remove() used to check whether an index was
stale only in the case where it was not removing the top entry
(now it always checks).
Made add() return NULL instead of dvmAbort()'ing in the case
where the table overflowed and ensure we don't blow away the
table in that cases. This change resolves an issue with
TestIndirectRefTable.cpp which deliberately overflows the table
and expects add() to return NULL (as documented!). As it
happens, the add() method is called in exactly 3 places in
Jni.cpp. In each of those cases, the code was written to
handle a NULL result and only in the case of adding a weak
global reference did it not abort. Fixed the weak global
reference case to be consistent with the others.
Changed the signature of contains() to take an Object* since
that's what we're actually looking for inside the table.
Added a couple of calls to dump() in TestIndirectRefTable.cpp
for visual inspection of its correctness.
Performance as measured by TestIndirectRefTable on same hardware.
Old implementation:
- Add/remove 100 objects FIFO order, 100000 iterations, 0.023ms / iteration
- Add/remove 100 objects LIFO order, 100000 iterations, 0.020ms / iteration
- Get 100 objects, 100000 iterations, 0.009ms / iteration
New implementation:
- Add/remove 100 objects FIFO order, 100000 iterations, 0.010ms / iteration
- Add/remove 100 objects LIFO order, 100000 iterations, 0.009ms / iteration
- Get 100 objects, 100000 iterations, 0.002ms / iteration
Cherry-pick from master.
Conflicts:
vm/IndirectRefTable.cpp
Change-Id: I157f3c1ba598137222878b8e6a5890efb744fe76
Ben Cheng [Thu, 27 Oct 2011 21:04:12 +0000 (14:04 -0700)]
Fix single-stepping resume mode in the interpreter.
(cherry-picked from master)
When a resume attempt is cancelled due to other pending request make sure
the old native resume PC is cleared. Otherwise the JIT code cache may be
re-entered with mismatching Dalvik PC.
Also fix a code bloat problem where single-step count is not set properly
after executing a return instruction.
BUG:
5208786
Change-Id: I39db1633dcda1f464311c878ded4b5695a9b7ffd
Ben Cheng [Fri, 28 Oct 2011 20:12:05 +0000 (20:12 +0000)]
am
b1e2271b: Fix single-stepping resume mode in the interpreter.
* commit '
b1e2271b51cfb1f264b8966f1151652767259751':
Fix single-stepping resume mode in the interpreter.
Ben Cheng [Thu, 27 Oct 2011 21:04:12 +0000 (14:04 -0700)]
Fix single-stepping resume mode in the interpreter.
(cherry-picked from master)
When a resume attempt is cancelled due to other pending request make sure
the old native resume PC is cleared. Otherwise the JIT code cache may be
re-entered with mismatching Dalvik PC.
Also fix a code bloat problem where single-step count is not set properly
after executing a return instruction.
BUG:
5208786
Change-Id: I39db1633dcda1f464311c878ded4b5695a9b7ffd
Ben Cheng [Thu, 27 Oct 2011 21:04:12 +0000 (14:04 -0700)]
Fix single-stepping resume mode in the interpreter.
(cherry-picked from master)
When a resume attempt is cancelled due to other pending request make sure
the old native resume PC is cleared. Otherwise the JIT code cache may be
re-entered with mismatching Dalvik PC.
Also fix a code bloat problem where single-step count is not set properly
after executing a return instruction.
BUG:
5208786
Change-Id: I54775215b11eae29ccdb6111dc0fdfa99e41e08d
The Android Automerger [Thu, 20 Oct 2011 13:59:36 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Jesse Wilson [Wed, 19 Oct 2011 20:26:19 +0000 (13:26 -0700)]
Merge "Provide debugging info should extended opcode lookup fail."
Jesse Wilson [Wed, 19 Oct 2011 15:02:51 +0000 (11:02 -0400)]
Provide debugging info should extended opcode lookup fail.
Bug: http://code.google.com/p/android/issues/detail?id=20814
Change-Id: Iedaf07721c29dd3d24827c3f7a953b7371c9735d
The Android Automerger [Tue, 18 Oct 2011 13:59:26 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Elliott Hughes [Fri, 14 Oct 2011 21:36:46 +0000 (14:36 -0700)]
Avoid deadlock.
dvmIsHeapAddress is the pointer validity checker for use outside the GC. If
it doesn't take the heap lock, it risks looking at data structures that are
changing under its feet. If it does take the heap lock, it risks deadlock
between a thread doing an explicit GC and the signal catcher trying to dump
threads (causing the GC thread to be suspended while holding the heap lock).
Calling back into managed code while holding the heap lock and with other
threads resumed sounds like an inherently bad idea to me, but that's a battle
for another day.
With this change, we can handle SIGQUIT while we're in ReferenceQueue.add
as a result of an explicit GC in a system doing concurrent collections, so
the only known problem is fixed.
Bug:
5425802
Change-Id: I42d434d5ea3ffbcb77a4c544b81b08a4c7364a16
The Android Automerger [Tue, 11 Oct 2011 12:32:21 +0000 (05:32 -0700)]
merge in ics-release history after reset to master
Ben Cheng [Mon, 10 Oct 2011 23:55:23 +0000 (16:55 -0700)]
Merge "Leave up to 512 chars of gDvm.lastMessage on dvmAbort's stack frame."
Ben Cheng [Mon, 10 Oct 2011 23:26:36 +0000 (16:26 -0700)]
Leave up to 512 chars of gDvm.lastMessage on dvmAbort's stack frame.
Bug:
5372634
Change-Id: I019a059e5a989de3dfc9e2f5e78f7caa7168cf75
jeffhao [Mon, 10 Oct 2011 21:51:45 +0000 (14:51 -0700)]
Merge "Reordered some checks and added more to the verifier."
Ben Cheng [Mon, 10 Oct 2011 21:08:17 +0000 (14:08 -0700)]
Merge "Revert "Use the card table to scan the immune region of the heap.""
Ben Cheng [Mon, 10 Oct 2011 20:17:58 +0000 (13:17 -0700)]
Revert "Use the card table to scan the immune region of the heap."
This reverts commit
6c355e53332502314c3d82a7afcf898d66118f27.
Conflicts are resolved in:
vm/alloc/CardTable.cpp
vm/alloc/HeapBitmap.cpp
vm/alloc/HeapInternal.h
vm/alloc/HeapSource.cpp
vm/alloc/MarkSweep.cpp
Tested with overnight monkey runs + Delaunay.
Bug:
5037417
Change-Id: I400eff8542d0bddd865ce570a479f7750c1ba484
Elliott Hughes [Mon, 10 Oct 2011 18:17:13 +0000 (11:17 -0700)]
Merge "Don't say UTF-8 in Dalvik's CheckJNI when we mean Modified UTF-8."
Elliott Hughes [Fri, 7 Oct 2011 22:42:23 +0000 (15:42 -0700)]
Don't say UTF-8 in Dalvik's CheckJNI when we mean Modified UTF-8.
Change-Id: I4130e7f92275275a6d6f782e1ad979fbf9197a8e
The Android Automerger [Fri, 7 Oct 2011 00:32:54 +0000 (17:32 -0700)]
Revert "GC experiment."
This reverts commit
b3fb1d08137ead7b6be016e1bc147cb781e76111.
jeffhao [Thu, 6 Oct 2011 17:33:22 +0000 (10:33 -0700)]
Reordered some checks and added more to the verifier.
The verifier checks for 2 errors in put instructions. First, if the
field can't be resolved, the instruction is overwritten to throw a
verifier error. Second, if the data types of the field and instruction
mismatch, the verifier rejects the whole class. This change swaps the
order of the checks, so that if both errors occur, the class is
rejected.
Also, checks were added to prevent float values from being used as array
indexes or arguments to if statements.
Change-Id: I7b122f4ebc4043266be4466e10679c6319a788ef
Ben Cheng [Thu, 6 Oct 2011 05:43:34 +0000 (22:43 -0700)]
GC experiment.
Change-Id: Ifbeec98a796fe8347da25a1be50288d756b40f02
The Android Automerger [Wed, 5 Oct 2011 13:58:05 +0000 (06:58 -0700)]
merge in ics-release history after reset to master
jeffhao [Tue, 4 Oct 2011 21:33:57 +0000 (14:33 -0700)]
Fixed dx verifier issue when an error is detected.
The code needed to break out properly when an error was detected to
prevent it from causing even more problems.
Change-Id: If497655a406689aeb1b4aa6523421cc22f2b7593
The Android Automerger [Fri, 30 Sep 2011 13:44:24 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
Elliott Hughes [Thu, 29 Sep 2011 17:47:22 +0000 (10:47 -0700)]
Fix a typo in unused code.
Change-Id: Ied11a79337a3cc795428dfde29e405ec0bbcb98c
The Android Automerger [Thu, 29 Sep 2011 00:57:05 +0000 (17:57 -0700)]
merge in ics-release history after reset to master
buzbee [Tue, 27 Sep 2011 18:47:28 +0000 (11:47 -0700)]
Fix memory barriers (Issue
3338450)
Add extra memory barrier on volatile stores.
Change-Id: Id4a4750cdfc910eda2f0b44ead0af2a569b5735e
The Android Automerger [Wed, 21 Sep 2011 13:59:19 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Jesse Wilson [Tue, 20 Sep 2011 15:52:02 +0000 (11:52 -0400)]
Don't spam the logs with thread priority information.
Ten minutes of logs contained 108 lines of 'Elevating priority from 10 to 0'
and 108 lines of 'Reset priority to 10'. This provides little value.
Change-Id: Id96e8304238aa3344af4dd6342ace575534acc0f
Jesse Wilson [Tue, 6 Sep 2011 16:55:25 +0000 (12:55 -0400)]
Attempt to fix dalvik heap corruption.
This is bccheng's find, as reported here:
http://b/
5208786#ISSUE_HistoryHeader49
Bug: http://b/
5208786
Change-Id: I1616bac1ef6c197f723656187a784fc6838975d4
Jesse Wilson [Tue, 6 Sep 2011 16:55:25 +0000 (12:55 -0400)]
Attempt to fix dalvik heap corruption.
This is bccheng's find, as reported here:
http://b/
5208786#ISSUE_HistoryHeader49
Bug: http://b/
5208786
Change-Id: I1616bac1ef6c197f723656187a784fc6838975d4
The Android Automerger [Tue, 6 Sep 2011 13:33:14 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 5 Sep 2011 13:33:20 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Logan Chien [Mon, 5 Sep 2011 13:14:25 +0000 (21:14 +0800)]
Fix document formatting error (html tags)
Change-Id: I57d10b69f400ce3ffda1a26dc632a4122a4f3d70
The Android Automerger [Fri, 2 Sep 2011 23:01:51 +0000 (16:01 -0700)]
merge in ics-release history after reset to master
jeffhao [Fri, 2 Sep 2011 19:00:05 +0000 (12:00 -0700)]
Merge "Dx reg allocator fix for accidental long/double clobbering."
Shih-wei Liao [Fri, 2 Sep 2011 14:15:10 +0000 (07:15 -0700)]
Merge "Rename register to conform to instruction format"
The Android Automerger [Thu, 1 Sep 2011 13:33:23 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Logan Chien [Thu, 1 Sep 2011 07:19:31 +0000 (15:19 +0800)]
Rename register to conform to instruction format
For instruction format 35c, 41c, 52c, and 5rc, the register
name was different from the Dalvik Instruction Format document,
and InstrUtils.cpp of libdex. This commit updates the name,
so that they will look consistent.
Change-Id: I857b1f9c1ac7178dc147d0019df589c9c6d102e1
Jesse Wilson [Wed, 31 Aug 2011 19:00:57 +0000 (15:00 -0400)]
Fix a corner-case dex merging bug.
When doing a null merge (merging a dex file with an empty file) word-alignment
means that the output may be two bytes longer than the input. Always include the
rounded-up length in the bytes allocated to a section.
com.android.dx.util.DexException: Section limit 669894 exceeded by type list
at com.android.dx.io.DexBuffer$Section.ensureCapacity(DexBuffer.java:541)
at com.android.dx.io.DexBuffer$Section.writeShort(DexBuffer.java:574)
at com.android.dx.io.DexBuffer$Section.writeTypeList(DexBuffer.java:636)
at com.android.dx.merge.DexMerger$3.write(DexMerger.java:439)
at com.android.dx.merge.DexMerger$3.write(DexMerger.java:424)
at com.android.dx.merge.DexMerger$IdMerger.mergeUnsorted(DexMerger.java:321)
Change-Id: I67b81ba8c837b0307e313f4012a051b022b25db2
The Android Automerger [Wed, 31 Aug 2011 13:33:16 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Raphael Moll [Tue, 30 Aug 2011 16:50:59 +0000 (09:50 -0700)]
am
4130f726: am
1dd1d924: am
e4e76feb: Merge "Set DX stack size to 1M by default on Windows."
* commit '
4130f726d82493748bf7252da631e1f315f2538c':
Set DX stack size to 1M by default on Windows.
Raphael Moll [Tue, 30 Aug 2011 01:01:08 +0000 (18:01 -0700)]
am
1dd1d924: am
e4e76feb: Merge "Set DX stack size to 1M by default on Windows."
* commit '
1dd1d9246c0804d1b4fda955c56a6d89c989ec6a':
Set DX stack size to 1M by default on Windows.
Raphael Moll [Tue, 30 Aug 2011 00:58:08 +0000 (17:58 -0700)]
am
e4e76feb: Merge "Set DX stack size to 1M by default on Windows."
* commit '
e4e76feb6aad0d0161fabe12cb7d97e665f7b109':
Set DX stack size to 1M by default on Windows.
Raphael Moll [Fri, 26 Aug 2011 23:33:03 +0000 (16:33 -0700)]
Merge "Set DX stack size to 1M by default on Windows."
jeffhao [Fri, 26 Aug 2011 22:01:11 +0000 (15:01 -0700)]
Dx reg allocator fix for accidental long/double clobbering.
Addresses this bug: http://b/issue?id=
5215643.
Change-Id: I82613c38b0a6247d071aa6c5cc90bf8b60d5d84b
Raphael Moll [Fri, 26 Aug 2011 21:42:41 +0000 (14:42 -0700)]
Set DX stack size to 1M by default on Windows.
Bug: http://code.google.com/p/android/issues/detail?id=15181
Summary of bug: some user reported issues running dx.bat and
Fadden figured out the VM's stack size default was too small.
Using -Xss1m fixed it.
This CL introduces a default of -Xss1m and the usual mechanism
to override it using -JXssNm (like for -JXmx...)
Change-Id: I9769316c1708f08c91b93e07bd6d713a10561ea2
The Android Automerger [Wed, 24 Aug 2011 13:33:17 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
jeffhao [Tue, 23 Aug 2011 21:19:35 +0000 (14:19 -0700)]
Removed parsing and output for unused --target-api switch in dx.
This is cherry-picked from dalvik-dev.
Change-Id: I74627e4c261e086e8c2c7cf38591cd3e9f5707e6
The Android Automerger [Tue, 23 Aug 2011 13:33:19 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Elliott Hughes [Mon, 22 Aug 2011 17:50:41 +0000 (10:50 -0700)]
Merge "Fix JNIEXPORT now people are using -fvisibility."
The Android Automerger [Mon, 22 Aug 2011 13:30:53 +0000 (06:30 -0700)]
merge in ics-release history after reset to master
Jesse Wilson [Fri, 19 Aug 2011 20:21:33 +0000 (16:21 -0400)]
Permit code size to grow when merging dex files.
The throws clauses use variable-length encodings (sleb and uleb)
which will have different lengths when the number of types grows.
Bug: http://b/
5127963
Change-Id: I50598a807596955e458d4ec87a730e62e12168d9
Elliott Hughes [Fri, 19 Aug 2011 18:32:49 +0000 (11:32 -0700)]
Fix JNIEXPORT now people are using -fvisibility.
This is a backport from dalvik-dev.
Change-Id: If6001b580bd9b36f3845aaa115333d69682f3a92
The Android Automerger [Wed, 17 Aug 2011 13:30:59 +0000 (06:30 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 16 Aug 2011 13:33:17 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Carl Shapiro [Tue, 2 Aug 2011 07:01:13 +0000 (00:01 -0700)]
Fix two data races in the monitor code.
First, the release of a lock was not preceded by a memory barrier.
This would allow stores within the critical section to move outside
the critical section violating the monitor invariant.
Second, the thin lock value was often not loaded through volatile
pointer. This provides the compiler with the freedom to reload the
thin lock with a different value causing erroneous updates to the lock
word.
Bug:
5107390
jeffhao [Mon, 15 Aug 2011 17:32:42 +0000 (10:32 -0700)]
Merge "Dexopt verifier checks that int/float and double/long uses do not mix."
The Android Automerger [Mon, 15 Aug 2011 13:33:18 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Elliott Hughes [Sun, 14 Aug 2011 21:30:54 +0000 (14:30 -0700)]
Enhance CheckJNI to recognize when an type-incompatible jfieldID is used to get/set a field.
This would have found a bug that broke setSoTimeout in libcore, and did find
a hitherto-unknown bug in android.text.format.Time.
Bug:
5162851
Change-Id: I62f2a0db3adb1cd0e4616075f6d4efaee393de30
Jesse Wilson [Sun, 14 Aug 2011 19:27:08 +0000 (15:27 -0400)]
Don't wrap the actual type in parens if its null.
Otherwise the exception message has unnecessary parens:
"expected receiver of type java.lang.String, but got (null)"
Change-Id: Iacd806d018019784afa6e9f25f7c039d9ca18fae
jeffhao [Wed, 10 Aug 2011 21:58:39 +0000 (14:58 -0700)]
Dexopt verifier checks that int/float and double/long uses do not mix.
Added new types to dexopt indicating a type is derived from a constant,
which may or may not be floating point. After such a value is used, its
type can be determined, and the verifier enforces that it is always used
that way afterwards.
Change-Id: I150deaa162aec17bcc9c3e3200bc0350ae5b3f24
The Android Automerger [Thu, 11 Aug 2011 13:33:16 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Jeff Brown [Wed, 10 Aug 2011 21:51:44 +0000 (14:51 -0700)]
am
be3942f2: (-s ours) am
3245c2e4: am
5017f3f2: Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
* commit '
be3942f2179d5f2270b757a792ed021eb2521b46':
Support wrapping app processes to inject debug instrumentation. Bug:
4437846
Jeff Brown [Wed, 10 Aug 2011 21:48:58 +0000 (14:48 -0700)]
am
8ddfe8b4: (-s ours) am
a0533621: am
9df264db: Merge "Add a dual clock profiler tracing mode."
* commit '
8ddfe8b44e0794a0c182046144af8c3c842686c2':
Add a dual clock profiler tracing mode.
Jeff Brown [Wed, 10 Aug 2011 20:58:01 +0000 (13:58 -0700)]
am
3245c2e4: am
5017f3f2: Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
* commit '
3245c2e4008b40e05db44ef7c897d0aa7b88c1d7':
Support wrapping app processes to inject debug instrumentation. Bug:
4437846
Jeff Brown [Wed, 10 Aug 2011 20:57:59 +0000 (13:57 -0700)]
am
a0533621: am
9df264db: Merge "Add a dual clock profiler tracing mode."
* commit '
a05336218332abf2753c63a50ede7551afdab6b5':
Add a dual clock profiler tracing mode.
Jeff Brown [Wed, 10 Aug 2011 20:56:16 +0000 (13:56 -0700)]
am
5017f3f2: Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
* commit '
5017f3f2b7c178761b919f22c02617fe6fe9468d':
Support wrapping app processes to inject debug instrumentation. Bug:
4437846