47121 2010-10-04 15:15:57 -0700 need way to measure size of JITed ARM code 2010-11-22 16:51:37 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other OS X 10.6 RESOLVED FIXED P2 Normal --- 0 david_goodwin webkit-unassigned eric ggaren loki oliver ossy thomas zherczeg oldest_to_newest 289197 0 david_goodwin 2010-10-04 15:15:57 -0700 To confirm correctness and improvement provided by various code-size-reduction optimization we should have a way to measure JIT generated code size. 289204 1 69697 david_goodwin 2010-10-04 15:22:45 -0700 Created attachment 69697 Patch adds function to dump generated code size before and after branch compaction. 289631 2 69697 ggaren 2010-10-05 08:38:57 -0700 Comment on attachment 69697 Patch adds function to dump generated code size before and after branch compaction. View in context: https://bugs.webkit.org/attachment.cgi?id=69697&action=review This patch looks good, but I think it's worth doing those minor style improvements before landing. > JavaScriptCore/assembler/LinkBuffer.h:288 > + static unsigned int linkCnt = 0; > + static unsigned int totalInitialSize = 0, totalFinalSize = 0; WebKit style is just "unsigned", not "unsigned int". > JavaScriptCore/assembler/LinkBuffer.h:289 > + linkCnt++; WebKit style is to use full words in names instead of abbreviations: "linkCount". 289964 3 69863 david_goodwin 2010-10-05 16:23:27 -0700 Created attachment 69863 Address review comments and add additional output The updated patch adds #define to enable asm output of JIT generated code ( requires some post processing to make it readable, as noted in the patch) 290321 4 david_goodwin 2010-10-06 08:37:06 -0700 I notice that LinkBuffer.h is shared across architectures, so I should guard the asm dumping code to be conditional on and ARM targeted build. 290336 5 69946 david_goodwin 2010-10-06 09:02:14 -0700 Created attachment 69946 conditionally include ARM assembly dump via CPU(ARM_THUMB2) 290431 6 69946 ggaren 2010-10-06 10:43:54 -0700 Comment on attachment 69946 conditionally include ARM assembly dump via CPU(ARM_THUMB2) View in context: https://bugs.webkit.org/attachment.cgi?id=69946&action=review Great patch, but I once again have some minutia about WebKit's coding style. Here's the full list of guidelines for future reference: http://webkit.org/coding/coding-style.html. > JavaScriptCore/assembler/LinkBuffer.h:289 > + static void dumpLinkStats(void *code, size_t initialSize, size_t finalSize) Should be "void* code". > JavaScriptCore/assembler/LinkBuffer.h:298 > + printf("link %p: orig %u, compact %u (delta %u, %.2f%%)\n", > + code, (unsigned)initialSize, (unsigned)finalSize, (unsigned)(initialSize - finalSize), > + 100.0 * (float)(initialSize - finalSize) / initialSize); Should be static_cast<x> instead of (x). > JavaScriptCore/assembler/LinkBuffer.h:301 > + printf("\ttotal %u: orig %u, compact %u (delta %u, %.2f%%)\n", > + linkCount, totalInitialSize, totalFinalSize, totalInitialSize - totalFinalSize, > + 100.0 * (float)(totalInitialSize - totalFinalSize) / totalInitialSize); Ditto. > JavaScriptCore/assembler/LinkBuffer.h:306 > + static void dumpCode(void *code, size_t size) Should be "void* code". > JavaScriptCore/assembler/LinkBuffer.h:314 > + unsigned short *tcode = (unsigned short *)code; Should be "unsigned short* tcode" and "static_cast<unsigned short*>(code)". 290658 7 70006 david_goodwin 2010-10-06 16:33:57 -0700 Created attachment 70006 Fix style 293841 8 70006 darin 2010-10-13 17:22:36 -0700 Comment on attachment 70006 Fix style View in context: https://bugs.webkit.org/attachment.cgi?id=70006&action=review > JavaScriptCore/assembler/LinkBuffer.h:269 > + dumpLinkStats(m_code, initialSize, m_size); Why abbreviate to “stats”? > JavaScriptCore/assembler/LinkBuffer.h:292 > + static unsigned totalInitialSize = 0, totalFinalSize = 0; We normally declare these things on separate lines. 294245 9 eric 2010-10-14 11:40:09 -0700 David is not a committer. Either this will need a new patch to be cq+'d or we can cq+ it as is... 294271 10 ggaren 2010-10-14 12:19:55 -0700 I committed this the old-fashioned way, with Darin's suggested changes: Committed revision 69787. 69697 2010-10-04 15:22:45 -0700 2010-10-05 16:23:27 -0700 Patch adds function to dump generated code size before and after branch compaction. patch.txt text/plain 2280 david_goodwin SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY5MDQxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDQgIERhdmlkIEdv b2R3aW4gIDxkYXZpZF9nb29kd2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBuZWVkIHdheSB0byBtZWFzdXJlIHNpemUgb2YgSklU ZWQgQVJNIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ3MTIxCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTGlua0J1ZmZlci5oOgorICAgICAgICAo SlNDOjpMaW5rQnVmZmVyOjpsaW5rQ29kZSk6CisgICAgICAgIChKU0M6OkxpbmtCdWZmZXI6OmR1 bXBMaW5rU3RhdHMpOgorCiAyMDEwLTEwLTA0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IEphdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9MaW5rQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL0xpbmtCdWZmZXIuaAkocmV2aXNpb24gNjkwMzYpCisrKyBKYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTGlua0J1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw4IEBA CiAKICNpZiBFTkFCTEUoQVNTRU1CTEVSKQogCisjZGVmaW5lIERVTVBfTElOS19TVEFUSVNUSUNT IDAKKwogI2luY2x1ZGUgPE1hY3JvQXNzZW1ibGVyLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+CiAKQEAgLTI2MSw2ICsyNjMsMTAgQEAgcHJpdmF0ZToKICAgICAgICAganVtcHNUb0xp bmsuY2xlYXIoKTsKICAgICAgICAgbV9zaXplID0gd3JpdGVQdHIgKyBtX2Fzc2VtYmxlci0+c2l6 ZSgpIC0gcmVhZFB0cjsKICAgICAgICAgbV9leGVjdXRhYmxlUG9vbC0+cmV0dXJuTGFzdEJ5dGVz KGluaXRpYWxTaXplIC0gbV9zaXplKTsKKyAgICAgICAgCisjaWYgRFVNUF9MSU5LX1NUQVRJU1RJ Q1MKKyAgICAgICAgZHVtcExpbmtTdGF0cyhpbml0aWFsU2l6ZSwgbV9zaXplKTsKKyNlbmRpZgog I2VuZGlmCiAgICAgfQogCkBAIC0yNzUsNiArMjgxLDIzIEBAIHByaXZhdGU6CiAgICAgICAgIEV4 ZWN1dGFibGVBbGxvY2F0b3I6OmNhY2hlRmx1c2goY29kZSgpLCBtX3NpemUpOwogICAgIH0KIAor I2lmIERVTVBfTElOS19TVEFUSVNUSUNTCisgICAgc3RhdGljIHZvaWQgZHVtcExpbmtTdGF0cyhz aXplX3QgaW5pdGlhbFNpemUsIHNpemVfdCBmaW5hbFNpemUpCisgICAgeworICAgICAgICBzdGF0 aWMgdW5zaWduZWQgaW50IGxpbmtDbnQgPSAwOworICAgICAgICBzdGF0aWMgdW5zaWduZWQgaW50 IHRvdGFsSW5pdGlhbFNpemUgPSAwLCB0b3RhbEZpbmFsU2l6ZSA9IDA7CisgICAgICAgIGxpbmtD bnQrKzsKKyAgICAgICAgdG90YWxJbml0aWFsU2l6ZSArPSBpbml0aWFsU2l6ZTsKKyAgICAgICAg dG90YWxGaW5hbFNpemUgKz0gZmluYWxTaXplOworICAgICAgICBwcmludGYoImxpbmsgJXU6IG9y aWcgJXUsIGNvbXBhY3QgJXUgKGRlbHRhICV1LCAlLjJmJSUpXG4iLCAKKyAgICAgICAgICAgICAg IGxpbmtDbnQsICh1bnNpZ25lZClpbml0aWFsU2l6ZSwgKHVuc2lnbmVkKWZpbmFsU2l6ZSwgKHVu c2lnbmVkKShpbml0aWFsU2l6ZSAtIGZpbmFsU2l6ZSksCisgICAgICAgICAgICAgICAxMDAuMCAq IChmbG9hdCkoaW5pdGlhbFNpemUgLSBmaW5hbFNpemUpIC8gaW5pdGlhbFNpemUpOworICAgICAg ICBwcmludGYoIlx0dG90YWw6IG9yaWcgJXUsIGNvbXBhY3QgJXUgKGRlbHRhICV1LCAlLjJmJSUp XG4iLCAKKyAgICAgICAgICAgICAgIHRvdGFsSW5pdGlhbFNpemUsIHRvdGFsRmluYWxTaXplLCB0 b3RhbEluaXRpYWxTaXplIC0gdG90YWxGaW5hbFNpemUsCisgICAgICAgICAgICAgICAxMDAuMCAq IChmbG9hdCkodG90YWxJbml0aWFsU2l6ZSAtIHRvdGFsRmluYWxTaXplKSAvIHRvdGFsSW5pdGlh bFNpemUpOworICAgIH0KKyNlbmRpZgorICAgIAogICAgIFJlZlB0cjxFeGVjdXRhYmxlUG9vbD4g bV9leGVjdXRhYmxlUG9vbDsKICAgICBzaXplX3QgbV9zaXplOwogICAgIHZvaWQqIG1fY29kZTsK 69863 2010-10-05 16:23:27 -0700 2010-10-06 09:02:14 -0700 Address review comments and add additional output 47121.txt text/plain 3713 david_goodwin SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY5MTU5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAtMDUgIERhdmlkIEdv b2R3aW4gIDxkYXZpZF9nb29kd2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBuZWVkIHdheSB0byBtZWFzdXJlIHNpemUgb2YgSklU ZWQgQVJNIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ3MTIxCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTGlua0J1ZmZlci5oOgorICAgICAgICAo SlNDOjpMaW5rQnVmZmVyOjpsaW5rQ29kZSk6CisgICAgICAgIChKU0M6OkxpbmtCdWZmZXI6OmR1 bXBMaW5rU3RhdHMpOgorICAgICAgICAoSlNDOjpMaW5rQnVmZmVyOjpkdW1wQ29kZSk6CisKIDIw MTAtMTAtMDUgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9MaW5rQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0xpbmtCdWZmZXIuaAkocmV2aXNpb24gNjkxNTYpCisrKyBKYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTGlua0J1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCw2ICsyOCw5IEBACiAKICNpZiBF TkFCTEUoQVNTRU1CTEVSKQogCisjZGVmaW5lIERVTVBfTElOS19TVEFUSVNUSUNTIDAKKyNkZWZp bmUgRFVNUF9DT0RFIDAKKwogI2luY2x1ZGUgPE1hY3JvQXNzZW1ibGVyLmg+CiAjaW5jbHVkZSA8 d3RmL05vbmNvcHlhYmxlLmg+CiAKQEAgLTI2MSw2ICsyNjQsMTMgQEAgcHJpdmF0ZToKICAgICAg ICAganVtcHNUb0xpbmsuY2xlYXIoKTsKICAgICAgICAgbV9zaXplID0gd3JpdGVQdHIgKyBtX2Fz c2VtYmxlci0+c2l6ZSgpIC0gcmVhZFB0cjsKICAgICAgICAgbV9leGVjdXRhYmxlUG9vbC0+cmV0 dXJuTGFzdEJ5dGVzKGluaXRpYWxTaXplIC0gbV9zaXplKTsKKworI2lmIERVTVBfTElOS19TVEFU SVNUSUNTCisgICAgICAgIGR1bXBMaW5rU3RhdHMobV9jb2RlLCBpbml0aWFsU2l6ZSwgbV9zaXpl KTsKKyNlbmRpZgorI2lmIERVTVBfQ09ERQorICAgICAgICBkdW1wQ29kZShtX2NvZGUsIG1fc2l6 ZSk7CisjZW5kaWYKICNlbmRpZgogICAgIH0KIApAQCAtMjc1LDYgKzI4NSw0OSBAQCBwcml2YXRl OgogICAgICAgICBFeGVjdXRhYmxlQWxsb2NhdG9yOjpjYWNoZUZsdXNoKGNvZGUoKSwgbV9zaXpl KTsKICAgICB9CiAKKyNpZiBEVU1QX0xJTktfU1RBVElTVElDUworICAgIHN0YXRpYyB2b2lkIGR1 bXBMaW5rU3RhdHModm9pZCAqY29kZSwgc2l6ZV90IGluaXRpYWxTaXplLCBzaXplX3QgZmluYWxT aXplKQorICAgIHsKKyAgICAgICAgc3RhdGljIHVuc2lnbmVkIGxpbmtDb3VudCA9IDA7CisgICAg ICAgIHN0YXRpYyB1bnNpZ25lZCB0b3RhbEluaXRpYWxTaXplID0gMCwgdG90YWxGaW5hbFNpemUg PSAwOworICAgICAgICBsaW5rQ291bnQrKzsKKyAgICAgICAgdG90YWxJbml0aWFsU2l6ZSArPSBp bml0aWFsU2l6ZTsKKyAgICAgICAgdG90YWxGaW5hbFNpemUgKz0gZmluYWxTaXplOworICAgICAg ICBwcmludGYoImxpbmsgJXA6IG9yaWcgJXUsIGNvbXBhY3QgJXUgKGRlbHRhICV1LCAlLjJmJSUp XG4iLCAKKyAgICAgICAgICAgICAgIGNvZGUsICh1bnNpZ25lZClpbml0aWFsU2l6ZSwgKHVuc2ln bmVkKWZpbmFsU2l6ZSwgKHVuc2lnbmVkKShpbml0aWFsU2l6ZSAtIGZpbmFsU2l6ZSksCisgICAg ICAgICAgICAgICAxMDAuMCAqIChmbG9hdCkoaW5pdGlhbFNpemUgLSBmaW5hbFNpemUpIC8gaW5p dGlhbFNpemUpOworICAgICAgICBwcmludGYoIlx0dG90YWwgJXU6IG9yaWcgJXUsIGNvbXBhY3Qg JXUgKGRlbHRhICV1LCAlLjJmJSUpXG4iLCAKKyAgICAgICAgICAgICAgIGxpbmtDb3VudCwgdG90 YWxJbml0aWFsU2l6ZSwgdG90YWxGaW5hbFNpemUsIHRvdGFsSW5pdGlhbFNpemUgLSB0b3RhbEZp bmFsU2l6ZSwKKyAgICAgICAgICAgICAgIDEwMC4wICogKGZsb2F0KSh0b3RhbEluaXRpYWxTaXpl IC0gdG90YWxGaW5hbFNpemUpIC8gdG90YWxJbml0aWFsU2l6ZSk7CisgICAgfQorI2VuZGlmCisg ICAgCisjaWYgRFVNUF9DT0RFCisgICAgLy8gRHVtcCB0aGUgZ2VuZXJhdGVkIGNvZGUgaW4gYW4g YXNtIGZpbGUgZm9ybWF0IHRoYXQgY2FuIGJlIGFzc2VtYmxlZCBhbmQgdGhlbiBkaXNhc3NlbWJs ZWQKKyAgICAvLyBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLiBGb3IgZXhhbXBsZSwgc2F2ZSB0aGlz IG91dHB1dCBhcyBqaXQuczoKKyAgICAvLyAgIGdjYyAtYXJjaCBhcm12NyAtYyBqaXQucworICAg IC8vICAgb3Rvb2wgLXR2IGppdC5vCisgICAgc3RhdGljIHZvaWQgZHVtcENvZGUodm9pZCAqY29k ZSwgc2l6ZV90IHNpemUpCisgICAgeworICAgICAgICBzdGF0aWMgdW5zaWduZWQgY29kZUNvdW50 ID0gMDsKKyAgICAgICAgdW5zaWduZWQgc2hvcnQgKnRjb2RlID0gKHVuc2lnbmVkIHNob3J0ICop Y29kZTsKKyAgICAgICAgc2l6ZV90IHRzaXplID0gc2l6ZSAvIHNpemVvZihzaG9ydCk7CisgICAg ICAgIGNoYXIgbmFtZUJ1ZlsxMjhdOworICAgICAgICBzbnByaW50ZihuYW1lQnVmLCBzaXplb2Yo bmFtZUJ1ZiksICJfanNjX2ppdCV1IiwgY29kZUNvdW50KyspOworICAgICAgICBwcmludGYoIlx0 LnN5bnRheCB1bmlmaWVkXG4iCisgICAgICAgICAgICAgICAiXHQuc2VjdGlvblx0X19URVhULF9f dGV4dCxyZWd1bGFyLHB1cmVfaW5zdHJ1Y3Rpb25zXG4iCisgICAgICAgICAgICAgICAiXHQuZ2xv YmxcdCVzXG4iCisgICAgICAgICAgICAgICAiXHQuYWxpZ24gMlxuIgorICAgICAgICAgICAgICAg Ilx0LmNvZGUgMTZcbiIKKyAgICAgICAgICAgICAgICJcdC50aHVtYl9mdW5jXHQlc1xuIgorICAg ICAgICAgICAgICAgIiMgJXBcbiIKKyAgICAgICAgICAgICAgICIlczpcbiIsIG5hbWVCdWYsIG5h bWVCdWYsIGNvZGUsIG5hbWVCdWYpOworICAgICAgICAKKyAgICAgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IHRzaXplOyBpKyspCisgICAgICAgICAgICBwcmludGYoIlx0LnNob3J0XHQweCV4 XG4iLCB0Y29kZVtpXSk7CisgICAgfQorI2VuZGlmCisgICAgCiAgICAgUmVmUHRyPEV4ZWN1dGFi bGVQb29sPiBtX2V4ZWN1dGFibGVQb29sOwogICAgIHNpemVfdCBtX3NpemU7CiAgICAgdm9pZCog bV9jb2RlOwo= 69946 2010-10-06 09:02:14 -0700 2010-10-06 16:33:57 -0700 conditionally include ARM assembly dump via CPU(ARM_THUMB2) 47121.txt text/plain 3758 david_goodwin SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY5MTU5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAtMDUgIERhdmlkIEdv b2R3aW4gIDxkYXZpZF9nb29kd2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBuZWVkIHdheSB0byBtZWFzdXJlIHNpemUgb2YgSklU ZWQgQVJNIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ3MTIxCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTGlua0J1ZmZlci5oOgorICAgICAgICAo SlNDOjpMaW5rQnVmZmVyOjpsaW5rQ29kZSk6CisgICAgICAgIChKU0M6OkxpbmtCdWZmZXI6OmR1 bXBMaW5rU3RhdHMpOgorICAgICAgICAoSlNDOjpMaW5rQnVmZmVyOjpkdW1wQ29kZSk6CisKIDIw MTAtMTAtMDUgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9MaW5rQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0xpbmtCdWZmZXIuaAkocmV2aXNpb24gNjkxNTYpCisrKyBKYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTGlua0J1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCw2ICsyOCw5IEBACiAKICNpZiBF TkFCTEUoQVNTRU1CTEVSKQogCisjZGVmaW5lIERVTVBfTElOS19TVEFUSVNUSUNTIDAKKyNkZWZp bmUgRFVNUF9DT0RFIDAKKwogI2luY2x1ZGUgPE1hY3JvQXNzZW1ibGVyLmg+CiAjaW5jbHVkZSA8 d3RmL05vbmNvcHlhYmxlLmg+CiAKQEAgLTI2MSw2ICsyNjQsMTMgQEAgcHJpdmF0ZToKICAgICAg ICAganVtcHNUb0xpbmsuY2xlYXIoKTsKICAgICAgICAgbV9zaXplID0gd3JpdGVQdHIgKyBtX2Fz c2VtYmxlci0+c2l6ZSgpIC0gcmVhZFB0cjsKICAgICAgICAgbV9leGVjdXRhYmxlUG9vbC0+cmV0 dXJuTGFzdEJ5dGVzKGluaXRpYWxTaXplIC0gbV9zaXplKTsKKworI2lmIERVTVBfTElOS19TVEFU SVNUSUNTCisgICAgICAgIGR1bXBMaW5rU3RhdHMobV9jb2RlLCBpbml0aWFsU2l6ZSwgbV9zaXpl KTsKKyNlbmRpZgorI2lmIERVTVBfQ09ERQorICAgICAgICBkdW1wQ29kZShtX2NvZGUsIG1fc2l6 ZSk7CisjZW5kaWYKICNlbmRpZgogICAgIH0KIApAQCAtMjc1LDYgKzI4NSw1MSBAQCBwcml2YXRl OgogICAgICAgICBFeGVjdXRhYmxlQWxsb2NhdG9yOjpjYWNoZUZsdXNoKGNvZGUoKSwgbV9zaXpl KTsKICAgICB9CiAKKyNpZiBEVU1QX0xJTktfU1RBVElTVElDUworICAgIHN0YXRpYyB2b2lkIGR1 bXBMaW5rU3RhdHModm9pZCAqY29kZSwgc2l6ZV90IGluaXRpYWxTaXplLCBzaXplX3QgZmluYWxT aXplKQorICAgIHsKKyAgICAgICAgc3RhdGljIHVuc2lnbmVkIGxpbmtDb3VudCA9IDA7CisgICAg ICAgIHN0YXRpYyB1bnNpZ25lZCB0b3RhbEluaXRpYWxTaXplID0gMCwgdG90YWxGaW5hbFNpemUg PSAwOworICAgICAgICBsaW5rQ291bnQrKzsKKyAgICAgICAgdG90YWxJbml0aWFsU2l6ZSArPSBp bml0aWFsU2l6ZTsKKyAgICAgICAgdG90YWxGaW5hbFNpemUgKz0gZmluYWxTaXplOworICAgICAg ICBwcmludGYoImxpbmsgJXA6IG9yaWcgJXUsIGNvbXBhY3QgJXUgKGRlbHRhICV1LCAlLjJmJSUp XG4iLCAKKyAgICAgICAgICAgICAgIGNvZGUsICh1bnNpZ25lZClpbml0aWFsU2l6ZSwgKHVuc2ln bmVkKWZpbmFsU2l6ZSwgKHVuc2lnbmVkKShpbml0aWFsU2l6ZSAtIGZpbmFsU2l6ZSksCisgICAg ICAgICAgICAgICAxMDAuMCAqIChmbG9hdCkoaW5pdGlhbFNpemUgLSBmaW5hbFNpemUpIC8gaW5p dGlhbFNpemUpOworICAgICAgICBwcmludGYoIlx0dG90YWwgJXU6IG9yaWcgJXUsIGNvbXBhY3Qg JXUgKGRlbHRhICV1LCAlLjJmJSUpXG4iLCAKKyAgICAgICAgICAgICAgIGxpbmtDb3VudCwgdG90 YWxJbml0aWFsU2l6ZSwgdG90YWxGaW5hbFNpemUsIHRvdGFsSW5pdGlhbFNpemUgLSB0b3RhbEZp bmFsU2l6ZSwKKyAgICAgICAgICAgICAgIDEwMC4wICogKGZsb2F0KSh0b3RhbEluaXRpYWxTaXpl IC0gdG90YWxGaW5hbFNpemUpIC8gdG90YWxJbml0aWFsU2l6ZSk7CisgICAgfQorI2VuZGlmCisg ICAgCisjaWYgRFVNUF9DT0RFCisgICAgc3RhdGljIHZvaWQgZHVtcENvZGUodm9pZCAqY29kZSwg c2l6ZV90IHNpemUpCisgICAgeworI2lmIENQVShBUk1fVEhVTUIyKQorICAgICAgICAvLyBEdW1w IHRoZSBnZW5lcmF0ZWQgY29kZSBpbiBhbiBhc20gZmlsZSBmb3JtYXQgdGhhdCBjYW4gYmUgYXNz ZW1ibGVkIGFuZCB0aGVuIGRpc2Fzc2VtYmxlZAorICAgICAgICAvLyBmb3IgZGVidWdnaW5nIHB1 cnBvc2VzLiBGb3IgZXhhbXBsZSwgc2F2ZSB0aGlzIG91dHB1dCBhcyBqaXQuczoKKyAgICAgICAg Ly8gICBnY2MgLWFyY2ggYXJtdjcgLWMgaml0LnMKKyAgICAgICAgLy8gICBvdG9vbCAtdHYgaml0 Lm8KKyAgICAgICAgc3RhdGljIHVuc2lnbmVkIGNvZGVDb3VudCA9IDA7CisgICAgICAgIHVuc2ln bmVkIHNob3J0ICp0Y29kZSA9ICh1bnNpZ25lZCBzaG9ydCAqKWNvZGU7CisgICAgICAgIHNpemVf dCB0c2l6ZSA9IHNpemUgLyBzaXplb2Yoc2hvcnQpOworICAgICAgICBjaGFyIG5hbWVCdWZbMTI4 XTsKKyAgICAgICAgc25wcmludGYobmFtZUJ1Ziwgc2l6ZW9mKG5hbWVCdWYpLCAiX2pzY19qaXQl dSIsIGNvZGVDb3VudCsrKTsKKyAgICAgICAgcHJpbnRmKCJcdC5zeW50YXggdW5pZmllZFxuIgor ICAgICAgICAgICAgICAgIlx0LnNlY3Rpb25cdF9fVEVYVCxfX3RleHQscmVndWxhcixwdXJlX2lu c3RydWN0aW9uc1xuIgorICAgICAgICAgICAgICAgIlx0Lmdsb2JsXHQlc1xuIgorICAgICAgICAg ICAgICAgIlx0LmFsaWduIDJcbiIKKyAgICAgICAgICAgICAgICJcdC5jb2RlIDE2XG4iCisgICAg ICAgICAgICAgICAiXHQudGh1bWJfZnVuY1x0JXNcbiIKKyAgICAgICAgICAgICAgICIjICVwXG4i CisgICAgICAgICAgICAgICAiJXM6XG4iLCBuYW1lQnVmLCBuYW1lQnVmLCBjb2RlLCBuYW1lQnVm KTsKKyAgICAgICAgCisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB0c2l6ZTsgaSsr KQorICAgICAgICAgICAgcHJpbnRmKCJcdC5zaG9ydFx0MHgleFxuIiwgdGNvZGVbaV0pOworI2Vu ZGlmCisgICAgfQorI2VuZGlmCisgICAgCiAgICAgUmVmUHRyPEV4ZWN1dGFibGVQb29sPiBtX2V4 ZWN1dGFibGVQb29sOwogICAgIHNpemVfdCBtX3NpemU7CiAgICAgdm9pZCogbV9jb2RlOwo= 70006 2010-10-06 16:33:57 -0700 2010-10-13 17:22:36 -0700 Fix style 47121.txt text/plain 3809 david_goodwin SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY5MTk3KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAtMDUgIERhdmlkIEdv b2R3aW4gIDxkYXZpZF9nb29kd2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBuZWVkIHdheSB0byBtZWFzdXJlIHNpemUgb2YgSklU ZWQgQVJNIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ3MTIxCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTGlua0J1ZmZlci5oOgorICAgICAgICAo SlNDOjpMaW5rQnVmZmVyOjpsaW5rQ29kZSk6CisgICAgICAgIChKU0M6OkxpbmtCdWZmZXI6OmR1 bXBMaW5rU3RhdHMpOgorICAgICAgICAoSlNDOjpMaW5rQnVmZmVyOjpkdW1wQ29kZSk6CisKIDIw MTAtMTAtMDUgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9MaW5rQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0xpbmtCdWZmZXIuaAkocmV2aXNpb24gNjkxOTcpCisrKyBKYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTGlua0J1ZmZlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCw2ICsyOCw5IEBACiAKICNpZiBF TkFCTEUoQVNTRU1CTEVSKQogCisjZGVmaW5lIERVTVBfTElOS19TVEFUSVNUSUNTIDAKKyNkZWZp bmUgRFVNUF9DT0RFIDAKKwogI2luY2x1ZGUgPE1hY3JvQXNzZW1ibGVyLmg+CiAjaW5jbHVkZSA8 d3RmL05vbmNvcHlhYmxlLmg+CiAKQEAgLTI2MSw2ICsyNjQsMTMgQEAgcHJpdmF0ZToKICAgICAg ICAganVtcHNUb0xpbmsuY2xlYXIoKTsKICAgICAgICAgbV9zaXplID0gd3JpdGVQdHIgKyBtX2Fz c2VtYmxlci0+c2l6ZSgpIC0gcmVhZFB0cjsKICAgICAgICAgbV9leGVjdXRhYmxlUG9vbC0+cmV0 dXJuTGFzdEJ5dGVzKGluaXRpYWxTaXplIC0gbV9zaXplKTsKKworI2lmIERVTVBfTElOS19TVEFU SVNUSUNTCisgICAgICAgIGR1bXBMaW5rU3RhdHMobV9jb2RlLCBpbml0aWFsU2l6ZSwgbV9zaXpl KTsKKyNlbmRpZgorI2lmIERVTVBfQ09ERQorICAgICAgICBkdW1wQ29kZShtX2NvZGUsIG1fc2l6 ZSk7CisjZW5kaWYKICNlbmRpZgogICAgIH0KIApAQCAtMjc1LDYgKzI4NSw1MiBAQCBwcml2YXRl OgogICAgICAgICBFeGVjdXRhYmxlQWxsb2NhdG9yOjpjYWNoZUZsdXNoKGNvZGUoKSwgbV9zaXpl KTsKICAgICB9CiAKKyNpZiBEVU1QX0xJTktfU1RBVElTVElDUworICAgIHN0YXRpYyB2b2lkIGR1 bXBMaW5rU3RhdHModm9pZCogY29kZSwgc2l6ZV90IGluaXRpYWxTaXplLCBzaXplX3QgZmluYWxT aXplKQorICAgIHsKKyAgICAgICAgc3RhdGljIHVuc2lnbmVkIGxpbmtDb3VudCA9IDA7CisgICAg ICAgIHN0YXRpYyB1bnNpZ25lZCB0b3RhbEluaXRpYWxTaXplID0gMCwgdG90YWxGaW5hbFNpemUg PSAwOworICAgICAgICBsaW5rQ291bnQrKzsKKyAgICAgICAgdG90YWxJbml0aWFsU2l6ZSArPSBp bml0aWFsU2l6ZTsKKyAgICAgICAgdG90YWxGaW5hbFNpemUgKz0gZmluYWxTaXplOworICAgICAg ICBwcmludGYoImxpbmsgJXA6IG9yaWcgJXUsIGNvbXBhY3QgJXUgKGRlbHRhICV1LCAlLjJmJSUp XG4iLCAKKyAgICAgICAgICAgICAgIGNvZGUsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihpbml0aWFs U2l6ZSksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihmaW5hbFNpemUpLAorICAgICAgICAgICAgICAg c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGluaXRpYWxTaXplIC0gZmluYWxTaXplKSwKKyAgICAgICAg ICAgICAgIDEwMC4wICogKGluaXRpYWxTaXplIC0gZmluYWxTaXplKSAvIGluaXRpYWxTaXplKTsK KyAgICAgICAgcHJpbnRmKCJcdHRvdGFsICV1OiBvcmlnICV1LCBjb21wYWN0ICV1IChkZWx0YSAl dSwgJS4yZiUlKVxuIiwgCisgICAgICAgICAgICAgICBsaW5rQ291bnQsIHRvdGFsSW5pdGlhbFNp emUsIHRvdGFsRmluYWxTaXplLCB0b3RhbEluaXRpYWxTaXplIC0gdG90YWxGaW5hbFNpemUsCisg ICAgICAgICAgICAgICAxMDAuMCAqICh0b3RhbEluaXRpYWxTaXplIC0gdG90YWxGaW5hbFNpemUp IC8gdG90YWxJbml0aWFsU2l6ZSk7CisgICAgfQorI2VuZGlmCisgICAgCisjaWYgRFVNUF9DT0RF CisgICAgc3RhdGljIHZvaWQgZHVtcENvZGUodm9pZCogY29kZSwgc2l6ZV90IHNpemUpCisgICAg eworI2lmIENQVShBUk1fVEhVTUIyKQorICAgICAgICAvLyBEdW1wIHRoZSBnZW5lcmF0ZWQgY29k ZSBpbiBhbiBhc20gZmlsZSBmb3JtYXQgdGhhdCBjYW4gYmUgYXNzZW1ibGVkIGFuZCB0aGVuIGRp c2Fzc2VtYmxlZAorICAgICAgICAvLyBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLiBGb3IgZXhhbXBs ZSwgc2F2ZSB0aGlzIG91dHB1dCBhcyBqaXQuczoKKyAgICAgICAgLy8gICBnY2MgLWFyY2ggYXJt djcgLWMgaml0LnMKKyAgICAgICAgLy8gICBvdG9vbCAtdHYgaml0Lm8KKyAgICAgICAgc3RhdGlj IHVuc2lnbmVkIGNvZGVDb3VudCA9IDA7CisgICAgICAgIHVuc2lnbmVkIHNob3J0KiB0Y29kZSA9 IHN0YXRpY19jYXN0PHVuc2lnbmVkIHNob3J0Kj4oY29kZSk7CisgICAgICAgIHNpemVfdCB0c2l6 ZSA9IHNpemUgLyBzaXplb2Yoc2hvcnQpOworICAgICAgICBjaGFyIG5hbWVCdWZbMTI4XTsKKyAg ICAgICAgc25wcmludGYobmFtZUJ1Ziwgc2l6ZW9mKG5hbWVCdWYpLCAiX2pzY19qaXQldSIsIGNv ZGVDb3VudCsrKTsKKyAgICAgICAgcHJpbnRmKCJcdC5zeW50YXggdW5pZmllZFxuIgorICAgICAg ICAgICAgICAgIlx0LnNlY3Rpb25cdF9fVEVYVCxfX3RleHQscmVndWxhcixwdXJlX2luc3RydWN0 aW9uc1xuIgorICAgICAgICAgICAgICAgIlx0Lmdsb2JsXHQlc1xuIgorICAgICAgICAgICAgICAg Ilx0LmFsaWduIDJcbiIKKyAgICAgICAgICAgICAgICJcdC5jb2RlIDE2XG4iCisgICAgICAgICAg ICAgICAiXHQudGh1bWJfZnVuY1x0JXNcbiIKKyAgICAgICAgICAgICAgICIjICVwXG4iCisgICAg ICAgICAgICAgICAiJXM6XG4iLCBuYW1lQnVmLCBuYW1lQnVmLCBjb2RlLCBuYW1lQnVmKTsKKyAg ICAgICAgCisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB0c2l6ZTsgaSsrKQorICAg ICAgICAgICAgcHJpbnRmKCJcdC5zaG9ydFx0MHgleFxuIiwgdGNvZGVbaV0pOworI2VuZGlmCisg ICAgfQorI2VuZGlmCisgICAgCiAgICAgUmVmUHRyPEV4ZWN1dGFibGVQb29sPiBtX2V4ZWN1dGFi bGVQb29sOwogICAgIHNpemVfdCBtX3NpemU7CiAgICAgdm9pZCogbV9jb2RlOwo=