OSDN Git Service
Brian Carlstrom [Wed, 1 May 2013 01:12:28 +0000 (18:12 -0700)]
am
15554a2f: Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
* commit '
15554a2f2d4920357f6cf1a0505a178de3781f77':
Update dalvik host script for new conscrypt and okhttp classpath entries
Brian Carlstrom [Wed, 1 May 2013 00:57:28 +0000 (00:57 +0000)]
Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
Brian Carlstrom [Wed, 1 May 2013 00:51:03 +0000 (17:51 -0700)]
Update dalvik host script for new conscrypt and okhttp classpath entries
Change-Id: I9af7dfeb7387544bff98af55716f3db9808e39cb
Brian Carlstrom [Tue, 30 Apr 2013 23:25:10 +0000 (16:25 -0700)]
am
b66781c5: Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* commit '
b66781c5bf4da1f6fdcbc5a1fcd2c962294b661c':
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 23:25:09 +0000 (16:25 -0700)]
am
71cf82a3: Merge "Teach dex how to parse encoded values from .dex files."
* commit '
71cf82a34cdd9b22ca9000575ab490a9a2c13cc8':
Teach dex how to parse encoded values from .dex files.
Brian Carlstrom [Tue, 30 Apr 2013 21:45:35 +0000 (21:45 +0000)]
Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* changes:
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 21:45:26 +0000 (21:45 +0000)]
Merge "Teach dex how to parse encoded values from .dex files."
Jesse Wilson [Mon, 19 Sep 2011 02:45:39 +0000 (22:45 -0400)]
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Change-Id: Ifd3672027d075b6c9f8df208a04bc33122c883af
(cherry picked from commit
f8357511efd16d76ce4410459c15dbb08b0140b6)
Conflicts:
dx/src/com/android/dx/merge/DexMerger.java
Jesse Wilson [Sun, 18 Sep 2011 16:53:38 +0000 (12:53 -0400)]
Move dex utilities from dalvik/dx to libcore/dex
Change-Id: If0022a069ba3ac51ae5cdc4b0eabb6b913cd8afe
(cherry picked from commit
7b13a4d41243f81fe80a76e2ff2f877b53610446)
Conflicts:
dx/src/com/android/dex/Code.java
dx/src/com/android/dex/Dex.java
dx/src/com/android/dex/SizeOf.java
dx/src/com/android/dex/TableOfContents.java
Jesse Wilson [Sat, 17 Sep 2011 03:10:02 +0000 (23:10 -0400)]
Mechanical refactoring of dx into two parts.
This splits off a new package, com.android.dex that contains
code for parsing and modelling dex files. This code is usable
both at build time (for compilation and analysis) and at runtime
(for introspection).
The original package, com.android.dx is the tool that compiles
.class files into .dex files. That package also includes utilities
for merging and querying dex files, all visible to the dx command
line application.
In a follow up change I'll move the new com.android.dex package
into the libcore/ project, and configure build rules so that it's
included in both dx.jar and core.jar. The core.jar will then be
able to use it for annotation processing.
Change-Id: I3c58cf87e728e4dda1925a0992c1ee7b8130e81a
(cherry picked from commit
bab4abb07335d162ecdb8091fc395cf84803a580)
Conflicts:
dx/junit-tests/com/android/dx/util/BitIntSetTest.java
dx/junit-tests/com/android/dx/util/BitsTest.java
dx/junit-tests/com/android/dx/util/IntListTest.java
dx/junit-tests/com/android/dx/util/ListIntSetTest.java
dx/src/com/android/dex/Dex.java
dx/src/com/android/dex/TableOfContents.java
dx/src/com/android/dx/annotations/AnnotationAccess.java
dx/src/com/android/dx/command/Main.java
dx/src/com/android/dx/dex/code/OutputFinisher.java
dx/src/com/android/dx/dex/code/form/Form32s.java
dx/src/com/android/dx/dex/code/form/Form33x.java
dx/src/com/android/dx/dex/code/form/Form41c.java
dx/src/com/android/dx/dex/code/form/Form52c.java
dx/src/com/android/dx/gen/DexGenerator.java
dx/src/com/android/dx/merge/DexMerger.java
Brian Carlstrom [Tue, 30 Apr 2013 01:26:09 +0000 (18:26 -0700)]
Change com.android.dx.io.Annotation to use EncodedValue
(cherry picked from commit
4ec022b0b6c84f994ab2fc78934110ad96d0bdec)
Change-Id: Ia420b7661f372c59af8fe62bdab7982a1d2b008f
Jesse Wilson [Thu, 15 Sep 2011 19:49:25 +0000 (15:49 -0400)]
Teach dex how to parse encoded values from .dex files.
Previously primitive values were treated as opaque byte arrays.
Now the encoded values can be interpreted as their proper types:
integers, indices, floats, chars, etc. This gets complicated
pretty fast due to the dense packing dx performs when encoding
the values.
The encoding code is moved from ValueEncoder. The decoding code
is ported from C++ to Java from Annotation.cpp.
There's a bunch of new tests to make sure the decoding is correct;
porting from C++ to Java was tricky because of the '>>' shifts on
unsigned values. The test input data is generated by dex!
Change-Id: I83b2fc3e16115d667fa94b3dab782d1a9687f3ad
(cherry picked from commit
27847605b9255358f0577ffec28886c450263898)
Elliott Hughes [Fri, 26 Apr 2013 17:44:59 +0000 (10:44 -0700)]
am
33a977ec: Merge "Fix JIT bug related to immediate doubles"
* commit '
33a977ec6a12deb22bcc87f8c294439b3aba16ab':
Fix JIT bug related to immediate doubles
Elliott Hughes [Fri, 26 Apr 2013 17:37:22 +0000 (17:37 +0000)]
Merge "Fix JIT bug related to immediate doubles"
buzbee [Tue, 12 Feb 2013 00:52:31 +0000 (16:52 -0800)]
Fix JIT bug related to immediate doubles
Change 256211 (JIT: Performance Fix for const doubles) introduced a
defect that can cause the JIT to use the wrong floating point
double constant in traces in which the following conditions hold:
o Two (or more) different 64-bit floating point constants are used.
o The physical register holding the first constant is still live
at the time the second constant is used.
o The low 32 bits of the two constants are identical.
In this situation, the load/copy optimization pass will incorrectly
determine that the two constants are the same, delete the load of
the second constant and re-use the first constant value.
Note: this problem only occurs with 64-bit floating point literals.
64-bit long literals are unaffected.
This CL works around the problem, and a subsequent CL will rework
disambiguation of 64-bit immediates in a somewhat cleaner fashion.
(cherry-pick of
c1757a6deab0ca0bfd42c38612d92b2f26c41dbe.)
Change-Id: I795b4b753550d2745cbbdd83ae25f4a7088990f6
Elliott Hughes [Thu, 25 Apr 2013 18:50:36 +0000 (11:50 -0700)]
am
3b79b5bf: Merge "Don\'t duplicate annotation set ref lists when merging."
* commit '
3b79b5bf70941a6da52ea8c5d50b0dcdb296a99f':
Don't duplicate annotation set ref lists when merging.
Elliott Hughes [Thu, 25 Apr 2013 18:36:21 +0000 (18:36 +0000)]
Merge "Don't duplicate annotation set ref lists when merging."
Xavier Ducrohet [Thu, 25 Apr 2013 02:11:19 +0000 (19:11 -0700)]
am
9b4204c1: am
33b5dfb6: am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
9b4204c1e265ad8b8c4fe4e671f91d1cd0e4ab4e':
Fix dx to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:09:32 +0000 (19:09 -0700)]
am
33b5dfb6: am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
33b5dfb684910c5dbcd0e58f24a90ead01078629':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:07:35 +0000 (19:07 -0700)]
am
bfae1ee4: Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev
* commit '
bfae1ee42bddedaf7ac7d77ce2f2fbd4486cf098':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:07:33 +0000 (19:07 -0700)]
am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
60db431fe44afb723654a19494b1ba0f35a735f0':
Fix dx to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:05:34 +0000 (19:05 -0700)]
am
4b724cff: Fix dx to match the new SDK structure.
* commit '
4b724cff027771d0d905809605b5cc50df220a4a':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:04:36 +0000 (02:04 +0000)]
Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev
Raphael Moll [Thu, 25 Apr 2013 02:04:13 +0000 (19:04 -0700)]
am
c38a95aa: am
8f93edac: am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
c38a95aa2d595f39964587c93f823c75c339f208':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:03:12 +0000 (19:03 -0700)]
am
8f93edac: am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
8f93edacdb6270a48f98aa3a82733f0f912d333a':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:01:15 +0000 (19:01 -0700)]
am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
2f23f4cb813a810bb79f2ea09733b37c9af7639b':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 01:59:15 +0000 (18:59 -0700)]
am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
c26c1291743ce7877cf11f3dc73d6f0c240229f7':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
(Cherry-pick from
c26c1291743ce7877cf11f3dc73d6f0c240229f7)
Change-Id: Ied431777e178529f1e2360bfbd69d2738839d5c6
Xavier Ducrohet [Tue, 26 Mar 2013 17:24:05 +0000 (10:24 -0700)]
Fix dx to match the new SDK structure.
(cherry picked from commit
cb9dfa123c6fcc43be629666837c4e6f86b476ea)
Change-Id: I071d73adc4a2eb812cdbc204d27884f4a527043d
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
Change-Id: I2c125bb40c7c64e010642274b482733c52b5c11e
Elliott Hughes [Tue, 23 Apr 2013 22:28:50 +0000 (15:28 -0700)]
am
514eabb9: Remove spammy logging from
8470684 investigation.
* commit '
514eabb960969b513c24f9cdfc8dec94c96d9359':
Remove spammy logging from
8470684 investigation.
Elliott Hughes [Tue, 23 Apr 2013 18:35:17 +0000 (11:35 -0700)]
Remove spammy logging from
8470684 investigation.
This has been tracked down to a kernel bug, so we no longer need
the extra diagnostics.
Bug:
8470684
(cherry picked from commit
3a9dbd30eb1598c737af7ef6110d46767d6e0336)
Change-Id: I0877a24a5a409695c3a1a9ddb5c7c4d78e6a578e
Elliott Hughes [Tue, 23 Apr 2013 18:54:32 +0000 (11:54 -0700)]
am
e5edfce1: Merge "Remove spammy logging from
8470684 investigation."
* commit '
e5edfce17359c0353744dd2b4db3a8deef2aef09':
Remove spammy logging from
8470684 investigation.
Elliott Hughes [Tue, 23 Apr 2013 18:44:41 +0000 (18:44 +0000)]
Merge "Remove spammy logging from
8470684 investigation."
Elliott Hughes [Tue, 23 Apr 2013 18:35:17 +0000 (11:35 -0700)]
Remove spammy logging from
8470684 investigation.
This has been tracked down to a kernel bug, so we no longer need
the extra diagnostics.
Bug:
8470684
Change-Id: Ib170d1f7b94488ed4acc763f8dddc44c81807aed
Elliott Hughes [Wed, 17 Apr 2013 22:49:20 +0000 (15:49 -0700)]
am
739bb122: Work around a dalvik JDWP/GC deadlock.
* commit '
739bb122cfc866d599338a9def221e0661b54d20':
Work around a dalvik JDWP/GC deadlock.
Elliott Hughes [Wed, 17 Apr 2013 19:08:56 +0000 (12:08 -0700)]
Work around a dalvik JDWP/GC deadlock.
Also add a few missing TEMP_FAILURE_RETRYs that can cause dalvik to
incorrectly decide that the debugger connection has been broken.
Bug:
8191824
(cherry picked from commit
b680ae3140a789f182c26abf8df9645f7744113a)
Change-Id: I92736a1ad2f06caba30506d05bfa59fccbeee834
Elliott Hughes [Wed, 17 Apr 2013 20:36:07 +0000 (13:36 -0700)]
am
00c9c9a7: Merge "Work around a dalvik JDWP/GC deadlock."
* commit '
00c9c9a720b316264e6c6a71b43584b6ebc93c17':
Work around a dalvik JDWP/GC deadlock.
Elliott Hughes [Wed, 17 Apr 2013 20:18:08 +0000 (20:18 +0000)]
Merge "Work around a dalvik JDWP/GC deadlock."
Elliott Hughes [Wed, 17 Apr 2013 19:08:56 +0000 (12:08 -0700)]
Work around a dalvik JDWP/GC deadlock.
Also add a few missing TEMP_FAILURE_RETRYs that can cause dalvik to
incorrectly decide that the debugger connection has been broken.
Bug:
8191824
Change-Id: I791b514c6bec1ca634a65d9f87c5fa06da01b5ed
The Android Open Source Project [Mon, 15 Apr 2013 17:45:47 +0000 (10:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I39b6c05167491cb73786c502b75ee6fd706208eb
The Android Automerger [Mon, 15 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Sat, 13 Apr 2013 00:51:47 +0000 (17:51 -0700)]
am
94422656: More native stack dump hardening.
* commit '
9442265659fb274358c7f95900742d8d3a1a0fb5':
More native stack dump hardening.
Elliott Hughes [Fri, 12 Apr 2013 18:51:51 +0000 (11:51 -0700)]
More native stack dump hardening.
Threads just starting up or shutting down might not have any managed
stack frames, leading to a NULL "currFrame" frame pointer in the
interpreter stack.
Bug:
8596028
(cherry picked from commit
46371593812d966c40e1ec4019e3c7c6613046a6)
Change-Id: I0fbc6d422bcae0fd080f7c1a63198755235e9e00
Elliott Hughes [Fri, 12 Apr 2013 21:08:15 +0000 (14:08 -0700)]
am
42aa0b6c: Merge "More native stack dump hardening."
* commit '
42aa0b6c213ef40ac9aad9d900204e9f6f966421':
More native stack dump hardening.
Elliott Hughes [Fri, 12 Apr 2013 20:47:54 +0000 (20:47 +0000)]
Merge "More native stack dump hardening."
Elliott Hughes [Fri, 12 Apr 2013 19:11:39 +0000 (12:11 -0700)]
am
7964f9ca: Harden the native stack dumping decision.
* commit '
7964f9ca0a14380a121c2757c566787b3d21bbe1':
Harden the native stack dumping decision.
Elliott Hughes [Fri, 12 Apr 2013 18:51:51 +0000 (11:51 -0700)]
More native stack dump hardening.
Threads just starting up or shutting down might not have any managed
stack frames, leading to a NULL "currFrame" frame pointer in the
interpreter stack.
Bug:
8596028
Change-Id: Ie24c8d5f8e78a5abe882a9e639046c03abb91649
Elliott Hughes [Fri, 12 Apr 2013 00:42:05 +0000 (17:42 -0700)]
am
6cd2e7bf: Merge "Fix flakiness in test 080-oom-throw."
* commit '
6cd2e7bfcd0899816be1e5eac4d0a69528764bbe':
Fix flakiness in test 080-oom-throw.
Elliott Hughes [Fri, 12 Apr 2013 00:23:03 +0000 (00:23 +0000)]
Merge "Fix flakiness in test 080-oom-throw."
Elliott Hughes [Fri, 12 Apr 2013 00:14:50 +0000 (17:14 -0700)]
Fix flakiness in test 080-oom-throw.
The problem was that the instance test could potentially fill the
heap close enough to the edge that you'd hit a follow-on OOME in
the attempt to print the success message, causing the test to fail.
I've also made the code a bit clearer while I'm here.
Bug: https://code.google.com/p/android/issues/detail?id=54114
Change-Id: I39127c3ea6a99940fa66ad8763bbbf6c01d308ef
Elliott Hughes [Thu, 11 Apr 2013 23:54:51 +0000 (16:54 -0700)]
am
8d02ea42: Merge "Harden the native stack dumping decision."
* commit '
8d02ea426aff289e249ee13d6de2cc3dd85c0fde':
Harden the native stack dumping decision.
Elliott Hughes [Thu, 11 Apr 2013 23:28:38 +0000 (16:28 -0700)]
Harden the native stack dumping decision.
We've seen monkey crashes in this code, though I haven't been
able to reproduce them in my own SIGQUIT stress tests. Address
the two most likely causes of trouble: dumping the signal catcher's
own thread (which will always be runnable), and assuming that the
Method* pulled from the save area is non-NULL.
(cherry-pick of
feddac5b7718dd8141391bfeb6359f1906542823.)
Bug:
8596028
Change-Id: I7a70ce047c8285715eb7bbb9438e8ef5d81fc59c
Elliott Hughes [Thu, 11 Apr 2013 23:41:29 +0000 (23:41 +0000)]
Merge "Harden the native stack dumping decision."
Elliott Hughes [Thu, 11 Apr 2013 23:28:38 +0000 (16:28 -0700)]
Harden the native stack dumping decision.
We've seen monkey crashes in this code, though I haven't been
able to reproduce them in my own SIGQUIT stress tests. Address
the two most likely causes of trouble: dumping the signal catcher's
own thread (which will always be runnable), and assuming that the
Method* pulled from the save area is non-NULL.
Bug:
8596028
Change-Id: I59d1dcb2264a774d8416d50a5f77a06c70d37c59
The Android Open Source Project [Wed, 10 Apr 2013 17:05:16 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id4335690018052987409fd37e3c60454e3da283b
The Android Automerger [Wed, 10 Apr 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:17:09 +0000 (22:17 -0700)]
Ying Wang [Wed, 10 Apr 2013 04:42:36 +0000 (21:42 -0700)]
Add liblog
Bug:
8580410
Change-Id: I649849a3a8d97a2555862ec70a1a2ca73b77cc4d
The Android Automerger [Tue, 9 Apr 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Mon, 8 Apr 2013 20:35:37 +0000 (13:35 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I12735409da99db414a4ea7cbd9a7f4862fc4447a
Xavier Ducrohet [Mon, 8 Apr 2013 18:48:52 +0000 (11:48 -0700)]
am
8154297e: Merge "Fix dx to match the new SDK structure." into jb-mr2-dev
* commit '
8154297e74d01f74b161da67a426765c92949549':
Fix dx to match the new SDK structure.
Xavier Ducrohet [Mon, 8 Apr 2013 18:45:21 +0000 (18:45 +0000)]
Merge "Fix dx to match the new SDK structure." into jb-mr2-dev
The Android Automerger [Mon, 8 Apr 2013 12:55:37 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Sat, 6 Apr 2013 00:48:56 +0000 (17:48 -0700)]
am
1b4500f9: Dump native stacks for all threads in native code.
* commit '
1b4500f91a5c3841729511cd1beac1299a54e4a7':
Dump native stacks for all threads in native code.
Elliott Hughes [Fri, 5 Apr 2013 22:45:24 +0000 (15:45 -0700)]
Dump native stacks for all threads in native code.
Bug:
7432159
(cherry picked from commit
890ce010c4846deb82d3ac09b6d2ceb76e59fb67)
Change-Id: I12e9b6998f2119e0fabb5717e9c54c53f206d34f
Elliott Hughes [Sat, 6 Apr 2013 00:16:36 +0000 (17:16 -0700)]
am
167bd124: Merge "Dump native stacks for all threads in native code."
* commit '
167bd12436dcf46740908a4d5898868e90cd716f':
Dump native stacks for all threads in native code.
Elliott Hughes [Sat, 6 Apr 2013 00:01:03 +0000 (00:01 +0000)]
Merge "Dump native stacks for all threads in native code."
Elliott Hughes [Fri, 5 Apr 2013 22:45:24 +0000 (15:45 -0700)]
Dump native stacks for all threads in native code.
Bug:
7432159
Change-Id: I83cb530155edfc35ae3be0f7a2a044245223d2d5
jwilson [Fri, 5 Apr 2013 07:46:53 +0000 (03:46 -0400)]
Don't duplicate annotation set ref lists when merging.
See exception reported on this thread:
https://groups.google.com/d/msg/android-contrib/h0sDMo5DVBI/MAMiBv5XR44J
Change-Id: I867a8d2328b32625e5baa0b029f55e373fe11271
Bill Buzbee [Thu, 4 Apr 2013 19:53:24 +0000 (19:53 +0000)]
Revert "Tiny optimization for complier templates for arm."
This reverts commit
87bc7988cdb4e61421a3e701e84f7070f603635d
No obvious problems with this change - but reverting to aid in tracking down bug:
8543495 NCs in Play Store : >>> com.android.vending
Change-Id: I8bd6dbe6a7b3a4650a5e857a5a529cde6569b987
Bill Buzbee [Thu, 4 Apr 2013 20:04:38 +0000 (13:04 -0700)]
am
4afb260c: Revert "Tiny optimization for complier templates for arm."
* commit '
4afb260cf1f312382541e30cab5766bff890e6fe':
Revert "Tiny optimization for complier templates for arm."
Bill Buzbee [Thu, 4 Apr 2013 19:53:24 +0000 (19:53 +0000)]
Revert "Tiny optimization for complier templates for arm."
This reverts commit
87bc7988cdb4e61421a3e701e84f7070f603635d
No obvious problems with this change - but reverting to aid in tracking down bug:
8543495 NCs in Play Store : >>> com.android.vending
Change-Id: I8bd6dbe6a7b3a4650a5e857a5a529cde6569b987
The Android Open Source Project [Wed, 3 Apr 2013 23:43:09 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic6ae8074b669ad14dbebbe935e01dda773c3a58c
The Android Automerger [Wed, 3 Apr 2013 13:02:12 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Tue, 2 Apr 2013 20:58:58 +0000 (13:58 -0700)]
am
1d98bdf6: Merge "Tiny optimization for complier templates for arm."
* commit '
1d98bdf68d48024c579b43df9931ed1b461df878':
Tiny optimization for complier templates for arm.
You Kim [Tue, 2 Apr 2013 20:42:28 +0000 (13:42 -0700)]
am
87bc7988: Tiny optimization for complier templates for arm.
* commit '
87bc7988cdb4e61421a3e701e84f7070f603635d':
Tiny optimization for complier templates for arm.
You Kim [Tue, 2 Apr 2013 16:41:19 +0000 (01:41 +0900)]
Tiny optimization for complier templates for arm.
1. Remove possible bubble in TEMPLATE_STRING_INDEXOF.S
2. Remove 1 instruction and reorder the opcodes
TEMPLATE_MUL_LONG.S
3. Reorder ldr r2 instruction in TEMPLATE_RETURN.S
(cherry-pick of
a2dc68acd954827cdc67929a859354e5ed9b5713.)
Change-Id: I78b9797aff3c2255c5d34a8391b1a94a1b09b613
Elliott Hughes [Tue, 2 Apr 2013 20:36:16 +0000 (13:36 -0700)]
am
c7bae7a4: Merge "Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile"
* commit '
c7bae7a49aafbbe00812330372d764bb1dc85323':
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
Elliott Hughes [Tue, 2 Apr 2013 20:33:04 +0000 (20:33 +0000)]
Merge "Tiny optimization for complier templates for arm."
You Kim [Tue, 2 Apr 2013 20:32:12 +0000 (13:32 -0700)]
am
0dcf6bb3: Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
* commit '
0dcf6bb34a8c8ef1a54f875c6052901d4aa1d5e8':
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
You Kim [Tue, 2 Apr 2013 16:58:30 +0000 (01:58 +0900)]
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
(cherry-pick of
7bf47d1d0d95c3ea9dfa7472e473edc820f21009.)
Change-Id: I0d4b96125e185b37767873e6fd88a59b63b6f7bd
Elliott Hughes [Tue, 2 Apr 2013 20:28:05 +0000 (20:28 +0000)]
Merge "Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile"
Elliott Hughes [Tue, 2 Apr 2013 20:21:29 +0000 (13:21 -0700)]
am
ab3cbf68: Merge "Fix a minor leaks caused by failed initializations.(typo)"
* commit '
ab3cbf684e4d80956952293bf1a0f46193cc9de7':
Fix a minor leaks caused by failed initializations.(typo)
You Kim [Tue, 2 Apr 2013 20:18:38 +0000 (13:18 -0700)]
am
e3b363d4: Fix a minor leaks caused by failed initializations.(typo)
* commit '
e3b363d470aa94e2a8c9df214c658980a6e83122':
Fix a minor leaks caused by failed initializations.(typo)
You Kim [Tue, 2 Apr 2013 17:13:46 +0000 (02:13 +0900)]
Fix a minor leaks caused by failed initializations.(typo)
(cherry-pick of
8e622221809bf852b1063db00493475b77beefed.)
Change-Id: I0ec95058616e48dbc574c5d207b4576923a0cc37
Elliott Hughes [Tue, 2 Apr 2013 20:12:14 +0000 (20:12 +0000)]
Merge "Fix a minor leaks caused by failed initializations.(typo)"
You Kim [Tue, 2 Apr 2013 20:08:36 +0000 (13:08 -0700)]
am
f0b2389f: Fix a minor leak in handleVM_CreateString
* commit '
f0b2389ff4355a184b1aad26d7f17cc182915041':
Fix a minor leak in handleVM_CreateString
You Kim [Tue, 2 Apr 2013 17:47:24 +0000 (02:47 +0900)]
Fix a minor leak in handleVM_CreateString
(cherry picked from commit
b825d9f38b6359ec2ac23528ac0342838e1f152f)
Change-Id: Id62e1d68492bbaa7232f7dbb229ab95433f4eb8e
Elliott Hughes [Tue, 2 Apr 2013 19:33:04 +0000 (12:33 -0700)]
am
22d8366a: Merge "Fix a minor leak in handleVM_CreateString"
* commit '
22d8366a51298a3ace15307ab62b5d5772c8f3ae':
Fix a minor leak in handleVM_CreateString
Elliott Hughes [Tue, 2 Apr 2013 18:29:18 +0000 (18:29 +0000)]
Merge "Fix a minor leak in handleVM_CreateString"
You Kim [Tue, 2 Apr 2013 17:47:24 +0000 (02:47 +0900)]
Fix a minor leak in handleVM_CreateString
Change-Id: I3273e5d2eb4621202837c43270a466fe056d6894
You Kim [Tue, 2 Apr 2013 17:13:46 +0000 (02:13 +0900)]
Fix a minor leaks caused by failed initializations.(typo)
Change-Id: I62bc3ea48938a4f54e9f47218d4025e954a6d566
You Kim [Tue, 2 Apr 2013 16:58:30 +0000 (01:58 +0900)]
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
Change-Id: I2b394c620af31914606763b35847b7f412774cf4
You Kim [Tue, 2 Apr 2013 16:41:19 +0000 (01:41 +0900)]
Tiny optimization for complier templates for arm.
1. Remove possible bubble in TEMPLATE_STRING_INDEXOF.S
2. Remove 1 instruction and reorder the opcodes
TEMPLATE_MUL_LONG.S
3. Reorder ldr r2 instruction in TEMPLATE_RETURN.S
Change-Id: I571c1278aa72cb1e6dbc6efe433932d5e9591b80
The Android Automerger [Tue, 2 Apr 2013 16:18:21 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:24 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id88870b54e658510c449c30901a9f511fca500b4
Udayan Banerji [Tue, 2 Apr 2013 15:24:10 +0000 (08:24 -0700)]
am
ed2876e5: [x86] Fix errors with WITH_JIT_TUNING defined
* commit '
ed2876e520bbdf295f894c5fb7c5a58bf90bf60f':
[x86] Fix errors with WITH_JIT_TUNING defined
Udayan Banerji [Tue, 2 Apr 2013 15:24:04 +0000 (08:24 -0700)]
am
82c80de1: [x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
* commit '
82c80de14da66b80474b298ae99cbff37cdf9b53':
[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
Udayan Banerji [Tue, 2 Apr 2013 15:23:58 +0000 (08:23 -0700)]
am
44272459: [x86] FPU stack needs to be reset after double conversion
* commit '
442724597a3db9387c964a652fda6e125413ee7e':
[x86] FPU stack needs to be reset after double conversion