OSDN Git Service
The Android Open Source Project [Fri, 25 Jun 2010 21:20:53 +0000 (14:20 -0700)]
am
5439ba57: merge from froyo-plus-aosp
Merge commit '
5439ba5780631d04fcded7c605eb00271b1a449c'
* commit '
5439ba5780631d04fcded7c605eb00271b1a449c':
dalvik: use pthread_setname_np() to set the name of the current thread
The Android Open Source Project [Fri, 25 Jun 2010 16:42:59 +0000 (09:42 -0700)]
merge from froyo-plus-aosp
Change-Id: If7ea7cb45a74560ef46f771e25b75a1c03417f27
Dan Bornstein [Fri, 25 Jun 2010 01:32:44 +0000 (18:32 -0700)]
am
a0d4e429: am
74826481: Merge "Updated the warning about old-style inner class metadata to reflect the current understanding of the situation." into gingerbread
Merge commit '
a0d4e42958ed95315f5c949db99c9a11db3ba120'
* commit '
a0d4e42958ed95315f5c949db99c9a11db3ba120':
Updated the warning about old-style inner class metadata to reflect
Dan Bornstein [Fri, 25 Jun 2010 01:31:03 +0000 (18:31 -0700)]
am
74826481: Merge "Updated the warning about old-style inner class metadata to reflect the current understanding of the situation." into gingerbread
Merge commit '
7482648141995c52f5e3aeddb3b44092923cb33a' into gingerbread-plus-aosp
* commit '
7482648141995c52f5e3aeddb3b44092923cb33a':
Updated the warning about old-style inner class metadata to reflect
Dan Bornstein [Fri, 25 Jun 2010 01:29:18 +0000 (18:29 -0700)]
Merge "Updated the warning about old-style inner class metadata to reflect the current understanding of the situation." into gingerbread
Dan Bornstein [Thu, 24 Jun 2010 21:51:17 +0000 (14:51 -0700)]
Updated the warning about old-style inner class metadata to reflect
the current understanding of the situation.
The change affects diagnostic output but doesn't change anything about
dex file production, per se. I also added a new test each for dx and
the vm, checking that the warning gets emitted and demonstrating the
effect (respectively).
Though it's a pretty minor change, I bumped up the version number of dx.
Added bonus: Wrapped a couple of too-long lines that I happened to notice.
Bug:
2171430
Change-Id: If6afa4ba88dca9b0e6d88603e0a5fc2e36358115
Elliott Hughes [Fri, 25 Jun 2010 00:16:46 +0000 (17:16 -0700)]
am
9974cb52: am
6626af93: Merge "Remove the 060-reflection-security test." into gingerbread
Merge commit '
9974cb521a01426c90e0c6836832eb2b33d7512b'
* commit '
9974cb521a01426c90e0c6836832eb2b33d7512b':
Remove the 060-reflection-security test.
Elliott Hughes [Thu, 24 Jun 2010 23:23:45 +0000 (16:23 -0700)]
am
6626af93: Merge "Remove the 060-reflection-security test." into gingerbread
Merge commit '
6626af931dad11d2c2035cbd1f2e1593fb3097b8' into gingerbread-plus-aosp
* commit '
6626af931dad11d2c2035cbd1f2e1593fb3097b8':
Remove the 060-reflection-security test.
Elliott Hughes [Thu, 24 Jun 2010 23:21:56 +0000 (16:21 -0700)]
Merge "Remove the 060-reflection-security test." into gingerbread
Elliott Hughes [Thu, 24 Jun 2010 23:11:03 +0000 (16:11 -0700)]
Remove the 060-reflection-security test.
Bug:
2796887
Change-Id: I30879565343ea00db042a9608c5bac27cef66bb3
The Android Open Source Project [Tue, 22 Jun 2010 21:28:00 +0000 (14:28 -0700)]
merge from open-source master
Change-Id: Ie085bcbe5ce7d055b4c3b3f82d68fed62b4793f7
Andy McFadden [Tue, 22 Jun 2010 20:21:00 +0000 (13:21 -0700)]
Merge "dalvik: use pthread_setname_np() to set the name of the current thread"
The Android Open Source Project [Mon, 21 Jun 2010 18:02:29 +0000 (11:02 -0700)]
am
577198ac: merge from froyo-plus-aosp
Merge commit '
577198ac632e57ac327555443cb0185d45ed3250'
* commit '
577198ac632e57ac327555443cb0185d45ed3250':
New implementation for java.lang.Runtime's availableProcessors().
The Android Open Source Project [Mon, 21 Jun 2010 17:59:37 +0000 (10:59 -0700)]
merge from froyo-plus-aosp
Change-Id: I42dc1a2946b44b870f4fbf21522c20974e8dfd39
Ying Wang [Tue, 15 Jun 2010 22:48:43 +0000 (15:48 -0700)]
am
cd401135: am
ff9aa9bf: am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
cd401135df4c66b6bfe2bfd3c2af125d103c098a'
* commit '
cd401135df4c66b6bfe2bfd3c2af125d103c098a':
Don't build dx if it's an app-only build.
Ying Wang [Tue, 15 Jun 2010 22:23:41 +0000 (15:23 -0700)]
am
ff9aa9bf: am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
ff9aa9bfadcd4b17b078dfad65e0d700ea8c237a' into gingerbread-plus-aosp
* commit '
ff9aa9bfadcd4b17b078dfad65e0d700ea8c237a':
Don't build dx if it's an app-only build.
Ying Wang [Tue, 15 Jun 2010 22:21:26 +0000 (15:21 -0700)]
am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46' into gingerbread
* commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46':
Don't build dx if it's an app-only build.
The Android Open Source Project [Tue, 15 Jun 2010 21:46:37 +0000 (14:46 -0700)]
merge from open-source master
Change-Id: I919a5dd1cc8d615c2d9224ff08e849394ee84df0
Ying Wang [Tue, 15 Jun 2010 21:27:30 +0000 (14:27 -0700)]
am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46' into froyo-plus-aosp
* commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46':
Don't build dx if it's an app-only build.
Elliott Hughes [Tue, 15 Jun 2010 20:34:30 +0000 (13:34 -0700)]
Remove run-core-tests.sh.
This script is always broken. Anyone wanting to run tests on a sim build should
use "vogar --mode sim" for one-offs or one of the dalvik-prebuild scripts to
run large batches.
Change-Id: Ie6b6a918d891589b071d4f07c766305561d80543
Mikael Ohlson [Tue, 23 Mar 2010 13:06:19 +0000 (14:06 +0100)]
New implementation for java.lang.Runtime's availableProcessors().
This patch adds a native implementation for availableProcessors(),
replacing the hardcoded "always return 1" implementation.
It uses sysconf(_SC_NPROCESSORS_ONLN) to get the number of online
processors.
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Andy McFadden [Mon, 14 Jun 2010 21:44:13 +0000 (14:44 -0700)]
am
c12b0da0: am
e0b23da8: Merge "Tweak sanity check." into gingerbread
Merge commit '
c12b0da035901923893f50663c48cb4efd390712'
* commit '
c12b0da035901923893f50663c48cb4efd390712':
Tweak sanity check.
Andy McFadden [Mon, 14 Jun 2010 20:41:09 +0000 (13:41 -0700)]
am
e0b23da8: Merge "Tweak sanity check." into gingerbread
Merge commit '
e0b23da8dfde8ed232bb03887762e580e0c4e04c' into gingerbread-plus-aosp
* commit '
e0b23da8dfde8ed232bb03887762e580e0c4e04c':
Tweak sanity check.
Andy McFadden [Mon, 14 Jun 2010 20:39:32 +0000 (13:39 -0700)]
Merge "Tweak sanity check." into gingerbread
Andy McFadden [Mon, 14 Jun 2010 20:37:49 +0000 (13:37 -0700)]
Tweak sanity check.
Somebody managed to overrun this.
Change-Id: Ibf7d6a9831d20ce4093fae8e67c835257b2c51a1
The Android Open Source Project [Mon, 14 Jun 2010 18:28:35 +0000 (11:28 -0700)]
am
36b3b873: merge from froyo-plus-aosp
Merge commit '
36b3b873fdd85cbcd89b158f5e211cfa934f12a1'
* commit '
36b3b873fdd85cbcd89b158f5e211cfa934f12a1':
Fix for x86-atom/CALLABI.S to handle failure for android.jni.cts.JniStaticTest#test_returnChar. CALLABI.S was not returning unsigned shorts correctly.
The Android Open Source Project [Mon, 14 Jun 2010 18:24:54 +0000 (11:24 -0700)]
merge from froyo-plus-aosp
Change-Id: Ie16c2a8d6465fb0b2d2a06027b29a6bbe4ff9d16
Ying Wang [Fri, 11 Jun 2010 20:54:13 +0000 (13:54 -0700)]
Don't build dx if it's an app-only build.
Change-Id: I609f21e78b7bbac9af25ac1bc6bd5d3941ea462a
Andy McFadden [Fri, 11 Jun 2010 17:49:11 +0000 (10:49 -0700)]
Andy McFadden [Fri, 11 Jun 2010 17:47:28 +0000 (10:47 -0700)]
am
891416ef: Update armv7-a-neon.
Merge commit '
891416ef725a5d9e64e5a1422f65394068c6e106' into gingerbread-plus-aosp
* commit '
891416ef725a5d9e64e5a1422f65394068c6e106':
Update armv7-a-neon.
Andy McFadden [Fri, 11 Jun 2010 17:43:37 +0000 (10:43 -0700)]
Update armv7-a-neon.
An externally-contributed fix was not able to update the armv7-a-neon
output files, because they don't exist in the open-source repository.
All I did was re-run rebuild.sh.
Change-Id: I3bf436ee8c0f57deb033815fd07f1a531ce851a1
The Android Open Source Project [Fri, 11 Jun 2010 16:33:03 +0000 (09:33 -0700)]
merge from open-source master
Change-Id: I5eed9fe77b936312b227cca4b7f3a9da2f5bf694
Andy McFadden [Thu, 10 Jun 2010 17:24:47 +0000 (10:24 -0700)]
am
41c2b663: am
805800d7: Merge "Up the version to 1.3.0." into kraken
Andy McFadden [Thu, 10 Jun 2010 17:23:50 +0000 (10:23 -0700)]
am
805800d7: Merge "Up the version to 1.3.0." into kraken
Andy McFadden [Thu, 10 Jun 2010 17:22:17 +0000 (10:22 -0700)]
Merge "Up the version to 1.3.0." into kraken
Andy McFadden [Thu, 10 Jun 2010 05:31:32 +0000 (22:31 -0700)]
Up the version to 1.3.0.
Make it one up from froyo.
Change-Id: I9f5170be0ab5f301e994f10300d81f60a01335f7
Johnnie Birch [Wed, 9 Jun 2010 22:03:27 +0000 (15:03 -0700)]
Fix for x86-atom/CALLABI.S to handle failure for android.jni.cts.JniStaticTest#test_returnChar. CALLABI.S was not returning unsigned shorts correctly.
Change-Id: Ia6b443d41a96b0f65739c0b16a0ddb39f7eb33fa
André Goddard Rosa [Wed, 9 Jun 2010 23:32:14 +0000 (20:32 -0300)]
dalvik: use pthread_setname_np() to set the name of the current thread
Introduced originally in bionic by
https://review.source.android.com/#change,14740
Change-Id: I624dba3847975b5cb3c0543a5fb6d6f6986e11b5
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
The Android Open Source Project [Fri, 4 Jun 2010 21:11:21 +0000 (14:11 -0700)]
am
1dd067d9: am
54709cb2: am
bf11852a: merge from open-source master
The Android Open Source Project [Fri, 4 Jun 2010 21:03:54 +0000 (14:03 -0700)]
am
54709cb2: am
bf11852a: merge from open-source master
The Android Open Source Project [Fri, 4 Jun 2010 21:02:48 +0000 (14:02 -0700)]
am
bf11852a: merge from open-source master
Merge commit '
bf11852aa3b56f1f77841dd0dbb3cc984711d674' into kraken
* commit '
bf11852aa3b56f1f77841dd0dbb3cc984711d674':
Fix for use of UNPREDICTABLE register combination
The Android Open Source Project [Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)]
merge from open-source master
Change-Id: Ic827f3b9a61ba4bfe72606950b6b34a5caf9d9bd
Dave Butcher [Wed, 2 Jun 2010 13:52:21 +0000 (14:52 +0100)]
Fix for use of UNPREDICTABLE register combination
Use of the LDRD instruction form LDRD Rt, Rt2, [Rn, Rm] has restrictions
on the register combinations - specifically if Rt or Rt2 is equal to Rn or
Rm the behaviour is defined as 'UNPREDICTABLE'.
Change-Id: I19834783865e07897cc7012367e698447f023ce6
Jeff Brown [Thu, 3 Jun 2010 21:26:46 +0000 (14:26 -0700)]
am
09eae10c: am
23971e39: Merge "Added a new JNI helper for logging exceptions. Plugged some JNI reference leaks in existing JNI helpers." into kraken
Jeff Brown [Thu, 3 Jun 2010 21:24:59 +0000 (14:24 -0700)]
am
23971e39: Merge "Added a new JNI helper for logging exceptions. Plugged some JNI reference leaks in existing JNI helpers." into kraken
Jeff Brown [Thu, 3 Jun 2010 21:23:25 +0000 (14:23 -0700)]
Merge "Added a new JNI helper for logging exceptions. Plugged some JNI reference leaks in existing JNI helpers." into kraken
Christopher Tate [Thu, 3 Jun 2010 18:10:39 +0000 (11:10 -0700)]
am
db5e758f: am
97e34d0d: am
c023ae6a: am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Thu, 3 Jun 2010 18:09:32 +0000 (11:09 -0700)]
am
97e34d0d: am
c023ae6a: am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Thu, 3 Jun 2010 18:07:49 +0000 (11:07 -0700)]
am
c023ae6a: am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Merge commit '
c023ae6afcdd37b26dd16be43b023a93acc90905' into kraken
* commit '
c023ae6afcdd37b26dd16be43b023a93acc90905':
Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Thu, 3 Jun 2010 18:06:14 +0000 (11:06 -0700)]
am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Merge commit '
962f896e1eeb159a6a2ac7a560708939cbb15575' into froyo-plus-aosp
* commit '
962f896e1eeb159a6a2ac7a560708939cbb15575':
Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Wed, 2 Jun 2010 23:17:46 +0000 (16:17 -0700)]
Add /proc/pid/task/tid/schedstat info to thread stack dumps
This lets us see whether a usually-blocked thread is actually making
progress in between stack snapshots.
Change-Id: If191627e4572457579d5f330d31bde86b8ce4ec5
Jeff Brown [Wed, 2 Jun 2010 04:07:08 +0000 (21:07 -0700)]
Added a new JNI helper for logging exceptions.
Plugged some JNI reference leaks in existing JNI helpers.
Change-Id: I62213cdae375235f6ee9304ecd8dc3d2b7f58c85
Brian Carlstrom [Tue, 1 Jun 2010 17:09:25 +0000 (10:09 -0700)]
Merge "Merge branch 'dalvik-dev'"
Brian Carlstrom [Tue, 1 Jun 2010 16:16:11 +0000 (09:16 -0700)]
Merge branch 'dalvik-dev'
Andy McFadden [Mon, 31 May 2010 04:20:47 +0000 (21:20 -0700)]
am
ead3d06b: am
67e82fb1: Merge "Atomic/SMP update, part 2." into kraken
Brian Carlstrom [Fri, 28 May 2010 22:42:12 +0000 (15:42 -0700)]
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Change-Id: I0c0edb3ebf0d5e040d6bbbf60269fab0deb70ef9
Andy McFadden [Fri, 28 May 2010 20:02:16 +0000 (13:02 -0700)]
am
67e82fb1: Merge "Atomic/SMP update, part 2." into kraken
Andy McFadden [Fri, 28 May 2010 20:00:21 +0000 (13:00 -0700)]
Merge "Atomic/SMP update, part 2." into kraken
buzbee [Fri, 28 May 2010 06:05:37 +0000 (23:05 -0700)]
am
b1293374: am
a02fe785: am
4d24105a: am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
android-build SharedAccount [Fri, 28 May 2010 06:05:33 +0000 (23:05 -0700)]
Ben Cheng [Thu, 27 May 2010 23:19:46 +0000 (16:19 -0700)]
Merge "Remove the write permission for the JIT code cache when not needed" into dalvik-dev
Ben Cheng [Mon, 17 May 2010 19:50:33 +0000 (12:50 -0700)]
Remove the write permission for the JIT code cache when not needed
To support the feature, redesigned the predicted chaining mechanism so that the
profile count is shared globally in InterpState.
Bug:
2690371
Change-Id: Ifed427e8b1fa4f6c670f19e0761e45e2d4afdbb6
Dan Bornstein [Thu, 27 May 2010 22:50:44 +0000 (15:50 -0700)]
Merge "Fix two dex file structural verification issues." into dalvik-dev
Dan Bornstein [Thu, 27 May 2010 00:24:05 +0000 (17:24 -0700)]
Fix two dex file structural verification issues.
First, structural verification failed to check for inconsistencies with
the number of arguments to methods compared to the number of registers
declared by those methods.
Second, neither the dexdump nor dexlist tools would run structural
verification.
As an added bonus, I renamed the function that performs byte swapping
and structural verification to be more descriptive about what it
does.
Bug:
2716693
Change-Id: I58794713967f5bea95010084c85efe1f929ce7d1
buzbee [Thu, 27 May 2010 19:39:12 +0000 (12:39 -0700)]
am
a02fe785: am
4d24105a: am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
buzbee [Thu, 27 May 2010 19:37:16 +0000 (12:37 -0700)]
am
4d24105a: am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
Merge commit '
4d24105a25ae285c324103843b9859c75e3f1a4c' into kraken
* commit '
4d24105a25ae285c324103843b9859c75e3f1a4c':
Jit: Fix for
2717275 First JIT bug reported by external developers
android-build SharedAccount [Thu, 27 May 2010 19:35:31 +0000 (12:35 -0700)]
buzbee [Thu, 27 May 2010 19:35:14 +0000 (12:35 -0700)]
am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
Merge commit '
2b469f82df14749c67da43f073fd7a9b6b1ccd74' into froyo-plus-aosp
* commit '
2b469f82df14749c67da43f073fd7a9b6b1ccd74':
Jit: Fix for
2717275 First JIT bug reported by external developers
android-build SharedAccount [Thu, 27 May 2010 19:33:39 +0000 (12:33 -0700)]
am
c0ebbcd5: Merge commit \'
720d1e962e248a30f81c1493081ff4c01e35c839\' into froyo-plus-aosp
Merge commit '
c0ebbcd5341625fbbba594d45ecffdfb83637f41' into kraken
* commit '
c0ebbcd5341625fbbba594d45ecffdfb83637f41':
Disable SSL Session Ticket extension for OpenSSLSocket
android-build SharedAccount [Thu, 27 May 2010 19:30:13 +0000 (12:30 -0700)]
Carl Shapiro [Thu, 27 May 2010 17:56:08 +0000 (10:56 -0700)]
Merge "Remove unused code from the thread scanner." into dalvik-dev
Andy McFadden [Thu, 27 May 2010 17:23:41 +0000 (10:23 -0700)]
Atomic/SMP update, part 2.
Updated "generic" quasiatomic implementation to use atomic release store
instead of atomic swap when releasing the lock.
Track change to name of memory barrier.
Change-Id: Ie6ec37bca6984553f665bd25385210ea6c8e0943
Carl Shapiro [Thu, 27 May 2010 03:25:22 +0000 (20:25 -0700)]
Merge "Fix three minor issues that prevent the phone from booting." into dalvik-dev
Carl Shapiro [Fri, 21 May 2010 03:22:31 +0000 (20:22 -0700)]
Fix three minor issues that prevent the phone from booting.
* Implement dvmHeapSourceGetLiveBits so we can pre- and post-verify
the heap.
* Add do-nothing methods for manipulating the heap threshold.
* Use the CLZ abstraction for open code on the ARM.
Change-Id: I988a207fba4a61572a3b4896b0e254078f95c333
Carl Shapiro [Thu, 27 May 2010 02:58:17 +0000 (19:58 -0700)]
Remove unused code from the thread scanner.
The affected cases have been migrated to the copying collector where
they are required. The non-moving collector does not need to visit
these roots.
Change-Id: I8b35d63cd8154b7c9f85320959559a718749976b
buzbee [Wed, 26 May 2010 22:57:27 +0000 (15:57 -0700)]
Jit: Fix for
2717275 First JIT bug reported by external developers
The JIT was incorrectly keeping a short value in a floating point
register rather than copying it to a core register before storing.
There was an assert to catch this case, but asserts don't fire in
production builds.
The fix is safe and simple - just exclude this case from the "optimization".
Change-Id: I33767c8a202b6fa36a19d918ac5b914a5e4e4de3
buzbee [Wed, 26 May 2010 21:48:04 +0000 (14:48 -0700)]
Jit: Fix for
2717275 First JIT bug reported by external developers
The JIT was incorrectly keeping a short value in a floating point
register rather than copying it to a core register before storing.
There was an assert to catch this case, but asserts don't fire in
production builds.
The fix is safe and simple - just exclude this case from the "optimization".
Change-Id: I38f1865da11ef3f78213f84967d4737e066b9c68
Carl Shapiro [Wed, 26 May 2010 21:32:00 +0000 (14:32 -0700)]
Remove an unused variable introduced in the last commit.
Change-Id: I699dc158b7c3a84e9ee3a3cc636f8bb122d69a79
Carl Shapiro [Wed, 26 May 2010 01:35:37 +0000 (18:35 -0700)]
Eliminate more unused variables and compiler warnings.
This change also introduces wrappers for condition variable operations
similar to what we have already for mutex operations.
Almost all the remaining warnings are now in the compiler or non-debug
uses of the CHECK_JIT macro.
Change-Id: I9f492f1582a06065e3a52287c7834adddfbefff9
Barry Hayes [Tue, 18 May 2010 16:48:37 +0000 (09:48 -0700)]
Replace the scanObject routines with one derived from Verify.
It seems to be slightly faster this way, as well as more readable.
Change-Id: I92b9c54289c484cb4606f054f258da4a4bef8658
Barry Hayes [Tue, 25 May 2010 20:28:35 +0000 (13:28 -0700)]
Merge "Check the number of slots in the Class.java definition against the number assumed by the VM, and abort if the Class has too many." into dalvik-dev
Elliott Hughes [Tue, 25 May 2010 00:30:41 +0000 (17:30 -0700)]
Merge "Fix dalvik/tests/062-character-encodings." into dalvik-dev
Barry Hayes [Mon, 24 May 2010 19:13:30 +0000 (12:13 -0700)]
Check the number of slots in the Class.java definition against the number assumed by the VM, and abort if the Class has too many.
Change-Id: Ibcf4539ab98639c1c92e5d910c38ee1feb9c8c43
Carl Shapiro [Mon, 24 May 2010 18:21:12 +0000 (11:21 -0700)]
Timeout the finalizer throw test if no finalization occurs.
This test will never complete if the objects intended for finalization
are not ready to be collected. This condition occurs with the copying
collector. Adding the timeout forces the test to fail and allows the
test suite to make forward progress.
Change-Id: I2abb0a2530755dd32a14ecf94b24a546fd1327a9
Elliott Hughes [Mon, 24 May 2010 17:59:11 +0000 (10:59 -0700)]
Fix dalvik/tests/062-character-encodings.
The dalvik charset test should just check that the standard charsets are
available, as guaranteed by the java.nio.charset.Charset documentation.
Bug:
2709552
Change-Id: I7d2b6210936f01736034222ce26cdf81c47ef984
Carl Shapiro [Fri, 21 May 2010 05:54:18 +0000 (22:54 -0700)]
Remove unused labels, variables, and functions. Enable warnings.
Change-Id: Icbe24eaf1ad499f28b68b6a5f05368271a0a7e86
Brian Carlstrom [Fri, 21 May 2010 22:10:31 +0000 (15:10 -0700)]
Merge commit '
720d1e962e248a30f81c1493081ff4c01e35c839' into mm
Conflicts:
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Change-Id: I765343d83fe9bd6610f630790fbbf034467834d1
Andy McFadden [Fri, 21 May 2010 19:22:30 +0000 (12:22 -0700)]
resolved conflicts for merge of
fc0dcfa2 to dalvik-dev
Change-Id: I54a5b9996252a22e8dd0214f4a4ccc8914f876ea
Andy McFadden [Fri, 21 May 2010 19:08:06 +0000 (12:08 -0700)]
am
f00de1ba: am
6a877083: Atomic/SMP update.
Andy McFadden [Fri, 21 May 2010 19:06:30 +0000 (12:06 -0700)]
am
6a877083: Atomic/SMP update.
Barry Hayes [Fri, 21 May 2010 15:44:42 +0000 (08:44 -0700)]
Merge "Improvements to setThreadSelf use." into dalvik-dev
Andy McFadden [Thu, 20 May 2010 05:36:33 +0000 (22:36 -0700)]
Atomic/SMP update.
Moved quasiatomic 64-bit operations in here. They still need work.
Use the new libcutils atomic-inline header for our memory barriers.
Adjust makefiles to set SMP definition appropriately.
Change-Id: Id2ab2123724bb0baeb32f862b5568392aba35a59
Carl Shapiro [Thu, 20 May 2010 22:43:30 +0000 (15:43 -0700)]
Verifiy threads, stacks, and heap worker structures.
Change-Id: I33caecfc53c8399b023675b5559be8a4b0696b97
Carl Shapiro [Thu, 20 May 2010 21:59:44 +0000 (14:59 -0700)]
Remove unused local variables and local functions.
Change-Id: Iacb14a83f59ac20ef5e0616acbf0c6f683b947d5
Carl Shapiro [Thu, 20 May 2010 00:38:33 +0000 (17:38 -0700)]
Properly implement conservative scanning.
Even when precise GC is enabled the register map may be unavailable
and registers must be treated as ambiguous roots. We now pin these
roots, along with native arguments, just prior to scavenging.
Change-Id: Ifbd799a34385a87960af28174128e2220e599c73
Barry Hayes [Tue, 20 Apr 2010 16:03:15 +0000 (09:03 -0700)]
Improvements to setThreadSelf use.
Made all calls to assignThreadId and prepareThread aquire
threadListLock, even in initialization, where it previously relied on
being single-threaded.
Change-Id: Ibffc454c4c6fd78efa6f22b955b955cd33998a4c
Carl Shapiro [Tue, 18 May 2010 21:16:26 +0000 (14:16 -0700)]
Instead of aborting, just ignore tracked allocation calls.
This fixes a crash in the 070-nio-buffer dalvik test.
Change-Id: If58895498d573408ed69b6b580c16b9e75e9c291
Bill Buzbee [Thu, 13 May 2010 20:02:53 +0000 (13:02 -0700)]
JIT: Fix for [Issue
2675245] FRF40 monkey crash in jit-cache
The JIT's chaining mechanism suffered from a narrow window that
could result in i-cache inconsistency. One of the forms of chaining
cell consisted of a two 16-bit thumb instruction sequence. If a thread were
interrupted between the execution of those two instructions *and*
another thread picked that moment to convert that cell's
chained/unchained state, then bad things happen.
This CL alters the chain/unchain model somewhat to avoid this case.
Chainable chaining cells grow by 4 bytes each, and instead of rewriting
a 32-bit cell to chain/unchain, we switch between chained and unchained
state by [re]writing the first 16-bits of the cell as either a 16-bit
Thumb unconditional branch (unchained mode) or the first half of a
32-bit Thumb branch. The 2nd 16-bits of the cell will never change once
the cell moves from its inital state - thus avoiding the possibility of it
becoming inconsistent.
This adds a trivial execution penalty on the slow path, but will add
about a kByte of memory usage to a typical process.
Change-Id: Id8b99802e11386cfbab23da6abae10e2d9fc4065
Brian Carlstrom [Thu, 13 May 2010 23:30:53 +0000 (16:30 -0700)]
Disable SSL Session Ticket extension for OpenSSLSocket
Due to compatability issues with some sites, disable this SSL extension which wasn't present in Eclair. See also:
b/
2682876 Some ssl sites cause "A secure connection could not be established" error
Change-Id: Ib42fb249eb0f8d645ae3f983c77cb278ca54f946
Andy McFadden [Thu, 13 May 2010 21:26:03 +0000 (14:26 -0700)]
Merge "Added a quick test." into dalvik-dev