OSDN Git Service
Raphael [Fri, 15 Oct 2010 07:07:54 +0000 (00:07 -0700)]
am
f4b26ea7: resolved conflicts for merge of
b0b2a75d to gingerbread-plus-aosp
Merge commit '
f4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038'
* commit '
f4b26ea7ea0a85e2592a0ec0e439ffa4f3c5a038':
SDK: fix dx shell script to look for dx.jar in platform-tools
Raphael [Wed, 13 Oct 2010 20:36:32 +0000 (13:36 -0700)]
resolved conflicts for merge of
b0b2a75d to gingerbread-plus-aosp
Change-Id: Ie475c74ea64cab1e74171a7f885dd3e48f219922
Raphael [Wed, 13 Oct 2010 20:11:07 +0000 (13:11 -0700)]
SDK: fix dx shell script to look for dx.jar in platform-tools
Change-Id: I4b644dc686f1da75ef7fb34ea874b54ce44f8391
Andy McFadden [Tue, 12 Oct 2010 23:38:38 +0000 (16:38 -0700)]
am
141c9711: am
3f01142e: Merge "Added some threading notes" into gingerbread
Merge commit '
141c9711d546c161d7ad6b149392dfddf705a26e'
* commit '
141c9711d546c161d7ad6b149392dfddf705a26e':
Added some threading notes
Carl Shapiro [Tue, 12 Oct 2010 23:27:10 +0000 (16:27 -0700)]
am
565c5663: am
44dcf29d: Add include guards to avoid multiple definitions.
Merge commit '
565c56636641b9ed28ed479b6f4730e1a9df4f7e'
* commit '
565c56636641b9ed28ed479b6f4730e1a9df4f7e':
Add include guards to avoid multiple definitions.
Jean-Baptiste Queru [Tue, 12 Oct 2010 08:45:43 +0000 (01:45 -0700)]
am
65da91cf: am
16926bc4: Merge "Remove obsolete variable "len" to avoid compile failed"
Merge commit '
65da91cf96f8e567db9fc1221d2dcb12bad2ab80'
* commit '
65da91cf96f8e567db9fc1221d2dcb12bad2ab80':
Remove obsolete variable "len" to avoid compile failed
Carl Shapiro [Tue, 12 Oct 2010 01:58:54 +0000 (18:58 -0700)]
am
7876eb7d: am
0b89c266: Merge "Use the break position of the current mspace for sizing the zygote heap." into gingerbread
Merge commit '
7876eb7d797f5c3937b7d1be34f81e9aa3b865e9'
* commit '
7876eb7d797f5c3937b7d1be34f81e9aa3b865e9':
Use the break position of the current mspace for sizing the zygote heap.
Jean-Baptiste Queru [Tue, 12 Oct 2010 01:58:15 +0000 (18:58 -0700)]
am
90ee39ea: am
ad3ff025: Merge "Update Call386ABI.S to support 16 byte alignment"
Merge commit '
90ee39eabbee701b63e79ddaf4859481b7e0547a'
* commit '
90ee39eabbee701b63e79ddaf4859481b7e0547a':
Update Call386ABI.S to support 16 byte alignment
Jean-Baptiste Queru [Tue, 12 Oct 2010 01:58:09 +0000 (18:58 -0700)]
am
789fb059: am
bc02ca96: Merge "Fixed bug in OP_GOTO_32.S, added support for additional parameters to dvmHandleStackOverflow"
Merge commit '
789fb0592cb6ea7ac573bd81ea8fb0a8bb5e103f'
* commit '
789fb0592cb6ea7ac573bd81ea8fb0a8bb5e103f':
Fixed bug in OP_GOTO_32.S, added support for additional parameters to dvmHandleStackOverflow
Andy McFadden [Tue, 12 Oct 2010 00:25:42 +0000 (17:25 -0700)]
am
3f01142e: Merge "Added some threading notes" into gingerbread
Merge commit '
3f01142ed915021eb871a80d3f8eadca6e6bfc3b' into gingerbread-plus-aosp
* commit '
3f01142ed915021eb871a80d3f8eadca6e6bfc3b':
Added some threading notes
Andy McFadden [Mon, 11 Oct 2010 22:35:54 +0000 (15:35 -0700)]
Merge "Added some threading notes" into gingerbread
Carl Shapiro [Mon, 11 Oct 2010 22:17:47 +0000 (15:17 -0700)]
am
44dcf29d: Add include guards to avoid multiple definitions.
Merge commit '
44dcf29d18f819b4b9d78d4d81676681b57f44ce' into gingerbread-plus-aosp
* commit '
44dcf29d18f819b4b9d78d4d81676681b57f44ce':
Add include guards to avoid multiple definitions.
Carl Shapiro [Mon, 11 Oct 2010 21:55:08 +0000 (14:55 -0700)]
Add include guards to avoid multiple definitions.
Change-Id: I2a52823325a0a582a746890af7f040324d671806
Andy McFadden [Mon, 11 Oct 2010 21:46:25 +0000 (14:46 -0700)]
Added some threading notes
Explain thread attach/detach, behavior of threads running native code.
Added pthread_key_create destructor note to backward compatibility
section.
Change-Id: I954708c9ec7c83ba951c0f512c88d5c610a49411
Andy McFadden [Mon, 11 Oct 2010 19:37:06 +0000 (12:37 -0700)]
am
c7fb06ef: am
5276cccb: Verify method invocation type.
Merge commit '
c7fb06efb576b7ff0295dd70c8beaeea11918645'
* commit '
c7fb06efb576b7ff0295dd70c8beaeea11918645':
Verify method invocation type.
Dan Bornstein [Mon, 11 Oct 2010 18:36:14 +0000 (11:36 -0700)]
am
22156b4d: am
9be25d09: Clarify the invoke-* opcodes.
Merge commit '
22156b4d43d06446a0bb4d2c887c23bedabb3a96'
* commit '
22156b4d43d06446a0bb4d2c887c23bedabb3a96':
Clarify the invoke-* opcodes.
Jean-Baptiste Queru [Mon, 11 Oct 2010 15:07:39 +0000 (08:07 -0700)]
am
16926bc4: Merge "Remove obsolete variable "len" to avoid compile failed"
Merge commit '
16926bc4382640b73e439f678f675444d0d39e8f' into gingerbread-plus-aosp
* commit '
16926bc4382640b73e439f678f675444d0d39e8f':
Remove obsolete variable "len" to avoid compile failed
Jean-Baptiste Queru [Mon, 11 Oct 2010 15:00:48 +0000 (08:00 -0700)]
Merge "Remove obsolete variable "len" to avoid compile failed"
Carl Shapiro [Mon, 11 Oct 2010 06:05:05 +0000 (23:05 -0700)]
am
0b89c266: Merge "Use the break position of the current mspace for sizing the zygote heap." into gingerbread
Merge commit '
0b89c266321d6db8c50485e3b65d7def799ae0a3' into gingerbread-plus-aosp
* commit '
0b89c266321d6db8c50485e3b65d7def799ae0a3':
Use the break position of the current mspace for sizing the zygote heap.
Carl Shapiro [Mon, 11 Oct 2010 06:03:22 +0000 (23:03 -0700)]
Merge "Use the break position of the current mspace for sizing the zygote heap." into gingerbread
Carl Shapiro [Mon, 11 Oct 2010 01:50:22 +0000 (18:50 -0700)]
Use the break position of the current mspace for sizing the zygote heap.
Previously, the mspace footprint used the "overhead" of a heap which
underestimates the size of the zygote heap by 16 bytes, the specific
size of a descriptor deposited at the start of an mspace containing
the control information about that mspace. If a heap is a multiple of
a page or within 15 bytes of it, the size of the new heap would be
underestimated.
Bad things happened when this underestimate was used to create an
application heap. The starting address of the application heap was
based on a correctly computed value instead of the underestimate.
This caused the application heap to be one page to large and end one
page beyond where it should. This additional page happened to overlap
the first page one of the heap bitmaps. Furthermore, the mspace
routine would proceed access protect that page thinking it was unused
free space. During the next GC reads to the first page of the bitmap
would generate a SIGSEGV.
By using the break position, correctly rounded, for all sizing
computations this problem no longer exists.
Change-Id: Icb3c82731e589747e8e4cf16d0797052e64b3ad5
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:49:37 +0000 (18:49 -0700)]
am
ad3ff025: Merge "Update Call386ABI.S to support 16 byte alignment"
Merge commit '
ad3ff0252ee5c59528828e0625490f0768d2081f' into gingerbread-plus-aosp
* commit '
ad3ff0252ee5c59528828e0625490f0768d2081f':
Update Call386ABI.S to support 16 byte alignment
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:49:31 +0000 (18:49 -0700)]
am
bc02ca96: Merge "Fixed bug in OP_GOTO_32.S, added support for additional parameters to dvmHandleStackOverflow"
Merge commit '
bc02ca96c5cd3b45939809ed43ae2e7f2e4fb5b9' into gingerbread-plus-aosp
* commit '
bc02ca96c5cd3b45939809ed43ae2e7f2e4fb5b9':
Fixed bug in OP_GOTO_32.S, added support for additional parameters to dvmHandleStackOverflow
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:35:44 +0000 (18:35 -0700)]
Merge "Update Call386ABI.S to support 16 byte alignment"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:34:16 +0000 (18:34 -0700)]
Merge "Fixed bug in OP_GOTO_32.S, added support for additional parameters to dvmHandleStackOverflow"
Andy McFadden [Sun, 10 Oct 2010 21:12:00 +0000 (14:12 -0700)]
am
5276cccb: Verify method invocation type.
Merge commit '
5276cccb15b6ce0133c8107ff9ff013b4a176ef7' into gingerbread-plus-aosp
* commit '
5276cccb15b6ce0133c8107ff9ff013b4a176ef7':
Verify method invocation type.
Andy McFadden [Sun, 10 Oct 2010 19:59:11 +0000 (12:59 -0700)]
Verify method invocation type.
Dalvik provides five different ways to invoke a method (virtual, super,
direct, static, interface). Using a virtual invoke instruction to call
a direct method will not produce the desired results.
This adds a test to the verifier that ensures the method targeted by
an invocation instruction is of an appropriate kind.
Bug
3082885.
(cherry-pick from dalvik-dev)
Change-Id: I3237cbefc7314f0b9d7557fc0bfd2b548ea30938
Dan Bornstein [Sun, 10 Oct 2010 20:20:02 +0000 (13:20 -0700)]
am
9be25d09: Clarify the invoke-* opcodes.
Merge commit '
9be25d09d24b3d6d0dd1a41c1c09471af4827687' into gingerbread-plus-aosp
* commit '
9be25d09d24b3d6d0dd1a41c1c09471af4827687':
Clarify the invoke-* opcodes.
Dan Bornstein [Sun, 10 Oct 2010 19:29:07 +0000 (12:29 -0700)]
Clarify the invoke-* opcodes.
In particular, make it a little more explicit what kinds of methods
are acceptable for each variant.
Change-Id: Icd9dad876c2d10c23462b4d85ccaa9441d7f2c04
Andy McFadden [Fri, 1 Oct 2010 22:22:35 +0000 (15:22 -0700)]
Merge "Use DMB ST for store fence."
Carl Shapiro [Fri, 1 Oct 2010 19:59:39 +0000 (12:59 -0700)]
am
5163f62f: am
7d3f633d: Merge "Include static fields when dumping class objects." into gingerbread
Merge commit '
5163f62f7048c4b651a425b4b7a3a1b0fb227eb6'
* commit '
5163f62f7048c4b651a425b4b7a3a1b0fb227eb6':
Include static fields when dumping class objects.
Carl Shapiro [Fri, 1 Oct 2010 19:57:44 +0000 (12:57 -0700)]
am
7d3f633d: Merge "Include static fields when dumping class objects." into gingerbread
Merge commit '
7d3f633d2c0061e579c57186276c05ddcc275641' into gingerbread-plus-aosp
* commit '
7d3f633d2c0061e579c57186276c05ddcc275641':
Include static fields when dumping class objects.
Carl Shapiro [Fri, 1 Oct 2010 19:54:52 +0000 (12:54 -0700)]
Merge "Include static fields when dumping class objects." into gingerbread
Andy McFadden [Fri, 1 Oct 2010 19:31:42 +0000 (12:31 -0700)]
Use DMB ST for store fence.
Change-Id: I4bde544a7c66e30a1756425ec088e53baa2f11a1
Carl Shapiro [Fri, 1 Oct 2010 00:20:11 +0000 (17:20 -0700)]
Include static fields when dumping class objects.
Change-Id: I8e7b1d1ef7ca205b489744dcbf0f210c1f2443c4
Elliott Hughes [Fri, 1 Oct 2010 17:52:29 +0000 (10:52 -0700)]
am
b11c54c9: am
307aa79a: Merge "Change Runtime.nativeLoad to return the dlerror(3) string." into gingerbread
Merge commit '
b11c54c9b7849eaa95423dbbf8433e9f1b20ec32'
* commit '
b11c54c9b7849eaa95423dbbf8433e9f1b20ec32':
Change Runtime.nativeLoad to return the dlerror(3) string.
Elliott Hughes [Fri, 1 Oct 2010 17:49:02 +0000 (10:49 -0700)]
am
307aa79a: Merge "Change Runtime.nativeLoad to return the dlerror(3) string." into gingerbread
Merge commit '
307aa79afc08c50e9ea69aac7bf5128bc75ac7ff' into gingerbread-plus-aosp
* commit '
307aa79afc08c50e9ea69aac7bf5128bc75ac7ff':
Change Runtime.nativeLoad to return the dlerror(3) string.
Elliott Hughes [Fri, 1 Oct 2010 17:35:13 +0000 (10:35 -0700)]
Merge "Change Runtime.nativeLoad to return the dlerror(3) string." into gingerbread
buzbee [Fri, 1 Oct 2010 06:19:49 +0000 (23:19 -0700)]
resolved conflicts for merge of
6d55b332 to master
Change-Id: I21e35d4cdf2636ae3cd7facd45ad4f5c4ab82e7b
buzbee [Fri, 1 Oct 2010 03:24:45 +0000 (20:24 -0700)]
am
b78c76f8: GC Card marking fix for SPUT_OBJECT - use correct object head
Merge commit '
b78c76f88ea42e7a3b295c210ca9ee86e7290043' into gingerbread-plus-aosp
* commit '
b78c76f88ea42e7a3b295c210ca9ee86e7290043':
GC Card marking fix for SPUT_OBJECT - use correct object head
buzbee [Fri, 1 Oct 2010 02:08:20 +0000 (19:08 -0700)]
GC Card marking fix for SPUT_OBJECT - use correct object head
Change-Id: I8b84a4f1e1690f5b62de7404ea6ede00317848bb
Andy McFadden [Fri, 1 Oct 2010 01:11:46 +0000 (18:11 -0700)]
am
33ff9f32: am
d8b5f50d: Correct dexopt for uniprocessors.
Merge commit '
33ff9f32d460a232729a123617ca81b3f67195c6'
* commit '
33ff9f32d460a232729a123617ca81b3f67195c6':
Correct dexopt for uniprocessors.
Dan Bornstein [Fri, 1 Oct 2010 01:11:15 +0000 (18:11 -0700)]
am
2428d518: am
f45b6cbe: Be explicit about both uniprocessor and SMP when calling dexopt.
Merge commit '
2428d518efb9b5a62d74f44a267f3a6c18982549'
* commit '
2428d518efb9b5a62d74f44a267f3a6c18982549':
Be explicit about both uniprocessor and SMP when calling dexopt.
Elliott Hughes [Thu, 30 Sep 2010 22:51:31 +0000 (15:51 -0700)]
Change Runtime.nativeLoad to return the dlerror(3) string.
This has a companion change in libcore:
https://android-git.corp.google.com/g/71342
Bug:
3044042
Change-Id: I070a80a41ec2f306f5092a641807017f70179451
Andy McFadden [Thu, 30 Sep 2010 22:40:43 +0000 (15:40 -0700)]
am
d8b5f50d: Correct dexopt for uniprocessors.
Merge commit '
d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3' into gingerbread-plus-aosp
* commit '
d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3':
Correct dexopt for uniprocessors.
Andy McFadden [Thu, 30 Sep 2010 21:02:54 +0000 (14:02 -0700)]
Correct dexopt for uniprocessors.
The SMP flag was defaulting to "true" for dexopt, even on uniprocessors.
With this change the VM now has three choices: dexopt for SMP, dexopt
for uniprocessor, or dexopt for current system. The last is used for
just-in-time dexopt (used by -eng and -userdebug builds on bootstrap DEX
files) and installd dexopt (used for apps on all builds).
The dexopt used by the build system during -user builds will either be
explicitly SMP or explicitly uniprocessor, since "current system" has
no meaning when you're cross-dexopting.
Also, unified the dexopt control flags into a single enum.
(cherry-pick from dalvik-dev)
Change-Id: Id1d9c548ca8567585a28ef9ee911cc2ac6b116dd
Dan Bornstein [Thu, 30 Sep 2010 22:11:27 +0000 (15:11 -0700)]
am
f45b6cbe: Be explicit about both uniprocessor and SMP when calling dexopt.
Merge commit '
f45b6cbed6ce7cb6a38746b5abe0213263106a71' into gingerbread-plus-aosp
* commit '
f45b6cbed6ce7cb6a38746b5abe0213263106a71':
Be explicit about both uniprocessor and SMP when calling dexopt.
Dan Bornstein [Thu, 30 Sep 2010 22:04:34 +0000 (15:04 -0700)]
Be explicit about both uniprocessor and SMP when calling dexopt.
Change-Id: Ic1b68dddf6822773041de6023c594a062e141325
Carl Shapiro [Thu, 30 Sep 2010 18:26:04 +0000 (11:26 -0700)]
am
f37569d1: am
1e053438: Merge "After trimming, set the footprint to the number of pages in use." into gingerbread
Merge commit '
f37569d1cf3ed24fa37488ceb9bac2a52f45260c'
* commit '
f37569d1cf3ed24fa37488ceb9bac2a52f45260c':
After trimming, set the footprint to the number of pages in use.
Carl Shapiro [Thu, 30 Sep 2010 18:24:50 +0000 (11:24 -0700)]
am
0cb51973: am
d4cdb357: Merge "Update the card table scanning for header-only card marks." into gingerbread
Merge commit '
0cb519734afc574b2ca60d72ced1e9fc46a8f4c9'
* commit '
0cb519734afc574b2ca60d72ced1e9fc46a8f4c9':
Update the card table scanning for header-only card marks.
Robert CH Chou [Thu, 30 Sep 2010 09:20:07 +0000 (17:20 +0800)]
Remove obsolete variable "len" to avoid compile failed
Change-Id: Ibf759acef58f6a3e404bfc4be13505774b3d39ad
Dan Bornstein [Thu, 30 Sep 2010 03:35:10 +0000 (20:35 -0700)]
am
c315cbf1: am
87f66617: Add --uniprocessor option to dex-preopt.
Merge commit '
c315cbf15411e9b4b1f7a9732f16117eaea7afcb'
* commit '
c315cbf15411e9b4b1f7a9732f16117eaea7afcb':
Add --uniprocessor option to dex-preopt.
Carl Shapiro [Wed, 29 Sep 2010 21:30:25 +0000 (14:30 -0700)]
am
1e053438: Merge "After trimming, set the footprint to the number of pages in use." into gingerbread
Merge commit '
1e053438810dbd8406ec8339b94801195261e849' into gingerbread-plus-aosp
* commit '
1e053438810dbd8406ec8339b94801195261e849':
After trimming, set the footprint to the number of pages in use.
Carl Shapiro [Wed, 29 Sep 2010 21:27:50 +0000 (14:27 -0700)]
Merge "After trimming, set the footprint to the number of pages in use." into gingerbread
Carl Shapiro [Wed, 29 Sep 2010 19:40:05 +0000 (12:40 -0700)]
am
d4cdb357: Merge "Update the card table scanning for header-only card marks." into gingerbread
Merge commit '
d4cdb3572b489e770d20a6afba0f86563f380825' into gingerbread-plus-aosp
* commit '
d4cdb3572b489e770d20a6afba0f86563f380825':
Update the card table scanning for header-only card marks.
Carl Shapiro [Wed, 29 Sep 2010 19:38:19 +0000 (12:38 -0700)]
Merge "Update the card table scanning for header-only card marks." into gingerbread
Dan Bornstein [Wed, 29 Sep 2010 17:04:22 +0000 (10:04 -0700)]
am
87f66617: Add --uniprocessor option to dex-preopt.
Merge commit '
87f666172f55863d6a50762a1a07a31b67eb48f6' into gingerbread-plus-aosp
* commit '
87f666172f55863d6a50762a1a07a31b67eb48f6':
Add --uniprocessor option to dex-preopt.
Carl Shapiro [Wed, 29 Sep 2010 08:09:11 +0000 (01:09 -0700)]
Update the card table scanning for header-only card marks.
Previously, the card table accessors assumed that objects had either
their header marked or would be marked exactly. As such, after
reckoning a marked card the scan would back up until it found an
object header and then move forward blackening each object within the
address range of the marked card.
Following a recent change we exclusively mark headers. The scan only
has to move forward until the end of a card. This saves scanning time
as dlmalloc's binning may leave large segments of the heap unused. It
is not uncommon for hundreds of cards to be spanned when backing up to
the first live object below a marked card.
In addition, this change fixes the card table verifier to search the
mark stack for gray objects. It is permissible for roots to point to
white objects on unmarked cards. This was incorrectly treated as an
error.
Change-Id: Ia6b6ee2012e381d644b8b3f38b39d746749ea47a
Carl Shapiro [Wed, 29 Sep 2010 03:30:42 +0000 (20:30 -0700)]
After trimming, set the footprint to the number of pages in use.
A trim can decrease the an mspace footprint but it will not decrease
its max footprint. We need to decrease the max footprint to make any
pages recovered by a trim available to external allocations.
By setting the ideal footprint after a trim we lift any soft limit in
effect and make the mspace footprint and max footprints equal.
Change-Id: Ia6eb99634ce1d732b417a90291b110d1fc46c2e3
Dan Bornstein [Wed, 29 Sep 2010 01:53:28 +0000 (18:53 -0700)]
Add --uniprocessor option to dex-preopt.
This tells the preoptimizer to target a uniprocessor (unsurprisingly).
By default, it targets SMP, which makes it do more changes than it has
to for a uniprocessor (e.g. editing how non-wide volatile fields are
accessed within bytecode). To be clear, when SMP-optimized code is run
on a uniprocessor, it should still work. We're just aiming to only
make truly necessary changes during optimization.
While I was in the territory, I went ahead and cleaned up some single
vs. double quote hygiene in the file.
Change-Id: Ia45992939a436d0be6db8363c43d430de4acb80b
Dan Bornstein [Wed, 29 Sep 2010 01:40:01 +0000 (18:40 -0700)]
am
b3a94965: am
148283d7: Plumb SMP optimization control through to dexopt.
Merge commit '
b3a949656a773953a44b148a6cdcba19f1c48e87'
* commit '
b3a949656a773953a44b148a6cdcba19f1c48e87':
Plumb SMP optimization control through to dexopt.
Dan Bornstein [Wed, 29 Sep 2010 01:37:39 +0000 (18:37 -0700)]
am
148283d7: Plumb SMP optimization control through to dexopt.
Merge commit '
148283d71a7e35b9b506cbb49294b6822719c25e' into gingerbread-plus-aosp
* commit '
148283d71a7e35b9b506cbb49294b6822719c25e':
Plumb SMP optimization control through to dexopt.
Andy McFadden [Wed, 29 Sep 2010 00:38:21 +0000 (17:38 -0700)]
am
63114829: am
de9cdfa9: Fix verification of switch offsets in large methods.
Merge commit '
63114829802ecdade4c95fe08a02acec67bd17bd'
* commit '
63114829802ecdade4c95fe08a02acec67bd17bd':
Fix verification of switch offsets in large methods.
Dan Bornstein [Tue, 28 Sep 2010 22:46:54 +0000 (15:46 -0700)]
Plumb SMP optimization control through to dexopt.
Change-Id: I3bfaf6723e7b14d001f9de60cc1c1fd4f8e1ed99
buzbee [Tue, 28 Sep 2010 22:22:48 +0000 (15:22 -0700)]
resolved conflicts for merge of
2e75e47d to master
Change-Id: I644b3cd50e3c63b209741c8b818b4c1435ee8218
Andy McFadden [Tue, 28 Sep 2010 22:15:04 +0000 (15:15 -0700)]
am
de9cdfa9: Fix verification of switch offsets in large methods.
Merge commit '
de9cdfa9d6d5fa5c46a0ec0f3f1e8de08a688841' into gingerbread-plus-aosp
* commit '
de9cdfa9d6d5fa5c46a0ec0f3f1e8de08a688841':
Fix verification of switch offsets in large methods.
Johnnie Birch [Tue, 28 Sep 2010 21:58:37 +0000 (14:58 -0700)]
Fixed bug in OP_GOTO_32.S, added support for additional parameters to dvmHandleStackOverflow
Change-Id: I4d8d75418395661ffc8e7055eeb4600bb5b8b0bc
Andy McFadden [Tue, 28 Sep 2010 21:43:28 +0000 (14:43 -0700)]
Fix verification of switch offsets in large methods.
The verifier was only using the low 16 bits when checking the offset
to a switch table. This was failing on really large methods.
We also blew up the arbitrary size cap again, so I made it a warning
rather than a failure (it really wasn't doing anybody any good).
Changed to width-specific types for the various offsets and sizes.
Bug
3044850.
(cherry-pick+squash from dalvik-dev)
Change-Id: Ic7ebb86728cb39151f617a3e69e1c1994e61b5d9
Johnnie Birch [Tue, 28 Sep 2010 21:39:15 +0000 (14:39 -0700)]
Update Call386ABI.S to support 16 byte alignment
Change-Id: I61125ffab37f728665a91907bb699a0568568418
Carl Shapiro [Tue, 28 Sep 2010 21:00:06 +0000 (14:00 -0700)]
am
252dfcbb: am
b755f9a3: Do not grow if we are invoked for an external allocation.
Merge commit '
252dfcbbc8ab27ba7f86908fbf8c13425d166a70'
* commit '
252dfcbbc8ab27ba7f86908fbf8c13425d166a70':
Do not grow if we are invoked for an external allocation.
buzbee [Tue, 28 Sep 2010 19:28:21 +0000 (12:28 -0700)]
am
b36ea791: Merge "Change GC card making to use object head, bug fix for volatile sput obj" into gingerbread
Merge commit '
b36ea7918612c81cb42ff2021443358a9f109a6d' into gingerbread-plus-aosp
* commit '
b36ea7918612c81cb42ff2021443358a9f109a6d':
Change GC card making to use object head, bug fix for volatile sput obj
buzbee [Tue, 28 Sep 2010 19:26:06 +0000 (12:26 -0700)]
Merge "Change GC card making to use object head, bug fix for volatile sput obj" into gingerbread
Carl Shapiro [Tue, 28 Sep 2010 18:35:26 +0000 (11:35 -0700)]
am
b755f9a3: Do not grow if we are invoked for an external allocation.
Merge commit '
b755f9a3caeaf65e95480ac66c2c95553bf79389' into gingerbread-plus-aosp
* commit '
b755f9a3caeaf65e95480ac66c2c95553bf79389':
Do not grow if we are invoked for an external allocation.
Carl Shapiro [Tue, 28 Sep 2010 17:56:55 +0000 (10:56 -0700)]
am
ee0a6abe: am
e8edf08f: Perform only one garbage collection before attempting a trim.
Merge commit '
ee0a6abec5a36d52cf9ddc09278cf3af7fe17ea1'
* commit '
ee0a6abec5a36d52cf9ddc09278cf3af7fe17ea1':
Perform only one garbage collection before attempting a trim.
buzbee [Mon, 27 Sep 2010 18:30:22 +0000 (11:30 -0700)]
Change GC card making to use object head, bug fix for volatile sput obj
This CL changes the way we mark GC card to consistently use the object
head (previously, we marked somewhere in the object - often the head, but
not always). Also, previously a coding error caused us to skip the card
mark for OP_APUT_OBJECT_VOLATILES. Fixed here.
Change-Id: I133ef6395c51a0466c9708209b08e79c3083aff2
Carl Shapiro [Tue, 28 Sep 2010 04:02:35 +0000 (21:02 -0700)]
am
ab7d3a27: am
812c1bed: Provide the required out parameter to the trim routine.
Merge commit '
ab7d3a27de4d9b1302640df5e1a42bd180259711'
* commit '
ab7d3a27de4d9b1302640df5e1a42bd180259711':
Provide the required out parameter to the trim routine.
Carl Shapiro [Tue, 28 Sep 2010 00:25:49 +0000 (17:25 -0700)]
Do not grow if we are invoked for an external allocation.
The garbage collection can elect to grow the size of an mspace if the
heap utilization is sufficiently large. This can remove pages from use
by the external allocation mechanism.
Change-Id: Ie2e9e3da9251068707a60a5835b50e485031578b
Carl Shapiro [Tue, 28 Sep 2010 02:47:16 +0000 (19:47 -0700)]
am
e8edf08f: Perform only one garbage collection before attempting a trim.
Merge commit '
e8edf08f04ecbe37f3e18a650a7c9002ceee4275' into gingerbread-plus-aosp
* commit '
e8edf08f04ecbe37f3e18a650a7c9002ceee4275':
Perform only one garbage collection before attempting a trim.
Carl Shapiro [Mon, 27 Sep 2010 23:55:21 +0000 (16:55 -0700)]
Perform only one garbage collection before attempting a trim.
Change-Id: Id7ea77fd8e6055a76a5f52bb96dd0544f88ce06b
Carl Shapiro [Mon, 27 Sep 2010 21:29:18 +0000 (14:29 -0700)]
am
812c1bed: Provide the required out parameter to the trim routine.
Merge commit '
812c1bed55e0ed9b092d320cb29d8adc17e5a10b' into gingerbread-plus-aosp
* commit '
812c1bed55e0ed9b092d320cb29d8adc17e5a10b':
Provide the required out parameter to the trim routine.
Carl Shapiro [Mon, 27 Sep 2010 21:10:10 +0000 (14:10 -0700)]
Provide the required out parameter to the trim routine.
Resolves http://b/issue?id=
3040192.
Change-Id: I886a2dc99956b06e953f03ac390865b118b634a3
Dan Bornstein [Sun, 26 Sep 2010 23:04:51 +0000 (16:04 -0700)]
am
41ad1bc3: am
85dc40d2: Take another tilt at the "--core-library" messaging windmill.
Merge commit '
41ad1bc3aa0ca63d8d66a36f45b6f7b2261b40a7'
* commit '
41ad1bc3aa0ca63d8d66a36f45b6f7b2261b40a7':
Take another tilt at the "--core-library" messaging windmill.
Dan Bornstein [Sun, 26 Sep 2010 23:02:23 +0000 (16:02 -0700)]
am
85dc40d2: Take another tilt at the "--core-library" messaging windmill.
Merge commit '
85dc40d2a0cb19792bf3ee6f6c57fed08eb91ea4' into gingerbread-plus-aosp
* commit '
85dc40d2a0cb19792bf3ee6f6c57fed08eb91ea4':
Take another tilt at the "--core-library" messaging windmill.
Dan Bornstein [Sun, 26 Sep 2010 22:03:28 +0000 (15:03 -0700)]
Take another tilt at the "--core-library" messaging windmill.
This time, I added a note about what appears to be the most common
inadvertent triggering, and I point people at JarJar as a possible
solution when the core class inclusion was intentional.
Change-Id: I2d576df0b8944882838cbb6e2b050d59434a238b
Norris, Lee [Sun, 26 Sep 2010 16:13:21 +0000 (09:13 -0700)]
am
50672515: am
60cc993e: Support -Xbootclasspath/a and /p for dvmProcessOptions in dalvik/vm/Init.c
Merge commit '
506725152f92738218823ed52e437458a043c7cb'
* commit '
506725152f92738218823ed52e437458a043c7cb':
Support -Xbootclasspath/a and /p for dvmProcessOptions in dalvik/vm/Init.c
Norris, Lee [Sun, 26 Sep 2010 16:09:47 +0000 (09:09 -0700)]
am
60cc993e: Support -Xbootclasspath/a and /p for dvmProcessOptions in dalvik/vm/Init.c
Merge commit '
60cc993e5afb3327482b172cc7e54c469b231741' into gingerbread-plus-aosp
* commit '
60cc993e5afb3327482b172cc7e54c469b231741':
Support -Xbootclasspath/a and /p for dvmProcessOptions in dalvik/vm/Init.c
Carl Shapiro [Sat, 25 Sep 2010 00:52:39 +0000 (17:52 -0700)]
am
4f85bfce: am
35b0f486: Merge "Wait for the GC to quiesce before attempting foreground GCs." into gingerbread
Merge commit '
4f85bfcebb2617b8776a07ed0c030aba40d2314a'
* commit '
4f85bfcebb2617b8776a07ed0c030aba40d2314a':
Wait for the GC to quiesce before attempting foreground GCs.
Carl Shapiro [Sat, 25 Sep 2010 00:49:51 +0000 (17:49 -0700)]
am
35b0f486: Merge "Wait for the GC to quiesce before attempting foreground GCs." into gingerbread
Merge commit '
35b0f486feb23a5c199c02ab45bfa613503e2b8f' into gingerbread-plus-aosp
* commit '
35b0f486feb23a5c199c02ab45bfa613503e2b8f':
Wait for the GC to quiesce before attempting foreground GCs.
Carl Shapiro [Sat, 25 Sep 2010 00:47:37 +0000 (17:47 -0700)]
Merge "Wait for the GC to quiesce before attempting foreground GCs." into gingerbread
Carl Shapiro [Sat, 25 Sep 2010 00:36:53 +0000 (17:36 -0700)]
Wait for the GC to quiesce before attempting foreground GCs.
Previously, dvmTrackExternalAllocation waited for the GC to complete
before retrying its allocation. However, there is no guarantee that
the GC will not be active at the time we are woken. Furthermore, the
code did not revalidate that the external allocation is still
possible, an assumption made by all externalAlloc calls.
With this change, the code loops until the GC is no longer active,
validates that the allocation is still possible, and then proceeds
with its routine for allocating additional storage. In addition, if
we try a few heroic measures to establish the externalAllocPossible
invariant rather than immediately failing the call.
Change-Id: I2e3b8a6c9fab617990edc085f52d0df35ad6d0f6
Andy McFadden [Fri, 24 Sep 2010 23:03:02 +0000 (16:03 -0700)]
am
a342c5a9: am
ddd9d0b3: Show errors from getSchedulerGroup().
Merge commit '
a342c5a9a3c475cfe0ebe579af4250b71d952cbf'
* commit '
a342c5a9a3c475cfe0ebe579af4250b71d952cbf':
Show errors from getSchedulerGroup().
Andy McFadden [Fri, 24 Sep 2010 22:54:54 +0000 (15:54 -0700)]
am
ddd9d0b3: Show errors from getSchedulerGroup().
Merge commit '
ddd9d0b3527072f83db00105e28fa88c47bd763b' into gingerbread-plus-aosp
* commit '
ddd9d0b3527072f83db00105e28fa88c47bd763b':
Show errors from getSchedulerGroup().
Andy McFadden [Fri, 24 Sep 2010 21:18:03 +0000 (14:18 -0700)]
Show errors from getSchedulerGroup().
If we failed to get the cgroup info, we were showing "unknown" in the
stack trace, and sometimes showing an error message in the log file.
Now we put a very brief error description into the cgroup text field,
so it shows up in the stack trace itself.
Also, replaced three strsep() calls with two strchr() calls.
Also, check return value from pthread_kill() calls.
Bug
3032532.
Change-Id: I3730cfb8a5c59048d35d746d8bffb4fa61bd5a6c
Brian Carlstrom [Fri, 24 Sep 2010 21:14:21 +0000 (14:14 -0700)]
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Dima Zavin [Fri, 24 Sep 2010 06:45:57 +0000 (23:45 -0700)]
am
9b55721f: am
85a3c66f: am
b14f405c: Turn off verbose chatter about libs in /vendor
Merge commit '
9b55721ff026fe0d8aa2b9d2c71255151b15ca52' into dalvik-dev
* commit '
9b55721ff026fe0d8aa2b9d2c71255151b15ca52':
Turn off verbose chatter about libs in /vendor
Dima Zavin [Fri, 24 Sep 2010 06:42:02 +0000 (23:42 -0700)]
am
85a3c66f: am
b14f405c: Turn off verbose chatter about libs in /vendor
Merge commit '
85a3c66f556ef3a4f6cf64bf1d7c1bafe60795d6'
* commit '
85a3c66f556ef3a4f6cf64bf1d7c1bafe60795d6':
Turn off verbose chatter about libs in /vendor
Dima Zavin [Fri, 24 Sep 2010 06:34:41 +0000 (23:34 -0700)]
am
b14f405c: Turn off verbose chatter about libs in /vendor
Merge commit '
b14f405c4492f770c14c9252e81ff4df4401c0ef' into gingerbread-plus-aosp
* commit '
b14f405c4492f770c14c9252e81ff4df4401c0ef':
Turn off verbose chatter about libs in /vendor
Ben Cheng [Fri, 24 Sep 2010 06:01:09 +0000 (23:01 -0700)]
am
72a1940f: am
6634a3c3: am
629e6923: Print the JIT codegen type in the VM configuration list.
Merge commit '
72a1940f5169b2af6d25a8bb0059edaaa951a96a' into dalvik-dev
* commit '
72a1940f5169b2af6d25a8bb0059edaaa951a96a':
Print the JIT codegen type in the VM configuration list.
Ben Cheng [Fri, 24 Sep 2010 05:50:18 +0000 (22:50 -0700)]
am
6634a3c3: am
629e6923: Print the JIT codegen type in the VM configuration list.
Merge commit '
6634a3c373ae46893234f0d92264e1d7d97f083d'
* commit '
6634a3c373ae46893234f0d92264e1d7d97f083d':
Print the JIT codegen type in the VM configuration list.
Dima Zavin [Fri, 24 Sep 2010 05:38:45 +0000 (22:38 -0700)]
Turn off verbose chatter about libs in /vendor
Change-Id: I243d538d342b5e0424321b09b2b17555ef6343dd
Signed-off-by: Dima Zavin <dima@android.com>