OSDN Git Service
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
Udayan Banerji [Fri, 29 Mar 2013 17:52:32 +0000 (10:52 -0700)]
[x86] Disable Method-JIT for x86 target
Disable Method JIT when compiling for x86 target.
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
8d8a7958a7aa0c73273161ddacfad34d1b9a97fe)
Change-Id: Ic0a809dc4f80e74db445b20f252d8c9707420588
Elliott Hughes [Mon, 1 Apr 2013 20:22:41 +0000 (13:22 -0700)]
am
35aa6a6b: am
ddff71d4: Merge "[x86] Disable Method-JIT for x86 target"
* commit '
35aa6a6bb1cd3871c3b6c32c9f4cce56e33112ee':
[x86] Disable Method-JIT for x86 target
Elliott Hughes [Mon, 1 Apr 2013 20:20:48 +0000 (13:20 -0700)]
am
ddff71d4: Merge "[x86] Disable Method-JIT for x86 target"
* commit '
ddff71d449765984d1cae6b6e8191fa9956d135b':
[x86] Disable Method-JIT for x86 target
Elliott Hughes [Mon, 1 Apr 2013 20:08:46 +0000 (20:08 +0000)]
Merge "[x86] Disable Method-JIT for x86 target"
The Android Automerger [Mon, 1 Apr 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Sat, 30 Mar 2013 01:09:43 +0000 (18:09 -0700)]
am
870318c5: am
cbe8d43e: Fix a cast in JniEnv::NewDirectByteBuffer.
* commit '
870318c59b17d132c74c9dd503f3bd15562c80c6':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 01:09:42 +0000 (18:09 -0700)]
am
a741ad6d: am
30165bdf: Track libcore\'s DirectByteBuffer <init> change.
* commit '
a741ad6dbf8af55271538dea51851bc77caba968':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 01:08:06 +0000 (18:08 -0700)]
am
cbe8d43e: Fix a cast in JniEnv::NewDirectByteBuffer.
* commit '
cbe8d43ea02e7885504a90461283d2bd8456aaa6':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 01:04:38 +0000 (18:04 -0700)]
am
30165bdf: Track libcore\'s DirectByteBuffer <init> change.
* commit '
30165bdf59a0395c6b87ce58fc60e4586a92d147':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 00:27:28 +0000 (17:27 -0700)]
Fix a cast in JniEnv::NewDirectByteBuffer.
(cherry picked from commit
1abc689a32fc20b38227060e4da5e0934df8fc19)
Change-Id: I89c8544d77721aaa5ae192087e8873d3d64d5f3b
Elliott Hughes [Sat, 30 Mar 2013 01:02:40 +0000 (18:02 -0700)]
am
fdfb24a4: am
497385d4: Merge "Fix a cast in JniEnv::NewDirectByteBuffer."
* commit '
fdfb24a474850329adce2308041301a607c9d685':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 00:19:31 +0000 (17:19 -0700)]
Track libcore's DirectByteBuffer <init> change.
See
9ce6a2533b50ffcd24b8b10bae7f234042768819.
(cherry picked from commit
e5d14162ff278c41e09c42769cc31401feeeba18)
Change-Id: I41be5581fd6f6c68243194d79c45450eeba86333
Elliott Hughes [Sat, 30 Mar 2013 00:59:22 +0000 (17:59 -0700)]
am
497385d4: Merge "Fix a cast in JniEnv::NewDirectByteBuffer."
* commit '
497385d4994ce49b8ef1efa3de6efb03afd333b9':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 00:58:47 +0000 (17:58 -0700)]
am
a34ad1c6: am
2a213ecf: Merge "Track libcore\'s DirectByteBuffer <init> change."
* commit '
a34ad1c6aa7c8bf9670c7565d9fa27d2d5614483':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 00:58:39 +0000 (17:58 -0700)]
am
69448f17: am
91b8b139: Extra log information when pthread_create fails.
* commit '
69448f178cf6834a2b80cf4fed15701e92b08b5b':
Extra log information when pthread_create fails.
Elliott Hughes [Sat, 30 Mar 2013 00:42:17 +0000 (00:42 +0000)]
Merge "Fix a cast in JniEnv::NewDirectByteBuffer."
Elliott Hughes [Sat, 30 Mar 2013 00:28:07 +0000 (17:28 -0700)]
am
2a213ecf: Merge "Track libcore\'s DirectByteBuffer <init> change."
* commit '
2a213ecf8c8d619f325e3576199142c61b8551b3':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 00:27:28 +0000 (17:27 -0700)]
Fix a cast in JniEnv::NewDirectByteBuffer.
Change-Id: I8692b31c6ce64efc68124df02117b6e4529dfe98
Elliott Hughes [Sat, 30 Mar 2013 00:20:29 +0000 (00:20 +0000)]
Merge "Track libcore's DirectByteBuffer <init> change."
Elliott Hughes [Sat, 30 Mar 2013 00:19:31 +0000 (17:19 -0700)]
Track libcore's DirectByteBuffer <init> change.
See
9ce6a2533b50ffcd24b8b10bae7f234042768819.
Change-Id: Ie736e69a3fa7bdf55709d8e2960761202a20e820
Elliott Hughes [Sat, 30 Mar 2013 00:06:12 +0000 (17:06 -0700)]
am
91b8b139: Extra log information when pthread_create fails.
* commit '
91b8b139893877cca509f35afa0075713d2ff7f3':
Extra log information when pthread_create fails.
Elliott Hughes [Fri, 29 Mar 2013 23:37:25 +0000 (16:37 -0700)]
Extra log information when pthread_create fails.
Bug:
8470684
(cherry picked from commit
3eeda5e6fe172758e47d237694daf4f9421f3c12)
Change-Id: Ideba410d393b69753bbfae7558a2692edd08d339
Elliott Hughes [Fri, 29 Mar 2013 23:58:02 +0000 (16:58 -0700)]
am
7450fa7b: am
1fb2fed5: Merge "Extra log information when pthread_create fails."
* commit '
7450fa7b9234a3e4f902fe58abbf91b9e39adc87':
Extra log information when pthread_create fails.
Elliott Hughes [Fri, 29 Mar 2013 23:53:02 +0000 (16:53 -0700)]
am
1fb2fed5: Merge "Extra log information when pthread_create fails."
* commit '
1fb2fed51f7d7376fb067a0fc32ae8d3eade843a':
Extra log information when pthread_create fails.
Elliott Hughes [Fri, 29 Mar 2013 23:47:53 +0000 (23:47 +0000)]
Merge "Extra log information when pthread_create fails."
Elliott Hughes [Fri, 29 Mar 2013 23:37:25 +0000 (16:37 -0700)]
Extra log information when pthread_create fails.
Bug:
8470684
Change-Id: I24d22d5ec4181614d173a582773540c8f712ab18
Elliott Hughes [Fri, 29 Mar 2013 21:35:05 +0000 (14:35 -0700)]
am
afc61c6f: am
4d5b4344: am
84975d53: am
9813216f: Merge "Track 64-bit nio changes."
* commit '
afc61c6fac3b855236fce1b062e1e2facdea641f':
Track 64-bit nio changes.
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
Change-Id: Ia5e5c0406433bf645ef67143d0f1a11a28153a66
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
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.
Change-Id: I0f38d6690b3501111bd16103623fa545d0ec1873
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
Udayan Banerji [Fri, 29 Mar 2013 17:52:32 +0000 (10:52 -0700)]
[x86] Disable Method-JIT for x86 target
Disable Method JIT when compiling for x86 target.
Change-Id: Ide0dbd1f602ffd955b901cc152de1e05771fd529
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
Elliott Hughes [Fri, 29 Mar 2013 17:26:17 +0000 (10:26 -0700)]
am
4d5b4344: am
84975d53: am
9813216f: Merge "Track 64-bit nio changes."
* commit '
4d5b4344904b099ea60b770df61d4e19bf23ecf1':
Track 64-bit nio changes.
Elliott Hughes [Fri, 29 Mar 2013 17:21:56 +0000 (10:21 -0700)]
am
84975d53: am
9813216f: Merge "Track 64-bit nio changes."
* commit '
84975d535edf98e911caf2a1bca1e7810aa03ccb':
Track 64-bit nio changes.
Elliott Hughes [Fri, 29 Mar 2013 17:19:31 +0000 (10:19 -0700)]
am
9813216f: Merge "Track 64-bit nio changes."
* commit '
9813216f8845e1c4a6dc4d2a10aa227e7d43f858':
Track 64-bit nio changes.
Elliott Hughes [Fri, 29 Mar 2013 17:14:49 +0000 (17:14 +0000)]
Merge "Track 64-bit nio changes."
Elliott Hughes [Fri, 29 Mar 2013 16:59:23 +0000 (09:59 -0700)]
Track 64-bit nio changes.
Change-Id: Id7a11af5f94b8ba82d42e1e7045302aca533f31a
The Android Open Source Project [Fri, 29 Mar 2013 16:50:36 +0000 (09:50 -0700)]
am
a5bf9b6d: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a5bf9b6d355a6a82fc9f00959c744cf32c936953':
The Android Open Source Project [Fri, 29 Mar 2013 16:48:37 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I8e1546cee7e24bc1407c8b022d29d463a661839a
Elliott Hughes [Thu, 28 Mar 2013 15:47:33 +0000 (08:47 -0700)]
am
fd21b120: am
51c578b6: am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
fd21b120062976f20450ac3cf80f980b54c59e00':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:45:22 +0000 (08:45 -0700)]
am
51c578b6: am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
51c578b64b7cd3e2fb8c3370d398507e28a47adc':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:42:57 +0000 (08:42 -0700)]
am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
df0568374da4856271a1a678208c638a0276b169':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:41:21 +0000 (08:41 -0700)]
am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
ef64fc32d412d64e180cb90ee29ff46af7391580':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:29:43 +0000 (15:29 +0000)]
Merge "Track libcore DirectByteBuffer cleanup."