OSDN Git Service
Elliott Hughes [Mon, 1 Mar 2010 18:26:01 +0000 (10:26 -0800)]
am
16525029: Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."
Merge commit '
165250293744f0aadcb0a0bfba1b53b8a4fb99b7' into dalvik-dev
* commit '
165250293744f0aadcb0a0bfba1b53b8a4fb99b7':
Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo.
Elliott Hughes [Mon, 1 Mar 2010 18:19:46 +0000 (10:19 -0800)]
Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."
Andy McFadden [Mon, 1 Mar 2010 03:36:45 +0000 (19:36 -0800)]
am
fcc61ec2: Merge "Don\'t set x86 arch variant."
Merge commit '
fcc61ec20932de83d385131983b47f82a2008cd3' into dalvik-dev
* commit '
fcc61ec20932de83d385131983b47f82a2008cd3':
Don't set x86 arch variant.
Jesse Wilson [Mon, 1 Mar 2010 03:36:41 +0000 (19:36 -0800)]
am
dd55f1bb: Merge "Adding tests to parse document attributes from the DOM."
Merge commit '
dd55f1bba1216e91206255f31de587062ed115b6' into dalvik-dev
* commit '
dd55f1bba1216e91206255f31de587062ed115b6':
Adding tests to parse document attributes from the DOM.
Andy McFadden [Mon, 1 Mar 2010 03:36:37 +0000 (19:36 -0800)]
am
f109fc4a: Merge "Update a few things in x86-atom."
Merge commit '
f109fc4aa8b26984e135cb8321bdde69b64c7878' into dalvik-dev
* commit '
f109fc4aa8b26984e135cb8321bdde69b64c7878':
Update a few things in x86-atom.
Ben Cheng [Mon, 1 Mar 2010 03:36:32 +0000 (19:36 -0800)]
am
40094c16: Tweak the interpreter entries and 2nd level trace filter to capture more traces.
Merge commit '
40094c16d9727cc1e047a7d4bddffe04dd566211' into dalvik-dev
* commit '
40094c16d9727cc1e047a7d4bddffe04dd566211':
Tweak the interpreter entries and 2nd level trace filter to capture more traces.
Brian Carlstrom [Sun, 28 Feb 2010 21:51:14 +0000 (13:51 -0800)]
resolved conflicts for merge of
e84bea92 to dalvik-dev
Elliott Hughes [Sun, 28 Feb 2010 19:31:52 +0000 (11:31 -0800)]
Merge "Upgrade our sqlite JDBC driver to version
20100131." into dalvik-dev
Elliott Hughes [Sun, 28 Feb 2010 19:10:10 +0000 (11:10 -0800)]
Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo.
We want to show the characters representing the flags, not the decimal
values of their ASCII representation. "Use overloading judiciously",
as the man says, or cause errors like this.
Seen in FRE56B (see https://android-git.corp.google.com/g/42528).
Elliott Hughes [Sun, 28 Feb 2010 09:41:22 +0000 (01:41 -0800)]
am
c85663a4: Merge "Fix a couple of typos in JIT function names."
Merge commit '
c85663a4856c476c4ead93bdf19e8a91b2d15e22' into dalvik-dev
* commit '
c85663a4856c476c4ead93bdf19e8a91b2d15e22':
Fix a couple of typos in JIT function names.
Bill Buzbee [Sun, 28 Feb 2010 09:41:17 +0000 (01:41 -0800)]
am
ac9f2112: Merge "Jit: fix typo that caused incorrect def mask for blr\'s."
Merge commit '
ac9f2112303e1353b875999d6481e2047789af9e' into dalvik-dev
* commit '
ac9f2112303e1353b875999d6481e2047789af9e':
Jit: fix typo that caused incorrect def mask for blr's.
Elliott Hughes [Sun, 28 Feb 2010 09:41:11 +0000 (01:41 -0800)]
am
f76b01c6: Merge "Document that Class.getSigners() always returns null."
Merge commit '
f76b01c6377ad4653dcdc37b2ca35db785219f80' into dalvik-dev
* commit '
f76b01c6377ad4653dcdc37b2ca35db785219f80':
Document that Class.getSigners() always returns null.
Andy McFadden [Sun, 28 Feb 2010 09:41:04 +0000 (01:41 -0800)]
am
ca5ac879: Merge "Rearrange JDWP cleanup."
Merge commit '
ca5ac8792c0dc7cb33728ba3389fcc7d7b76772b' into dalvik-dev
* commit '
ca5ac8792c0dc7cb33728ba3389fcc7d7b76772b':
Rearrange JDWP cleanup.
Elliott Hughes [Sun, 28 Feb 2010 09:40:56 +0000 (01:40 -0800)]
am
4d5e5a0f: Merge "Keep the order from getaddrinfo() unchanged if preferIPv6Addresses() is true."
Merge commit '
4d5e5a0f65e3cca6662fac8e832712fba61b9d2c' into dalvik-dev
* commit '
4d5e5a0f65e3cca6662fac8e832712fba61b9d2c':
Keep the order from getaddrinfo() unchanged if preferIPv6Addresses() is true.
Ben Cheng [Sun, 28 Feb 2010 09:40:48 +0000 (01:40 -0800)]
am
cbcd79b3: Merge "Print "JIT" in the thread dump if the top frame is in JIT\'ed code."
Merge commit '
cbcd79b31ddecad8ae38e5f45ac63e7225a877ff' into dalvik-dev
* commit '
cbcd79b31ddecad8ae38e5f45ac63e7225a877ff':
Print "JIT" in the thread dump if the top frame is in JIT'ed code.
Andy McFadden [Sun, 28 Feb 2010 09:40:40 +0000 (01:40 -0800)]
am
ae9cc0e6: Merge "Added printf attribute to exception function."
Merge commit '
ae9cc0e699cc680873b4fc72a020afd167722047' into dalvik-dev
* commit '
ae9cc0e699cc680873b4fc72a020afd167722047':
Added printf attribute to exception function.
Elliott Hughes [Sun, 28 Feb 2010 09:40:32 +0000 (01:40 -0800)]
am
b4c05977: Optimize more easy multiplications by constants.
Merge commit '
b4c05977c28c38d2f81b48d0cb15559dc3d05564' into dalvik-dev
* commit '
b4c05977c28c38d2f81b48d0cb15559dc3d05564':
Optimize more easy multiplications by constants.
Ben Cheng [Sun, 28 Feb 2010 09:40:23 +0000 (01:40 -0800)]
am
88a0f970: Enhance the jit profiler to print more statistics and be more verbose.
Merge commit '
88a0f970e47dc0091d2c9965aa9bd06667e5f4b7' into dalvik-dev
* commit '
88a0f970e47dc0091d2c9965aa9bd06667e5f4b7':
Enhance the jit profiler to print more statistics and be more verbose.
Andy McFadden [Sun, 28 Feb 2010 09:40:11 +0000 (01:40 -0800)]
am
59a007be: am
cf4e8b02: Merge "This is a contribution of x86-atom targeted assembly for the fast byte-code interpreter engine. This is an initial contribution with minimal optimizations that target the Intel ATOM processor. We expect to continuously improve this cod
Merge commit '
59a007be670601e40f036f63904b3f51c91a4d95' into dalvik-dev
* commit '
59a007be670601e40f036f63904b3f51c91a4d95':
This is a contribution of x86-atom targeted assembly for the fast byte-code interpreter engine. This is an initial contribution with minimal optimizations that target the Intel ATOM processor. We expect to continuously improve this code. It is expected that there will be a discussion on the potential merge of this code and similar efforts (i.e. the mterp/x86 directory first included with cupcake). While this code is intended to target ATOM and not a generic X-86 processor, we were able to show the following improvements over the c-portable interpreter using the simulator build:
Dan Bornstein [Sun, 28 Feb 2010 09:40:02 +0000 (01:40 -0800)]
am
11834964: Clarify a few items in the dex spec.
Merge commit '
118349640ffa44bbc55ed355d0aaa2b993de5e5b' into dalvik-dev
* commit '
118349640ffa44bbc55ed355d0aaa2b993de5e5b':
Clarify a few items in the dex spec.
Andy McFadden [Sun, 28 Feb 2010 09:39:53 +0000 (01:39 -0800)]
am
ba05d3b5: Merge "Add class init stats to alloc counters (API change)."
Merge commit '
ba05d3b507d5e1de794d00e7e634862c2a7cf8c2' into dalvik-dev
* commit '
ba05d3b507d5e1de794d00e7e634862c2a7cf8c2':
Add class init stats to alloc counters (API change).
Jesse Wilson [Sun, 28 Feb 2010 09:39:43 +0000 (01:39 -0800)]
am
4795e033: Merge "Implementing still more DOM API for text nodes. - Text.isElementContentWhitespace() - Text.getWholeText() - Text.replaceWholeText()"
Merge commit '
4795e033e5d93d72438d5004dd77ea82014f4657' into dalvik-dev
* commit '
4795e033e5d93d72438d5004dd77ea82014f4657':
Implementing still more DOM API for text nodes.
Brian Carlstrom [Sun, 28 Feb 2010 09:39:32 +0000 (01:39 -0800)]
am
60a65773: Minor fix for Adb.waitForNonEmptyDirectory so that waiting for /sdcard after reboot works again.
Merge commit '
60a65773a7199f0a6b8f36bba00f11b84f8c0227' into dalvik-dev
* commit '
60a65773a7199f0a6b8f36bba00f11b84f8c0227':
Minor fix for Adb.waitForNonEmptyDirectory so that waiting for /sdcard after reboot works again.
Jeff Hao [Sun, 28 Feb 2010 09:39:21 +0000 (01:39 -0800)]
am
01961a9d: Merge "Fixed bug
2438465, prevented blocks with move-result from being combined."
Merge commit '
01961a9d1f152c308b0c372214a1f204b3c0a5cf' into dalvik-dev
* commit '
01961a9d1f152c308b0c372214a1f204b3c0a5cf':
Fixed bug
2438465, prevented blocks with move-result from being combined.
Brian Carlstrom [Sun, 28 Feb 2010 09:39:10 +0000 (01:39 -0800)]
am
d1ad6ae8: DalvikRunner --tee option to send output to a file or stdout at runtime
Merge commit '
d1ad6ae8509d5890a7175a1dcd0a3f7fceb75d23' into dalvik-dev
* commit '
d1ad6ae8509d5890a7175a1dcd0a3f7fceb75d23':
DalvikRunner --tee option to send output to a file or stdout at runtime
jeffhao [Sun, 28 Feb 2010 09:38:58 +0000 (01:38 -0800)]
am
b0d01b01: Fixed bug
2438465, prevented blocks with move-result from being combined.
Merge commit '
b0d01b0178081c98b8cdb2fba2d84f275a0c595e' into dalvik-dev
* commit '
b0d01b0178081c98b8cdb2fba2d84f275a0c595e':
Fixed bug
2438465, prevented blocks with move-result from being combined.
Dan Bornstein [Sun, 28 Feb 2010 09:38:44 +0000 (01:38 -0800)]
am
05c9d91a: Add a test case for the jsr / invoke bug. (See the included info.txt for more details.)
Merge commit '
05c9d91a7fd80fef3141b832fc8caeef44612c86' into dalvik-dev
* commit '
05c9d91a7fd80fef3141b832fc8caeef44612c86':
Add a test case for the jsr / invoke bug. (See the included
Elliott Hughes [Sat, 27 Feb 2010 02:13:57 +0000 (18:13 -0800)]
Upgrade our sqlite JDBC driver to version
20100131.
This fixes a bunch of KnownFailures, and adds a bunch of new features. I've
updated the tests correspondingly (though doubtless we could add a lot more
tests now, if we wanted to).
I regenerated Constants.java manually, and explained how in its javadoc.
I've added the upstream VERSION file so it's easier to see what upstream
version we're at. (Constants now contains the version number too, but that's
less obvious.)
All our changes now have android-changed markers. I'll see about getting them
pushed upstream next week.
(This change best reviewed with "ignore whitespace". It looks like we made a
bunch of whitespace "corrections" when we imported this source, which just
makes it harder to stay in sync. I've taken the upstream copies of files that
only had whitespace differences.)
Elliott Hughes [Fri, 26 Feb 2010 22:46:53 +0000 (14:46 -0800)]
Break the sqlite JDBC driver out from our JDBC implementation.
The JDBC driver is from a different source
(http://www.ch-werner.de/javasqlite/overview-summary.html) and is only
really needed for testing.
Bug
2468870 asks that we don't eagerly register the native methods for
these classes. That bug is fixed by this change.
Bug
2198667 asks that we stop shipping this JDBC driver as part of the
base system. That bug is not addressed by this change: the classes and
native code are now in their own, separate, .jar and .so files -- so
they'll be easier to remove in future -- but for now those files are
still in /system/framework and /system/lib respectively.
Bug:
2468870
Bug:
2198667
Andy McFadden [Fri, 26 Feb 2010 22:25:32 +0000 (14:25 -0800)]
Merge "Don't set x86 arch variant."
Andy McFadden [Fri, 26 Feb 2010 21:34:01 +0000 (13:34 -0800)]
Don't set x86 arch variant.
This was a workaround for a missing bit in the core build. No longer
needed.
Jesse Wilson [Fri, 26 Feb 2010 21:16:39 +0000 (13:16 -0800)]
Merge "Adding tests to parse document attributes from the DOM."
Jesse Wilson [Fri, 26 Feb 2010 20:17:32 +0000 (12:17 -0800)]
Adding tests to parse document attributes from the DOM.
This adds implementation and tests for these methods:
getInputEncoding(), getDocumentURI().
And tests for these methods:
getXmlEncoding(), getXmlVersion(), getXmlStandalone().
Andy McFadden [Fri, 26 Feb 2010 18:16:38 +0000 (10:16 -0800)]
Merge "Update a few things in x86-atom."
Andy McFadden [Fri, 26 Feb 2010 15:35:20 +0000 (07:35 -0800)]
Update a few things in x86-atom.
This replaced unuses opcodes EC and EF with C stubs for the breakpoint
and execute-inline/range instructions, which were added after the last
bunch of stuff we rolled out to eclair open-source. I also rebuilt the
"out" dir to pick up the various other changes.
Ben Cheng [Thu, 25 Feb 2010 04:58:44 +0000 (20:58 -0800)]
Tweak the interpreter entries and 2nd level trace filter to capture more traces.
Real changes:
1) Add a new entry point from JIT to the interpreter to request hot traces w/o
doing chaining.
2) Increase the granularity of the secondary profile filter to match 64-byte
chunks using 64 entries.
The remaining are just cosmetic changes.
Brian Carlstrom [Fri, 26 Feb 2010 00:15:50 +0000 (16:15 -0800)]
Merge "First pass at reorganizing org.apache.harmony.xnet.provider.jsse native code into a single file."
Bill Buzbee [Fri, 26 Feb 2010 00:10:39 +0000 (16:10 -0800)]
Merge "Jit: fix typo that caused incorrect def mask for blr's." into dalvik-dev
Bill Buzbee [Thu, 25 Feb 2010 23:38:40 +0000 (15:38 -0800)]
Jit: fix typo that caused incorrect def mask for blr's.
Elliott Hughes [Fri, 26 Feb 2010 00:04:11 +0000 (16:04 -0800)]
Merge "Fix a couple of typos in JIT function names."
Carl Shapiro [Thu, 25 Feb 2010 23:54:18 +0000 (15:54 -0800)]
Merge "Relocate function declaration out the GC and into the compiler." into dalvik-dev
Brian Carlstrom [Thu, 11 Feb 2010 06:56:47 +0000 (22:56 -0800)]
First pass at reorganizing org.apache.harmony.xnet.provider.jsse native code into a single file.
At enh's suggestion, I'm consoldiating the OpenSSL related native code
into a single wrapper class NativeCrypto. This changes is the firs
step, combining the cpp code into a single NativeCode.cpp. The next
step will involved introducting a single SSL_CTX in NativeCode and
cleaning up SSL_CTX use. As part of this, I'll start moving the native
wrappers to from various OpenSSL*.java classes into NativeCode.
Carl Shapiro [Thu, 25 Feb 2010 23:47:08 +0000 (15:47 -0800)]
Relocate function declaration out the GC and into the compiler.
Bill Buzbee [Thu, 25 Feb 2010 23:43:39 +0000 (15:43 -0800)]
Merge "Jit: fix typo that caused incorrect def mask for blr's."
Elliott Hughes [Thu, 25 Feb 2010 23:41:42 +0000 (15:41 -0800)]
Fix a couple of typos in JIT function names.
(I saw these the other day, but preferred a separate patch.)
Bill Buzbee [Thu, 25 Feb 2010 23:38:40 +0000 (15:38 -0800)]
Jit: fix typo that caused incorrect def mask for blr's.
Carl Shapiro [Thu, 25 Feb 2010 23:13:05 +0000 (15:13 -0800)]
Remove the sole use of WITH_HPROF_STACK_UNREACHABLE macro. This
feature never seems to have existed.
Carl Shapiro [Thu, 25 Feb 2010 23:04:55 +0000 (15:04 -0800)]
Merge "Eliminate the unused hprof "unreachable" feature. This code dates back to the Perforce repository and has never been enabled. Nobody seems to know what it was once, if ever, used for so it may as well go." into dalvik-dev
Elliott Hughes [Thu, 25 Feb 2010 22:59:44 +0000 (14:59 -0800)]
Merge "Document that Class.getSigners() always returns null."
Elliott Hughes [Thu, 25 Feb 2010 22:42:17 +0000 (14:42 -0800)]
Document that Class.getSigners() always returns null.
Bug:
1594865
Bug: http://code.google.com/p/android/issues/detail?id=1766
Carl Shapiro [Thu, 25 Feb 2010 03:47:40 +0000 (19:47 -0800)]
Eliminate the unused hprof "unreachable" feature. This code dates
back to the Perforce repository and has never been enabled. Nobody
seems to know what it was once, if ever, used for so it may as well
go.
Andy McFadden [Thu, 25 Feb 2010 22:12:32 +0000 (14:12 -0800)]
Merge "Rearrange JDWP cleanup."
Andy McFadden [Thu, 25 Feb 2010 20:31:04 +0000 (12:31 -0800)]
Rearrange JDWP cleanup.
This moves the "get rid of the breakpoints" part before the "tell the
rest of the VM that there's no debugger attached" part. Hitting a
breakpoint when there's no debugger attached is not expected.
For bug
2461667.
Elliott Hughes [Thu, 25 Feb 2010 16:22:52 +0000 (08:22 -0800)]
Merge "Keep the order from getaddrinfo() unchanged if preferIPv6Addresses() is true."
Elliott Hughes [Thu, 25 Feb 2010 16:17:58 +0000 (08:17 -0800)]
Merge "Fix a test by syncing with upstream." into dalvik-dev
Carl Shapiro [Wed, 24 Feb 2010 10:30:55 +0000 (02:30 -0800)]
Print the self thread id and the owning thread id in the description
of the IllegalMonitorExcpetion throw by unlockMonitor.
Carl Shapiro [Thu, 25 Feb 2010 02:40:54 +0000 (18:40 -0800)]
Merge "Allocate an object and mark bitmap which span the entire virtual memory reservation of the heap. Eliminates indirection during the marking phase." into dalvik-dev
Ben Cheng [Thu, 25 Feb 2010 02:34:25 +0000 (18:34 -0800)]
Merge "Print "JIT" in the thread dump if the top frame is in JIT'ed code."
Andy McFadden [Thu, 25 Feb 2010 02:28:14 +0000 (18:28 -0800)]
Merge "Added printf attribute to exception function."
Elliott Hughes [Thu, 25 Feb 2010 02:16:28 +0000 (18:16 -0800)]
Fix a test by syncing with upstream.
This test has been failing for us because of a local modification.
Ben Cheng [Thu, 25 Feb 2010 01:27:01 +0000 (17:27 -0800)]
Print "JIT" in the thread dump if the top frame is in JIT'ed code.
Elliott Hughes [Thu, 25 Feb 2010 00:58:08 +0000 (16:58 -0800)]
If we're in an Android build tree, we should use core.jar as our "SDK".
This fixes running junit tests for non-public classes, since bdc's --sdk
change went in. While --sdk is perfect for real people, it's probably not
what we want to use ourselves. Since this script is already hard-coded
for use in an Android build tree, this seems like a reasonable place to
apply the fix.
Elliott Hughes [Thu, 25 Feb 2010 00:36:18 +0000 (16:36 -0800)]
Optimize more easy multiplications by constants.
Rather than make these changes in the libraries (*10 being a common case),
let's do them once and for all in the JIT.
The 2^n-1 case could be better if we generated RSB instructions, but the
current "fake" RSB is still better than a full multiply.
Thumb doesn't support reg/reg/reg/shift instructions, so we can't optimize
the "population count <= 2" cases (such as *10) there.
Tested on sholes, passion, and passion-running-sapphire (and visually
inspected to check we weren't trying to generate Thumb2 instructions there).
Also tested with the self-verifier.
Carl Shapiro [Fri, 19 Feb 2010 08:46:33 +0000 (00:46 -0800)]
Allocate an object and mark bitmap which span the entire virtual
memory reservation of the heap. Eliminates indirection during the
marking phase.
Ben Cheng [Wed, 24 Feb 2010 23:00:40 +0000 (15:00 -0800)]
Enhance the jit profiler to print more statistics and be more verbose.
Specifically, the per-trace invocation percentage is printed now.
D/dalvikvm( 671): TRACEPROFILE 0x42b6eed8
15449863 2.13% [0(+2), 253] Ljava/nio/Buffer;position;()I
D/dalvikvm( 671): TRACEPROFILE 0x42b7b3ac
15410023 2.13% [0x4(+3), 450] Lorg/apache/xml/serializer/CharInfo;shouldMapTextChar;(I)Z
D/dalvikvm( 671): TRACEPROFILE 0x42b7b2cc
15346582 2.12% [0(+2), 449] Lorg/apache/xml/serializer/CharInfo;shouldMapTextChar;(I)Z
D/dalvikvm( 671): TRACEPROFILE 0x42b7b40c
15013650 2.07% [0xb4(+2), 1527] Lorg/apache/xml/serializer/ToStream;characters;([CII)V
D/dalvikvm( 671): TRACEPROFILE 0x42b7b4f0
14907957 2.06% [0xc7(+2), 1537] Lorg/apache/xml/serializer/ToStream;characters;([CII)V
D/dalvikvm( 671): TRACEPROFILE 0x42b7b308
14898588 2.06% [0xad(+3), 1525] Lorg/apache/xml/serializer/ToStream;characters;([CII)V
D/dalvikvm( 671): TRACEPROFILE 0x42b7b52c
14798762 2.04% [0xc4(+2), 1523] Lorg/apache/xml/serializer/ToStream;characters;([CII)V
D/dalvikvm( 671): TRACEPROFILE 0x42b7b570
14763770 2.04% [0xf3(+2), 1577] Lorg/apache/xml/serializer/ToStream;characters;([CII)V
And the top 10 traces will be recompiled in verbose mode to facilitate code
quality analysis.
Andy McFadden [Wed, 24 Feb 2010 19:18:33 +0000 (11:18 -0800)]
am
cf4e8b02: Merge "This is a contribution of x86-atom targeted assembly for the fast byte-code interpreter engine. This is an initial contribution with minimal optimizations that target the Intel ATOM processor. We expect to continuously improve this code. It is expe
Merge commit '
cf4e8b02ecfb5ec17a27ed4188dd7a9db14ab7bf'
* commit '
cf4e8b02ecfb5ec17a27ed4188dd7a9db14ab7bf':
This is a contribution of x86-atom targeted assembly for the fast byte-code interpreter engine. This is an initial contribution with minimal optimizations that target the Intel ATOM processor. We expect to continuously improve this code. It is expected that there will be a discussion on the potential merge of this code and similar efforts (i.e. the mterp/x86 directory first included with cupcake). While this code is intended to target ATOM and not a generic X-86 processor, we were able to show the following improvements over the c-portable interpreter using the simulator build:
Dan Bornstein [Wed, 24 Feb 2010 18:54:08 +0000 (10:54 -0800)]
Clarify a few items in the dex spec.
In particular, do a bit of "may" vs. "must" maintenance, and be specific
about references as arguments to filled-new-array.
Change-Id: Iae4cb734e05cd29230e2c9a343108bbfb3c20193
Andy McFadden [Wed, 24 Feb 2010 17:39:52 +0000 (09:39 -0800)]
Added printf attribute to exception function.
Andy McFadden [Wed, 24 Feb 2010 17:39:09 +0000 (09:39 -0800)]
Merge "Add class init stats to alloc counters (API change)."
Carl Shapiro [Wed, 24 Feb 2010 10:44:53 +0000 (02:44 -0800)]
Remove a bogus assertion.
Elliott Hughes [Wed, 24 Feb 2010 02:05:54 +0000 (18:05 -0800)]
Fix DalvikRunner on the dalvik-dev branch.
(Longer term, we want to package junit, but this gets us running again.)
Jesse Wilson [Wed, 24 Feb 2010 01:58:01 +0000 (17:58 -0800)]
Merge "Implementing still more DOM API for text nodes. - Text.isElementContentWhitespace() - Text.getWholeText() - Text.replaceWholeText()"
Jesse Wilson [Tue, 23 Feb 2010 23:23:26 +0000 (15:23 -0800)]
Implementing still more DOM API for text nodes.
- Text.isElementContentWhitespace()
- Text.getWholeText()
- Text.replaceWholeText()
Andy McFadden [Tue, 23 Feb 2010 01:07:23 +0000 (17:07 -0800)]
Add class init stats to alloc counters (API change).
Add calls to retrieve class initialization stats via the allocation
count mechanism.
Also: deprecate a method that is never used, and a redundantly declared
default filename that begins with "/sdcard".
For bug
2461549.
Brian Carlstrom [Wed, 24 Feb 2010 00:39:09 +0000 (16:39 -0800)]
Minor fix for Adb.waitForNonEmptyDirectory so that waiting for /sdcard after reboot works again.
Elliott Hughes [Wed, 24 Feb 2010 00:20:16 +0000 (16:20 -0800)]
Fix "HttpUrlConnection.addRequestProperty replaces existing properties instead of append them".
The bug was actually that the copy constructor wasn't reconstructing the 'props'
list correctly. Upstream has applied the same fix, so I'm also bringing my
earlier change into sync with theirs, whitespace-wise (and removing no longer
necessary 'android-changed' tags).
Bug: http://code.google.com/p/android/issues/detail?id=6722
Elliott Hughes [Tue, 23 Feb 2010 22:57:28 +0000 (14:57 -0800)]
Remove more useless annotations: logging, luni-kernel, and math.
(Plus a bonus item: one Android-written test under luni.)
Jeff Hao [Tue, 23 Feb 2010 22:49:38 +0000 (14:49 -0800)]
Merge "Fixed bug
2438465, prevented blocks with move-result from being combined."
Andy McFadden [Tue, 23 Feb 2010 21:46:14 +0000 (13:46 -0800)]
Merge "This is a contribution of x86-atom targeted assembly for the fast byte-code interpreter engine. This is an initial contribution with minimal optimizations that target the Intel ATOM processor. We expect to continuously improve this code. It is expected that there will be a discussion on the potential merge of this code and similar efforts (i.e. the mterp/x86 directory first included with cupcake). While this code is intended to target ATOM and not a generic X-86 processor, we were able to show the following improvements over the c-portable interpreter using the simulator build: Build: TARGET_SIMULATOR: true TARGET_BUILD_TYPE: release TARGET_PRODUCT: sim Environment: Intel(R) Core(TM)2 Quad CPU Q9550 @ 2.83GHz PI = Portable Interpreter IA = Fast IA Interpreter Embedded CaffeineMark: (IA-PI)/PI: Average of 70% improvement on overall score SPECjbb2000*: (IA-PI)/PI: Average of 37% improvement on raw score SPECjvm98*: (PI/IA) Speedup: Mtrt: 1.2; Jess: 1.34; Compress: 1.57; Db: 1.46; Jack: 1.28 * SPECjbb2000 - 1 warehouse. Noncompliant - modified to run on Dalvik * SPECjvm98 - Noncompliant - modified to run on Dalivk"
Brian Carlstrom [Tue, 23 Feb 2010 19:31:46 +0000 (11:31 -0800)]
DalvikRunner --tee option to send output to a file or stdout at runtime
Added --tee option so we can watch test output while the test is
running, as opposed to waiting until all the output is collected.
As part of this, Command.Builder can now optionally specifiy a
PrintStream via tee (name from tee(1)).
Added ADB.waitForFile to accompany ADB.waitForNonEmptyDirectory
Removed gross bash wait loop hack in Activity Mode by replacing
Mode.buildCommands with Mode.runTestCommand.
Fixed bug that out generated APK package names did not contain a
required "." in all cases.
jeffhao [Tue, 23 Feb 2010 20:29:47 +0000 (12:29 -0800)]
Fixed bug
2438465, prevented blocks with move-result from being combined.
jeffhao [Tue, 23 Feb 2010 20:29:47 +0000 (12:29 -0800)]
Fixed bug
2438465, prevented blocks with move-result from being combined.
Johnnie Birch [Mon, 6 Apr 2009 22:26:13 +0000 (15:26 -0700)]
This is a contribution of x86-atom targeted assembly for the fast byte-code interpreter engine. This is an initial contribution with minimal optimizations that target the Intel ATOM processor. We expect to continuously improve this code. It is expected that there will be a discussion on the potential merge of this code and similar efforts (i.e. the mterp/x86 directory first included with cupcake). While this code is intended to target ATOM and not a generic X-86 processor, we were able to show the following improvements over the c-portable interpreter using the simulator build:
Build: TARGET_SIMULATOR: true
TARGET_BUILD_TYPE: release
TARGET_PRODUCT: sim
Environment: Intel(R) Core(TM)2 Quad CPU Q9550 @ 2.83GHz
PI = Portable Interpreter
IA = Fast IA Interpreter
Embedded CaffeineMark: (IA-PI)/PI: Average of 70% improvement on overall score
SPECjbb2000*: (IA-PI)/PI: Average of 37% improvement on raw score
SPECjvm98*: (PI/IA) Speedup: Mtrt: 1.2; Jess: 1.34; Compress: 1.57; Db: 1.46; Jack: 1.28
* SPECjbb2000 - 1 warehouse. Noncompliant - modified to run on Dalvik
* SPECjvm98 - Noncompliant - modified to run on Dalivk
Elliott Hughes [Tue, 23 Feb 2010 00:47:08 +0000 (16:47 -0800)]
Remove useless annotation cruft from tests for: annotation, archive, concurrent, and suncompat.
22 files (and 4 modules) down, 1000 to go...
Elliott Hughes [Tue, 23 Feb 2010 00:00:27 +0000 (16:00 -0800)]
Update run-core-tests' documentation, remove the leading : from the classpath, and add the json tests to the classpath.
(I did look at replacing this with a bash script we run on the host, but adb
turns out to have a command-line limit of 1024 bytes, and our classpath alone
is ~850 bytes long!)
Dan Bornstein [Tue, 23 Feb 2010 00:08:53 +0000 (16:08 -0800)]
Add a test case for the jsr / invoke bug. (See the included
info.txt for more details.)
Change-Id: I6ae5266e3f3371406c366d4f4644a445875adf95
Elliott Hughes [Mon, 22 Feb 2010 23:01:55 +0000 (15:01 -0800)]
Fix a stupid mistake in my earlier change.
(I removed the unused parameter from the wrong macro!)
Elliott Hughes [Mon, 22 Feb 2010 20:45:26 +0000 (12:45 -0800)]
Adapt jesse's new json tests to the new build scheme.
Elliott Hughes [Mon, 22 Feb 2010 20:09:51 +0000 (12:09 -0800)]
Merge remote branch 'goog/master' into mm
Conflicts:
libcore/JavaLibrary.mk
Elliott Hughes [Mon, 22 Feb 2010 19:15:21 +0000 (11:15 -0800)]
Merge "Resync a load of tests with upstream, make our build faster." into dalvik-dev
Barry Hayes [Mon, 22 Feb 2010 17:39:10 +0000 (09:39 -0800)]
Fix build breakage.
the "HeapChunk" abstraction was removed almost everywhere; but not here
until now.
Barry Hayes [Mon, 22 Feb 2010 17:13:28 +0000 (09:13 -0800)]
Merge " Add the "-Xgc:[no]overwritefree" flags. When set, the GC will clobber the memory of freed objects." into dalvik-dev
Jesse Wilson [Sat, 20 Feb 2010 19:12:12 +0000 (11:12 -0800)]
Merge "Removing dead code from BigInt"
Jesse Wilson [Sat, 20 Feb 2010 19:11:40 +0000 (11:11 -0800)]
Merge "More XML DOM v3 APIs."
Jesse Wilson [Sat, 20 Feb 2010 18:20:55 +0000 (10:20 -0800)]
More XML DOM v3 APIs.
This adds the following APIs and tests:
- Node.isDefaultNamespace
- DomImplementation.hasFeature
- Node.isSupported
- Node.getFeature
- Node.isEqualNode
Jesse Wilson [Sat, 20 Feb 2010 18:35:21 +0000 (10:35 -0800)]
Removing dead code from BigInt
Elliott Hughes [Sat, 20 Feb 2010 06:14:19 +0000 (22:14 -0800)]
Remove external/jsr305, external/guava, and external/caliper.
Ben Cheng [Fri, 19 Feb 2010 23:30:16 +0000 (15:30 -0800)]
Merge "Disable JIT for armv5te for A/B tests."
Ben Cheng [Fri, 19 Feb 2010 22:49:44 +0000 (14:49 -0800)]
Disable JIT for armv5te for A/B tests.
Jesse Wilson [Fri, 19 Feb 2010 19:18:41 +0000 (11:18 -0800)]
DOM setTextContent() tests and implementation fixes.