OSDN Git Service
Andy McFadden [Thu, 9 Sep 2010 23:28:43 +0000 (16:28 -0700)]
am
fb12fb32: am
fdc9cfa3: am
139bd978: Added "dexopt for SMP" flag.
Merge commit '
fb12fb3242e8735e07e1a4583517f2e36a79b200' into dalvik-dev
* commit '
fb12fb3242e8735e07e1a4583517f2e36a79b200':
Added "dexopt for SMP" flag.
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
Dan Bornstein [Thu, 9 Sep 2010 22:40:34 +0000 (15:40 -0700)]
am
611f0c0b: am
070fceca: am
d394371b: Remove the functionality in ReduceConstants.[ch].
Merge commit '
611f0c0b5075be16c517431354db4a3facd5a5ef' into dalvik-dev
* commit '
611f0c0b5075be16c517431354db4a3facd5a5ef':
Remove the functionality in ReduceConstants.[ch].
buzbee [Thu, 9 Sep 2010 22:03:03 +0000 (15:03 -0700)]
Merge "JIT: Fix inconsistent handling of sub-word instance git/put" into dalvik-dev
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].
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: I6108ccc98c1b43974373764913d5f8d0d8723cd4
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.
Change-Id: If20aa6f513896fd8b35394388eaca6214f0449a7
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 02:05:09 +0000 (19:05 -0700)]
am
194185e2: am
917aef91: am
2c81bdc3: Cherry pick new concurrent gc trigger change from dalvik-dev.
Merge commit '
194185e2ae8cb2d4b2828e9a1ba3d94adf9cd32f' into dalvik-dev
* commit '
194185e2ae8cb2d4b2828e9a1ba3d94adf9cd32f':
Cherry pick new concurrent gc trigger change from dalvik-dev.
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.
Ben Cheng [Wed, 8 Sep 2010 00:18:12 +0000 (17:18 -0700)]
Fix the Dalvik host build.
Change-Id: I7b019cfe6c6e1e37115fdcc9760c09d73dae0420
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 [Tue, 7 Sep 2010 23:07:36 +0000 (16:07 -0700)]
Merge "Use the correct constant for the limit value of size_t." into dalvik-dev
Elliott Hughes [Tue, 7 Sep 2010 21:53:55 +0000 (14:53 -0700)]
Stop using getEffectiveAddress.
The corresponding field is now set in the constructor, thanks to:
https://android-git.corp.google.com/g/64867
Bug:
2935622
Change-Id: Ifcd77b3e83e046eb7ba6aa2d917aa434e508f3e8
Carl Shapiro [Tue, 7 Sep 2010 21:49:19 +0000 (14:49 -0700)]
Use the correct constant for the limit value of size_t.
Change-Id: Ic918a380b7f581c2cf9d3f28e6179cd0182cd495
Elliott Hughes [Tue, 7 Sep 2010 17:15:16 +0000 (10:15 -0700)]
Merge "Fix build (track Java class name change)." into dalvik-dev
Elliott Hughes [Tue, 7 Sep 2010 17:10:48 +0000 (10:10 -0700)]
Fix build (track Java class name change).
Change-Id: I731d8fe3d24becd284764f8f05d59340fbe02bb8
Barry Hayes [Fri, 3 Sep 2010 21:26:12 +0000 (14:26 -0700)]
The host build lacks SIZE_T_MAX, even though bionic has it.
Change SIZE_T_MAX to UINT_MAX.
Change-Id: Icbf74abb26cac680ff1b470260c1fba6991bc975
Carl Shapiro [Fri, 3 Sep 2010 19:59:02 +0000 (12:59 -0700)]
Merge "Change the concurrent trigger condition from "start after N bytes allocated" to "start when N bytes of free-space remain."" into dalvik-dev
Carl Shapiro [Fri, 3 Sep 2010 19:29:25 +0000 (12:29 -0700)]
am
dab09d9d: am
e67a0f17: am
44165848: Merge "Operate on bitmaps directly for live and mark checks." into gingerbread
Merge commit '
dab09d9d81d1a6a23f11739017cc619d0cb411c3' into dalvik-dev
* commit '
dab09d9d81d1a6a23f11739017cc619d0cb411c3':
Operate on bitmaps directly for live and mark checks.
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.
Barry Hayes [Tue, 31 Aug 2010 16:14:00 +0000 (09:14 -0700)]
Change the concurrent trigger condition from "start after N bytes
allocated" to "start when N bytes of free-space remain."
To avoid continuous concurrent collection: if free-space after a GC is
under set amount, the next GC will not be concurrent. When the
application is in steady-state near its max heap, concurrent
collection will be effectively disabled.
Change-Id: I248230ef42d49df93903b2c29faae7454eaed325
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
Elliott Hughes [Fri, 3 Sep 2010 17:10:40 +0000 (10:10 -0700)]
Merge "Do less work in NewDirectByteBuffer." into dalvik-dev
Ben Cheng [Fri, 3 Sep 2010 17:00:59 +0000 (10:00 -0700)]
Merge "Collect method traces with the fast interpreter and the JIT'ed code." into dalvik-dev
buzbee [Fri, 3 Sep 2010 16:35:22 +0000 (09:35 -0700)]
am
8ef4d4f3: am
58a661c4: am
ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '
8ef4d4f3d050b0130dbf723285990b045f04d5f3' into dalvik-dev
* commit '
8ef4d4f3d050b0130dbf723285990b045f04d5f3':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
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
Ben Cheng [Tue, 31 Aug 2010 16:30:37 +0000 (09:30 -0700)]
Collect method traces with the fast interpreter and the JIT'ed code.
Insert inline code instead of switching to the debug interpreter in the hope
that the time stamps collected in traceview are more close to the real
world behavior with minimal profiling overhead.
Because the inline polling still introduces additional overhead (20% ~ 100%),
it is only enabled in the special VM build called "libdvm_traceview.so".
It won't work on the emulator because it is not implemented to collect the
detailed instruction traces.
Here are some performance numbers using the FibonacciSlow microbenchmark
(ie recursive workloads / the shorter the faster):
time: configuration
8,162,602: profiling off/libdvm.so/JIT off
2,801,829: profiling off/libdvm.so/JIT on
9,952,236: profiling off/libdvm_traceview.so/JIT off
4,465,701: profiling off/libdvm_traceview.so/JIT on
164,786,585: profiling on/libdvm.so/JIT off
164,664,634: profiling on/libdvm.so/JIT on
11,231,707: profiling on/libdvm_traceview.so/JIT off
8,427,846: profiling on/libdvm_traceview.so/JIT on
Comparing the 8,427,846 vs 164,664,634 numbers againt the true baseline
performance number of 2,801,829, the new libdvm_traceview.so improves the time
skew from 58x to 3x.
Change-Id: I48611a3a4ff9c4950059249e5503c26abd6b138e
Carl Shapiro [Fri, 3 Sep 2010 01:57:55 +0000 (18:57 -0700)]
am
1311c9e5: am
3d1485b1: am
d7400e0e: Normalize the declaration style.
Merge commit '
1311c9e54386741f846d80c36c8474c0f5b77f6c' into dalvik-dev
* commit '
1311c9e54386741f846d80c36c8474c0f5b77f6c':
Normalize the declaration style.
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:38:59 +0000 (18:38 -0700)]
am
b45efe57: am
23cdb738: am
3ba10c99: Use an acquiring CAS for lock acquisition.
Merge commit '
b45efe5722476fb6ad9e66b4b6fba0486f6fc221' into dalvik-dev
* commit '
b45efe5722476fb6ad9e66b4b6fba0486f6fc221':
Use an acquiring CAS for lock acquisition.
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.
Elliott Hughes [Fri, 3 Sep 2010 00:04:50 +0000 (17:04 -0700)]
Do less work in NewDirectByteBuffer.
There's no obvious reason to be duplicating Java code in C, and incurring
the cost of repeated crossings of the JNI boundary. Plus I want to
change/remove the Java code...
Bug:
2935622
Change-Id: I4eb25dd4b83cdbefaeed7593d3a5bbdb6cc06ced
Carl Shapiro [Thu, 2 Sep 2010 23:43:16 +0000 (16:43 -0700)]
Use an acquiring CAS for lock acquisition.
Change-Id: Idca782aedc8f2071cdfde2fe3dcba0503fa6c9f0
Elliott Hughes [Thu, 2 Sep 2010 21:11:09 +0000 (14:11 -0700)]
Update the GetDirectBufferAddress implementation.
This change is the dalvik change corresponding to the following libcore change:
https://android-git.corp.google.com/g/64326
Bug:
2935622
Change-Id: If3687e3efcc322e651c685885f6701726b5d9efc
Carl Shapiro [Thu, 2 Sep 2010 18:44:45 +0000 (11:44 -0700)]
am
e07c0f48: am
f14d72d8: am
7d12781a: Merge "Add additional context to the contention event logging." into gingerbread
Merge commit '
e07c0f48a6aa2cb2d6301930e6b4290488cd7b46' into dalvik-dev
* commit '
e07c0f48a6aa2cb2d6301930e6b4290488cd7b46':
Add additional context to the contention event logging.
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:35:13 +0000 (11:35 -0700)]
am
0bc2d449: Merge "Add dexgen project dir"
Merge commit '
0bc2d449637b3de623b10b6db6cc3f097bf43a5b' into dalvik-dev
* commit '
0bc2d449637b3de623b10b6db6cc3f097bf43a5b':
Add dexgen project dir
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 03:30:57 +0000 (20:30 -0700)]
am
c3288051: am
26122f7b: am
38d710b5: Move the finger computation out of the bitmap scanning callback.
Merge commit '
c3288051029805ace18d943e26db84e5fb4c5272' into dalvik-dev
* commit '
c3288051029805ace18d943e26db84e5fb4c5272':
Move the finger computation out of the bitmap scanning callback.
Carl Shapiro [Thu, 2 Sep 2010 03:30:54 +0000 (20:30 -0700)]
am
b492c326: (-s ours) am
75233705: am
a634c852: Reduce the frequency of bitmap walk loop-bound computations.
Merge commit '
b492c326009cc179ad9eb79857d0f7d23901860e' into dalvik-dev
* commit '
b492c326009cc179ad9eb79857d0f7d23901860e':
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Thu, 2 Sep 2010 03:28:59 +0000 (20:28 -0700)]
am
30e64a29: am
81fc9917: am
c44bca65: Improve the heap verifier\'s failure report.
Merge commit '
30e64a291ae9d7f616e074afc9b6f12760a1d3d0' into dalvik-dev
* commit '
30e64a291ae9d7f616e074afc9b6f12760a1d3d0':
Improve the heap verifier's failure report.
Carl Shapiro [Thu, 2 Sep 2010 03:28:57 +0000 (20:28 -0700)]
am
23bc9b8c: (-s ours) am
8f96d635: am
57ee270b: Simplify the bitmap walker subroutines.
Merge commit '
23bc9b8c90dfadb30e8f6c18be24ff3847fc923f' into dalvik-dev
* commit '
23bc9b8c90dfadb30e8f6c18be24ff3847fc923f':
Simplify the bitmap walker subroutines.
Carl Shapiro [Thu, 2 Sep 2010 03:16:05 +0000 (20:16 -0700)]
am
c6ffb2c5: am
16b6646f: am
b2e78d39: Consistently refer to the mark context as ctx.
Merge commit '
c6ffb2c5378cc53b31461a164e22bc4f8f24e10c' into dalvik-dev
* commit '
c6ffb2c5378cc53b31461a164e22bc4f8f24e10c':
Consistently refer to the mark context as ctx.
Carl Shapiro [Thu, 2 Sep 2010 03:16:01 +0000 (20:16 -0700)]
am
4e195382: am
73479900: am
5d81aa32: Collapse a variable declaration and initialization.
Merge commit '
4e195382d571ba049a94085bc98c3a3ac267498e' into dalvik-dev
* commit '
4e195382d571ba049a94085bc98c3a3ac267498e':
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 2 Sep 2010 03:15:56 +0000 (20:15 -0700)]
am
adc1e19d: am
fa4ae67c: am
7511ae1e: Combine a typedef with a struct declaration.
Merge commit '
adc1e19dc6dfaff19355c02f5420a0cc8965a2ea' into dalvik-dev
* commit '
adc1e19dc6dfaff19355c02f5420a0cc8965a2ea':
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 2 Sep 2010 03:15:53 +0000 (20:15 -0700)]
am
20e165ca: am
03dce8ca: am
eff16fb8: Use symbolic constants when computing bits-per-word.
Merge commit '
20e165ca67d05e82c21b553324b003c434ba4246' into dalvik-dev
* commit '
20e165ca67d05e82c21b553324b003c434ba4246':
Use symbolic constants when computing bits-per-word.
Carl Shapiro [Thu, 2 Sep 2010 03:15:49 +0000 (20:15 -0700)]
am
3d891ca4: am
27fc78f6: am
ca2d17e5: Merge "Bitmap naming clean-up." into gingerbread
Merge commit '
3d891ca44fe66a2c8c00afded6c192c25296f9c4' into dalvik-dev
* commit '
3d891ca44fe66a2c8c00afded6c192c25296f9c4':
Bitmap naming clean-up.
Elliott Hughes [Thu, 2 Sep 2010 03:15:44 +0000 (20:15 -0700)]
am
3e2c191b: am
7453145e: am
a1227409: Intrinsics for float/int and double/long conversions.
Merge commit '
3e2c191bb01bd53cfc5cf4f8e777f442ecaae6e4' into dalvik-dev
* commit '
3e2c191bb01bd53cfc5cf4f8e777f442ecaae6e4':
Intrinsics for float/int and double/long conversions.
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.
Carl Shapiro [Thu, 2 Sep 2010 01:45:12 +0000 (18:45 -0700)]
am
c44bca65: Improve the heap verifier\'s failure report.
Merge commit '
c44bca6530787454ee794cf2f83c1c6671a93aa8' into gingerbread-plus-aosp
* commit '
c44bca6530787454ee794cf2f83c1c6671a93aa8':
Improve the heap verifier's failure report.
Carl Shapiro [Mon, 30 Aug 2010 18:10:45 +0000 (11:10 -0700)]
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Thu, 2 Sep 2010 01:41:16 +0000 (18:41 -0700)]
am
57ee270b: Simplify the bitmap walker subroutines.
Merge commit '
57ee270b755271166b2349321e5b8b5457731dd7' into gingerbread-plus-aosp
* commit '
57ee270b755271166b2349321e5b8b5457731dd7':
Simplify the bitmap walker subroutines.
Carl Shapiro [Thu, 2 Sep 2010 01:39:20 +0000 (18:39 -0700)]
am
b2e78d39: Consistently refer to the mark context as ctx.
Merge commit '
b2e78d39f6df19a6222b3cd4c7010864fb8cb55f' into gingerbread-plus-aosp
* commit '
b2e78d39f6df19a6222b3cd4c7010864fb8cb55f':
Consistently refer to the mark context as ctx.
Carl Shapiro [Thu, 2 Sep 2010 01:39:17 +0000 (18:39 -0700)]
am
5d81aa32: Collapse a variable declaration and initialization.
Merge commit '
5d81aa327a11f6e929c2396d34c343923268bdc3' into gingerbread-plus-aosp
* commit '
5d81aa327a11f6e929c2396d34c343923268bdc3':
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 2 Sep 2010 01:39:14 +0000 (18:39 -0700)]
am
7511ae1e: Combine a typedef with a struct declaration.
Merge commit '
7511ae1ed686ccdf6cfefeabeede0cedb0c36b77' into gingerbread-plus-aosp
* commit '
7511ae1ed686ccdf6cfefeabeede0cedb0c36b77':
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 2 Sep 2010 01:39:07 +0000 (18:39 -0700)]
am
eff16fb8: Use symbolic constants when computing bits-per-word.
Merge commit '
eff16fb843ec191508d2e8306b6dfd8209ede501' into gingerbread-plus-aosp
* commit '
eff16fb843ec191508d2e8306b6dfd8209ede501':
Use symbolic constants when computing bits-per-word.
Carl Shapiro [Thu, 2 Sep 2010 01:38:47 +0000 (18:38 -0700)]
am
ca2d17e5: Merge "Bitmap naming clean-up." into gingerbread
Merge commit '
ca2d17e55ae11434c83e395867d3258f9b9b8474' into gingerbread-plus-aosp
* commit '
ca2d17e55ae11434c83e395867d3258f9b9b8474':
Bitmap naming clean-up.
Elliott Hughes [Thu, 2 Sep 2010 01:38:33 +0000 (18:38 -0700)]
am
a1227409: Intrinsics for float/int and double/long conversions.
Merge commit '
a1227409084c4a675cc83ada128f364506528b9c' into gingerbread-plus-aosp
* commit '
a1227409084c4a675cc83ada128f364506528b9c':
Intrinsics for float/int and double/long conversions.
Carl Shapiro [Fri, 27 Aug 2010 22:21:13 +0000 (15:21 -0700)]
Improve the heap verifier's failure report.
Previously, when a reference verify failed we would print the location
of the bad reference and abort. With this change, when a reference
fails to verify we try to print out more context. First, we dump the
object which contains the bad references and print each reference that
failed verification. Following that, we scan the roots and the heap
and print all of the objects which reference the bad object.
Carl Shapiro [Fri, 27 Aug 2010 20:06:48 +0000 (13:06 -0700)]
Simplify the bitmap walker subroutines.
This change...
* Separates walking from sweeping. Walking had been implemented by a
sweeping with an empty mark bitmap argument.
* Localizes the finger machinations to scanBitmapCallback. There is
one use of the finger but all callbacks received the argument.
* Inlines a simplified bitmap walking routine operating a pointer at a
time. Only sweeping benefits from batching decoded addresses.
Carl Shapiro [Fri, 20 Aug 2010 18:34:18 +0000 (11:34 -0700)]
Consistently refer to the mark context as ctx.
Carl Shapiro [Fri, 20 Aug 2010 18:04:25 +0000 (11:04 -0700)]
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 19 Aug 2010 23:54:01 +0000 (16:54 -0700)]
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 19 Aug 2010 21:29:41 +0000 (14:29 -0700)]
Use symbolic constants when computing bits-per-word.
Carl Shapiro [Thu, 2 Sep 2010 01:22:58 +0000 (18:22 -0700)]
Merge "Bitmap naming clean-up." into gingerbread
Carl Shapiro [Thu, 19 Aug 2010 04:04:31 +0000 (21:04 -0700)]
Bitmap naming clean-up.
Disambiguate bitmaps based on their use by adding a "curr" or "prev"
prefix. Also, fix names in a prototype to match the definition.
Elliott Hughes [Sat, 21 Aug 2010 01:47:36 +0000 (18:47 -0700)]
Intrinsics for float/int and double/long conversions.
[cherry-picked
e22bd84c8c8a57ddd86c21a1f65137d549b07935 from dalvik-dev to gingerbread]
Bug:
2935622
Change-Id: Ib4de19033dc4a08f41bf0eb0f7a21dcde216aae3
Dan Bornstein [Thu, 2 Sep 2010 00:21:23 +0000 (17:21 -0700)]
am
826ff7b0: am
b685b591: am
4a2b20a1: Let <stdbool.h> (or its substitute) get picked up via the preexisting mechanism in vm/Common.h.
Merge commit '
826ff7b0cb9964701ae77fb0132757a37c5a8418' into dalvik-dev
* commit '
826ff7b0cb9964701ae77fb0132757a37c5a8418':
Let <stdbool.h> (or its substitute) get picked up via the preexisting
Dan Bornstein [Thu, 2 Sep 2010 00:19:29 +0000 (17:19 -0700)]
am
b685b591: am
4a2b20a1: Let <stdbool.h> (or its substitute) get picked up via the preexisting mechanism in vm/Common.h.
Merge commit '
b685b5911262329759e6f2c8ec8a4465a18b324d'
* commit '
b685b5911262329759e6f2c8ec8a4465a18b324d':
Let <stdbool.h> (or its substitute) get picked up via the preexisting
Brian Carlstrom [Thu, 2 Sep 2010 00:12:11 +0000 (17:12 -0700)]
am
eb9eaf73: am
b204391f: am
ba2f27fb: Merge "Removal of more sampling profiler bits" into gingerbread
Merge commit '
eb9eaf73ac38449f0be043f6eb033349fb6a33dc' into dalvik-dev
* commit '
eb9eaf73ac38449f0be043f6eb033349fb6a33dc':
Removal of more sampling profiler bits
Brian Carlstrom [Thu, 2 Sep 2010 00:01:14 +0000 (17:01 -0700)]
am
b204391f: am
ba2f27fb: Merge "Removal of more sampling profiler bits" into gingerbread
Merge commit '
b204391f6846801c3df9cd5265340e256fb86ee5'
* commit '
b204391f6846801c3df9cd5265340e256fb86ee5':
Removal of more sampling profiler bits
Dan Bornstein [Wed, 1 Sep 2010 23:58:01 +0000 (16:58 -0700)]
am
4a2b20a1: Let <stdbool.h> (or its substitute) get picked up via the preexisting mechanism in vm/Common.h.
Merge commit '
4a2b20a1128b13dbcda9e7d1114f4d60a02431ed' into gingerbread-plus-aosp
* commit '
4a2b20a1128b13dbcda9e7d1114f4d60a02431ed':
Let <stdbool.h> (or its substitute) get picked up via the preexisting
Piotr Gurgul [Wed, 1 Sep 2010 23:53:13 +0000 (16:53 -0700)]
Add dexgen project dir
Adds a home directory and description for the dexgen project which aims to
provide API for runtime dex classes generation which is necessary e.g for class
mocking. It is mostly based on dx tool classes.
Change-Id: I92b02e38f305b94ad088ec8a8a8899b1d600268d
Dan Bornstein [Wed, 1 Sep 2010 23:44:23 +0000 (16:44 -0700)]
Let <stdbool.h> (or its substitute) get picked up via the preexisting
mechanism in vm/Common.h.
Change-Id: I6b79ee3d67b23d8077567a1bce0a58ae46ceb7f3