34855 2010-02-11 11:27:51 -0800 Add a flag to enable JSC JIT in Android, disabled by default 2010-02-22 17:55:49 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 mediadependent mediadependent commit-queue laszlo.gombos mjs webkit.review.bot oldest_to_newest 189756 0 mediadependent 2010-02-11 11:27:51 -0800 Add code that enables SquirrelFish Extreme (a.k.a JSCX, JSC JIT) in Android. It's disabled by default, but can be enabled with a enveronment variable. 189761 1 mediadependent 2010-02-11 11:32:02 -0800 I've already got the code working, please assign it to myself. 191104 2 48916 mediadependent 2010-02-17 11:10:18 -0800 Created attachment 48916 The patch that adds a flag to enable JSC JIT in Android. 191107 3 webkit.review.bot 2010-02-17 11:12:51 -0800 Attachment 48916 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 JavaScriptCore/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] JavaScriptCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] JavaScriptCore/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] JavaScriptCore/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] ChangeLog:5: Line contains tab character. [whitespace/tab] [5] ChangeLog:6: Line contains tab character. [whitespace/tab] [5] ChangeLog:7: Line contains tab character. [whitespace/tab] [5] ChangeLog:8: Line contains tab character. [whitespace/tab] [5] Total errors found: 8 If any of these errors are false positives, please file a bug against check-webkit-style. 191126 4 48916 ariya.hidayat 2010-02-17 11:50:19 -0800 Comment on attachment 48916 The patch that adds a flag to enable JSC JIT in Android. The patch looks fine, but please fix the tabs in the ChangeLog (like the style bot says). 191607 5 49013 mediadependent 2010-02-18 08:06:49 -0800 Created attachment 49013 The revised patch that removes the style violations. 191910 6 mediadependent 2010-02-19 07:48:14 -0800 (In reply to comment #4) > (From update of attachment 48916 [details]) > The patch looks fine, but please fix the tabs in the ChangeLog (like the style > bot says). Hello, I've updated the patch, could you have another look? Thanks! 192163 7 49013 laszlo.gombos 2010-02-20 05:03:02 -0800 Comment on attachment 49013 The revised patch that removes the style violations. > Index: Android.mk > =================================================================== > --- Android.mk (revision 54822) > +++ Android.mk (working copy) > @@ -33,6 +33,8 @@ LOCAL_PATH := $(call my-dir) > # To help setup buildbot, a new environment variable, USE_ALT_JS_ENGINE, > # can be set to true, so that two builds can be different but without > # specifying which JS engine to use. > +# To enable JIT in Android's JSC, please set ENABLE_ANDROID_JSC_JIT environment > +# variable to true. > > # Read JS_ENGINE environment variable > JAVASCRIPT_ENGINE = $(JS_ENGINE) > @@ -199,6 +201,14 @@ LOCAL_CFLAGS += -fno-strict-aliasing > LOCAL_CFLAGS += -include "WebCorePrefix.h" > LOCAL_CFLAGS += -fvisibility=hidden > > +# Enable JSC JIT if JSC is used and ENABLE_ANDROID_JSC_JIT environment > +# variable is set to true > +ifeq ($(JAVASCRIPT_ENGINE),jsc) > +ifeq ($(ENABLE_ANDROID_JSC_JIT),true) The name of the environment variable does not seems to be consistent with the existing environment configuration option for Android. I would suggest to drop the ANDROID name from the name of the environment variable and change ENABLE_ANDROID_JSC_JIT to ENABLE_JSC_JIT. > +LOCAL_CFLAGS += -DENABLE_ANDROID_JSC_JIT=1 Instead of introducing a new (ENABLE_ANDROID_JSC_JIT) C macro that WebKit source tree needs to be aware of, can we maybe use the the existing defines so that Platform.h does not need to change ? Some other ports are using the same technique, see for example JavaScriptCore.pri LOCAL_CFLAGS += "-DENABLE_JIT=1 -DENABLE_YARR=1 -DENABLE_YARR_JIT=1" > +endif > +endif > + The proposed patch is correct, but I'd like to see the inconsistencies with the existing code addressed. 192504 8 49223 mediadependent 2010-02-22 10:15:07 -0800 Created attachment 49223 Revised patch that changes ENABLE_ANDROID_JSC_JIT environment variable to ENABLE_JSC_JIT. 192509 9 mediadependent 2010-02-22 10:23:41 -0800 (In reply to comment #7) > (From update of attachment 49013 [details]) > > Index: Android.mk > > =================================================================== > > --- Android.mk (revision 54822) > > +++ Android.mk (working copy) > > @@ -33,6 +33,8 @@ LOCAL_PATH := $(call my-dir) > > # To help setup buildbot, a new environment variable, USE_ALT_JS_ENGINE, > > # can be set to true, so that two builds can be different but without > > # specifying which JS engine to use. > > +# To enable JIT in Android's JSC, please set ENABLE_ANDROID_JSC_JIT environment > > +# variable to true. > > > > # Read JS_ENGINE environment variable > > JAVASCRIPT_ENGINE = $(JS_ENGINE) > > @@ -199,6 +201,14 @@ LOCAL_CFLAGS += -fno-strict-aliasing > > LOCAL_CFLAGS += -include "WebCorePrefix.h" > > LOCAL_CFLAGS += -fvisibility=hidden > > > > +# Enable JSC JIT if JSC is used and ENABLE_ANDROID_JSC_JIT environment > > +# variable is set to true > > +ifeq ($(JAVASCRIPT_ENGINE),jsc) > > +ifeq ($(ENABLE_ANDROID_JSC_JIT),true) > > The name of the environment variable does not seems to be consistent with the > existing environment configuration option for Android. I would suggest to drop > the ANDROID name from the name of the environment variable and change > ENABLE_ANDROID_JSC_JIT to ENABLE_JSC_JIT. Updated. > > > +LOCAL_CFLAGS += -DENABLE_ANDROID_JSC_JIT=1 > > Instead of introducing a new (ENABLE_ANDROID_JSC_JIT) C macro that WebKit > source tree needs to be aware of, can we maybe use the the existing defines so > that Platform.h does not need to change ? Some other ports are using the same > technique, see for example JavaScriptCore.pri > > LOCAL_CFLAGS += "-DENABLE_JIT=1 -DENABLE_YARR=1 -DENABLE_YARR_JIT=1" I think adding a new C macro makes more sense for following reasons: 1. The new code is consistent with the style of the code that enables JIT on iPhone and other platform. A general webkit reader can quickly understand which platforms JIT is working well. 2. There are cases, that Android is not running on an ARM-Thumb2 core, and the proposed code with new C macro is able to detect that and override the flag. 3. We (Android team) is measuring the performance for JIT, if we decide to use JIT as default later, we'll need to touch Platform.h anyway. > > > +endif > > +endif > > + > > The proposed patch is correct, but I'd like to see the inconsistencies with the > existing code addressed. 192596 10 49223 eric 2010-02-22 13:38:11 -0800 Comment on attachment 49223 Revised patch that changes ENABLE_ANDROID_JSC_JIT environment variable to ENABLE_JSC_JIT. OK. 192729 11 49223 commit-queue 2010-02-22 17:55:44 -0800 Comment on attachment 49223 Revised patch that changes ENABLE_ANDROID_JSC_JIT environment variable to ENABLE_JSC_JIT. Clearing flags on attachment: 49223 Committed r55117: <http://trac.webkit.org/changeset/55117> 192730 12 commit-queue 2010-02-22 17:55:49 -0800 All reviewed patches have been landed. Closing bug. 48916 2010-02-17 11:10:18 -0800 2010-02-18 08:06:49 -0800 The patch that adds a flag to enable JSC JIT in Android. AndroidJscJitPatch.txt text/plain 4236 mediadependent SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDU0OTAw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDIt MTcgIEh1YWh1aSBXdSAgPGh3dUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisJQWRkIGNvZGUgdGhhdCBlbmFibGVzIFNxdWlycmVsRmlzaCBFeHRy ZW1lIChhLmsuYSBKU0NYLCBKU0MgSklUKSBpbiBBbmRyb2lkLgorCUl0J3MgZGlzYWJsZWQgYnkg ZGVmYXVsdCwgYnV0IGlzIGVuYWJsZWQgd2hlbiB0aGUgZW52ZXJvbm1lbnQgdmFyaWFibGUKKwlF TkFCTEVfQU5EUk9JRF9KU0NfSklUIGlzIHNldCB0byB0cnVlLgorCWh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDg1NQorCisgICAgICAgICogQW5kcm9pZC5tazoKKwog MjAxMC0wMi0xNSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgpJbmRleDogQW5kcm9pZC5t awo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBBbmRyb2lkLm1rCShyZXZpc2lvbiA1NDgyMikKKysrIEFuZHJvaWQu bWsJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDggQEAgTE9DQUxfUEFUSCA6PSAkKGNhbGwg bXktZGlyKQogIyAgICBUbyBoZWxwIHNldHVwIGJ1aWxkYm90LCBhIG5ldyBlbnZpcm9ubWVudCB2 YXJpYWJsZSwgVVNFX0FMVF9KU19FTkdJTkUsCiAjICAgIGNhbiBiZSBzZXQgdG8gdHJ1ZSwgc28g dGhhdCB0d28gYnVpbGRzIGNhbiBiZSBkaWZmZXJlbnQgYnV0IHdpdGhvdXQKICMgICAgc3BlY2lm eWluZyB3aGljaCBKUyBlbmdpbmUgdG8gdXNlLgorIyBUbyBlbmFibGUgSklUIGluIEFuZHJvaWQn cyBKU0MsIHBsZWFzZSBzZXQgRU5BQkxFX0FORFJPSURfSlNDX0pJVCBlbnZpcm9ubWVudAorIyB2 YXJpYWJsZSB0byB0cnVlLgogCiAjIFJlYWQgSlNfRU5HSU5FIGVudmlyb25tZW50IHZhcmlhYmxl CiBKQVZBU0NSSVBUX0VOR0lORSA9ICQoSlNfRU5HSU5FKQpAQCAtMTk5LDYgKzIwMSwxNCBAQCBM T0NBTF9DRkxBR1MgKz0gLWZuby1zdHJpY3QtYWxpYXNpbmcKIExPQ0FMX0NGTEFHUyArPSAtaW5j bHVkZSAiV2ViQ29yZVByZWZpeC5oIgogTE9DQUxfQ0ZMQUdTICs9IC1mdmlzaWJpbGl0eT1oaWRk ZW4KIAorIyBFbmFibGUgSlNDIEpJVCBpZiBKU0MgaXMgdXNlZCBhbmQgRU5BQkxFX0FORFJPSURf SlNDX0pJVCBlbnZpcm9ubWVudAorIyB2YXJpYWJsZSBpcyBzZXQgdG8gdHJ1ZQoraWZlcSAoJChK QVZBU0NSSVBUX0VOR0lORSksanNjKQoraWZlcSAoJChFTkFCTEVfQU5EUk9JRF9KU0NfSklUKSx0 cnVlKQorTE9DQUxfQ0ZMQUdTICs9IC1ERU5BQkxFX0FORFJPSURfSlNDX0pJVD0xCitlbmRpZgor ZW5kaWYKKwogaWZlcSAoJChUQVJHRVRfQVJDSCksYXJtKQogTE9DQUxfQ0ZMQUdTICs9IC1EYXJt CiBlbmRpZgpJbmRleDogSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNTQ5MDApCisrKyBKYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMi0xNyAg SHVhaHVpIFd1ICA8aHd1QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKwlBZGQgY29kZSB0aGF0IGVuYWJsZXMgU3F1aXJyZWxGaXNoIEV4dHJlbWUg KGEuay5hIEpTQ1gsIEpTQyBKSVQpIGluIEFuZHJvaWQuCisJSXQncyBkaXNhYmxlZCBieSBkZWZh dWx0LCBidXQgaXMgZW5hYmxlZCB3aGVuIHRoZSBlbnZlcm9ubWVudCB2YXJpYWJsZQorCUVOQUJM RV9BTkRST0lEX0pTQ19KSVQgaXMgc2V0IHRvIHRydWUuCisJaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM0ODU1CisKKyAgICAgICAgKiBBbmRyb2lkLm1rOgorICAgICAg ICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDEwLTAyLTE3ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdh bGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCkluZGV4OiBK YXZhU2NyaXB0Q29yZS9BbmRyb2lkLm1rCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL0Fu ZHJvaWQubWsJKHJldmlzaW9uIDU0ODIyKQorKysgSmF2YVNjcmlwdENvcmUvQW5kcm9pZC5tawko d29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsMTYgQEAgTE9DQUxfU1JDX0ZJTEVTIDo9IFwKIAlp bnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAgXAogCWludGVycHJldGVyL1JlZ2lzdGVyRmlsZS5j cHAgXAogCVwKKwlqaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5jcHBcCisJaml0L0V4ZWN1dGFibGVB bGxvY2F0b3JGaXhlZFZNUG9vbC5jcHAgXAorCWppdC9FeGVjdXRhYmxlQWxsb2NhdG9yUG9zaXgu Y3BwIFwKKwlqaXQvSklULmNwcCBcCisJaml0L0pJVEFyaXRobWV0aWMuY3BwIFwKKwlqaXQvSklU Q2FsbC5jcHAgXAorCWppdC9KSVRPcGNvZGVzLmNwcCBcCisJaml0L0pJVFByb3BlcnR5QWNjZXNz LmNwcCBcCisJaml0L0pJVFN0dWJzLmNwcCBcCisJXAogCXBhcnNlci9MZXhlci5jcHAgXAogCXBh cnNlci9Ob2Rlcy5jcHAgXAogCXBhcnNlci9QYXJzZXIuY3BwIFwKQEAgLTE3MSw3ICsxODEsMTEg QEAgTE9DQUxfU1JDX0ZJTEVTIDo9IFwKIAl3dGYvdW5pY29kZS9Db2xsYXRvckRlZmF1bHQuY3Bw IFwKIAl3dGYvdW5pY29kZS9VVEY4LmNwcCBcCiAJXAotCXd0Zi91bmljb2RlL2ljdS9Db2xsYXRv cklDVS5jcHAKKwl3dGYvdW5pY29kZS9pY3UvQ29sbGF0b3JJQ1UuY3BwIFwKKwlcCisJeWFyci9S ZWdleENvbXBpbGVyLmNwcCBcCisJeWFyci9SZWdleEludGVycHJldGVyLmNwcCBcCisJeWFyci9S ZWdleEpJVC5jcHAKIAogIyBSdWxlIHRvIGJ1aWxkIGdyYW1tYXIueSB3aXRoIG91ciBjdXN0b20g Ymlzb24uCiBHRU4gOj0gJChpbnRlcm1lZGlhdGVzKS9wYXJzZXIvR3JhbW1hci5jcHAKSW5kZXg6 IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRD b3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiA1NDgyMikKKysrIEphdmFTY3JpcHRDb3JlL3d0 Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC04NTYsNiArODU2LDkgQEAgb24gTWluR1cu IFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaAogICAgICNkZWZpbmUgV1RGX1VTRV9KSVRf U1RVQl9BUkdVTUVOVF9WQV9MSVNUIDEKICNlbGlmIENQVShBUk1fVEhVTUIyKSAmJiBQTEFURk9S TShJUEhPTkUpCiAgICAgI2RlZmluZSBFTkFCTEVfSklUIDEKKy8qIFRoZSBKSVQgaXMgdGVzdGVk ICYgd29ya2luZyBvbiBBbmRyb2lkICovCisjZWxpZiBDUFUoQVJNX1RIVU1CMikgJiYgUExBVEZP Uk0oQU5EUk9JRCkgJiYgRU5BQkxFKEFORFJPSURfSlNDX0pJVCkKKyAgICAjZGVmaW5lIEVOQUJM RV9KSVQgMQogLyogVGhlIEpJVCBpcyB0ZXN0ZWQgJiB3b3JraW5nIG9uIHg4NiBXaW5kb3dzICov CiAjZWxpZiBDUFUoWDg2KSAmJiBQTEFURk9STShXSU4pCiAgICAgI2RlZmluZSBFTkFCTEVfSklU IDEKQEAgLTkzNSw2ICs5MzgsNyBAQCBvbiBNaW5HVy4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3NoCiAjaWYgKENQVShYODYpICYmIFBMQVRGT1JNKE1BQykpIFwKICAgICB8fCAoQ1BVKFg4 Nl82NCkgJiYgUExBVEZPUk0oTUFDKSkgXAogICAgIHx8IChDUFUoQVJNX1RIVU1CMikgJiYgUExB VEZPUk0oSVBIT05FKSkgXAorICAgIHx8IChDUFUoQVJNX1RIVU1CMikgJiYgUExBVEZPUk0oQU5E Uk9JRCkgJiYgRU5BQkxFKEFORFJPSURfSlNDX0pJVCkpIFwKICAgICB8fCAoQ1BVKFg4NikgJiYg UExBVEZPUk0oV0lOKSkgXAogICAgIHx8IChDUFUoWDg2KSAmJiBQTEFURk9STShXWCkpCiAjZGVm aW5lIEVOQUJMRV9ZQVJSIDEK 49013 2010-02-18 08:06:49 -0800 2010-02-22 10:15:07 -0800 The revised patch that removes the style violations. AndroidJscJitPatch2.txt text/plain 4294 mediadependent SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDU0OTAw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDIt MTcgIEh1YWh1aSBXdSAgPGh3dUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBjb2RlIHRoYXQgZW5hYmxlcyBTcXVpcnJlbEZp c2ggRXh0cmVtZSAoYS5rLmEgSlNDWCwgSlNDIEpJVCkKKyAgICAgICAgaW4gQW5kcm9pZC4gSXQn cyBkaXNhYmxlZCBieSBkZWZhdWx0LCBidXQgaXMgZW5hYmxlZCB3aGVuIHRoZSAKKyAgICAgICAg ZW52ZXJvbm1lbnQgdmFyaWFibGUgRU5BQkxFX0FORFJPSURfSlNDX0pJVCBpcyBzZXQgdG8gdHJ1 ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODU1 CisKKyAgICAgICAgKiBBbmRyb2lkLm1rOgorCiAyMDEwLTAyLTE1ICBQaGlsaXBwZSBOb3JtYW5k ICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5v cm9uaGEgU2lsdmEuCkluZGV4OiBBbmRyb2lkLm1rCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEFuZHJvaWQubWsJ KHJldmlzaW9uIDU0ODIyKQorKysgQW5kcm9pZC5tawkod29ya2luZyBjb3B5KQpAQCAtMzMsNiAr MzMsOCBAQCBMT0NBTF9QQVRIIDo9ICQoY2FsbCBteS1kaXIpCiAjICAgIFRvIGhlbHAgc2V0dXAg YnVpbGRib3QsIGEgbmV3IGVudmlyb25tZW50IHZhcmlhYmxlLCBVU0VfQUxUX0pTX0VOR0lORSwK ICMgICAgY2FuIGJlIHNldCB0byB0cnVlLCBzbyB0aGF0IHR3byBidWlsZHMgY2FuIGJlIGRpZmZl cmVudCBidXQgd2l0aG91dAogIyAgICBzcGVjaWZ5aW5nIHdoaWNoIEpTIGVuZ2luZSB0byB1c2Uu CisjIFRvIGVuYWJsZSBKSVQgaW4gQW5kcm9pZCdzIEpTQywgcGxlYXNlIHNldCBFTkFCTEVfQU5E Uk9JRF9KU0NfSklUIGVudmlyb25tZW50CisjIHZhcmlhYmxlIHRvIHRydWUuCiAKICMgUmVhZCBK U19FTkdJTkUgZW52aXJvbm1lbnQgdmFyaWFibGUKIEpBVkFTQ1JJUFRfRU5HSU5FID0gJChKU19F TkdJTkUpCkBAIC0xOTksNiArMjAxLDE0IEBAIExPQ0FMX0NGTEFHUyArPSAtZm5vLXN0cmljdC1h bGlhc2luZwogTE9DQUxfQ0ZMQUdTICs9IC1pbmNsdWRlICJXZWJDb3JlUHJlZml4LmgiCiBMT0NB TF9DRkxBR1MgKz0gLWZ2aXNpYmlsaXR5PWhpZGRlbgogCisjIEVuYWJsZSBKU0MgSklUIGlmIEpT QyBpcyB1c2VkIGFuZCBFTkFCTEVfQU5EUk9JRF9KU0NfSklUIGVudmlyb25tZW50CisjIHZhcmlh YmxlIGlzIHNldCB0byB0cnVlCitpZmVxICgkKEpBVkFTQ1JJUFRfRU5HSU5FKSxqc2MpCitpZmVx ICgkKEVOQUJMRV9BTkRST0lEX0pTQ19KSVQpLHRydWUpCitMT0NBTF9DRkxBR1MgKz0gLURFTkFC TEVfQU5EUk9JRF9KU0NfSklUPTEKK2VuZGlmCitlbmRpZgorCiBpZmVxICgkKFRBUkdFVF9BUkNI KSxhcm0pCiBMT0NBTF9DRkxBR1MgKz0gLURhcm0KIGVuZGlmCkluZGV4OiBKYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZp c2lvbiA1NDkwMCkKKysrIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDEwLTAyLTE3ICBIdWFodWkgV3UgIDxod3VAZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29k ZSB0aGF0IGVuYWJsZXMgU3F1aXJyZWxGaXNoIEV4dHJlbWUgKGEuay5hIEpTQ1gsIEpTQyBKSVQp CisgICAgICAgIGluIEFuZHJvaWQuIEl0J3MgZGlzYWJsZWQgYnkgZGVmYXVsdCwgYnV0IGlzIGVu YWJsZWQgd2hlbiB0aGUgCisgICAgICAgIGVudmVyb25tZW50IHZhcmlhYmxlIEVOQUJMRV9BTkRS T0lEX0pTQ19KSVQgaXMgc2V0IHRvIHRydWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNDg1NQorCisgICAgICAgICogQW5kcm9pZC5tazoKKyAgICAg ICAgKiB3dGYvUGxhdGZvcm0uaDoKKwogMjAxMC0wMi0xNyAgWGFuIExvcGV6ICA8eGxvcGV6QGln YWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhLgpJbmRleDog SmF2YVNjcmlwdENvcmUvQW5kcm9pZC5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9B bmRyb2lkLm1rCShyZXZpc2lvbiA1NDgyMikKKysrIEphdmFTY3JpcHRDb3JlL0FuZHJvaWQubWsJ KHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1LDE2IEBAIExPQ0FMX1NSQ19GSUxFUyA6PSBcCiAJ aW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwIFwKIAlpbnRlcnByZXRlci9SZWdpc3RlckZpbGUu Y3BwIFwKIAlcCisJaml0L0V4ZWN1dGFibGVBbGxvY2F0b3IuY3BwXAorCWppdC9FeGVjdXRhYmxl QWxsb2NhdG9yRml4ZWRWTVBvb2wuY3BwIFwKKwlqaXQvRXhlY3V0YWJsZUFsbG9jYXRvclBvc2l4 LmNwcCBcCisJaml0L0pJVC5jcHAgXAorCWppdC9KSVRBcml0aG1ldGljLmNwcCBcCisJaml0L0pJ VENhbGwuY3BwIFwKKwlqaXQvSklUT3Bjb2Rlcy5jcHAgXAorCWppdC9KSVRQcm9wZXJ0eUFjY2Vz cy5jcHAgXAorCWppdC9KSVRTdHVicy5jcHAgXAorCVwKIAlwYXJzZXIvTGV4ZXIuY3BwIFwKIAlw YXJzZXIvTm9kZXMuY3BwIFwKIAlwYXJzZXIvUGFyc2VyLmNwcCBcCkBAIC0xNzEsNyArMTgxLDEx IEBAIExPQ0FMX1NSQ19GSUxFUyA6PSBcCiAJd3RmL3VuaWNvZGUvQ29sbGF0b3JEZWZhdWx0LmNw cCBcCiAJd3RmL3VuaWNvZGUvVVRGOC5jcHAgXAogCVwKLQl3dGYvdW5pY29kZS9pY3UvQ29sbGF0 b3JJQ1UuY3BwCisJd3RmL3VuaWNvZGUvaWN1L0NvbGxhdG9ySUNVLmNwcCBcCisJXAorCXlhcnIv UmVnZXhDb21waWxlci5jcHAgXAorCXlhcnIvUmVnZXhJbnRlcnByZXRlci5jcHAgXAorCXlhcnIv UmVnZXhKSVQuY3BwCiAKICMgUnVsZSB0byBidWlsZCBncmFtbWFyLnkgd2l0aCBvdXIgY3VzdG9t IGJpc29uLgogR0VOIDo9ICQoaW50ZXJtZWRpYXRlcykvcGFyc2VyL0dyYW1tYXIuY3BwCkluZGV4 OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNTQ4MjIpCisrKyBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtODU2LDYgKzg1Niw5IEBAIG9uIE1pbkdX LiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2gKICAgICAjZGVmaW5lIFdURl9VU0VfSklU X1NUVUJfQVJHVU1FTlRfVkFfTElTVCAxCiAjZWxpZiBDUFUoQVJNX1RIVU1CMikgJiYgUExBVEZP Uk0oSVBIT05FKQogICAgICNkZWZpbmUgRU5BQkxFX0pJVCAxCisvKiBUaGUgSklUIGlzIHRlc3Rl ZCAmIHdvcmtpbmcgb24gQW5kcm9pZCAqLworI2VsaWYgQ1BVKEFSTV9USFVNQjIpICYmIFBMQVRG T1JNKEFORFJPSUQpICYmIEVOQUJMRShBTkRST0lEX0pTQ19KSVQpCisgICAgI2RlZmluZSBFTkFC TEVfSklUIDEKIC8qIFRoZSBKSVQgaXMgdGVzdGVkICYgd29ya2luZyBvbiB4ODYgV2luZG93cyAq LwogI2VsaWYgQ1BVKFg4NikgJiYgUExBVEZPUk0oV0lOKQogICAgICNkZWZpbmUgRU5BQkxFX0pJ VCAxCkBAIC05MzUsNiArOTM4LDcgQEAgb24gTWluR1cuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaAogI2lmIChDUFUoWDg2KSAmJiBQTEFURk9STShNQUMpKSBcCiAgICAgfHwgKENQVShY ODZfNjQpICYmIFBMQVRGT1JNKE1BQykpIFwKICAgICB8fCAoQ1BVKEFSTV9USFVNQjIpICYmIFBM QVRGT1JNKElQSE9ORSkpIFwKKyAgICB8fCAoQ1BVKEFSTV9USFVNQjIpICYmIFBMQVRGT1JNKEFO RFJPSUQpICYmIEVOQUJMRShBTkRST0lEX0pTQ19KSVQpKSBcCiAgICAgfHwgKENQVShYODYpICYm IFBMQVRGT1JNKFdJTikpIFwKICAgICB8fCAoQ1BVKFg4NikgJiYgUExBVEZPUk0oV1gpKQogI2Rl ZmluZSBFTkFCTEVfWUFSUiAxCg== 49223 2010-02-22 10:15:07 -0800 2010-02-22 17:55:44 -0800 Revised patch that changes ENABLE_ANDROID_JSC_JIT environment variable to ENABLE_JSC_JIT. AndroidJscJitPatch3.txt text/plain 4254 mediadependent SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDU0OTAw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDIt MTcgIEh1YWh1aSBXdSAgPGh3dUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBjb2RlIHRoYXQgZW5hYmxlcyBTcXVpcnJlbEZp c2ggRXh0cmVtZSAoYS5rLmEgSlNDWCwgSlNDIEpJVCkKKyAgICAgICAgaW4gQW5kcm9pZC4gSXQn cyBkaXNhYmxlZCBieSBkZWZhdWx0LCBidXQgaXMgZW5hYmxlZCB3aGVuIHRoZSAKKyAgICAgICAg ZW52ZXJvbm1lbnQgdmFyaWFibGUgRU5BQkxFX0pTQ19KSVQgaXMgc2V0IHRvIHRydWUuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDg1NQorCisgICAg ICAgICogQW5kcm9pZC5tazoKKwogMjAxMC0wMi0xNSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNp bHZhLgpJbmRleDogQW5kcm9pZC5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBBbmRyb2lkLm1rCShyZXZpc2lv biA1NDgyMikKKysrIEFuZHJvaWQubWsJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDggQEAg TE9DQUxfUEFUSCA6PSAkKGNhbGwgbXktZGlyKQogIyAgICBUbyBoZWxwIHNldHVwIGJ1aWxkYm90 LCBhIG5ldyBlbnZpcm9ubWVudCB2YXJpYWJsZSwgVVNFX0FMVF9KU19FTkdJTkUsCiAjICAgIGNh biBiZSBzZXQgdG8gdHJ1ZSwgc28gdGhhdCB0d28gYnVpbGRzIGNhbiBiZSBkaWZmZXJlbnQgYnV0 IHdpdGhvdXQKICMgICAgc3BlY2lmeWluZyB3aGljaCBKUyBlbmdpbmUgdG8gdXNlLgorIyBUbyBl bmFibGUgSklUIGluIEFuZHJvaWQncyBKU0MsIHBsZWFzZSBzZXQgRU5BQkxFX0pTQ19KSVQgZW52 aXJvbm1lbnQKKyMgdmFyaWFibGUgdG8gdHJ1ZS4KIAogIyBSZWFkIEpTX0VOR0lORSBlbnZpcm9u bWVudCB2YXJpYWJsZQogSkFWQVNDUklQVF9FTkdJTkUgPSAkKEpTX0VOR0lORSkKQEAgLTE5OSw2 ICsyMDEsMTQgQEAgTE9DQUxfQ0ZMQUdTICs9IC1mbm8tc3RyaWN0LWFsaWFzaW5nCiBMT0NBTF9D RkxBR1MgKz0gLWluY2x1ZGUgIldlYkNvcmVQcmVmaXguaCIKIExPQ0FMX0NGTEFHUyArPSAtZnZp c2liaWxpdHk9aGlkZGVuCiAKKyMgRW5hYmxlIEpTQyBKSVQgaWYgSlNDIGlzIHVzZWQgYW5kIEVO QUJMRV9KU0NfSklUIGVudmlyb25tZW50CisjIHZhcmlhYmxlIGlzIHNldCB0byB0cnVlCitpZmVx ICgkKEpBVkFTQ1JJUFRfRU5HSU5FKSxqc2MpCitpZmVxICgkKEVOQUJMRV9KU0NfSklUKSx0cnVl KQorTE9DQUxfQ0ZMQUdTICs9IC1ERU5BQkxFX0FORFJPSURfSlNDX0pJVD0xCitlbmRpZgorZW5k aWYKKwogaWZlcSAoJChUQVJHRVRfQVJDSCksYXJtKQogTE9DQUxfQ0ZMQUdTICs9IC1EYXJtCiBl bmRpZgpJbmRleDogSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNTQ5MDApCisrKyBKYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMi0xNyAgSHVh aHVpIFd1ICA8aHd1QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGNvZGUgdGhhdCBlbmFibGVzIFNxdWlycmVsRmlzaCBFeHRy ZW1lIChhLmsuYSBKU0NYLCBKU0MgSklUKQorICAgICAgICBpbiBBbmRyb2lkLiBJdCdzIGRpc2Fi bGVkIGJ5IGRlZmF1bHQsIGJ1dCBpcyBlbmFibGVkIHdoZW4gdGhlIAorICAgICAgICBlbnZlcm9u bWVudCB2YXJpYWJsZSBFTkFCTEVfSlNDX0pJVCBpcyBzZXQgdG8gdHJ1ZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODU1CisKKyAgICAgICAgKiBB bmRyb2lkLm1rOgorICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDEwLTAyLTE3ICBYYW4g TG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZv IE5vcm9uaGEuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9BbmRyb2lkLm1rCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IEphdmFTY3JpcHRDb3JlL0FuZHJvaWQubWsJKHJldmlzaW9uIDU0ODIyKQorKysgSmF2YVNjcmlw dENvcmUvQW5kcm9pZC5tawkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsMTYgQEAgTE9DQUxf U1JDX0ZJTEVTIDo9IFwKIAlpbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAgXAogCWludGVycHJl dGVyL1JlZ2lzdGVyRmlsZS5jcHAgXAogCVwKKwlqaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5jcHBc CisJaml0L0V4ZWN1dGFibGVBbGxvY2F0b3JGaXhlZFZNUG9vbC5jcHAgXAorCWppdC9FeGVjdXRh YmxlQWxsb2NhdG9yUG9zaXguY3BwIFwKKwlqaXQvSklULmNwcCBcCisJaml0L0pJVEFyaXRobWV0 aWMuY3BwIFwKKwlqaXQvSklUQ2FsbC5jcHAgXAorCWppdC9KSVRPcGNvZGVzLmNwcCBcCisJaml0 L0pJVFByb3BlcnR5QWNjZXNzLmNwcCBcCisJaml0L0pJVFN0dWJzLmNwcCBcCisJXAogCXBhcnNl ci9MZXhlci5jcHAgXAogCXBhcnNlci9Ob2Rlcy5jcHAgXAogCXBhcnNlci9QYXJzZXIuY3BwIFwK QEAgLTE3MSw3ICsxODEsMTEgQEAgTE9DQUxfU1JDX0ZJTEVTIDo9IFwKIAl3dGYvdW5pY29kZS9D b2xsYXRvckRlZmF1bHQuY3BwIFwKIAl3dGYvdW5pY29kZS9VVEY4LmNwcCBcCiAJXAotCXd0Zi91 bmljb2RlL2ljdS9Db2xsYXRvcklDVS5jcHAKKwl3dGYvdW5pY29kZS9pY3UvQ29sbGF0b3JJQ1Uu Y3BwIFwKKwlcCisJeWFyci9SZWdleENvbXBpbGVyLmNwcCBcCisJeWFyci9SZWdleEludGVycHJl dGVyLmNwcCBcCisJeWFyci9SZWdleEpJVC5jcHAKIAogIyBSdWxlIHRvIGJ1aWxkIGdyYW1tYXIu eSB3aXRoIG91ciBjdXN0b20gYmlzb24uCiBHRU4gOj0gJChpbnRlcm1lZGlhdGVzKS9wYXJzZXIv R3JhbW1hci5jcHAKSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiA1NDgyMikKKysr IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC04NTYsNiAr ODU2LDkgQEAgb24gTWluR1cuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaAogICAgICNk ZWZpbmUgV1RGX1VTRV9KSVRfU1RVQl9BUkdVTUVOVF9WQV9MSVNUIDEKICNlbGlmIENQVShBUk1f VEhVTUIyKSAmJiBQTEFURk9STShJUEhPTkUpCiAgICAgI2RlZmluZSBFTkFCTEVfSklUIDEKKy8q IFRoZSBKSVQgaXMgdGVzdGVkICYgd29ya2luZyBvbiBBbmRyb2lkICovCisjZWxpZiBDUFUoQVJN X1RIVU1CMikgJiYgUExBVEZPUk0oQU5EUk9JRCkgJiYgRU5BQkxFKEFORFJPSURfSlNDX0pJVCkK KyAgICAjZGVmaW5lIEVOQUJMRV9KSVQgMQogLyogVGhlIEpJVCBpcyB0ZXN0ZWQgJiB3b3JraW5n IG9uIHg4NiBXaW5kb3dzICovCiAjZWxpZiBDUFUoWDg2KSAmJiBQTEFURk9STShXSU4pCiAgICAg I2RlZmluZSBFTkFCTEVfSklUIDEKQEAgLTkzNSw2ICs5MzgsNyBAQCBvbiBNaW5HVy4gU2VlIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3NoCiAjaWYgKENQVShYODYpICYmIFBMQVRGT1JNKE1BQykp IFwKICAgICB8fCAoQ1BVKFg4Nl82NCkgJiYgUExBVEZPUk0oTUFDKSkgXAogICAgIHx8IChDUFUo QVJNX1RIVU1CMikgJiYgUExBVEZPUk0oSVBIT05FKSkgXAorICAgIHx8IChDUFUoQVJNX1RIVU1C MikgJiYgUExBVEZPUk0oQU5EUk9JRCkgJiYgRU5BQkxFKEFORFJPSURfSlNDX0pJVCkpIFwKICAg ICB8fCAoQ1BVKFg4NikgJiYgUExBVEZPUk0oV0lOKSkgXAogICAgIHx8IChDUFUoWDg2KSAmJiBQ TEFURk9STShXWCkpCiAjZGVmaW5lIEVOQUJMRV9ZQVJSIDEK