34939 2010-02-15 05:01:19 -0800 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) 2010-02-15 23:42:33 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Other RESOLVED FIXED P2 Critical --- 1 loki webkit-unassigned barraclough commit-queue zherczeg oldest_to_newest 190430 0 loki 2010-02-15 05:01:19 -0800 There is a typo inside ctiOpThrowNotCaught for JSValue32 on Thumb2. The SP addition should be 0x40 (according to ctiTrampoline). 190431 1 48747 loki 2010-02-15 05:02:56 -0800 Created attachment 48747 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) 190432 2 zherczeg 2010-02-15 05:30:09 -0800 Nice catch. Oh wait, this is a fix for not catch :) 190433 3 loki 2010-02-15 05:41:03 -0800 > Nice catch. Oh wait, this is a fix for not catch :) Hahaha. Thanks Pal! ;) 190604 4 48747 barraclough 2010-02-15 22:41:26 -0800 Comment on attachment 48747 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) r+, but... Here's one way you could make this awesomer. The underlying problem here is that the hardcoded constants in the asm make this code really error prone - it's really easy to miss one of these & end up with a typo like this. So. The magic value 0x40 represents the amount of stack frame that needs to be dynamically allocated on entry through the cti trampoline stub. We expect this to be equal to the offset of enabledProfilerReference within JITStackFrame (and assert such in the JITThunks constructor). You could so something like: #define JIT_STACK_FRAME_ALLOCATION 0x40 #define JIT_STACK_FRAME_ALLOCATION_string STRINGIZE(JIT_STACK_FRAME_ALLOCATION) then change all the asm to use this string instead of the hardcoded constant, e.g.: "add sp, sp," JIT_STACK_FRAME_ALLOCATION_string "\n" and make the assert in JITThunks::JITThunks be: // The fifth argument is the first item already on the stack. ASSERT(OBJECT_OFFSETOF(struct JITStackFrame, enabledProfilerReference) == JIT_STACK_FRAME_ALLOCATION); Less had coded constants should hopefully make this code less fragile in the future. r+ with or without the asm/ASSERT changes suggested. 190611 5 48747 commit-queue 2010-02-15 23:42:26 -0800 Comment on attachment 48747 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) Clearing flags on attachment: 48747 Committed r54809: <http://trac.webkit.org/changeset/54809> 190612 6 commit-queue 2010-02-15 23:42:33 -0800 All reviewed patches have been landed. Closing bug. 48747 2010-02-15 05:02:56 -0800 2010-02-15 23:42:26 -0800 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) 0001-Fix-ctiOpThrowNotCaught.patch text/plain 1326 loki RnJvbSA3YWNlYzdkOTM1MjQ2ZmVlMDM5MTlkNTg1MmFmOTJhODA3NzE4MDkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHYWJvciBMb2tpIDxsb2tpQGluZi51LXN6ZWdlZC5odT4KRGF0 ZTogTW9uLCAxNSBGZWIgMjAxMCAxMTo1MToyMyArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBj dGlPcFRocm93Tm90Q2F1Z2h0CgpTaWduZWQtb2ZmLWJ5OiBHYWJvciBMb2tpIDxsb2tpQHdlYmtp dC5vcmc+Ci0tLQogSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nICAgICAgICB8ICAgIDggKysrKysr KysKIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAgfCAgICAyICstCiAyIGZpbGVzIGNo YW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNTUx MDBkZC4uZGY3NWViMSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBi L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEwLTAyLTE1ICBH YWJvciBMb2tpICA8bG9raUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgU1AgYXQgY3RpT3BUaHJvd05vdENhdWdodCBv biBUaHVtYjIgKEpTVkFMVUUzMikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM0OTM5CisKKyAgICAgICAgKiBqaXQvSklUU3R1YnMuY3BwOgorCiAyMDEw LTAyLTE0ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUv aml0L0pJVFN0dWJzLmNwcCBiL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAKaW5kZXgg ODU0NzFkZS4uZjE4ZjJmYyAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJz LmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCkBAIC02MDAsNyArNjAw LDcgQEAgU1lNQk9MX1NUUklORyhjdGlPcFRocm93Tm90Q2F1Z2h0KSAiOiIgIlxuIgogICAgICJs ZHIgcjUsIFtzcCwgIzB4MjhdIiAiXG4iCiAgICAgImxkciByNCwgW3NwLCAjMHgyNF0iICJcbiIK ICAgICAibGRyIGxyLCBbc3AsICMweDIwXSIgIlxuIgotICAgICJhZGQgc3AsIHNwLCAjMHgzYyIg IlxuIgorICAgICJhZGQgc3AsIHNwLCAjMHg0MCIgIlxuIgogICAgICJieCBsciIgIlxuIgogKTsK IAotLSAKMS41LjQuMwoK