OSDN Git Service
Carl Shapiro [Mon, 20 Sep 2010 19:12:51 +0000 (12:12 -0700)]
am
60d48755: am
43c54c0b: Ensure that an explicit GC request initiates a GC.
Merge commit '
60d487552319a1921629978806fdffc8fe90dc8a'
* commit '
60d487552319a1921629978806fdffc8fe90dc8a':
Ensure that an explicit GC request initiates a GC.
Carl Shapiro [Mon, 20 Sep 2010 19:10:33 +0000 (12:10 -0700)]
am
43c54c0b: Ensure that an explicit GC request initiates a GC.
Merge commit '
43c54c0b3a5161dedfee9c255e60788627ed8505' into gingerbread-plus-aosp
* commit '
43c54c0b3a5161dedfee9c255e60788627ed8505':
Ensure that an explicit GC request initiates a GC.
Carl Shapiro [Sat, 18 Sep 2010 07:14:48 +0000 (00:14 -0700)]
am
ac347a94: am
18131c2e: Merge "Add more context to the garbage collection log messages." into gingerbread
Merge commit '
ac347a94098d4563686152471b694a2be6e3d2e4'
* commit '
ac347a94098d4563686152471b694a2be6e3d2e4':
Add more context to the garbage collection log messages.
Carl Shapiro [Sat, 18 Sep 2010 02:29:15 +0000 (19:29 -0700)]
am
18131c2e: Merge "Add more context to the garbage collection log messages." into gingerbread
Merge commit '
18131c2e1426ba836b5a508842cd370d95d0a964' into gingerbread-plus-aosp
* commit '
18131c2e1426ba836b5a508842cd370d95d0a964':
Add more context to the garbage collection log messages.
Carl Shapiro [Sat, 18 Sep 2010 00:10:48 +0000 (17:10 -0700)]
Ensure that an explicit GC request initiates a GC.
Previously, if a concurrent GC was in-flight when an explicit GC was
requested a warning would be logged about a recursive GC attempt. Now,
the requesting thread will block until the GC is inactive and afterward
initiate its foreground collection.
Change-Id: Ibc4cef83315ffe7ccf822a32beb4cce5b1c816bd
Dan Bornstein [Fri, 17 Sep 2010 23:10:52 +0000 (16:10 -0700)]
am
10d11e92: am
49f62de0: Add --dexopt option to explicitly specify the dexopt binary.
Merge commit '
10d11e9205d9277e274d28801d881964ac092aea'
* commit '
10d11e9205d9277e274d28801d881964ac092aea':
Add --dexopt option to explicitly specify the dexopt binary.
Dan Bornstein [Fri, 17 Sep 2010 23:10:34 +0000 (16:10 -0700)]
am
aa09711b: am
2b9e8c1d: Modify dex-preopt to take better arguments for the build process.
Merge commit '
aa09711bd901c1eac9b2860609a56650f2dd3bb7'
* commit '
aa09711bd901c1eac9b2860609a56650f2dd3bb7':
Modify dex-preopt to take better arguments for the build process.
Carl Shapiro [Fri, 17 Sep 2010 23:05:35 +0000 (16:05 -0700)]
Merge "Add more context to the garbage collection log messages." into gingerbread
Carl Shapiro [Fri, 17 Sep 2010 22:53:16 +0000 (15:53 -0700)]
Add more context to the garbage collection log messages.
With this change, the heap size, number of bytes allocated, the
percentage of free heap, the external allocation limit, and the number
of external bytes allocated are logged. The number of objects freed
and suspend times are no longer logged but are still included in the
event log records.
Change-Id: I5d5a9d623ae8cb72ad7d4bc5014e218c61a33561
Dan Bornstein [Fri, 17 Sep 2010 21:22:06 +0000 (14:22 -0700)]
am
49f62de0: Add --dexopt option to explicitly specify the dexopt binary.
Merge commit '
49f62de02d20143f73d7afbb4c5e36a6b7082c3a' into gingerbread-plus-aosp
* commit '
49f62de02d20143f73d7afbb4c5e36a6b7082c3a':
Add --dexopt option to explicitly specify the dexopt binary.
Dan Bornstein [Fri, 17 Sep 2010 21:11:19 +0000 (14:11 -0700)]
Add --dexopt option to explicitly specify the dexopt binary.
Also, cleaned up the docs and usage message a little.
Change-Id: I5bb0ce1b4f8153c19da69fca05cd9318c7e02536
Dan Bornstein [Fri, 17 Sep 2010 20:53:33 +0000 (13:53 -0700)]
am
2b9e8c1d: Modify dex-preopt to take better arguments for the build process.
Merge commit '
2b9e8c1db0e886a57a13f778c01469713a8f5985' into gingerbread-plus-aosp
* commit '
2b9e8c1db0e886a57a13f778c01469713a8f5985':
Modify dex-preopt to take better arguments for the build process.
Dan Bornstein [Fri, 17 Sep 2010 19:54:07 +0000 (12:54 -0700)]
Modify dex-preopt to take better arguments for the build process.
In particular, it now takes a --product-dir that doesn't assume any
particular build tree structure, and it takes a --boot-dir for the
target path (which will be under the product-dir) for the boot
classpath files.
Change-Id: I8986f1d4d37330ab32ebe8b55d38bdd5e24d4aaf
Jesse Wilson [Fri, 17 Sep 2010 00:38:46 +0000 (17:38 -0700)]
am
7c73c80e: am
42929e15: Add optional tags to dalvik.
Merge commit '
7c73c80e187012b57872df0c16a42bde27d5be73'
* commit '
7c73c80e187012b57872df0c16a42bde27d5be73':
Add optional tags to dalvik.
Jesse Wilson [Fri, 17 Sep 2010 00:37:21 +0000 (17:37 -0700)]
am
42929e15: Add optional tags to dalvik.
Merge commit '
42929e15765640324d9181ec1159effd22aa86ca' into gingerbread-plus-aosp
* commit '
42929e15765640324d9181ec1159effd22aa86ca':
Add optional tags to dalvik.
Jesse Wilson [Thu, 16 Sep 2010 22:56:25 +0000 (15:56 -0700)]
Add optional tags to dalvik.
Change-Id: I29a78ccb6312d12b3ef0ed02cfbc638a5b01db9c
Piotr Gurgul [Thu, 16 Sep 2010 18:15:24 +0000 (11:15 -0700)]
Merge "Add type name conversion methods for dexgen"
Dan Bornstein [Thu, 16 Sep 2010 02:02:32 +0000 (19:02 -0700)]
am
806a5160: am
4c5d26bc: Make the app processing variant of dex-preopt more consistent.
Merge commit '
806a516031e6ff716891d9e471e13ee27ca0c2fe'
* commit '
806a516031e6ff716891d9e471e13ee27ca0c2fe':
Make the app processing variant of dex-preopt more consistent.
Piotr Gurgul [Thu, 16 Sep 2010 00:33:12 +0000 (17:33 -0700)]
Merge "Move up inner class definition"
Dan Bornstein [Wed, 15 Sep 2010 21:55:22 +0000 (14:55 -0700)]
am
4c5d26bc: Make the app processing variant of dex-preopt more consistent.
Merge commit '
4c5d26bcfe9027a6e350af70a67cf2b584534509' into gingerbread-plus-aosp
* commit '
4c5d26bcfe9027a6e350af70a67cf2b584534509':
Make the app processing variant of dex-preopt more consistent.
Dan Bornstein [Wed, 15 Sep 2010 21:44:01 +0000 (14:44 -0700)]
Make the app processing variant of dex-preopt more consistent.
In particular, make it take paths relative to the product, just like
how the bootclasspath is found and processed.
Change-Id: I3f2a98a6bf6bbcf3145cf9be8edc1c3be4d763b9
Piotr Gurgul [Wed, 15 Sep 2010 21:30:00 +0000 (14:30 -0700)]
Move up inner class definition
Placing inner class definition right after enclosing class declaration.
Change-Id: If7ec40c96c3c3e54d7f29002b30e178f82a5d9c6
Piotr Gurgul [Mon, 13 Sep 2010 23:56:13 +0000 (16:56 -0700)]
Add type name conversion methods for dexgen
Methods added to Type and CstType classes are supposed to adapt
various type names and signatures from the format returned
by Java reflection into format accepted by ClassDefItem.
Change-Id: Iefbf87cfac89f6041fc9580803ea074a69fb0a55
Dan Bornstein [Wed, 15 Sep 2010 19:32:57 +0000 (12:32 -0700)]
am
3a9aa008: am
def30fc2: Clarify the use of --boot-dirs in the header comment.
Merge commit '
3a9aa008c9d4bfe29d3e35658a7f227bc4340b43'
* commit '
3a9aa008c9d4bfe29d3e35658a7f227bc4340b43':
Clarify the use of --boot-dirs in the header comment.
Dan Bornstein [Wed, 15 Sep 2010 18:39:00 +0000 (11:39 -0700)]
am
8f069486: am
32bc0787: Add use of sentinel in BOOTCLASSPATH entries during preopt.
Merge commit '
8f069486a35e9032762063cb7c389ebde76d3529'
* commit '
8f069486a35e9032762063cb7c389ebde76d3529':
Add use of sentinel in BOOTCLASSPATH entries during preopt.
Dan Bornstein [Tue, 14 Sep 2010 23:21:21 +0000 (16:21 -0700)]
am
def30fc2: Clarify the use of --boot-dirs in the header comment.
Merge commit '
def30fc213d62fc93edce2ca63967ab93380075d' into gingerbread-plus-aosp
* commit '
def30fc213d62fc93edce2ca63967ab93380075d':
Clarify the use of --boot-dirs in the header comment.
Dan Bornstein [Tue, 14 Sep 2010 23:15:49 +0000 (16:15 -0700)]
Clarify the use of --boot-dirs in the header comment.
Change-Id: I89cf275e6188d5615bfb4e45fe35580b0ebe5be2
Dan Bornstein [Tue, 14 Sep 2010 20:01:58 +0000 (13:01 -0700)]
am
32bc0787: Add use of sentinel in BOOTCLASSPATH entries during preopt.
Merge commit '
32bc0787307ba57e92fa74c52da550e2ca22af7f' into gingerbread-plus-aosp
* commit '
32bc0787307ba57e92fa74c52da550e2ca22af7f':
Add use of sentinel in BOOTCLASSPATH entries during preopt.
Dan Bornstein [Tue, 14 Sep 2010 00:30:10 +0000 (17:30 -0700)]
Add use of sentinel in BOOTCLASSPATH entries during preopt.
This change introduces the use of the sentinel string "/./" inside
BOOTCLASSPATH entries to signal the start of the portion of the paths
that should be preserved in optimized dex file dependency lists. It's
a little grotty, but it does serve the purpose of allowing host side
dexopt to do its thing inside a build directory without letting the
host path leading up to that build directory to leak into the results.
This change also makes it an error (instead of just a warning) for
there to be BOOTCLASSPATH entries that are not absolute paths (either
truly absolute or ones with the sentinels as per above).
FWIW, dx uses this sentinel in a similar way.
Change-Id: Ic8d0533d3ee0bd7a1d4d06fcf9232c56f0a60abf
Dan Bornstein [Tue, 14 Sep 2010 01:58:04 +0000 (18:58 -0700)]
am
e5a8cd42: am
96604831: First possibly-working cut of dex-preopt.
Merge commit '
e5a8cd42a5d9ab9c8466fe7b333f94fe1a034f52'
* commit '
e5a8cd42a5d9ab9c8466fe7b333f94fe1a034f52':
First possibly-working cut of dex-preopt.
Dan Bornstein [Mon, 13 Sep 2010 23:43:59 +0000 (16:43 -0700)]
am
96604831: First possibly-working cut of dex-preopt.
Merge commit '
96604831505a9ffef8d2da38c24a533a593efb34' into gingerbread-plus-aosp
* commit '
96604831505a9ffef8d2da38c24a533a593efb34':
First possibly-working cut of dex-preopt.
Dan Bornstein [Mon, 13 Sep 2010 22:37:28 +0000 (15:37 -0700)]
First possibly-working cut of dex-preopt.
Change-Id: I65c8ca76d75285ebd510babe5d0b3e0a157f82b7
Dan Bornstein [Mon, 13 Sep 2010 22:02:35 +0000 (15:02 -0700)]
am
10a1d761: am
20228de2: Flesh out dex-preopt a bit more.
Merge commit '
10a1d7615652de5de0214265123044f032d45177'
* commit '
10a1d7615652de5de0214265123044f032d45177':
Flesh out dex-preopt a bit more.
Dan Bornstein [Mon, 13 Sep 2010 21:42:26 +0000 (14:42 -0700)]
am
de9307da: am
46f7d54c: We also need to tell it the file mode when creating the output.
Merge commit '
de9307dace945eea0bbcfa008d7e164f8777e28d'
* commit '
de9307dace945eea0bbcfa008d7e164f8777e28d':
We also need to tell it the file mode when creating the output.
Piotr Gurgul [Mon, 13 Sep 2010 21:02:31 +0000 (14:02 -0700)]
Merge "Add several classes from dx tool to the dexgen project"
Dan Bornstein [Mon, 13 Sep 2010 20:49:41 +0000 (13:49 -0700)]
am
20228de2: Flesh out dex-preopt a bit more.
Merge commit '
20228de2a8b0902d919b8acc27a9e954a597d16b' into gingerbread-plus-aosp
* commit '
20228de2a8b0902d919b8acc27a9e954a597d16b':
Flesh out dex-preopt a bit more.
Dan Bornstein [Mon, 13 Sep 2010 20:40:33 +0000 (13:40 -0700)]
Flesh out dex-preopt a bit more.
It's still not done.
Change-Id: I8b1cbe14841f12c8f299638c1ddaeec659ec441b
Dan Bornstein [Mon, 13 Sep 2010 18:52:10 +0000 (11:52 -0700)]
am
46f7d54c: We also need to tell it the file mode when creating the output.
Merge commit '
46f7d54cbda931213bbe710c065e1bd82aa0af6c' into gingerbread-plus-aosp
* commit '
46f7d54cbda931213bbe710c065e1bd82aa0af6c':
We also need to tell it the file mode when creating the output.
Dan Bornstein [Mon, 13 Sep 2010 01:27:00 +0000 (18:27 -0700)]
We also need to tell it the file mode when creating the output.
Thanks to Elliott for catching this.
Change-Id: Ibb89ece3dd2e1d39a8a2d51cb8b7278842e057a1
Dan Bornstein [Mon, 13 Sep 2010 01:18:48 +0000 (18:18 -0700)]
am
1df6d930: am
17e4ea8f: Actually, dexopt needs to read the optimized dex file too.
Merge commit '
1df6d93064c3e43356869407eff41a03bc9ca4b8'
* commit '
1df6d93064c3e43356869407eff41a03bc9ca4b8':
Actually, dexopt needs to read the optimized dex file too.
Dan Bornstein [Mon, 13 Sep 2010 01:18:46 +0000 (18:18 -0700)]
am
f3a6934b: am
dd2502bd: Move declarations to the top to avoid potential uninitialized use.
Merge commit '
f3a6934bbe1e295956f3d9f16ac675fb7d4232b7'
* commit '
f3a6934bbe1e295956f3d9f16ac675fb7d4232b7':
Move declarations to the top to avoid potential uninitialized use.
Dan Bornstein [Mon, 13 Sep 2010 01:17:08 +0000 (18:17 -0700)]
am
17e4ea8f: Actually, dexopt needs to read the optimized dex file too.
Merge commit '
17e4ea8f17b6e4e14c483de49b3a3f053af188b4' into gingerbread-plus-aosp
* commit '
17e4ea8f17b6e4e14c483de49b3a3f053af188b4':
Actually, dexopt needs to read the optimized dex file too.
Dan Bornstein [Mon, 13 Sep 2010 01:17:06 +0000 (18:17 -0700)]
am
dd2502bd: Move declarations to the top to avoid potential uninitialized use.
Merge commit '
dd2502bd371ddca554b7a3d900fe120a3e7767ec' into gingerbread-plus-aosp
* commit '
dd2502bd371ddca554b7a3d900fe120a3e7767ec':
Move declarations to the top to avoid potential uninitialized use.
Dan Bornstein [Mon, 13 Sep 2010 01:12:27 +0000 (18:12 -0700)]
Actually, dexopt needs to read the optimized dex file too.
Change-Id: Ib36cc0fd134a6916100060c8e2eee5158ac87201
Dan Bornstein [Mon, 13 Sep 2010 00:34:35 +0000 (17:34 -0700)]
Move declarations to the top to avoid potential uninitialized use.
I didn't catch the warnings among the build spew before. Also, made
"--preopt" use stderr for its complaints about arguments.
Change-Id: I8d470ccc40c4cdc9131beb0991060358039e2727
Dan Bornstein [Mon, 13 Sep 2010 00:26:49 +0000 (17:26 -0700)]
am
3bb31513: am
4701d5f8: Add a new "--preopt" mode to dexopt, for running on the host.
Merge commit '
3bb31513f5aa1e3c4860947287a6edf7842d2c49'
* commit '
3bb31513f5aa1e3c4860947287a6edf7842d2c49':
Add a new "--preopt" mode to dexopt, for running on the host.
Dan Bornstein [Mon, 13 Sep 2010 00:23:51 +0000 (17:23 -0700)]
am
4701d5f8: Add a new "--preopt" mode to dexopt, for running on the host.
Merge commit '
4701d5f8d0e691eeb9a0824311d5166d301a5aa5' into gingerbread-plus-aosp
* commit '
4701d5f8d0e691eeb9a0824311d5166d301a5aa5':
Add a new "--preopt" mode to dexopt, for running on the host.
Dan Bornstein [Sun, 12 Sep 2010 23:42:28 +0000 (16:42 -0700)]
Add a new "--preopt" mode to dexopt, for running on the host.
This change takes much of what used to be in the function fromZip()
(the "--zip" mode implementation) and pulls it into a helper function,
which is then also used by the new preopt() function.
Change-Id: Id54618047896366448adaec0bf973627a9f1f397
Dan Bornstein [Sun, 12 Sep 2010 21:01:40 +0000 (14:01 -0700)]
am
1c73c286: am
ab9d89fb: Pre-alpha cut of the new dex preoptimization script.
Merge commit '
1c73c2863feb505b2145566ec2bcc96d4ccc4641'
* commit '
1c73c2863feb505b2145566ec2bcc96d4ccc4641':
Pre-alpha cut of the new dex preoptimization script.
Dan Bornstein [Sun, 12 Sep 2010 20:12:29 +0000 (13:12 -0700)]
am
ab9d89fb: Pre-alpha cut of the new dex preoptimization script.
Merge commit '
ab9d89fb7417157c3972278d1bd899cc091a8168' into gingerbread-plus-aosp
* commit '
ab9d89fb7417157c3972278d1bd899cc091a8168':
Pre-alpha cut of the new dex preoptimization script.
Dan Bornstein [Sun, 12 Sep 2010 20:03:27 +0000 (13:03 -0700)]
Pre-alpha cut of the new dex preoptimization script.
This will successfully find all the right directories etc., but it doesn't
do any actual dex processing yet. Stay tuned!
Change-Id: I4926308231366d6bae7b6a4594b4edb99192bf42
Ben Cheng [Sat, 11 Sep 2010 00:24:57 +0000 (17:24 -0700)]
am
fd93a495: am
23608ab4: Fix inliner bug for empty callees.
Merge commit '
fd93a495deb6b1642925e0a98a63cd9b21b6a232'
* commit '
fd93a495deb6b1642925e0a98a63cd9b21b6a232':
Fix inliner bug for empty callees.
Ben Cheng [Sat, 11 Sep 2010 00:19:42 +0000 (17:19 -0700)]
am
23608ab4: Fix inliner bug for empty callees.
Merge commit '
23608ab40900463fc5c8461671ba3aa5d0a4260e' into gingerbread-plus-aosp
* commit '
23608ab40900463fc5c8461671ba3aa5d0a4260e':
Fix inliner bug for empty callees.
Ben Cheng [Sat, 11 Sep 2010 00:11:11 +0000 (17:11 -0700)]
Fix inliner bug for empty callees.
Add an explicit branch to continue from the next instruction.
Bug:
2992514
(cherry-picked from dalvik-dev)
Change-Id: I6e036e330255e7cd9d1504c50c4260910c38dfff
Piotr Gurgul [Fri, 10 Sep 2010 01:22:53 +0000 (18:22 -0700)]
Add several classes from dx tool to the dexgen project
Dexgen depends on many classes from dx tool but for now there is no target
build of dx. That is why some of its classes need to be moved directly into
dexgen source code, as building target version of the whole dx project
is not an option. This CL produces a lot of duplicate classes in
dalvik/dx and dalvik/dexgen, but this will be resolved in future by removing
these classes from dalvik/dx.
Change-Id: I5411f92761d73c3ab555feaa345e5d150aa280ef
buzbee [Thu, 9 Sep 2010 23:52:00 +0000 (16:52 -0700)]
am
24628c4c: am
50afc65c: Merge "JIT: Fix inconsistent handling of sub-word instance git/put" into gingerbread
Merge commit '
24628c4c898930ba350b6ac99625c8ff700f35c8'
* commit '
24628c4c898930ba350b6ac99625c8ff700f35c8':
JIT: Fix inconsistent handling of sub-word instance git/put
buzbee [Thu, 9 Sep 2010 23:48:42 +0000 (16:48 -0700)]
am
50afc65c: Merge "JIT: Fix inconsistent handling of sub-word instance git/put" into gingerbread
Merge commit '
50afc65c674fee10ed9a0380daaee7862cc79d5d' into gingerbread-plus-aosp
* commit '
50afc65c674fee10ed9a0380daaee7862cc79d5d':
JIT: Fix inconsistent handling of sub-word instance git/put
buzbee [Thu, 9 Sep 2010 23:46:09 +0000 (16:46 -0700)]
Merge "JIT: Fix inconsistent handling of sub-word instance git/put" into gingerbread
buzbee [Thu, 9 Sep 2010 21:07:01 +0000 (14:07 -0700)]
JIT: Fix inconsistent handling of sub-word instance git/put
The portable interpreter and fast interpreter use 32-bit accesses
for all sub-word scalars. The JIT generated code to tailor the access
to the data size. It doesn't matter which approach is taken, but all
interpreters & JIT must be consistent. Changing the JIT to use 32-bit
accesses for all sub-word instance scalars.
Fix for Issue
2973137
Change-Id: I8b1e9e6be075012c7c174728b77c7a76884975b7
Piotr Gurgul [Thu, 9 Sep 2010 23:34:48 +0000 (16:34 -0700)]
Merge "Add dexgen helper classes and Android.mk"
Andy McFadden [Thu, 9 Sep 2010 23:19:42 +0000 (16:19 -0700)]
am
fdc9cfa3: am
139bd978: Added "dexopt for SMP" flag.
Merge commit '
fdc9cfa3bcf418d59c47a8d114ec84452b2f1d11'
* commit '
fdc9cfa3bcf418d59c47a8d114ec84452b2f1d11':
Added "dexopt for SMP" flag.
Andy McFadden [Thu, 9 Sep 2010 23:16:57 +0000 (16:16 -0700)]
am
139bd978: Added "dexopt for SMP" flag.
Merge commit '
139bd97804a69634e7c4cecf06910a050a4ac093' into gingerbread-plus-aosp
* commit '
139bd97804a69634e7c4cecf06910a050a4ac093':
Added "dexopt for SMP" flag.
Andy McFadden [Thu, 9 Sep 2010 19:54:43 +0000 (12:54 -0700)]
Added "dexopt for SMP" flag.
Currently, dexopt always runs on the target device, which means that
decisions about whether or not to convert certain opcodes to SMP-safe
variants could be made based on #ifdefs.
Since we are planning to run dexopt on the host, we need to be able
to configure SMP-mode independently. This change adds a global variable
that the dexopt code can check.
There is currently no command-line argument to set this, since it will
be set by "dexopt" rather than "dalvikvm", and the exact method of
launching dexopt from the host build is still mildly TBD.
Bug
2981136.
(cherry-pick from dalvik-dev)
Change-Id: I7474f79a25368223ecf1e491458f4a82e85db01f
Piotr Gurgul [Fri, 3 Sep 2010 02:15:30 +0000 (19:15 -0700)]
Add dexgen helper classes and Android.mk
This commit adds the very first classes to the dexgen project together with
its Android.mk file. These are the helper classes needed by dex class builder.
Change-Id: I47f8132443f43881826d24a854ab6bafb14181bd
Dan Bornstein [Thu, 9 Sep 2010 21:23:28 +0000 (14:23 -0700)]
am
070fceca: am
d394371b: Remove the functionality in ReduceConstants.[ch].
Merge commit '
070fceca4bf6d717094a0be33b322e84c0a6874d'
* commit '
070fceca4bf6d717094a0be33b322e84c0a6874d':
Remove the functionality in ReduceConstants.[ch].
Dan Bornstein [Thu, 9 Sep 2010 19:07:28 +0000 (12:07 -0700)]
am
d394371b: Remove the functionality in ReduceConstants.[ch].
Merge commit '
d394371bd84bacc51e96e2d2eacb8549d9110b1e' into gingerbread-plus-aosp
* commit '
d394371bd84bacc51e96e2d2eacb8549d9110b1e':
Remove the functionality in ReduceConstants.[ch].
Dan Bornstein [Wed, 8 Sep 2010 22:50:00 +0000 (15:50 -0700)]
Remove the functionality in ReduceConstants.[ch].
It was a good experiment to try, but it was never made production-ready,
and it doesn't look like it would be a net win at this point. We
metaphorically pour out a beer in its honor.
Change-Id: I7f6ac95f5b7c963df0a3015ed33595fa1a928636
Carl Shapiro [Wed, 8 Sep 2010 01:52:31 +0000 (18:52 -0700)]
am
917aef91: am
2c81bdc3: Cherry pick new concurrent gc trigger change from dalvik-dev.
Merge commit '
917aef916f31d087b31a99b396e39be885772a8d'
* commit '
917aef916f31d087b31a99b396e39be885772a8d':
Cherry pick new concurrent gc trigger change from dalvik-dev.
Carl Shapiro [Wed, 8 Sep 2010 00:10:32 +0000 (17:10 -0700)]
am
2c81bdc3: Cherry pick new concurrent gc trigger change from dalvik-dev.
Merge commit '
2c81bdc3bb892d7d60855e14f61854f20a9f6cb8' into gingerbread-plus-aosp
* commit '
2c81bdc3bb892d7d60855e14f61854f20a9f6cb8':
Cherry pick new concurrent gc trigger change from dalvik-dev.
Carl Shapiro [Tue, 7 Sep 2010 23:19:01 +0000 (16:19 -0700)]
Cherry pick new concurrent gc trigger change from dalvik-dev.
git cherry-pick
d370c7d8c5bd4f49274b5d306751c43c7bb44a0b --no-commit
git cherry-pick
562cafca106d36ae910fafa87f3d5f245fe818ae --no-commit
git cherry-pick
ab46f94967a76a1c141c1e719d5f2cffe2780a8c --no-commit
Change-Id: Iba35cd3afee5d575b8121f7ab3ef5b45b37f5278
Carl Shapiro [Fri, 3 Sep 2010 19:18:38 +0000 (12:18 -0700)]
am
e67a0f17: am
44165848: Merge "Operate on bitmaps directly for live and mark checks." into gingerbread
Merge commit '
e67a0f17f1c53f248d710fe8b1476abe8ef0f622'
* commit '
e67a0f17f1c53f248d710fe8b1476abe8ef0f622':
Operate on bitmaps directly for live and mark checks.
Carl Shapiro [Fri, 3 Sep 2010 19:16:34 +0000 (12:16 -0700)]
am
44165848: Merge "Operate on bitmaps directly for live and mark checks." into gingerbread
Merge commit '
4416584802dbda4ade8df7f81af84a73d6887049' into gingerbread-plus-aosp
* commit '
4416584802dbda4ade8df7f81af84a73d6887049':
Operate on bitmaps directly for live and mark checks.
Carl Shapiro [Fri, 3 Sep 2010 19:14:46 +0000 (12:14 -0700)]
Merge "Operate on bitmaps directly for live and mark checks." into gingerbread
buzbee [Fri, 3 Sep 2010 16:27:53 +0000 (09:27 -0700)]
am
58a661c4: am
ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '
58a661c4ec0c18473b6b9814a78896caa74d0c8c'
* commit '
58a661c4ec0c18473b6b9814a78896caa74d0c8c':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
buzbee [Fri, 3 Sep 2010 16:22:41 +0000 (09:22 -0700)]
am
ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '
ddc7d29baa92cb24b7bfa80395479f878109f3f8' into gingerbread-plus-aosp
* commit '
ddc7d29baa92cb24b7bfa80395479f878109f3f8':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
buzbee [Fri, 3 Sep 2010 00:16:24 +0000 (17:16 -0700)]
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Fix for http://b/issue?id=
2971877, which was identified via
debug tracing on http://b/issue?id=
2971569. There were a couple
of problems: first, the volatile sget/sput byte codes had the
wrong format tag (22c instead of 21c). Second, the JIT was missing
a couple of case statments to handle these. As far as the JIT goes,
this would not have caused correctness problems, but would have
been slower than necessary.
Change-Id: I57a41c4e063642b0c19acba5bb0855dd8ce2d4ba
Carl Shapiro [Fri, 3 Sep 2010 06:32:25 +0000 (23:32 -0700)]
Operate on bitmaps directly for live and mark checks.
Previously, the card table scan use the valid object check to see if a
given address pointed to a live object header. This check is overkill
an requires out of line function calls. With this change, we query the
bitmaps directly during the scan avoiding significant overhead.
Change-Id: Ifccb93edb97154d44a652735c1d34845adf88740
Carl Shapiro [Fri, 3 Sep 2010 01:53:35 +0000 (18:53 -0700)]
am
3d1485b1: am
d7400e0e: Normalize the declaration style.
Merge commit '
3d1485b15d83dd920ffb1a826d42ae65f3b31a93'
* commit '
3d1485b15d83dd920ffb1a826d42ae65f3b31a93':
Normalize the declaration style.
Carl Shapiro [Fri, 3 Sep 2010 01:44:15 +0000 (18:44 -0700)]
am
d7400e0e: Normalize the declaration style.
Merge commit '
d7400e0ec701dd481489ad421d55c7cd903f77ee' into gingerbread-plus-aosp
* commit '
d7400e0ec701dd481489ad421d55c7cd903f77ee':
Normalize the declaration style.
Carl Shapiro [Fri, 3 Sep 2010 01:24:29 +0000 (18:24 -0700)]
Normalize the declaration style.
Change-Id: I204dec4a80672ea10286cefcff7884b15ebaae51
Carl Shapiro [Fri, 3 Sep 2010 01:00:39 +0000 (18:00 -0700)]
am
23cdb738: am
3ba10c99: Use an acquiring CAS for lock acquisition.
Merge commit '
23cdb738c525ade350c441cf4b5edca4526aef07'
* commit '
23cdb738c525ade350c441cf4b5edca4526aef07':
Use an acquiring CAS for lock acquisition.
Carl Shapiro [Fri, 3 Sep 2010 00:45:25 +0000 (17:45 -0700)]
am
3ba10c99: Use an acquiring CAS for lock acquisition.
Merge commit '
3ba10c9932db4c7c9546081ea070c73d5001c168' into gingerbread-plus-aosp
* commit '
3ba10c9932db4c7c9546081ea070c73d5001c168':
Use an acquiring CAS for lock acquisition.
Carl Shapiro [Thu, 2 Sep 2010 23:43:16 +0000 (16:43 -0700)]
Use an acquiring CAS for lock acquisition.
Change-Id: Idca782aedc8f2071cdfde2fe3dcba0503fa6c9f0
Carl Shapiro [Thu, 2 Sep 2010 18:41:30 +0000 (11:41 -0700)]
am
f14d72d8: am
7d12781a: Merge "Add additional context to the contention event logging." into gingerbread
Merge commit '
f14d72d8d8ec023021d94bbf91fddf9f292225dd'
* commit '
f14d72d8d8ec023021d94bbf91fddf9f292225dd':
Add additional context to the contention event logging.
Carl Shapiro [Thu, 2 Sep 2010 18:35:31 +0000 (11:35 -0700)]
am
7d12781a: Merge "Add additional context to the contention event logging." into gingerbread
Merge commit '
7d12781a1d2d4d4b2e3a6c78a375cb15ea2d96ae' into gingerbread-plus-aosp
* commit '
7d12781a1d2d4d4b2e3a6c78a375cb15ea2d96ae':
Add additional context to the contention event logging.
Piotr Gurgul [Thu, 2 Sep 2010 18:31:37 +0000 (11:31 -0700)]
Merge "Add dexgen project dir"
Carl Shapiro [Thu, 2 Sep 2010 18:28:32 +0000 (11:28 -0700)]
Merge "Add additional context to the contention event logging." into gingerbread
Carl Shapiro [Thu, 2 Sep 2010 02:00:43 +0000 (19:00 -0700)]
am
26122f7b: am
38d710b5: Move the finger computation out of the bitmap scanning callback.
Merge commit '
26122f7b5411d120d6d9d7f967abdd4f8c323414'
* commit '
26122f7b5411d120d6d9d7f967abdd4f8c323414':
Move the finger computation out of the bitmap scanning callback.
Carl Shapiro [Thu, 2 Sep 2010 02:00:41 +0000 (19:00 -0700)]
am
75233705: am
a634c852: Reduce the frequency of bitmap walk loop-bound computations.
Merge commit '
7523370510bb3eb61360dd3eb95ae537a6ffb412'
* commit '
7523370510bb3eb61360dd3eb95ae537a6ffb412':
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Thu, 2 Sep 2010 02:00:39 +0000 (19:00 -0700)]
am
81fc9917: am
c44bca65: Improve the heap verifier\'s failure report.
Merge commit '
81fc991785ff3dc160942a88bbd713b677e63450'
* commit '
81fc991785ff3dc160942a88bbd713b677e63450':
Improve the heap verifier's failure report.
Carl Shapiro [Thu, 2 Sep 2010 02:00:36 +0000 (19:00 -0700)]
am
8f96d635: am
57ee270b: Simplify the bitmap walker subroutines.
Merge commit '
8f96d635aace5ec6cb30fd84e95fab4091ed6479'
* commit '
8f96d635aace5ec6cb30fd84e95fab4091ed6479':
Simplify the bitmap walker subroutines.
Carl Shapiro [Thu, 2 Sep 2010 02:00:29 +0000 (19:00 -0700)]
am
16b6646f: am
b2e78d39: Consistently refer to the mark context as ctx.
Merge commit '
16b6646fcbc187b280dcc64f7bd1c1dabe8b37f0'
* commit '
16b6646fcbc187b280dcc64f7bd1c1dabe8b37f0':
Consistently refer to the mark context as ctx.
Carl Shapiro [Thu, 2 Sep 2010 02:00:26 +0000 (19:00 -0700)]
am
73479900: am
5d81aa32: Collapse a variable declaration and initialization.
Merge commit '
73479900d36fdcb6a9cf3edae66335158860c043'
* commit '
73479900d36fdcb6a9cf3edae66335158860c043':
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 2 Sep 2010 02:00:23 +0000 (19:00 -0700)]
am
fa4ae67c: am
7511ae1e: Combine a typedef with a struct declaration.
Merge commit '
fa4ae67c6a5bca3c0fccbe7775292f61be2935d5'
* commit '
fa4ae67c6a5bca3c0fccbe7775292f61be2935d5':
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 2 Sep 2010 02:00:19 +0000 (19:00 -0700)]
am
03dce8ca: am
eff16fb8: Use symbolic constants when computing bits-per-word.
Merge commit '
03dce8ca75c05f0588ceb5db4b236746e8f445e7'
* commit '
03dce8ca75c05f0588ceb5db4b236746e8f445e7':
Use symbolic constants when computing bits-per-word.
Carl Shapiro [Thu, 2 Sep 2010 02:00:15 +0000 (19:00 -0700)]
am
27fc78f6: am
ca2d17e5: Merge "Bitmap naming clean-up." into gingerbread
Merge commit '
27fc78f6b8d5a641024c2bd393cddaf5a9f818aa'
* commit '
27fc78f6b8d5a641024c2bd393cddaf5a9f818aa':
Bitmap naming clean-up.
Elliott Hughes [Thu, 2 Sep 2010 02:00:10 +0000 (19:00 -0700)]
am
7453145e: am
a1227409: Intrinsics for float/int and double/long conversions.
Merge commit '
7453145e658dfe5b93bf19a997df617b0f66b136'
* commit '
7453145e658dfe5b93bf19a997df617b0f66b136':
Intrinsics for float/int and double/long conversions.
Carl Shapiro [Thu, 2 Sep 2010 01:53:47 +0000 (18:53 -0700)]
am
38d710b5: Move the finger computation out of the bitmap scanning callback.
Merge commit '
38d710b524f2d9888e89b4ea0209f0b57025dab4' into gingerbread-plus-aosp
* commit '
38d710b524f2d9888e89b4ea0209f0b57025dab4':
Move the finger computation out of the bitmap scanning callback.
Carl Shapiro [Thu, 2 Sep 2010 01:50:11 +0000 (18:50 -0700)]
am
a634c852: Reduce the frequency of bitmap walk loop-bound computations.
Merge commit '
a634c852e985dcacf621c428c0597674bc5bfd77' into gingerbread-plus-aosp
* commit '
a634c852e985dcacf621c428c0597674bc5bfd77':
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Tue, 31 Aug 2010 23:48:31 +0000 (16:48 -0700)]
Move the finger computation out of the bitmap scanning callback.
The finger computation depends on bitmap internals. This knowledge
should not be part of the bitmap interface, just its implementation.
This change adds a new walker that computes and passes a finger
argument to a callback. As part of this change, code to recompute the
end address during a walk has been removed from the ordinary bitmap
walker code. That check is needed by the scanning walk as its
callback may advance the max address when setting mark bits for
objects beyond the finger.