18059 2008-03-24 21:40:03 -0700 squirrelfish needs to compile on platforms without computed goto 2008-03-24 22:08:00 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver ggaren oliver oldest_to_newest 75061 0 oliver 2008-03-24 21:40:03 -0700 Tracking bug 75063 1 20021 oliver 2008-03-24 21:45:35 -0700 Created attachment 20021 First run at the patch Formatting of the runloop should be indented one level, but that will screw anyone with unlanded changes. Also not entirely sure about having the computed goto conditionalised on the compiler support computed goto -- may be better to have an explicit (independent) flag later. 75064 2 ggaren 2008-03-24 21:59:05 -0700 + ASSERT(isOpcode(opcode)); return m_opcodeIDTable.get(opcode); Please move this onto two lines. 75066 3 oliver 2008-03-24 22:08:00 -0700 Landed r31276 20021 2008-03-24 21:45:35 -0700 2008-03-24 21:59:14 -0700 First run at the patch computedgoto-switch.patch text/plain 11347 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA3ZDVkYWI3Li41OWE0YTJiIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMDgtMDMtMjQgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTgwNTk6IHNxdWly cmVsZmlzaCBuZWVkcyB0byBjb21waWxlIG9uIHBsYXRmb3JtcyB3aXRob3V0IGNvbXB1dGVkIGdv dG8KKyAgICAgICAgPGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDU5 PgorCisgICAgICAgICJTdGFuZGFyZCIgbWFjcm8gc3R5bGUgc3VwcG9ydCBmb3IgY29uZGl0aW9u YWxpc2luZyB0aGUgdXNlIG9mIGNvbXB1dGVkIGdvdG8uCisKKyAgICAgICAgKiBKYXZhU2NyaXB0 Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFZNL01hY2hpbmUuY3Bw OgorICAgICAgICAoS0pTOjpNYWNoaW5lOjppc09wY29kZSk6CisgICAgICAgIChLSlM6Ok1hY2hp bmU6OnByaXZhdGVFeGVjdXRlKToKKyAgICAgICAgKiBWTS9NYWNoaW5lLmg6CisgICAgICAgIChL SlM6Ok1hY2hpbmU6OmdldE9wY29kZSk6CisgICAgICAgIChLSlM6Ok1hY2hpbmU6OmdldE9wY29k ZUlEKToKKyAgICAgICAgKiBWTS9PcGNvZGUuaDoKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoK KwogMjAwOC0wMy0yNCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAg ICAgIE1vdmVkIG15IG5vdGVzIGZyb20gbm9kZXMuaCB0byB0aGUgd2lraS4KZGlmZiAtLWdpdCBh L0phdmFTY3JpcHRDb3JlL1ZNL01hY2hpbmUuY3BwIGIvSmF2YVNjcmlwdENvcmUvVk0vTWFjaGlu ZS5jcHAKaW5kZXggNWQ5OTVmNy4uMzNjODRhNSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUv Vk0vTWFjaGluZS5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUvVk0vTWFjaGluZS5jcHAKQEAgLTEy OCw5ICsxMjgsMTMgQEAgTWFjaGluZTo6TWFjaGluZSgpCiAKIGJvb2wgTWFjaGluZTo6aXNPcGNv ZGUoT3Bjb2RlIG9wY29kZSkKIHsKKyNpZiBIQVZFKENPTVBVVEVEX0dPVE8pCiAgICAgcmV0dXJu IG9wY29kZSAhPSBIYXNoVHJhaXRzPE9wY29kZT46OmVtcHR5VmFsdWUoKQogICAgICAgICAmJiBv cGNvZGUgIT0gSGFzaFRyYWl0czxPcGNvZGU+OjpkZWxldGVkVmFsdWUoKQogICAgICAgICAmJiBt X29wY29kZUlEVGFibGUuY29udGFpbnMob3Bjb2RlKTsKKyNlbHNlCisgICAgcmV0dXJuIG9wY29k ZSA+PSAwICYmIG9wY29kZSA8IG9wX2VuZDsKKyNlbmRpZgogfQogCiB2b2lkIE1hY2hpbmU6OnBy aXZhdGVFeGVjdXRlKEV4ZWN1dGlvbkZsYWcgZmxhZywgRXhlY1N0YXRlKiBleGVjLCBTY29wZUNo YWluKiBzY29wZUNoYWluLCBDb2RlQmxvY2sqIGNvZGVCbG9jaykKQEAgLTEzOCwxNiArMTQyLDE2 IEBAIHZvaWQgTWFjaGluZTo6cHJpdmF0ZUV4ZWN1dGUoRXhlY3V0aW9uRmxhZyBmbGFnLCBFeGVj U3RhdGUqIGV4ZWMsIFNjb3BlQ2hhaW4qIHNjCiAgICAgLy8gT25lLXRpbWUgaW5pdGlhbGl6YXRp b24gb2Ygb3VyIGFkZHJlc3MgdGFibGVzLiBXZSBoYXZlIHRvIHB1dCB0aGlzIGNvZGUKICAgICAv LyBoZXJlIGJlY2F1c2Ugb3VyIGxhYmVscyBhcmUgb25seSBpbiBzY29wZSBpbnNpZGUgdGhpcyBm dW5jdGlvbi4KICAgICBpZiAoZmxhZyA9PSBJbml0aWFsaXplQW5kUmV0dXJuKSB7Ci0gICAgICAg ICNkZWZpbmUgQUREX09QQ09ERShpZCkgbV9vcGNvZGVUYWJsZVtpZF0gPSAmJmlkOwotICAgICAg ICAgICAgRk9SX0VBQ0hfT1BDT0RFX0lEKEFERF9PUENPREUpOwotICAgICAgICAjdW5kZWYgQURE X09QQ09ERQotCi0gICAgICAgICNkZWZpbmUgQUREX09QQ09ERV9JRChpZCkgbV9vcGNvZGVJRFRh YmxlLmFkZCgmJmlkLCBpZCk7Ci0gICAgICAgICAgICBGT1JfRUFDSF9PUENPREVfSUQoQUREX09Q Q09ERV9JRCk7Ci0gICAgICAgICN1bmRlZiBBRERfT1BDT0RFCi0gICAgICAgIAotICAgICAgICBB U1NFUlQobV9vcGNvZGVJRFRhYmxlLnNpemUoKSA9PSBudW1PcGNvZGVJRHMpOwotICAgICAgICAK KyAgICAgICAgI2lmIEhBVkUoQ09NUFVURURfR09UTykKKyAgICAgICAgICAgICNkZWZpbmUgQURE X09QQ09ERShpZCkgbV9vcGNvZGVUYWJsZVtpZF0gPSAmJmlkOworICAgICAgICAgICAgICAgIEZP Ul9FQUNIX09QQ09ERV9JRChBRERfT1BDT0RFKTsKKyAgICAgICAgICAgICN1bmRlZiBBRERfT1BD T0RFCisKKyAgICAgICAgICAgICNkZWZpbmUgQUREX09QQ09ERV9JRChpZCkgbV9vcGNvZGVJRFRh YmxlLmFkZCgmJmlkLCBpZCk7CisgICAgICAgICAgICAgICAgRk9SX0VBQ0hfT1BDT0RFX0lEKEFE RF9PUENPREVfSUQpOworICAgICAgICAgICAgI3VuZGVmIEFERF9PUENPREUKKyAgICAgICAgICAg IEFTU0VSVChtX29wY29kZUlEVGFibGUuc2l6ZSgpID09IG51bU9wY29kZUlEcyk7CisgICAgICAg ICNlbmRpZiAvLyBIQVZFKENPTVBVVEVEX0dPVE8pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgCkBAIC0xNjAsNTQgKzE2NCw2OCBAQCB2b2lkIE1hY2hpbmU6OnByaXZhdGVFeGVjdXRlKEV4 ZWN1dGlvbkZsYWcgZmxhZywgRXhlY1N0YXRlKiBleGVjLCBTY29wZUNoYWluKiBzYwogICAgIEpT VmFsdWUqKiBrID0gY29kZUJsb2NrLT5qc1ZhbHVlcy5kYXRhKCk7CiAKICAgICBkdW1wUmVnaXN0 ZXJzKHJlZ2lzdGVycywgcik7Ci0KLSAgICBnb3RvICp2UEMtPnUub3Bjb2RlOwotICAgIAotICAg IG9wX2xvYWQ6IHsKKyNpZiBIQVZFKENPTVBVVEVEX0dPVE8pCisgICAgI2RlZmluZSBORVhUX09Q Q09ERSBnb3RvICp2UEMtPnUub3Bjb2RlCisgICAgI2RlZmluZSBCRUdJTl9PUENPREUob3Bjb2Rl KSBvcGNvZGU6CisgICAgTkVYVF9PUENPREU7CisjZWxzZQorICAgICNkZWZpbmUgTkVYVF9PUENP REUgY29udGludWUKKyAgICAjZGVmaW5lIEJFR0lOX09QQ09ERShvcGNvZGUpIGNhc2Ugb3Bjb2Rl OgorICAgIHdoaWxlKDEpIC8vIGl0ZXJhdG9yIGxvb3AgYmVnaW5zCisgICAgc3dpdGNoICh2UEMt PnUub3Bjb2RlKQorI2VuZGlmCisgICAgeworICAgIEJFR0lOX09QQ09ERShvcF9sb2FkKSB7CiAg ICAgICAgIGludCByMCA9ICgrK3ZQQyktPnUub3BlcmFuZDsKICAgICAgICAgaW50IGswID0gKCsr dlBDKS0+dS5vcGVyYW5kOwogICAgICAgICByW3IwXS51LmpzVmFsdWUgPSBrW2swXTsKICAgICAg ICAgCi0gICAgICAgIGdvdG8gKigrK3ZQQyktPnUub3Bjb2RlOworICAgICAgICArK3ZQQzsKKyAg ICAgICAgTkVYVF9PUENPREU7CiAgICAgfQotICAgIG9wX21vdjogeworICAgIEJFR0lOX09QQ09E RShvcF9tb3YpIHsKICAgICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAg ICBpbnQgcjEgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIHJbcjBdID0gcltyMV07CiAK LSAgICAgICAgZ290byAqKCsrdlBDKS0+dS5vcGNvZGU7CisgICAgICAgICsrdlBDOworICAgICAg ICBORVhUX09QQ09ERTsKICAgICB9Ci0gICAgb3BfbGVzczogeworICAgIEJFR0lOX09QQ09ERShv cF9sZXNzKSB7CiAgICAgICAgIGludCByMCA9ICgrK3ZQQyktPnUub3BlcmFuZDsKICAgICAgICAg aW50IHIxID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAgICBpbnQgcjIgPSAoKyt2UEMpLT51 Lm9wZXJhbmQ7CiAgICAgICAgIHJbcjBdLnUuanNWYWx1ZSA9IGpzQm9vbGVhbihqc0xlc3MoZXhl YywgcltyMV0udS5qc1ZhbHVlLCByW3IyXS51LmpzVmFsdWUpKTsKIAotICAgICAgICBnb3RvICoo Kyt2UEMpLT51Lm9wY29kZTsKKyAgICAgICAgKyt2UEM7CisgICAgICAgIE5FWFRfT1BDT0RFOwog ICAgIH0KLSAgICBvcF9wcmVfaW5jOiB7CisgICAgQkVHSU5fT1BDT0RFKG9wX3ByZV9pbmMpIHsK ICAgICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAgICByW3IwXS51Lmpz VmFsdWUgPSBqc051bWJlcihyW3IwXS51LmpzVmFsdWUtPnRvTnVtYmVyKGV4ZWMpICsgMSk7CiAK LSAgICAgICAgZ290byAqKCsrdlBDKS0+dS5vcGNvZGU7CisgICAgICAgICsrdlBDOworICAgICAg ICBORVhUX09QQ09ERTsKICAgICB9Ci0gICAgb3BfcG9zdF9pbmM6IHsKKyAgICBCRUdJTl9PUENP REUob3BfcG9zdF9pbmMpIHsKICAgICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwog ICAgICAgICBpbnQgcjEgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIHJbcjBdLnUuanNW YWx1ZSA9IHJbcjFdLnUuanNWYWx1ZS0+dG9KU051bWJlcihleGVjKTsKICAgICAgICAgcltyMV0u dS5qc1ZhbHVlID0ganNOdW1iZXIocltyMF0udS5qc1ZhbHVlLT50b051bWJlcihleGVjKSArIDEp OwogCi0gICAgICAgIGdvdG8gKigrK3ZQQyktPnUub3Bjb2RlOworICAgICAgICArK3ZQQzsKKyAg ICAgICAgTkVYVF9PUENPREU7CiAgICAgfQotICAgIG9wX2FkZDogeworICAgIEJFR0lOX09QQ09E RShvcF9hZGQpIHsKICAgICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAg ICBpbnQgcjEgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIGludCByMiA9ICgrK3ZQQykt PnUub3BlcmFuZDsKICAgICAgICAgcltyMF0udS5qc1ZhbHVlID0ganNBZGQoZXhlYywgcltyMV0u dS5qc1ZhbHVlLCByW3IyXS51LmpzVmFsdWUpOwogCi0gICAgICAgIGdvdG8gKigrK3ZQQyktPnUu b3Bjb2RlOworICAgICAgICArK3ZQQzsKKyAgICAgICAgTkVYVF9PUENPREU7CiAgICAgfQotICAg IG9wX3Jlc29sdmU6IHsKKyAgICBCRUdJTl9PUENPREUob3BfcmVzb2x2ZSkgewogICAgICAgICBp bnQgcjAgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIGludCBrMCA9ICgrK3ZQQyktPnUu b3BlcmFuZDsKIApAQCAtMjIxLDEzICsyMzksMTQgQEAgdm9pZCBNYWNoaW5lOjpwcml2YXRlRXhl Y3V0ZShFeGVjdXRpb25GbGFnIGZsYWcsIEV4ZWNTdGF0ZSogZXhlYywgU2NvcGVDaGFpbiogc2MK ICAgICAgICAgICAgIEpTT2JqZWN0KiBvID0gKml0ZXI7CiAgICAgICAgICAgICBpZiAoby0+Z2V0 UHJvcGVydHlTbG90KGV4ZWMsIGlkZW50LCBzbG90KSkgewogICAgICAgICAgICAgICAgIHJbcjBd LnUuanNWYWx1ZSA9IHNsb3QuZ2V0VmFsdWUoZXhlYywgbywgaWRlbnQpOwotICAgICAgICAgICAg ICAgIGdvdG8gKigrK3ZQQyktPnUub3Bjb2RlOworICAgICAgICAgICAgICAgICsrdlBDOworICAg ICAgICAgICAgICAgIE5FWFRfT1BDT0RFOwogICAgICAgICAgICAgfQogICAgICAgICB9IHdoaWxl ICgrK2l0ZXIgIT0gZW5kKTsKIAogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgLy8gRklY TUU6IHRocm93IGFuIHVuZGVmaW5lZCB2YXJpYWJsZSBleGNlcHRpb24KICAgICB9Ci0gICAgb3Bf cmVzb2x2ZV9iYXNlOiB7CisgICAgQkVHSU5fT1BDT0RFKG9wX3Jlc29sdmVfYmFzZSkgewogICAg ICAgICBpbnQgcjAgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIGludCBrMCA9ICgrK3ZQ QyktPnUub3BlcmFuZDsKIApAQCAtMjQzLDE1ICsyNjIsMTcgQEAgdm9pZCBNYWNoaW5lOjpwcml2 YXRlRXhlY3V0ZShFeGVjdXRpb25GbGFnIGZsYWcsIEV4ZWNTdGF0ZSogZXhlYywgU2NvcGVDaGFp biogc2MKICAgICAgICAgICAgIGlmIChiYXNlLT5nZXRQcm9wZXJ0eVNsb3QoZXhlYywgaWRlbnQs IHNsb3QpKSB7CiAgICAgICAgICAgICAgICAgcltyMF0udS5qc1ZhbHVlID0gYmFzZTsKIAotICAg ICAgICAgICAgICAgIGdvdG8gKigrK3ZQQyktPnUub3Bjb2RlOworICAgICAgICAgICAgICAgICsr dlBDOworICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFOwogICAgICAgICAgICAgfQogICAgICAg ICB9IHdoaWxlICgrK2l0ZXIgIT0gZW5kKTsKIAogICAgICAgICByW3IwXS51LmpzVmFsdWUgPSBi YXNlOwogCi0gICAgICAgIGdvdG8gKigrK3ZQQyktPnUub3Bjb2RlOworICAgICAgICArK3ZQQzsK KyAgICAgICAgTkVYVF9PUENPREU7CiAgICAgfQotICAgIG9wX29iamVjdF9nZXQ6IHsKKyAgICBC RUdJTl9PUENPREUob3Bfb2JqZWN0X2dldCkgewogICAgICAgICBpbnQgcjAgPSAoKyt2UEMpLT51 Lm9wZXJhbmQ7CiAgICAgICAgIGludCByMSA9ICgrK3ZQQyktPnUub3BlcmFuZDsKICAgICAgICAg aW50IGswID0gKCsrdlBDKS0+dS5vcGVyYW5kOwpAQCAtMjU5LDkgKzI4MCwxMCBAQCB2b2lkIE1h Y2hpbmU6OnByaXZhdGVFeGVjdXRlKEV4ZWN1dGlvbkZsYWcgZmxhZywgRXhlY1N0YXRlKiBleGVj LCBTY29wZUNoYWluKiBzYwogICAgICAgICBJZGVudGlmaWVyJiBpZGVudCA9IGNvZGVCbG9jay0+ aWRlbnRpZmllcnNbazBdOwogICAgICAgICByW3IwXS51LmpzVmFsdWUgPSByW3IxXS51LmpzT2Jq ZWN0LT5nZXQoZXhlYywgaWRlbnQpOwogCi0gICAgICAgIGdvdG8gKigrK3ZQQyktPnUub3Bjb2Rl OworICAgICAgICArK3ZQQzsKKyAgICAgICAgTkVYVF9PUENPREU7CiAgICAgfQotICAgIG9wX29i amVjdF9wdXQ6IHsKKyAgICBCRUdJTl9PUENPREUob3Bfb2JqZWN0X3B1dCkgewogICAgICAgICBp bnQgcjAgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIGludCBrMCA9ICgrK3ZQQyktPnUu b3BlcmFuZDsKICAgICAgICAgaW50IHIxID0gKCsrdlBDKS0+dS5vcGVyYW5kOwpAQCAtMjY5LDMz ICsyOTEsMzYgQEAgdm9pZCBNYWNoaW5lOjpwcml2YXRlRXhlY3V0ZShFeGVjdXRpb25GbGFnIGZs YWcsIEV4ZWNTdGF0ZSogZXhlYywgU2NvcGVDaGFpbiogc2MKICAgICAgICAgSWRlbnRpZmllciYg aWRlbnQgPSBjb2RlQmxvY2stPmlkZW50aWZpZXJzW2swXTsKICAgICAgICAgcltyMF0udS5qc09i amVjdC0+cHV0KGV4ZWMsIGlkZW50LCByW3IxXS51LmpzVmFsdWUpOwogCi0gICAgICAgIGdvdG8g KigrK3ZQQyktPnUub3Bjb2RlOworICAgICAgICArK3ZQQzsKKyAgICAgICAgTkVYVF9PUENPREU7 CiAgICAgfQotICAgIG9wX2ptcDogeworICAgIEJFR0lOX09QQ09ERShvcF9qbXApIHsKICAgICAg ICAgaW50IG9mZnNldCA9ICgrK3ZQQyktPnUub3BlcmFuZDsKICAgICAgICAgdlBDICs9IG9mZnNl dDsKIAotICAgICAgICBnb3RvICp2UEMtPnUub3Bjb2RlOworICAgICAgICBORVhUX09QQ09ERTsK ICAgICB9Ci0gICAgb3BfanRydWU6IHsKKyAgICBCRUdJTl9PUENPREUob3BfanRydWUpIHsKICAg ICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAgICBpbnQgb2Zmc2V0ID0g KCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAgICBpZiAocltyMF0udS5qc1ZhbHVlLT50b0Jvb2xl YW4oZXhlYykpIHsKICAgICAgICAgICAgIHZQQyArPSBvZmZzZXQ7Ci0gICAgICAgICAgICBnb3Rv ICp2UEMtPnUub3Bjb2RlOworICAgICAgICAgICAgTkVYVF9PUENPREU7CiAgICAgICAgIH0KIAot ICAgICAgICBnb3RvICooKyt2UEMpLT51Lm9wY29kZTsKKyAgICAgICAgKyt2UEM7CisgICAgICAg IE5FWFRfT1BDT0RFOwogICAgIH0KLSAgICBvcF9uZXdfZnVuYzogeworICAgIEJFR0lOX09QQ09E RShvcF9uZXdfZnVuYykgewogICAgICAgICBpbnQgcjAgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAg ICAgICAgIGludCBrMCA9ICgrK3ZQQyktPnUub3BlcmFuZDsKIAogICAgICAgICByW3IwXS51Lmpz VmFsdWUgPSBjb2RlQmxvY2stPmZ1bmN0aW9uc1trMF0tPm1ha2VGdW5jdGlvbihleGVjKTsKIAot ICAgICAgICBnb3RvICooKyt2UEMpLT51Lm9wY29kZTsKKyAgICAgICAgKyt2UEM7CisgICAgICAg IE5FWFRfT1BDT0RFOwogICAgIH0KLSAgICBvcF9jYWxsOiB7CisgICAgQkVHSU5fT1BDT0RFKG9w X2NhbGwpIHsKICAgICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAgICBp bnQgcjEgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIGludCBhcmd2ID0gKCsrdlBDKS0+ dS5vcGVyYW5kOwpAQCAtMzQ1LDkgKzM3MCw5IEBAIHZvaWQgTWFjaGluZTo6cHJpdmF0ZUV4ZWN1 dGUoRXhlY3V0aW9uRmxhZyBmbGFnLCBFeGVjU3RhdGUqIGV4ZWMsIFNjb3BlQ2hhaW4qIHNjCiAg ICAgICAgIHNjb3BlQ2hhaW4gPSAmZnVuY3Rpb24tPnNjb3BlKCk7CiAgICAgICAgIGNvZGVCbG9j ayA9IG5ld0NvZGVCbG9jazsKIAotICAgICAgICBnb3RvICp2UEMtPnUub3Bjb2RlOworICAgICAg ICBORVhUX09QQ09ERTsKICAgICB9Ci0gICAgb3BfcmV0OiB7CisgICAgQkVHSU5fT1BDT0RFKG9w X3JldCkgewogICAgICAgICBpbnQgcjEgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7CiAKICAgICAgICAg Q29kZUJsb2NrKiBvbGRDb2RlQmxvY2sgPSBjb2RlQmxvY2s7CkBAIC0zNjMsMTMgKzM4OCwxNiBA QCB2b2lkIE1hY2hpbmU6OnByaXZhdGVFeGVjdXRlKEV4ZWN1dGlvbkZsYWcgZmxhZywgRXhlY1N0 YXRlKiBleGVjLCBTY29wZUNoYWluKiBzYwogICAgICAgICBpbnQgcjAgPSByZXR1cm5JbmZvWzRd LnUuaTsKICAgICAgICAgcltyMF0gPSAqcmV0dXJuVmFsdWU7CiAgICAgICAgIAotICAgICAgICBn b3RvICp2UEMtPnUub3Bjb2RlOworICAgICAgICBORVhUX09QQ09ERTsKICAgICB9Ci0gICAgb3Bf ZW5kOiB7CisgICAgQkVHSU5fT1BDT0RFKG9wX2VuZCkgewogICAgICAgICBpbnQgcjAgPSAoKyt2 UEMpLT51Lm9wZXJhbmQ7CiAgICAgICAgIHByaW50ZigiRW5kOiAlc1xuIiwgcltyMF0udS5qc1Zh bHVlLT50b1N0cmluZyhleGVjKS5hc2NpaSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAg ICB9CisgICAgI3VuZGVmaW5lIE5FWFRfT1BDT0RFCisgICAgI3VuZGVmaW5lIEJFR0lOX09QQ09E RQogfQogCiBNYWNoaW5lJiBtYWNoaW5lKCkKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL1ZN L01hY2hpbmUuaCBiL0phdmFTY3JpcHRDb3JlL1ZNL01hY2hpbmUuaAppbmRleCA1ZmU5ZDkwLi43 NTA3OWYyIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9WTS9NYWNoaW5lLmgKKysrIGIvSmF2 YVNjcmlwdENvcmUvVk0vTWFjaGluZS5oCkBAIC00NCw4ICs0NCwyMiBAQCBuYW1lc3BhY2UgS0pT IHsKIAogICAgICAgICBNYWNoaW5lKCk7CiAgICAgICAgIAotICAgICAgICBPcGNvZGUgZ2V0T3Bj b2RlKE9wY29kZUlEIGlkKSB7IHJldHVybiBtX29wY29kZVRhYmxlW2lkXTsgfQotICAgICAgICBP cGNvZGVJRCBnZXRPcGNvZGVJRChPcGNvZGUgb3Bjb2RlKSB7IEFTU0VSVChpc09wY29kZShvcGNv ZGUpKTsgcmV0dXJuIG1fb3Bjb2RlSURUYWJsZS5nZXQob3Bjb2RlKTsgfQorICAgICAgICBPcGNv ZGUgZ2V0T3Bjb2RlKE9wY29kZUlEIGlkKSB7CisgICAgICAgICAgICAjaWYgSEFWRShDT01QVVRF RF9HT1RPKQorICAgICAgICAgICAgICAgIHJldHVybiBtX29wY29kZVRhYmxlW2lkXTsgCisgICAg ICAgICAgICAjZWxzZQorICAgICAgICAgICAgICAgIHJldHVybiBpZDsKKyAgICAgICAgICAgICNl bmRpZgorICAgICAgICB9CisKKyAgICAgICAgT3Bjb2RlSUQgZ2V0T3Bjb2RlSUQoT3Bjb2RlIG9w Y29kZSkgeworICAgICAgICAgICAgI2lmIEhBVkUoQ09NUFVURURfR09UTykKKyAgICAgICAgICAg ICAgICBBU1NFUlQoaXNPcGNvZGUob3Bjb2RlKSk7IHJldHVybiBtX29wY29kZUlEVGFibGUuZ2V0 KG9wY29kZSk7CisgICAgICAgICAgICAjZWxzZQorICAgICAgICAgICAgICAgIHJldHVybiBvcGNv ZGU7CisgICAgICAgICAgICAjZW5kaWYKKyAgICAgICAgfQorCiAgICAgICAgIGJvb2wgaXNPcGNv ZGUoT3Bjb2RlIG9wY29kZSk7CiAgICAgICAgIAogICAgICAgICB2b2lkIGV4ZWN1dGUoRXhlY1N0 YXRlKiBleGVjLCBTY29wZUNoYWluKiBzY29wZUNoYWluLCBDb2RlQmxvY2sqIGNvZGVCbG9jaykg eyBwcml2YXRlRXhlY3V0ZShOb3JtYWwsIGV4ZWMsIHNjb3BlQ2hhaW4sIGNvZGVCbG9jayk7IH0K QEAgLTU1LDkgKzY5LDEwIEBAIG5hbWVzcGFjZSBLSlMgewogICAgICAgICAKICAgICAgICAgdm9p ZCBwcml2YXRlRXhlY3V0ZShFeGVjdXRpb25GbGFnLCBFeGVjU3RhdGUqID0gMCwgU2NvcGVDaGFp biogPSAwLCBDb2RlQmxvY2sqID0gMCk7CiAgICAgICAgIHZvaWQgZHVtcFJlZ2lzdGVycyhjb25z dCBWZWN0b3I8UmVnaXN0ZXI+JiwgUmVnaXN0ZXIqKTsKLSAgICAgICAgCisjaWYgSEFWRShDT01Q VVRFRF9HT1RPKSAgICAgICAgCiAgICAgICAgIE9wY29kZSBtX29wY29kZVRhYmxlW251bU9wY29k ZUlEc107IC8vIE1hcHMgT3Bjb2RlSUQgPT4gT3Bjb2RlIGZvciBjb21waWxpbmcKICAgICAgICAg SGFzaE1hcDxPcGNvZGUsIE9wY29kZUlEPiBtX29wY29kZUlEVGFibGU7IC8vIE1hcHMgT3Bjb2Rl ID0+IE9wY29kZUlEIGZvciBkZWNvbXBpbGluZworI2VuZGlmCiAgICAgfTsKICAgICAKICAgICBN YWNoaW5lJiBtYWNoaW5lKCk7CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9WTS9PcGNvZGUu aCBiL0phdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5oCmluZGV4IGYxMDU2ZDUuLmM0NzBhY2MgMTAw NjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5oCisrKyBiL0phdmFTY3JpcHRDb3Jl L1ZNL09wY29kZS5oCkBAIC0zMiw4ICszMiw2IEBACiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMu aD4KIAogbmFtZXNwYWNlIEtKUyB7Ci0KLSAgICB0eXBlZGVmIHZvaWQqIE9wY29kZTsKICAgICAg ICAgCiAgICAgI2RlZmluZSBGT1JfRUFDSF9PUENPREVfSUQobWFjcm8pIFwKICAgICAgICAgbWFj cm8ob3BfbG9hZCkgXApAQCAtNjksNiArNjcsMTIgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAgICAg IEZPUl9FQUNIX09QQ09ERV9JRChWRVJJRllfT1BDT0RFX0lEKTsKICAgICAjdW5kZWYgVkVSSUZZ X09QQ09ERV9JRAogCisjaWYgSEFWRShDT01QVVRFRF9HT1RPKQorICAgIHR5cGVkZWYgdm9pZCog T3Bjb2RlOworI2Vsc2UKKyAgICB0eXBlZGVmIE9wY29kZUlEIE9wY29kZTsKKyNlbmRpZgorCiB9 IC8vIG5hbWVzcGFjZSBLSlMKIAogI2VuZGlmIC8vIE9wY29kZXNfaApkaWZmIC0tZ2l0IGEvSmF2 YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmggYi9KYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0u aAppbmRleCAwYzZhZmFiLi45ZTRhYjRjIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYv UGxhdGZvcm0uaAorKysgYi9KYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaApAQCAtMjQwLDYg KzI0MCwxMCBAQAogI2RlZmluZSBVU0VfU1lTVEVNX01BTExPQyAxCiAjZW5kaWYKIAorI2lmIENP TVBJTEVSKEdDQykKKyNkZWZpbmUgSEFWRV9DT01QVVRFRF9HT1RPIDEKKyNlbmRpZgorCiAvKiBF TkFCTEUgbWFjcm8gZGVmYXVsdHMgKi8KIAogI2lmICFkZWZpbmVkKEVOQUJMRV9JQ09OREFUQUJB U0UpCg==