OSDN Git Service
The Android Open Source Project [Mon, 15 Apr 2013 17:49:04 +0000 (10:49 -0700)]
am
d8a82683: Reconcile with jb-mr2-release - do not merge
* commit '
d8a82683137bec017d20319b9c357ba1c90e4827':
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 01:05:53 +0000 (18:05 -0700)]
am
f8ebe761: am
94422656: More native stack dump hardening.
* commit '
f8ebe76164af371e9ed6476b075db384ad950d51':
More native stack dump hardening.
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:14:27 +0000 (14:14 -0700)]
am
2a4a5959: am
42aa0b6c: Merge "More native stack dump hardening."
* commit '
2a4a59596d64be77f601e74a8c3dc739e627d4ae':
More native stack dump hardening.
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:15:47 +0000 (12:15 -0700)]
am
8912ce34: am
7964f9ca: Harden the native stack dumping decision.
* commit '
8912ce34ca467eaebb76b9f2baa4164078a53da9':
Harden the native stack dumping decision.
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:44:57 +0000 (17:44 -0700)]
am
10b196f3: am
6cd2e7bf: Merge "Fix flakiness in test 080-oom-throw."
* commit '
10b196f30282b9e8a50a788c76eeaf6efbefbb60':
Fix flakiness in test 080-oom-throw.
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:59:02 +0000 (16:59 -0700)]
am
b00f965a: am
8d02ea42: Merge "Harden the native stack dumping decision."
* commit '
b00f965aba9e140f7d80fdfebc3a490b34c28208':
Harden the native stack dumping decision.
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:08:30 +0000 (10:08 -0700)]
am
76519bef: Reconcile with jb-mr2-release - do not merge
* commit '
76519befe4d2465afe782a6cc5e812d4458bfb1b':
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:25:09 +0000 (22:25 -0700)]
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:40:33 +0000 (13:40 -0700)]
am
0496604f: Reconcile with jb-mr2-release - do not merge
* commit '
0496604fd45a8bd1350ac6f6cdf61f3cc4201f04':
Revert "Tiny optimization for complier templates for arm."
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:52:39 +0000 (11:52 -0700)]
am
0ba2138b: am
8154297e: Merge "Fix dx to match the new SDK structure." into jb-mr2-dev
* commit '
0ba2138b8432aafc612254cde789901a5eafd731':
Fix dx to match the new SDK structure.
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:52:07 +0000 (17:52 -0700)]
am
61235971: am
1b4500f9: Dump native stacks for all threads in native code.
* commit '
6123597147e2a39ce7506a687daed6d20a5f4fec':
Dump native stacks for all threads in native code.
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:21:41 +0000 (17:21 -0700)]
am
881cbcb2: am
167bd124: Merge "Dump native stacks for all threads in native code."
* commit '
881cbcb24daf226ede0f6f80b2c9595816408869':
Dump native stacks for all threads in native code.
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
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:07:43 +0000 (13:07 -0700)]
am
fa0cad33: am
4afb260c: Revert "Tiny optimization for complier templates for arm."
* commit '
fa0cad33190890bd11c2de588ad0f3d69a0f6329':
Revert "Tiny optimization for complier templates for arm."
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 [Thu, 4 Apr 2013 01:05:25 +0000 (18:05 -0700)]
am
0be32b1b: Reconcile with jb-mr2-release - do not merge
* commit '
0be32b1b45820b239ec2e552c28402ebf1dae866':
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 21:21:11 +0000 (14:21 -0700)]
am
9544fb14: am
1d98bdf6: Merge "Tiny optimization for complier templates for arm."
* commit '
9544fb1464cbd216648d3f9ba1aa03c911ff6f7b':
Tiny optimization for complier templates for arm.
You Kim [Tue, 2 Apr 2013 21:21:06 +0000 (14:21 -0700)]
am
ac024053: am
87bc7988: Tiny optimization for complier templates for arm.
* commit '
ac02405350181999d0d8314d2b18e0ccf6654bab':
Tiny optimization for complier templates for arm.
Elliott Hughes [Tue, 2 Apr 2013 21:21:05 +0000 (14:21 -0700)]
am
c788a610: am
c7bae7a4: Merge "Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile"
* commit '
c788a610ddffdd07083a9ec7ef8a1986b7190333':
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
You Kim [Tue, 2 Apr 2013 21:21:04 +0000 (14:21 -0700)]
am
36b895ea: am
0dcf6bb3: Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
* commit '
36b895ea329e124db4a3c57596acb33eeac10102':
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
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:26:02 +0000 (13:26 -0700)]
am
8d5fd8fd: am
ab3cbf68: Merge "Fix a minor leaks caused by failed initializations.(typo)"
* commit '
8d5fd8fd2b788e57f7170d78e06d85155644aa21':
Fix a minor leaks caused by failed initializations.(typo)
You Kim [Tue, 2 Apr 2013 20:22:41 +0000 (13:22 -0700)]
am
eff23b78: am
e3b363d4: Fix a minor leaks caused by failed initializations.(typo)
* commit '
eff23b788b16e682cf328d0bcb22c3f05b919f72':
Fix a minor leaks caused by failed initializations.(typo)
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
You Kim [Tue, 2 Apr 2013 20:12:26 +0000 (13:12 -0700)]
am
ca0e63fe: am
f0b2389f: Fix a minor leak in handleVM_CreateString
* commit '
ca0e63feabe4ac229928945d7ea135a3f3cf66f3':
Fix a minor leak in handleVM_CreateString
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:35:51 +0000 (12:35 -0700)]
am
af4b7786: am
22d8366a: Merge "Fix a minor leak in handleVM_CreateString"
* commit '
af4b7786163d3bbd28fde13a5f7a2b716bcc10ae':
Fix a minor leak in handleVM_CreateString
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"
The Android Open Source Project [Tue, 2 Apr 2013 18:04:13 +0000 (11:04 -0700)]
am
b9376fdd: Reconcile with jb-mr2-release - do not merge
* commit '
b9376fddcc5d727d7dd68cd3b84a0e8175170bc3':
Udayan Banerji [Tue, 2 Apr 2013 18:03:42 +0000 (11:03 -0700)]
am
567c7f88: am
ed2876e5: [x86] Fix errors with WITH_JIT_TUNING defined
* commit '
567c7f880970a10020fd7a5df2695311e2ea8cf8':
[x86] Fix errors with WITH_JIT_TUNING defined
Udayan Banerji [Tue, 2 Apr 2013 18:03:41 +0000 (11:03 -0700)]
am
8d122ba8: am
82c80de1: [x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
* commit '
8d122ba84ccc0eb6b1e8c0f5303df4a3797463f6':
[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
Udayan Banerji [Tue, 2 Apr 2013 18:03:40 +0000 (11:03 -0700)]
am
ab86d750: am
44272459: [x86] FPU stack needs to be reset after double conversion
* commit '
ab86d75028afbbc1f04ccd182ac4c1108ccb6baa':
[x86] FPU stack needs to be reset after double conversion
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
Udayan Banerji [Fri, 29 Mar 2013 21:05:18 +0000 (14:05 -0700)]
[x86] Fix errors with WITH_JIT_TUNING defined
This patch makes the necessary changes to pass on correct information to
dvmBumpNoChain, so that WITH_JIT_TUNING flag can be enabled for x86 codegen
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
19eb287ac848f10e03ca2614bf53bd9d1ddd3724)
Change-Id: I6871dd0839b3656beed4633e3a0f3df780af98a0
Elliott Hughes [Mon, 1 Apr 2013 23:23:13 +0000 (16:23 -0700)]
am
2e876ff4: am
bf452d48: Merge "[x86] Fix errors with WITH_JIT_TUNING defined"
* commit '
2e876ff4db894fe4f2fc9cb5d1a9fff51c0a7f5a':
[x86] Fix errors with WITH_JIT_TUNING defined
Elliott Hughes [Mon, 1 Apr 2013 23:21:34 +0000 (16:21 -0700)]
am
bf452d48: Merge "[x86] Fix errors with WITH_JIT_TUNING defined"
* commit '
bf452d484529d0022f08cb2efcf31bc30f7ed7d8':
[x86] Fix errors with WITH_JIT_TUNING defined
Udayan Banerji [Fri, 29 Mar 2013 20:32:10 +0000 (13:32 -0700)]
[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
The interpreter doesn't allow SGET/SPUT bytecodes in a trace till the field
is resolved. However, exhaustTrace can pick up bytecodes beyond the trace
sent by the interpreter. Terminate the loop formation if this is seen.
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
4eb6d969de37f9b82aaa4089490900f620e50f46)
Change-Id: If5480640375a5152748e74e00be200d80f313b31
Elliott Hughes [Mon, 1 Apr 2013 23:07:05 +0000 (16:07 -0700)]
am
24474096: am
d335cba5: Merge "[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen"
* commit '
24474096b4624d2f5ab20956bc4d26520935279c':
[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
Elliott Hughes [Mon, 1 Apr 2013 23:05:30 +0000 (16:05 -0700)]
am
d335cba5: Merge "[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen"
* commit '
d335cba5c2868922abf2fa09432f8a938907e2da':
[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
Elliott Hughes [Mon, 1 Apr 2013 23:04:54 +0000 (23:04 +0000)]
Merge "[x86] Fix errors with WITH_JIT_TUNING defined"
Elliott Hughes [Mon, 1 Apr 2013 22:53:09 +0000 (22:53 +0000)]
Merge "[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen"
Udayan Banerji [Mon, 1 Apr 2013 21:27:09 +0000 (14:27 -0700)]
[x86] FPU stack needs to be reset after double conversion
The x86 codegen uses the FPU stack for double/float to long conversions. We
need to clear out the FPU stack after done, to prevent an eventual stack
overflow.
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
05d4f7c4a9e0604a247954220363e28cc92c382d)
Change-Id: I2342de4b4efab74cb88471ded8dcc94899768d7c
Elliott Hughes [Mon, 1 Apr 2013 22:01:08 +0000 (15:01 -0700)]
am
dbb1f813: am
953e6b83: Merge "[x86] FPU stack needs to be reset after double conversion"
* commit '
dbb1f813ad87baad3116c857a99d21b754269fea':
[x86] FPU stack needs to be reset after double conversion
Elliott Hughes [Mon, 1 Apr 2013 21:59:13 +0000 (14:59 -0700)]
am
953e6b83: Merge "[x86] FPU stack needs to be reset after double conversion"
* commit '
953e6b836e514263d1b9a267bf5d613964098d38':
[x86] FPU stack needs to be reset after double conversion
Elliott Hughes [Mon, 1 Apr 2013 21:39:58 +0000 (21:39 +0000)]
Merge "[x86] FPU stack needs to be reset after double conversion"
Udayan Banerji [Mon, 1 Apr 2013 21:27:09 +0000 (14:27 -0700)]
[x86] FPU stack needs to be reset after double conversion
The x86 codegen uses the FPU stack for double/float to long conversions. We
need to clear out the FPU stack after done, to prevent an eventual stack
overflow.
Change-Id: I2f306d7c228ad3da2b84faf9f08326769a9417af
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
Udayan Banerji [Mon, 1 Apr 2013 20:35:52 +0000 (13:35 -0700)]
am
3d80060d: am
cc76e3ff: [x86] Disable Method-JIT for x86 target
* commit '
3d80060d70e50e9b3b3e559f2c9cdc162680daf8':
[x86] Disable Method-JIT for x86 target
Udayan Banerji [Mon, 1 Apr 2013 20:33:35 +0000 (13:33 -0700)]
am
cc76e3ff: [x86] Disable Method-JIT for x86 target
* commit '
cc76e3ff10f5b1fc5b196e531d5a4e108df87913':
[x86] Disable Method-JIT for x86 target
OSDN Git Service
