67299 2011-08-31 10:42:11 -0700 Add Android's platform specification and atomic functions 2011-08-31 14:47:26 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Android RESOLVED FIXED P2 Normal --- 66687 66689 1 peter webkit-unassigned abarth andreip mjs steveblock webkit.review.bot oldest_to_newest 459721 0 peter 2011-08-31 10:42:11 -0700 This will re-add the Platform.h changes removed in r94191, and adds Android's atomic functions to WTF. 459724 1 105790 peter 2011-08-31 10:43:15 -0700 Created attachment 105790 Patch 459740 2 105790 steveblock 2011-08-31 10:59:37 -0700 Comment on attachment 105790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105790&action=review LGTM, but I'd like to get somebody else to take a look to double-check the change to Platform.h, perhaps Maciej? Also, shouldn't this bug block Bug 66689? > Source/JavaScriptCore/wtf/Atomics.h:109 > +inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend); } So __atomic_inc/dec() are functionally identical to android_atomic_inc/dec() removed in r94191, but are in the NDK, right? > Source/JavaScriptCore/wtf/Platform.h:306 > +/* OS(ANDRO67299ID) - Android */ ??!! 459781 3 105805 peter 2011-08-31 11:39:56 -0700 Created attachment 105805 Patch 459785 4 peter 2011-08-31 11:41:50 -0700 (In reply to comment #2) > (From update of attachment 105790 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105790&action=review > > LGTM, but I'd like to get somebody else to take a look to double-check the change to Platform.h, perhaps Maciej? Ok, thanks. > > Also, shouldn't this bug block Bug 66689? Yes, you're right. I've added the bug, but won't remove the main one as that'll unnecessarily mail all cc'ed people again. > > > Source/JavaScriptCore/wtf/Atomics.h:109 > > +inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend); } > > So __atomic_inc/dec() are functionally identical to android_atomic_inc/dec() removed in r94191, but are in the NDK, right? Yes. > > > Source/JavaScriptCore/wtf/Platform.h:306 > > +/* OS(ANDRO67299ID) - Android */ > > ??!! Ugh, fixed. 459888 5 105805 abarth 2011-08-31 13:54:07 -0700 Comment on attachment 105805 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105805&action=review The Platform.h changes look fine to me. > Source/JavaScriptCore/wtf/Platform.h:698 > #if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \ > && !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \ > - && !PLATFORM(BREWMP) > + && !OS(ANDROID) && !PLATFORM(BREWMP) This should probably be a whitelist, but that's a change for another day. 459944 6 105805 webkit.review.bot 2011-08-31 14:47:21 -0700 Comment on attachment 105805 Patch Clearing flags on attachment: 105805 Committed r94235: <http://trac.webkit.org/changeset/94235> 459945 7 webkit.review.bot 2011-08-31 14:47:26 -0700 All reviewed patches have been landed. Closing bug. 105790 2011-08-31 10:43:15 -0700 2011-08-31 11:39:56 -0700 Patch atomics.patch text/plain 3477 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDFjMGUzZTIuLjYwNDRmZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA4LTMxICBQZXRlciBCZXZlcmxv byAgPHBldGVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgQW5kcm9pZCdzIHBsYXRmb3Jt IHNwZWNpZmljYXRpb24gYW5kIHRoZSByaWdodCBhdG9taWMgZnVuY3Rpb25zLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcyOTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9BdG9taWNzLmg6Cisg ICAgICAgIChXVEY6OmF0b21pY0luY3JlbWVudCk6CisgICAgICAgIChXVEY6OmF0b21pY0RlY3Jl bWVudCk6CisgICAgICAgICogd3RmL1BsYXRmb3JtLmg6CisKIDIwMTEtMDgtMzEgIEFuZHJlaSBQ b3Blc2N1ICA8YW5kcmVpcEBnb29nbGUuY29tPgogCiAgICAgICAgIEludmVzdGlnYXRlIGN1cnJl bnQgdXNlcyBvZiBPUyhBTkRST0lEKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9BdG9taWNzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0F0b21pY3MuaAppbmRl eCAyMzRmY2RlLi43NmI3YzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3Rm L0F0b21pY3MuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0F0b21pY3MuaApAQCAt NjcsNiArNjcsOCBAQAogI2luY2x1ZGUgPGxpYmtlcm4vT1NBdG9taWMuaD4KICNlbGlmIE9TKFFO WCkKICNpbmNsdWRlIDxhdG9taWMuaD4KKyNlbGlmIE9TKEFORFJPSUQpCisjaW5jbHVkZSA8c3lz L2F0b21pY3MuaD4KICNlbGlmIENPTVBJTEVSKEdDQykgJiYgIU9TKFNZTUJJQU4pCiAjaWYgKF9f R05VQ19fID4gNCkgfHwgKChfX0dOVUNfXyA9PSA0KSAmJiAoX19HTlVDX01JTk9SX18gPj0gMikp CiAjaW5jbHVkZSA8ZXh0L2F0b21pY2l0eS5oPgpAQCAtMTAxLDYgKzEwMywxMSBAQCBpbmxpbmUg aW50IGF0b21pY0RlY3JlbWVudChpbnQgdm9sYXRpbGUqIGFkZGVuZCkgeyByZXR1cm4gT1NBdG9t aWNEZWNyZW1lbnQzMkJhcgogaW5saW5lIGludCBhdG9taWNJbmNyZW1lbnQoaW50IHZvbGF0aWxl KiBhZGRlbmQpIHsgcmV0dXJuIHN0YXRpY19jYXN0PGludD4oYXRvbWljX2FkZF92YWx1ZShyZWlu dGVycHJldF9jYXN0PHVuc2lnbmVkIHZvbGF0aWxlKj4oYWRkZW5kKSwgMSkpICsgMTsgfQogaW5s aW5lIGludCBhdG9taWNEZWNyZW1lbnQoaW50IHZvbGF0aWxlKiBhZGRlbmQpIHsgcmV0dXJuIHN0 YXRpY19jYXN0PGludD4oYXRvbWljX3N1Yl92YWx1ZShyZWludGVycHJldF9jYXN0PHVuc2lnbmVk IHZvbGF0aWxlKj4oYWRkZW5kKSwgMSkpIC0gMTsgfQogCisjZWxpZiBPUyhBTkRST0lEKQorCitp bmxpbmUgaW50IGF0b21pY0luY3JlbWVudChpbnQgdm9sYXRpbGUqIGFkZGVuZCkgeyByZXR1cm4g X19hdG9taWNfaW5jKGFkZGVuZCk7IH0KK2lubGluZSBpbnQgYXRvbWljRGVjcmVtZW50KGludCB2 b2xhdGlsZSogYWRkZW5kKSB7IHJldHVybiBfX2F0b21pY19kZWMoYWRkZW5kKTsgfQorCiAjZWxp ZiBDT01QSUxFUihHQ0MpICYmICFDUFUoU1BBUkM2NCkgJiYgIU9TKFNZTUJJQU4pIC8vIHNpemVv ZihfQXRvbWljX3dvcmQpICE9IHNpemVvZihpbnQpIG9uIHNwYXJjNjQgZ2NjCiAjZGVmaW5lIFdU Rl9VU0VfTE9DS0ZSRUVfVEhSRUFEU0FGRVJFRkNPVU5URUQgMQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d3RmL1BsYXRmb3JtLmgKaW5kZXggYjFjMzNlNS4uOGVmMDZhOCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93dGYvUGxhdGZvcm0uaApAQCAtMTc2LDcgKzE3Niw4IEBACiAjZWxpZiAhZGVmaW5lZChfX0FS TV9FQUJJX18pIFwKICAgICAmJiAhZGVmaW5lZChfX0VBQklfXykgXAogICAgICYmICFkZWZpbmVk KF9fVkZQX0ZQX18pIFwKLSAgICAmJiAhZGVmaW5lZChfV0lOMzJfV0NFKQorICAgICYmICFkZWZp bmVkKF9XSU4zMl9XQ0UpIFwKKyAgICAmJiAhZGVmaW5lZChBTkRST0lEKQogI2RlZmluZSBXVEZf Q1BVX01JRERMRV9FTkRJQU4gMQogCiAjZW5kaWYKQEAgLTMwMiw2ICszMDMsMTEgQEAKIC8qID09 PT0gT1MoKSAtIHVuZGVybHlpbmcgb3BlcmF0aW5nIHN5c3RlbTsgb25seSB0byBiZSB1c2VkIGZv ciBtYW5kYXRlZCBsb3ctbGV2ZWwgc2VydmljZXMgbGlrZSAKICAgIHZpcnR1YWwgbWVtb3J5LCBu b3QgdG8gY2hvb3NlIGEgR1VJIHRvb2xraXQgPT09PSAqLwogCisvKiBPUyhBTkRSTzY3Mjk5SUQp IC0gQW5kcm9pZCAqLworI2lmZGVmIEFORFJPSUQKKyNkZWZpbmUgV1RGX09TX0FORFJPSUQgMQor I2VuZGlmCisKIC8qIE9TKEFJWCkgLSBBSVggKi8KICNpZmRlZiBfQUlYCiAjZGVmaW5lIFdURl9P U19BSVggMQpAQCAtMzg5LDYgKzM5NSw3IEBACiAKIC8qIE9TKFVOSVgpIC0gQW55IFVuaXgtbGlr ZSBzeXN0ZW0gKi8KICNpZiAgIE9TKEFJWCkgICAgICAgICAgICAgIFwKKyAgICB8fCBPUyhBTkRS T0lEKSAgICAgICAgICBcCiAgICAgfHwgT1MoREFSV0lOKSAgICAgICAgICAgXAogICAgIHx8IE9T KEZSRUVCU0QpICAgICAgICAgIFwKICAgICB8fCBPUyhIQUlLVSkgICAgICAgICAgICBcCkBAIC02 ODgsNyArNjk1LDcgQEAKIAogI2lmICFPUyhXSU5ET1dTKSAmJiAhT1MoU09MQVJJUykgJiYgIU9T KFFOWCkgXAogICAgICYmICFPUyhTWU1CSUFOKSAmJiAhT1MoSEFJS1UpICYmICFPUyhSVkNUKSBc Ci0gICAgJiYgIVBMQVRGT1JNKEJSRVdNUCkKKyAgICAmJiAhT1MoQU5EUk9JRCkgJiYgIVBMQVRG T1JNKEJSRVdNUCkKICNkZWZpbmUgSEFWRV9UTV9HTVRPRkYgMQogI2RlZmluZSBIQVZFX1RNX1pP TkUgMQogI2RlZmluZSBIQVZFX1RJTUVHTSAxCkBAIC03NjEsNiArNzY4LDE2IEBACiAjZGVmaW5l IEhBVkVfU1lTX1BBUkFNX0ggMQogI2RlZmluZSBIQVZFX1NZU19USU1FX0ggMQogCisjZWxpZiBP UyhBTkRST0lEKQorCisjZGVmaW5lIEhBVkVfRVJSTk9fSCAxCisjZGVmaW5lIEhBVkVfTEFOR0lO Rk9fSCAwCisjZGVmaW5lIEhBVkVfTk1BUCAxCisjZGVmaW5lIEhBVkVfU0JSSyAxCisjZGVmaW5l IEhBVkVfU1RSSU5HU19IIDEKKyNkZWZpbmUgSEFWRV9TWVNfUEFSQU1fSCAxCisjZGVmaW5lIEhB VkVfU1lTX1RJTUVfSCAxCisKICNlbHNlCiAKIC8qIEZJWE1FOiBpcyB0aGlzIGFjdHVhbGx5IHVz ZWQgb3IgZG8gb3RoZXIgcGxhdGZvcm1zIGdlbmVyYXRlIHRoZWlyIG93biBjb25maWcuaD8gKi8K 105805 2011-08-31 11:39:56 -0700 2011-08-31 14:47:21 -0700 Patch atomics.patch text/plain 3472 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDFjMGUzZTIuLjYwNDRmZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA4LTMxICBQZXRlciBCZXZlcmxv byAgPHBldGVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgQW5kcm9pZCdzIHBsYXRmb3Jt IHNwZWNpZmljYXRpb24gYW5kIHRoZSByaWdodCBhdG9taWMgZnVuY3Rpb25zLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY2ODcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9BdG9taWNzLmg6Cisg ICAgICAgIChXVEY6OmF0b21pY0luY3JlbWVudCk6CisgICAgICAgIChXVEY6OmF0b21pY0RlY3Jl bWVudCk6CisgICAgICAgICogd3RmL1BsYXRmb3JtLmg6CisKIDIwMTEtMDgtMzEgIEFuZHJlaSBQ b3Blc2N1ICA8YW5kcmVpcEBnb29nbGUuY29tPgogCiAgICAgICAgIEludmVzdGlnYXRlIGN1cnJl bnQgdXNlcyBvZiBPUyhBTkRST0lEKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9BdG9taWNzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0F0b21pY3MuaAppbmRl eCAyMzRmY2RlLi43NmI3YzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3Rm L0F0b21pY3MuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0F0b21pY3MuaApAQCAt NjcsNiArNjcsOCBAQAogI2luY2x1ZGUgPGxpYmtlcm4vT1NBdG9taWMuaD4KICNlbGlmIE9TKFFO WCkKICNpbmNsdWRlIDxhdG9taWMuaD4KKyNlbGlmIE9TKEFORFJPSUQpCisjaW5jbHVkZSA8c3lz L2F0b21pY3MuaD4KICNlbGlmIENPTVBJTEVSKEdDQykgJiYgIU9TKFNZTUJJQU4pCiAjaWYgKF9f R05VQ19fID4gNCkgfHwgKChfX0dOVUNfXyA9PSA0KSAmJiAoX19HTlVDX01JTk9SX18gPj0gMikp CiAjaW5jbHVkZSA8ZXh0L2F0b21pY2l0eS5oPgpAQCAtMTAxLDYgKzEwMywxMSBAQCBpbmxpbmUg aW50IGF0b21pY0RlY3JlbWVudChpbnQgdm9sYXRpbGUqIGFkZGVuZCkgeyByZXR1cm4gT1NBdG9t aWNEZWNyZW1lbnQzMkJhcgogaW5saW5lIGludCBhdG9taWNJbmNyZW1lbnQoaW50IHZvbGF0aWxl KiBhZGRlbmQpIHsgcmV0dXJuIHN0YXRpY19jYXN0PGludD4oYXRvbWljX2FkZF92YWx1ZShyZWlu dGVycHJldF9jYXN0PHVuc2lnbmVkIHZvbGF0aWxlKj4oYWRkZW5kKSwgMSkpICsgMTsgfQogaW5s aW5lIGludCBhdG9taWNEZWNyZW1lbnQoaW50IHZvbGF0aWxlKiBhZGRlbmQpIHsgcmV0dXJuIHN0 YXRpY19jYXN0PGludD4oYXRvbWljX3N1Yl92YWx1ZShyZWludGVycHJldF9jYXN0PHVuc2lnbmVk IHZvbGF0aWxlKj4oYWRkZW5kKSwgMSkpIC0gMTsgfQogCisjZWxpZiBPUyhBTkRST0lEKQorCitp bmxpbmUgaW50IGF0b21pY0luY3JlbWVudChpbnQgdm9sYXRpbGUqIGFkZGVuZCkgeyByZXR1cm4g X19hdG9taWNfaW5jKGFkZGVuZCk7IH0KK2lubGluZSBpbnQgYXRvbWljRGVjcmVtZW50KGludCB2 b2xhdGlsZSogYWRkZW5kKSB7IHJldHVybiBfX2F0b21pY19kZWMoYWRkZW5kKTsgfQorCiAjZWxp ZiBDT01QSUxFUihHQ0MpICYmICFDUFUoU1BBUkM2NCkgJiYgIU9TKFNZTUJJQU4pIC8vIHNpemVv ZihfQXRvbWljX3dvcmQpICE9IHNpemVvZihpbnQpIG9uIHNwYXJjNjQgZ2NjCiAjZGVmaW5lIFdU Rl9VU0VfTE9DS0ZSRUVfVEhSRUFEU0FGRVJFRkNPVU5URUQgMQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d3RmL1BsYXRmb3JtLmgKaW5kZXggYjFjMzNlNS4uOGVmMDZhOCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93dGYvUGxhdGZvcm0uaApAQCAtMTc2LDcgKzE3Niw4IEBACiAjZWxpZiAhZGVmaW5lZChfX0FS TV9FQUJJX18pIFwKICAgICAmJiAhZGVmaW5lZChfX0VBQklfXykgXAogICAgICYmICFkZWZpbmVk KF9fVkZQX0ZQX18pIFwKLSAgICAmJiAhZGVmaW5lZChfV0lOMzJfV0NFKQorICAgICYmICFkZWZp bmVkKF9XSU4zMl9XQ0UpIFwKKyAgICAmJiAhZGVmaW5lZChBTkRST0lEKQogI2RlZmluZSBXVEZf Q1BVX01JRERMRV9FTkRJQU4gMQogCiAjZW5kaWYKQEAgLTMwMiw2ICszMDMsMTEgQEAKIC8qID09 PT0gT1MoKSAtIHVuZGVybHlpbmcgb3BlcmF0aW5nIHN5c3RlbTsgb25seSB0byBiZSB1c2VkIGZv ciBtYW5kYXRlZCBsb3ctbGV2ZWwgc2VydmljZXMgbGlrZSAKICAgIHZpcnR1YWwgbWVtb3J5LCBu b3QgdG8gY2hvb3NlIGEgR1VJIHRvb2xraXQgPT09PSAqLwogCisvKiBPUyhBTkRST0lEKSAtIEFu ZHJvaWQgKi8KKyNpZmRlZiBBTkRST0lECisjZGVmaW5lIFdURl9PU19BTkRST0lEIDEKKyNlbmRp ZgorCiAvKiBPUyhBSVgpIC0gQUlYICovCiAjaWZkZWYgX0FJWAogI2RlZmluZSBXVEZfT1NfQUlY IDEKQEAgLTM4OSw2ICszOTUsNyBAQAogCiAvKiBPUyhVTklYKSAtIEFueSBVbml4LWxpa2Ugc3lz dGVtICovCiAjaWYgICBPUyhBSVgpICAgICAgICAgICAgICBcCisgICAgfHwgT1MoQU5EUk9JRCkg ICAgICAgICAgXAogICAgIHx8IE9TKERBUldJTikgICAgICAgICAgIFwKICAgICB8fCBPUyhGUkVF QlNEKSAgICAgICAgICBcCiAgICAgfHwgT1MoSEFJS1UpICAgICAgICAgICAgXApAQCAtNjg4LDcg KzY5NSw3IEBACiAKICNpZiAhT1MoV0lORE9XUykgJiYgIU9TKFNPTEFSSVMpICYmICFPUyhRTlgp IFwKICAgICAmJiAhT1MoU1lNQklBTikgJiYgIU9TKEhBSUtVKSAmJiAhT1MoUlZDVCkgXAotICAg ICYmICFQTEFURk9STShCUkVXTVApCisgICAgJiYgIU9TKEFORFJPSUQpICYmICFQTEFURk9STShC UkVXTVApCiAjZGVmaW5lIEhBVkVfVE1fR01UT0ZGIDEKICNkZWZpbmUgSEFWRV9UTV9aT05FIDEK ICNkZWZpbmUgSEFWRV9USU1FR00gMQpAQCAtNzYxLDYgKzc2OCwxNiBAQAogI2RlZmluZSBIQVZF X1NZU19QQVJBTV9IIDEKICNkZWZpbmUgSEFWRV9TWVNfVElNRV9IIDEKIAorI2VsaWYgT1MoQU5E Uk9JRCkKKworI2RlZmluZSBIQVZFX0VSUk5PX0ggMQorI2RlZmluZSBIQVZFX0xBTkdJTkZPX0gg MAorI2RlZmluZSBIQVZFX05NQVAgMQorI2RlZmluZSBIQVZFX1NCUksgMQorI2RlZmluZSBIQVZF X1NUUklOR1NfSCAxCisjZGVmaW5lIEhBVkVfU1lTX1BBUkFNX0ggMQorI2RlZmluZSBIQVZFX1NZ U19USU1FX0ggMQorCiAjZWxzZQogCiAvKiBGSVhNRTogaXMgdGhpcyBhY3R1YWxseSB1c2VkIG9y IGRvIG90aGVyIHBsYXRmb3JtcyBnZW5lcmF0ZSB0aGVpciBvd24gY29uZmlnLmg/ICovCg==