123734 2013-11-04 03:17:47 -0800 [sh4] Jumps in baseline JIT should return label after the jump 2013-11-04 10:19:45 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbriance webkit-unassigned commit-queue fpizlo mark.lam msaboff oliver yannick.poirier oldest_to_newest 946598 0 jbriance 2013-11-04 03:17:47 -0800 Current implementation of jumps in sh4 baseline JIT returns a label on the jump itself and not after it. This is not correct and leads to issues like https://bugs.webkit.org/show_bug.cgi?id=122597 Jumps for sh4 must be refactored to return labels after the jump, like other ports do (x86, arm, mips ...). 946600 1 jbriance 2013-11-04 03:19:26 -0800 *** Bug 122597 has been marked as a duplicate of this bug. *** 946634 2 215913 jbriance 2013-11-04 04:49:46 -0800 Created attachment 215913 Refactor jumps in sh4 baseline JIT to return label after the jump. 946718 3 215913 commit-queue 2013-11-04 10:19:42 -0800 Comment on attachment 215913 Refactor jumps in sh4 baseline JIT to return label after the jump. Clearing flags on attachment: 215913 Committed r158580: <http://trac.webkit.org/changeset/158580> 946719 4 commit-queue 2013-11-04 10:19:45 -0800 All reviewed patches have been landed. Closing bug. 215913 2013-11-04 04:49:46 -0800 2013-11-04 10:19:42 -0800 Refactor jumps in sh4 baseline JIT to return label after the jump. bug-123734.patch text/plain 11483 jbriance SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU4NTY1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBA CisyMDEzLTExLTA0ICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VAY2lzY28uY29tPgorCisg ICAgICAgIFtzaDRdIFJlZmFjdG9yIGp1bXBzIGluIGJhc2VsaW5lIEpJVCB0byByZXR1cm4gbGFi ZWwgYWZ0ZXIgdGhlIGp1bXAuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjM3MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDdXJyZW50IGltcGxlbWVudGF0aW9uIG9mIGp1bXBzIGluIHNoNCBiYXNlbGlu ZSBKSVQgcmV0dXJucyBhIGxhYmVsIG9uIHRoZSBqdW1wIGl0c2VsZgorICAgICAgICBhbmQgbm90 IGFmdGVyIGl0LiBUaGlzIGlzIG5vdCBjb3JyZWN0IGFuZCBsZWFkcyB0byBpc3N1ZXMgbGlrZSBp bmZpbml0ZSBsb29wIHRoZSBERkcKKyAgICAgICAgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjI1OTcgZm9yIGluc3RhbmNlKS4gVGhpcyByZWZhY3RvciBmaXhlcyB0 aGlzCisgICAgICAgIGFuZCBhbHNvIHNpbXBsaWZpZXMgdGhlIGxpbmsgYW5kIHJlbGluayBwcm9j ZWR1cmVzIGZvciBzaDQganVtcHMuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJs ZXJTSDQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJTSDQ6OmJyYW5jaERvdWJsZSk6 CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyU0g0OjpicmFuY2hUcnVlKToKKyAgICAgICAg KEpTQzo6TWFjcm9Bc3NlbWJsZXJTSDQ6OmJyYW5jaEZhbHNlKToKKyAgICAgICAgKiBhc3NlbWJs ZXIvU0g0QXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6OlNINEFzc2VtYmxlcjo6am1wKToKKyAg ICAgICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpleHRyYUluc3RyRm9yQnJhbmNoKToKKyAgICAgICAg KEpTQzo6U0g0QXNzZW1ibGVyOjpqbmUpOgorICAgICAgICAoSlNDOjpTSDRBc3NlbWJsZXI6Ompl KToKKyAgICAgICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpicmEpOgorICAgICAgICAoSlNDOjpTSDRB c3NlbWJsZXI6OmxpbmtKdW1wKToKKyAgICAgICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpyZWxpbmtK dW1wKToKKwogMjAxMy0xMS0wMyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAg ICAgICAgIEdlbmVyYXRlZCBjb2xvciB3aGVlbCBkaXNwbGF5cyBpbmNvcnJlY3RseSAocmVncmVz c2VkIGluIHIxNTU1NjcpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyU0g0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlclNINC5oCShyZXZpc2lvbiAxNTg1NTgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyU0g0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTE0NTQsMTAgKzE0NTQsOSBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX2Fzc2VtYmxl ci5kY21wcGVxKHJpZ2h0LCByaWdodCk7CiAgICAgICAgICAgICB0YWtlQnJhbmNoLmFwcGVuZChK dW1wKG1fYXNzZW1ibGVyLmpuZSgpLCBTSDRBc3NlbWJsZXI6Okp1bXBOZWFyKSk7CiAgICAgICAg ICAgICBtX2Fzc2VtYmxlci5kY21wcGVxKGxlZnQsIHJpZ2h0KTsKLSAgICAgICAgICAgIEp1bXAg bV9qdW1wID0gSnVtcChtX2Fzc2VtYmxlci5qZSgpKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVy LmJyYW5jaChCRl9PUENPREUsIDIpOwogICAgICAgICAgICAgdGFrZUJyYW5jaC5saW5rKHRoaXMp OwotICAgICAgICAgICAgbV9hc3NlbWJsZXIuZXh0cmFJbnN0ckZvckJyYW5jaChzY3JhdGNoUmVn Myk7Ci0gICAgICAgICAgICByZXR1cm4gbV9qdW1wOworICAgICAgICAgICAgcmV0dXJuIEp1bXAo bV9hc3NlbWJsZXIuZXh0cmFJbnN0ckZvckJyYW5jaChzY3JhdGNoUmVnMykpOwogICAgICAgICB9 CiAKICAgICAgICAgaWYgKGNvbmQgPT0gRG91YmxlR3JlYXRlclRoYW5PclVub3JkZXJlZCkgewpA QCAtMTQ2OCwxMCArMTQ2Nyw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmRj bXBwZXEocmlnaHQsIHJpZ2h0KTsKICAgICAgICAgICAgIHRha2VCcmFuY2guYXBwZW5kKEp1bXAo bV9hc3NlbWJsZXIuam5lKCksIFNINEFzc2VtYmxlcjo6SnVtcE5lYXIpKTsKICAgICAgICAgICAg IG1fYXNzZW1ibGVyLmRjbXBwZ3QocmlnaHQsIGxlZnQpOwotICAgICAgICAgICAgSnVtcCBtX2p1 bXAgPSBKdW1wKG1fYXNzZW1ibGVyLmplKCkpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIuYnJh bmNoKEJGX09QQ09ERSwgMik7CiAgICAgICAgICAgICB0YWtlQnJhbmNoLmxpbmsodGhpcyk7Ci0g ICAgICAgICAgICBtX2Fzc2VtYmxlci5leHRyYUluc3RyRm9yQnJhbmNoKHNjcmF0Y2hSZWczKTsK LSAgICAgICAgICAgIHJldHVybiBtX2p1bXA7CisgICAgICAgICAgICByZXR1cm4gSnVtcChtX2Fz c2VtYmxlci5leHRyYUluc3RyRm9yQnJhbmNoKHNjcmF0Y2hSZWczKSk7CiAgICAgICAgIH0KIAog ICAgICAgICBpZiAoY29uZCA9PSBEb3VibGVHcmVhdGVyVGhhbk9yRXF1YWxPclVub3JkZXJlZCkg ewpAQCAtMTQ4NywxMCArMTQ4NSw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fYXNzZW1ibGVy LmRjbXBwZXEocmlnaHQsIHJpZ2h0KTsKICAgICAgICAgICAgIHRha2VCcmFuY2guYXBwZW5kKEp1 bXAobV9hc3NlbWJsZXIuam5lKCksIFNINEFzc2VtYmxlcjo6SnVtcE5lYXIpKTsKICAgICAgICAg ICAgIG1fYXNzZW1ibGVyLmRjbXBwZ3QobGVmdCwgcmlnaHQpOwotICAgICAgICAgICAgSnVtcCBt X2p1bXAgPSBKdW1wKG1fYXNzZW1ibGVyLmplKCkpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIu YnJhbmNoKEJGX09QQ09ERSwgMik7CiAgICAgICAgICAgICB0YWtlQnJhbmNoLmxpbmsodGhpcyk7 Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci5leHRyYUluc3RyRm9yQnJhbmNoKHNjcmF0Y2hSZWcz KTsKLSAgICAgICAgICAgIHJldHVybiBtX2p1bXA7CisgICAgICAgICAgICByZXR1cm4gSnVtcCht X2Fzc2VtYmxlci5leHRyYUluc3RyRm9yQnJhbmNoKHNjcmF0Y2hSZWczKSk7CiAgICAgICAgIH0K IAogICAgICAgICBpZiAoY29uZCA9PSBEb3VibGVMZXNzVGhhbk9yRXF1YWxPclVub3JkZXJlZCkg ewpAQCAtMTUwNiwxNyArMTUwMywxNSBAQCBwdWJsaWM6CiAgICAgSnVtcCBicmFuY2hUcnVlKCkK ICAgICB7CiAgICAgICAgIG1fYXNzZW1ibGVyLmVuc3VyZVNwYWNlKG1fYXNzZW1ibGVyLm1heElu c3RydWN0aW9uU2l6ZSArIDYsIHNpemVvZih1aW50MzJfdCkpOwotICAgICAgICBKdW1wIG1fanVt cCA9IEp1bXAobV9hc3NlbWJsZXIuamUoKSk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLmV4dHJhSW5z dHJGb3JCcmFuY2goc2NyYXRjaFJlZzMpOwotICAgICAgICByZXR1cm4gbV9qdW1wOworICAgICAg ICBtX2Fzc2VtYmxlci5icmFuY2goQkZfT1BDT0RFLCAyKTsKKyAgICAgICAgcmV0dXJuIEp1bXAo bV9hc3NlbWJsZXIuZXh0cmFJbnN0ckZvckJyYW5jaChzY3JhdGNoUmVnMykpOwogICAgIH0KIAog ICAgIEp1bXAgYnJhbmNoRmFsc2UoKQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuZW5zdXJl U3BhY2UobV9hc3NlbWJsZXIubWF4SW5zdHJ1Y3Rpb25TaXplICsgNiwgc2l6ZW9mKHVpbnQzMl90 KSk7Ci0gICAgICAgIEp1bXAgbV9qdW1wID0gSnVtcChtX2Fzc2VtYmxlci5qbmUoKSk7Ci0gICAg ICAgIG1fYXNzZW1ibGVyLmV4dHJhSW5zdHJGb3JCcmFuY2goc2NyYXRjaFJlZzMpOwotICAgICAg ICByZXR1cm4gbV9qdW1wOworICAgICAgICBtX2Fzc2VtYmxlci5icmFuY2goQlRfT1BDT0RFLCAy KTsKKyAgICAgICAgcmV0dXJuIEp1bXAobV9hc3NlbWJsZXIuZXh0cmFJbnN0ckZvckJyYW5jaChz Y3JhdGNoUmVnMykpOwogICAgIH0KIAogICAgIEp1bXAgYnJhbmNoMzIoUmVsYXRpb25hbENvbmRp dGlvbiBjb25kLCBCYXNlSW5kZXggbGVmdCwgVHJ1c3RlZEltbTMyIHJpZ2h0KQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9TSDRBc3NlbWJsZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NINEFzc2VtYmxlci5oCShyZXZpc2lv biAxNTg1NTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NINEFzc2VtYmxl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjUxLDE5ICsxMjUxLDE5IEBAIHB1YmxpYzoKICAgICB7 CiAgICAgICAgIFJlZ2lzdGVySUQgc2NyID0gY2xhaW1TY3JhdGNoKCk7CiAgICAgICAgIG1fYnVm ZmVyLmVuc3VyZVNwYWNlKG1heEluc3RydWN0aW9uU2l6ZSArIDQsIHNpemVvZih1aW50MzJfdCkp OwotICAgICAgICBBc3NlbWJsZXJMYWJlbCBsYWJlbCA9IG1fYnVmZmVyLmxhYmVsKCk7CiAgICAg ICAgIGxvYWRDb25zdGFudFVuUmV1c2FibGUoMHgwLCBzY3IpOwogICAgICAgICBicmFuY2goQlJB Rl9PUENPREUsIHNjcik7CiAgICAgICAgIG5vcCgpOwogICAgICAgICByZWxlYXNlU2NyYXRjaChz Y3IpOwotICAgICAgICByZXR1cm4gbGFiZWw7CisgICAgICAgIHJldHVybiBtX2J1ZmZlci5sYWJl bCgpOwogICAgIH0KIAotICAgIHZvaWQgZXh0cmFJbnN0ckZvckJyYW5jaChSZWdpc3RlcklEIGRz dCkKKyAgICBBc3NlbWJsZXJMYWJlbCBleHRyYUluc3RyRm9yQnJhbmNoKFJlZ2lzdGVySUQgZHN0 KQogICAgIHsKICAgICAgICAgbG9hZENvbnN0YW50VW5SZXVzYWJsZSgweDAsIGRzdCk7CisgICAg ICAgIGJyYW5jaChCUkFGX09QQ09ERSwgZHN0KTsKICAgICAgICAgbm9wKCk7Ci0gICAgICAgIG5v cCgpOworICAgICAgICByZXR1cm4gbV9idWZmZXIubGFiZWwoKTsKICAgICB9CiAKICAgICBBc3Nl bWJsZXJMYWJlbCBqbXAoUmVnaXN0ZXJJRCBkc3QpCkBAIC0xMjgxLDIzICsxMjgxLDIwIEBAIHB1 YmxpYzoKIAogICAgIEFzc2VtYmxlckxhYmVsIGpuZSgpCiAgICAgewotICAgICAgICBBc3NlbWJs ZXJMYWJlbCBsYWJlbCA9IG1fYnVmZmVyLmxhYmVsKCk7CiAgICAgICAgIGJyYW5jaChCRl9PUENP REUsIDApOwotICAgICAgICByZXR1cm4gbGFiZWw7CisgICAgICAgIHJldHVybiBtX2J1ZmZlci5s YWJlbCgpOwogICAgIH0KIAogICAgIEFzc2VtYmxlckxhYmVsIGplKCkKICAgICB7Ci0gICAgICAg IEFzc2VtYmxlckxhYmVsIGxhYmVsID0gbV9idWZmZXIubGFiZWwoKTsKICAgICAgICAgYnJhbmNo KEJUX09QQ09ERSwgMCk7Ci0gICAgICAgIHJldHVybiBsYWJlbDsKKyAgICAgICAgcmV0dXJuIG1f YnVmZmVyLmxhYmVsKCk7CiAgICAgfQogCiAgICAgQXNzZW1ibGVyTGFiZWwgYnJhKCkKICAgICB7 Ci0gICAgICAgIEFzc2VtYmxlckxhYmVsIGxhYmVsID0gbV9idWZmZXIubGFiZWwoKTsKICAgICAg ICAgYnJhbmNoKEJSQV9PUENPREUsIDApOwotICAgICAgICByZXR1cm4gbGFiZWw7CisgICAgICAg IHJldHVybiBtX2J1ZmZlci5sYWJlbCgpOwogICAgIH0KIAogICAgIHZvaWQgcmV0KCkKQEAgLTEz NzEsMzMgKzEzNjgsMTYgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgQVNTRVJUKGZyb20uaXNT ZXQoKSk7CiAKLSAgICAgICAgdWludDE2X3QqIGluc3RydWN0aW9uUHRyID0gZ2V0SW5zdHJ1Y3Rp b25QdHIoY29kZSwgZnJvbS5tX29mZnNldCk7Ci0gICAgICAgIHVpbnQxNl90IGluc3RydWN0aW9u ID0gKmluc3RydWN0aW9uUHRyOworICAgICAgICB1aW50MTZfdCogaW5zdHJ1Y3Rpb25QdHIgPSBn ZXRJbnN0cnVjdGlvblB0cihjb2RlLCBmcm9tLm1fb2Zmc2V0KSAtIDM7CiAgICAgICAgIGludCBv ZmZzZXRCaXRzID0gKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3Q+KHRvKSAtIHJlaW50ZXJwcmV0 X2Nhc3Q8dWludDMyX3Q+KGNvZGUpKSAtIGZyb20ubV9vZmZzZXQ7CiAKLSAgICAgICAgaWYgKCgo aW5zdHJ1Y3Rpb24gJiAweGZmMDApID09IEJUX09QQ09ERSkgfHwgKChpbnN0cnVjdGlvbiAmIDB4 ZmYwMCkgPT0gQkZfT1BDT0RFKSkgewotICAgICAgICAgICAgLyogQlQgbGFiZWwgPT0+IEJGIDIK LSAgICAgICAgICAgICAgIG5vcCAgICAgICAgICBMRFIgcmVnCi0gICAgICAgICAgICAgICBub3Ag ICAgICAgICAgYnJhZiBAcmVnCi0gICAgICAgICAgICAgICBub3AgICAgICAgICAgbm9wCi0gICAg ICAgICAgICAqLwotICAgICAgICAgICAgb2Zmc2V0Qml0cyAtPSA4OwotICAgICAgICAgICAgaW5z dHJ1Y3Rpb24gXj0gMHgwMjAyOwotICAgICAgICAgICAgKmluc3RydWN0aW9uUHRyKysgPSBpbnN0 cnVjdGlvbjsKLSAgICAgICAgICAgIGNoYW5nZVBDcmVsYXRpdmVBZGRyZXNzKCgqaW5zdHJ1Y3Rp b25QdHIgJiAweGZmKSwgaW5zdHJ1Y3Rpb25QdHIsIG9mZnNldEJpdHMpOwotICAgICAgICAgICAg aW5zdHJ1Y3Rpb24gPSAoQlJBRl9PUENPREUgfCAoKmluc3RydWN0aW9uUHRyKysgJiAweGYwMCkp OwotICAgICAgICAgICAgKmluc3RydWN0aW9uUHRyID0gaW5zdHJ1Y3Rpb247Ci0gICAgICAgICAg ICBwcmludEJsb2NrSW5zdHIoaW5zdHJ1Y3Rpb25QdHIgLSAyLCBmcm9tLm1fb2Zmc2V0LCAzKTsK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgICAvKiBNT1YgI2ltbSwg cmVnID0+IExEUiByZWcKLSAgICAgICAgICAgIGJyYWYgQHJlZyAgICAgICAgYnJhZiBAcmVnCi0g ICAgICAgICAgICBub3AgICAgICAgICAgICAgIG5vcAotICAgICAgICAgKi8KKyAgICAgICAgLyog TU9WICNpbW0sIHJlZyA9PiBMRFIgcmVnCisgICAgICAgICAgIGJyYWYgQHJlZyAgICAgICAgYnJh ZiBAcmVnCisgICAgICAgICAgIG5vcCAgICAgICAgICAgICAgbm9wCisgICAgICAgICovCiAgICAg ICAgIEFTU0VSVCgoaW5zdHJ1Y3Rpb25QdHJbMF0gJiAweGYwMDApID09IE1PVkxfUkVBRF9PRkZQ Q19PUENPREUpOwogICAgICAgICBBU1NFUlQoKGluc3RydWN0aW9uUHRyWzFdICYgMHhmMGZmKSA9 PSBCUkFGX09QQ09ERSk7Ci0gICAgICAgIGNoYW5nZVBDcmVsYXRpdmVBZGRyZXNzKCgqaW5zdHJ1 Y3Rpb25QdHIgJiAweGZmKSwgaW5zdHJ1Y3Rpb25QdHIsIG9mZnNldEJpdHMgLSA2KTsKKyAgICAg ICAgY2hhbmdlUENyZWxhdGl2ZUFkZHJlc3MoKCppbnN0cnVjdGlvblB0ciAmIDB4ZmYpLCBpbnN0 cnVjdGlvblB0ciwgb2Zmc2V0Qml0cyk7CiAgICAgICAgIHByaW50SW5zdHIoKmluc3RydWN0aW9u UHRyLCBmcm9tLm1fb2Zmc2V0ICsgMik7CiAgICAgfQogCkBAIC0xNTAwLDI0ICsxNDgwLDEwIEBA IHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCByZWxpbmtKdW1wKHZvaWQqIGZyb20sIHZvaWQqIHRv KQogICAgIHsKICAgICAgICAgdWludDE2X3QqIGluc3RydWN0aW9uUHRyID0gcmVpbnRlcnByZXRf Y2FzdDx1aW50MTZfdCo+IChmcm9tKTsKLSAgICAgICAgdWludDE2X3QgaW5zdHJ1Y3Rpb24gPSAq aW5zdHJ1Y3Rpb25QdHI7Ci0gICAgICAgIGludDMyX3Qgb2Zmc2V0Qml0cyA9IChyZWludGVycHJl dF9jYXN0PHVpbnQzMl90Pih0bykgLSByZWludGVycHJldF9jYXN0PHVpbnQzMl90Pihmcm9tKSk7 Ci0KLSAgICAgICAgaWYgKCgoKmluc3RydWN0aW9uUHRyICYgMHhmZjAwKSA9PSBCVF9PUENPREUp IHx8ICgoKmluc3RydWN0aW9uUHRyICYgMHhmZjAwKSA9PSBCRl9PUENPREUpKSB7Ci0gICAgICAg ICAgICBvZmZzZXRCaXRzIC09IDg7Ci0gICAgICAgICAgICBpbnN0cnVjdGlvblB0cisrOwotICAg ICAgICAgICAgQVNTRVJUKChpbnN0cnVjdGlvblB0clswXSAmIDB4ZjAwMCkgPT0gTU9WTF9SRUFE X09GRlBDX09QQ09ERSk7Ci0gICAgICAgICAgICBjaGFuZ2VQQ3JlbGF0aXZlQWRkcmVzcygoKmlu c3RydWN0aW9uUHRyICYgMHhmZiksIGluc3RydWN0aW9uUHRyLCBvZmZzZXRCaXRzKTsKLSAgICAg ICAgICAgIGluc3RydWN0aW9uID0gKEJSQUZfT1BDT0RFIHwgKCppbnN0cnVjdGlvblB0cisrICYg MHhmMDApKTsKLSAgICAgICAgICAgICppbnN0cnVjdGlvblB0ciA9IGluc3RydWN0aW9uOwotICAg ICAgICAgICAgcHJpbnRCbG9ja0luc3RyKGluc3RydWN0aW9uUHRyLCByZWludGVycHJldF9jYXN0 PHVpbnQzMl90Pihmcm9tKSArIDEsIDMpOwotICAgICAgICAgICAgY2FjaGVGbHVzaChpbnN0cnVj dGlvblB0ciwgc2l6ZW9mKFNINFdvcmQpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fQotCisgICAgICAgIGluc3RydWN0aW9uUHRyIC09IDM7CisgICAgICAgIEFTU0VSVCgoaW5zdHJ1 Y3Rpb25QdHJbMF0gJiAweGYwMDApID09IE1PVkxfUkVBRF9PRkZQQ19PUENPREUpOwogICAgICAg ICBBU1NFUlQoKGluc3RydWN0aW9uUHRyWzFdICYgMHhmMGZmKSA9PSBCUkFGX09QQ09ERSk7Ci0g ICAgICAgIGNoYW5nZVBDcmVsYXRpdmVBZGRyZXNzKCgqaW5zdHJ1Y3Rpb25QdHIgJiAweGZmKSwg aW5zdHJ1Y3Rpb25QdHIsIG9mZnNldEJpdHMgLSA2KTsKLSAgICAgICAgcHJpbnRJbnN0cigqaW5z dHJ1Y3Rpb25QdHIsIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3Q+KGZyb20pKTsKKyAgICAgICAg Y2hhbmdlUENyZWxhdGl2ZUFkZHJlc3MoKCppbnN0cnVjdGlvblB0ciAmIDB4ZmYpLCBpbnN0cnVj dGlvblB0ciwgcmVpbnRlcnByZXRfY2FzdDx1aW50MzJfdD4odG8pIC0gcmVpbnRlcnByZXRfY2Fz dDx1aW50MzJfdD4oZnJvbSkpOwogICAgIH0KIAogICAgIC8vIExpbmtpbmcgJiBwYXRjaGluZwpA QCAtMTU2OSwxMiArMTUzNSwxMiBAQCBwdWJsaWM6CiAgICAgICAgIEFTU0VSVCh0by5pc1NldCgp KTsKICAgICAgICAgQVNTRVJUKGZyb20uaXNTZXQoKSk7CiAKLSAgICAgICAgdWludDE2X3QqIGlu c3RydWN0aW9uUHRyID0gZ2V0SW5zdHJ1Y3Rpb25QdHIoZGF0YSgpLCBmcm9tLm1fb2Zmc2V0KTsK LSAgICAgICAgdWludDE2X3QgaW5zdHJ1Y3Rpb24gPSAqaW5zdHJ1Y3Rpb25QdHI7Ci0gICAgICAg IGludCBvZmZzZXRCaXRzOworICAgICAgICB1aW50MTZfdCogaW5zdHJ1Y3Rpb25QdHIgPSBnZXRJ bnN0cnVjdGlvblB0cihkYXRhKCksIGZyb20ubV9vZmZzZXQpIC0gMTsKKyAgICAgICAgaW50IG9m ZnNldEJpdHMgPSAodG8ubV9vZmZzZXQgLSBmcm9tLm1fb2Zmc2V0KTsKIAogICAgICAgICBpZiAo dHlwZSA9PSBKdW1wTmVhcikgewotICAgICAgICAgICAgaW50IG9mZnNldCA9IChjb2RlU2l6ZSgp IC0gZnJvbS5tX29mZnNldCkgLSA0OworICAgICAgICAgICAgdWludDE2X3QgaW5zdHJ1Y3Rpb24g PSBpbnN0cnVjdGlvblB0clswXTsKKyAgICAgICAgICAgIGludCBvZmZzZXQgPSAob2Zmc2V0Qml0 cyAtIDIpOwogICAgICAgICAgICAgQVNTRVJUKCgoKGluc3RydWN0aW9uID09IEJUX09QQ09ERSkg fHwgKGluc3RydWN0aW9uID09IEJGX09QQ09ERSkpICYmIChvZmZzZXQgPj0gLTI1NikgJiYgKG9m ZnNldCA8PSAyNTQpKQogICAgICAgICAgICAgICAgIHx8ICgoaW5zdHJ1Y3Rpb24gPT0gQlJBX09Q Q09ERSkgJiYgKG9mZnNldCA+PSAtNDA5NikgJiYgKG9mZnNldCA8PSA0MDk0KSkpOwogICAgICAg ICAgICAgKmluc3RydWN0aW9uUHRyKysgPSBpbnN0cnVjdGlvbiB8IChvZmZzZXQgPj4gMSk7CkBA IC0xNTgyLDM1ICsxNTQ4LDE0IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQogCi0gICAgICAgIGlmICgoKGluc3RydWN0aW9uICYgMHhmZjAwKSA9PSBCVF9PUENPREUp IHx8ICgoaW5zdHJ1Y3Rpb24gJiAweGZmMDApID09IEJGX09QQ09ERSkpIHsKLSAgICAgICAgICAg IC8qIEJUIGxhYmVsID0+IEJGIDIKLSAgICAgICAgICAgICAgIG5vcCAgICAgICAgTERSIHJlZwot ICAgICAgICAgICAgICAgbm9wICAgICAgICBicmFmIEByZWcKLSAgICAgICAgICAgICAgIG5vcCAg ICAgICAgbm9wCi0gICAgICAgICAgICAqLwotICAgICAgICAgICAgb2Zmc2V0Qml0cyA9ICh0by5t X29mZnNldCAtIGZyb20ubV9vZmZzZXQpIC0gODsKLSAgICAgICAgICAgIGluc3RydWN0aW9uIF49 IDB4MDIwMjsKLSAgICAgICAgICAgICppbnN0cnVjdGlvblB0cisrID0gaW5zdHJ1Y3Rpb247Ci0g ICAgICAgICAgICBpZiAoKCppbnN0cnVjdGlvblB0ciAmIDB4ZjAwMCkgPT0gTU9WSU1NX09QQ09E RSkgewotICAgICAgICAgICAgICAgIHVpbnQzMl90KiBhZGRyID0gZ2V0TGRySW1tQWRkcmVzc09u UG9vbChpbnN0cnVjdGlvblB0ciwgbV9idWZmZXIucG9vbEFkZHJlc3MoKSk7Ci0gICAgICAgICAg ICAgICAgKmFkZHIgPSBvZmZzZXRCaXRzOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICAgICAgY2hhbmdlUENyZWxhdGl2ZUFkZHJlc3MoKCppbnN0cnVjdGlvblB0ciAmIDB4ZmYpLCBp bnN0cnVjdGlvblB0ciwgb2Zmc2V0Qml0cyk7Ci0gICAgICAgICAgICBpbnN0cnVjdGlvbiA9IChC UkFGX09QQ09ERSB8ICgqaW5zdHJ1Y3Rpb25QdHIrKyAmIDB4ZjAwKSk7Ci0gICAgICAgICAgICAq aW5zdHJ1Y3Rpb25QdHIgPSBpbnN0cnVjdGlvbjsKLSAgICAgICAgICAgIHByaW50QmxvY2tJbnN0 cihpbnN0cnVjdGlvblB0ciAtIDIsIGZyb20ubV9vZmZzZXQsIDMpOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9Ci0KICAgICAgICAgLyogTU9WICMgaW1tLCByZWcgPT4gTERSIHJlZwog ICAgICAgICAgICBicmFmIEByZWcgICAgICAgICBicmFmIEByZWcKICAgICAgICAgICAgbm9wICAg ICAgICAgICAgICAgbm9wCiAgICAgICAgICovCi0gICAgICAgIEFTU0VSVCgoKihpbnN0cnVjdGlv blB0ciArIDEpICYgQlJBRl9PUENPREUpID09IEJSQUZfT1BDT0RFKTsKLSAgICAgICAgb2Zmc2V0 Qml0cyA9ICh0by5tX29mZnNldCAtIGZyb20ubV9vZmZzZXQpIC0gNjsKKyAgICAgICAgaW5zdHJ1 Y3Rpb25QdHIgLT0gMjsKKyAgICAgICAgQVNTRVJUKChpbnN0cnVjdGlvblB0clsxXSAmIDB4ZjBm ZikgPT0gQlJBRl9PUENPREUpOwogCi0gICAgICAgIGluc3RydWN0aW9uID0gKmluc3RydWN0aW9u UHRyOwotICAgICAgICBpZiAoKGluc3RydWN0aW9uICYgMHhmMDAwKSA9PSBNT1ZJTU1fT1BDT0RF KSB7CisgICAgICAgIGlmICgoaW5zdHJ1Y3Rpb25QdHJbMF0gJiAweGYwMDApID09IE1PVklNTV9P UENPREUpIHsKICAgICAgICAgICAgIHVpbnQzMl90KiBhZGRyID0gZ2V0TGRySW1tQWRkcmVzc09u UG9vbChpbnN0cnVjdGlvblB0ciwgbV9idWZmZXIucG9vbEFkZHJlc3MoKSk7CiAgICAgICAgICAg ICAqYWRkciA9IG9mZnNldEJpdHM7CiAgICAgICAgICAgICBwcmludEluc3RyKCppbnN0cnVjdGlv blB0ciwgZnJvbS5tX29mZnNldCArIDIpOwo=