20296 2008-08-06 04:35:24 -0700 OpcodeStats doesn't build on platforms which don't have mergesort() 2008-09-02 23:29:02 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Minor --- 1 ossy webkit-unassigned ggaren mjs oliver oldest_to_newest 87939 0 ossy 2008-08-06 04:35:24 -0700 OpcodeStats don't build on linux, beacuse on this platform there isn't mergesort() function. qsort() should be used instead of mergesort(). 87940 1 22676 ossy 2008-08-06 04:39:54 -0700 Created attachment 22676 proposed patch 87945 2 22676 eric 2008-08-06 05:20:32 -0700 Comment on attachment 22676 proposed patch Nah. Better would be to either #define mergesort qsort or to build some sort of abstraction for sorting "platformMergeSort()" and only have the #ifdef in one place. I'm surprised this hasn't been done already somewhere else? You might try searching the sources for HAVE(MERGE_SORT) 87948 3 ossy 2008-08-06 05:37:48 -0700 (In reply to comment #2) > I'm surprised this hasn't been done already somewhere else? You might try > searching the sources for HAVE(MERGE_SORT) I searched for HAVE(MERGESORT), and found it kjs/JSArray.cpp and VM/SamplingTools.cpp. HAVE_MERGESORT macro defined in wtf/Platform.h. I think this is a commonly used macro. Your advice about platformMergeSort() can be a nice solution. What do you think, if I would refactor my patch and extend it the above mentioned files? 88030 4 22694 ossy 2008-08-07 04:32:54 -0700 Created attachment 22694 new patch based on Comment #2 I refactored using mergesort based on your advices. What about this preliminary patch? 89102 5 22933 ossy 2008-08-22 04:33:40 -0700 Created attachment 22933 This is my new proposed patch. 89111 6 22933 darin 2008-08-22 08:41:42 -0700 Comment on attachment 22933 This is my new proposed patch. This should not be defined in Platform.h -- that goes beyond the scope of what Platform.h should contain; just configuration macros. It belongs in a header like MathExtras.h -- perhaps StdLibExtras.h. This should be an inline function, not a macro. If it was going to be a macro it should be a macro with arguments, not an unqualified macro. The name platformSort doesn't make sense to me. If we need mergesort specifically, then it needs to be mergesort. If it can be either qsort or mergesort, then we can come up with a name that describes the reason we want mergesort if we have it -- what is that reason? Why is mergesort better than qsort for these purposes? I don't think "platform" enters into it, despite Eric's earlier suggestion. For example, in JSArray.cpp it's pretty clear what we want is a stable sort. In those cases, using qsort is actually incorrect, so I don't think we should try to make it more elegant -- the lack of a stable sort there is a problem needs to be fixed. Is stable sorting the issue in Opcode.cpp too? If we don't have any special requirements, then it we can just change Opcode.cpp to use qsort instead of doing this whole thing. 89112 7 darin 2008-08-22 08:42:01 -0700 My apologies -- I'm not trying to make this more complicated than it is. 89255 8 ossy 2008-08-25 00:42:51 -0700 You're right, in JSArray.cpp we need stable sort. I think we don't need stable sort in Opcode.cpp. OpcodeStats is only generates statistics for developers, it doesn't modify the funcionality of jsc release version. 89256 9 22974 ossy 2008-08-25 00:44:15 -0700 Created attachment 22974 proposed patch 89288 10 22974 darin 2008-08-25 08:58:58 -0700 Comment on attachment 22974 proposed patch r=me 89980 11 mrowe 2008-09-02 23:29:02 -0700 Landed in r36048. 22676 2008-08-06 04:39:54 -0700 2008-08-22 04:33:40 -0700 proposed patch opcodestats.patch text/plain 1812 ossy SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM1NTk1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDgtMDgtMDYgIENzYWJhIE9z enRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwMjk2OiBPcGNvZGVTdGF0cyBkb24ndCBi dWlsZCBvbiBsaW51eAorICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwMjk2PgorCisgICAgICAgICogVk0vT3Bjb2RlLmNwcDoKKyAgICAgICAgKEtKUzo6 T3Bjb2RlU3RhdHM6On5PcGNvZGVTdGF0cyk6IE9uIHBsYXRmb3JtcyB0aGF0IAorICAgICAgICBk b24ndCBoYXZlIGEgbWVyZ2Vzb3J0KCkgZnVuY3Rpb24sIHVzZSBxc29ydCgpLgorCiAyMDA4LTA4 LTA2ICBBcml5YSBIaWRheWF0ICA8YXJpeWEuaGlkYXlhdEB0cm9sbHRlY2guY29tPgogCiAgICAg ICAgIEZpeCBub24tTWFjIGJ1aWxkLgpJbmRleDogSmF2YVNjcmlwdENvcmUvVk0vT3Bjb2RlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9WTS9PcGNvZGUuY3BwCShyZXZpc2lvbiAz NTU4OCkKKysrIEphdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEwNCwxNCArMTA0LDIyIEBAIE9wY29kZVN0YXRzOjp+T3Bjb2RlU3RhdHMoKQogICAgIGludCBz b3J0ZWRJbmRpY2VzW251bU9wY29kZUlEc107ICAgIAogICAgIGZvciAoaW50IGkgPSAwOyBpIDwg bnVtT3Bjb2RlSURzOyArK2kpCiAgICAgICAgIHNvcnRlZEluZGljZXNbaV0gPSBpOworI2lmIEhB VkUoTUVSR0VTT1JUKQogICAgIG1lcmdlc29ydChzb3J0ZWRJbmRpY2VzLCBudW1PcGNvZGVJRHMs IHNpemVvZihpbnQpLCBjb21wYXJlT3Bjb2RlSW5kaWNlcyk7Ci0gICAgCisjZWxzZQorICAgIHFz b3J0KHNvcnRlZEluZGljZXMsIG51bU9wY29kZUlEcywgc2l6ZW9mKGludCksIGNvbXBhcmVPcGNv ZGVJbmRpY2VzKTsKKyNlbmRpZgorCiAgICAgcGFpcjxpbnQsIGludD4gc29ydGVkUGFpckluZGlj ZXNbbnVtT3Bjb2RlSURzICogbnVtT3Bjb2RlSURzXTsKICAgICBwYWlyPGludCwgaW50PiogY3Vy cmVudFBhaXJJbmRleCA9IHNvcnRlZFBhaXJJbmRpY2VzOwogICAgIGZvciAoaW50IGkgPSAwOyBp IDwgbnVtT3Bjb2RlSURzOyArK2kpCiAgICAgICAgIGZvciAoaW50IGogPSAwOyBqIDwgbnVtT3Bj b2RlSURzOyArK2opCiAgICAgICAgICAgICAqKGN1cnJlbnRQYWlySW5kZXgrKykgPSBtYWtlX3Bh aXIoaSwgaik7CisjaWYgSEFWRShNRVJHRVNPUlQpCiAgICAgbWVyZ2Vzb3J0KHNvcnRlZFBhaXJJ bmRpY2VzLCBudW1PcGNvZGVJRHMgKiBudW1PcGNvZGVJRHMsIHNpemVvZihwYWlyPGludCwgaW50 PiksIGNvbXBhcmVPcGNvZGVQYWlySW5kaWNlcyk7CisjZWxzZQorICAgIHFzb3J0KHNvcnRlZFBh aXJJbmRpY2VzLCBudW1PcGNvZGVJRHMgKiBudW1PcGNvZGVJRHMsIHNpemVvZihwYWlyPGludCwg aW50PiksIGNvbXBhcmVPcGNvZGVQYWlySW5kaWNlcyk7CisjZW5kaWYKICAgICAKICAgICBwcmlu dGYoIlxuRXhlY3V0ZWQgb3Bjb2RlIHN0YXRpc3RpY3NcbiIpOyAKICAgICAK 22694 2008-08-07 04:32:54 -0700 2008-08-22 04:33:40 -0700 new patch based on Comment #2 mergesort.patch text/plain 5457 ossy SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM1NjIwKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDgtMDgtMDcgIFN5c3RlbSBV c2VyICA8c2V0IEVNQUlMX0FERFJFU1MgZW52aXJvbm1lbnQgdmFyaWFibGU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBWTS9PcGNvZGUuY3BwOgor ICAgICAgICAoS0pTOjpPcGNvZGVTdGF0czo6fk9wY29kZVN0YXRzKToKKyAgICAgICAgKiBWTS9T YW1wbGluZ1Rvb2wuY3BwOgorICAgICAgICAoS0pTOjpTYW1wbGluZ1Rvb2w6OmR1bXApOgorICAg ICAgICAqIGtqcy9KU0FycmF5LmNwcDoKKyAgICAgICAgKEtKUzo6SlNBcnJheTo6c29ydCk6Cisg ICAgICAgICogd3RmL1BsYXRmb3JtLmg6CisKIDIwMDgtMDgtMDYgIEFkYW0gUm9iZW4gIDxhcm9i ZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFRyeSB0byBmaXggdGhlIFdpbmRvd3MgYnVpbGQgYm90 cwpJbmRleDogSmF2YVNjcmlwdENvcmUvVk0vT3Bjb2RlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZh U2NyaXB0Q29yZS9WTS9PcGNvZGUuY3BwCShyZXZpc2lvbiAzNTYyMCkKKysrIEphdmFTY3JpcHRD b3JlL1ZNL09wY29kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNCwxNCArMTA0LDE0IEBAIE9w Y29kZVN0YXRzOjp+T3Bjb2RlU3RhdHMoKQogICAgIGludCBzb3J0ZWRJbmRpY2VzW251bU9wY29k ZUlEc107ICAgIAogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVtT3Bjb2RlSURzOyArK2kpCiAg ICAgICAgIHNvcnRlZEluZGljZXNbaV0gPSBpOwotICAgIG1lcmdlc29ydChzb3J0ZWRJbmRpY2Vz LCBudW1PcGNvZGVJRHMsIHNpemVvZihpbnQpLCBjb21wYXJlT3Bjb2RlSW5kaWNlcyk7CisgICAg cGxhdGZvcm1Tb3J0KHNvcnRlZEluZGljZXMsIG51bU9wY29kZUlEcywgc2l6ZW9mKGludCksIGNv bXBhcmVPcGNvZGVJbmRpY2VzKTsKICAgICAKICAgICBwYWlyPGludCwgaW50PiBzb3J0ZWRQYWly SW5kaWNlc1tudW1PcGNvZGVJRHMgKiBudW1PcGNvZGVJRHNdOwogICAgIHBhaXI8aW50LCBpbnQ+ KiBjdXJyZW50UGFpckluZGV4ID0gc29ydGVkUGFpckluZGljZXM7CiAgICAgZm9yIChpbnQgaSA9 IDA7IGkgPCBudW1PcGNvZGVJRHM7ICsraSkKICAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCBu dW1PcGNvZGVJRHM7ICsraikKICAgICAgICAgICAgICooY3VycmVudFBhaXJJbmRleCsrKSA9IG1h a2VfcGFpcihpLCBqKTsKLSAgICBtZXJnZXNvcnQoc29ydGVkUGFpckluZGljZXMsIG51bU9wY29k ZUlEcyAqIG51bU9wY29kZUlEcywgc2l6ZW9mKHBhaXI8aW50LCBpbnQ+KSwgY29tcGFyZU9wY29k ZVBhaXJJbmRpY2VzKTsKKyAgICBwbGF0Zm9ybVNvcnQoc29ydGVkUGFpckluZGljZXMsIG51bU9w Y29kZUlEcyAqIG51bU9wY29kZUlEcywgc2l6ZW9mKHBhaXI8aW50LCBpbnQ+KSwgY29tcGFyZU9w Y29kZVBhaXJJbmRpY2VzKTsKICAgICAKICAgICBwcmludGYoIlxuRXhlY3V0ZWQgb3Bjb2RlIHN0 YXRpc3RpY3NcbiIpOyAKICAgICAKSW5kZXg6IEphdmFTY3JpcHRDb3JlL1ZNL1NhbXBsaW5nVG9v bC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvVk0vU2FtcGxpbmdUb29sLmNwcAko cmV2aXNpb24gMzU2MjApCisrKyBKYXZhU2NyaXB0Q29yZS9WTS9TYW1wbGluZ1Rvb2wuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNzMsMTEgKzE3Myw3IEBAIHZvaWQgU2FtcGxpbmdUb29sOjpkdW1w KEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgY29kZUJsb2NrU2FtcGxlc1tpXSA9IGl0ZXItPnNl Y29uZDsKICAgICAgICAgdG90YWxDb2RlQmxvY2tTYW1wbGVzICs9IGNvZGVCbG9ja1NhbXBsZXNb aV0tPm1fdG90YWxDb3VudDsKICAgICB9Ci0jaWYgSEFWRShNRVJHRVNPUlQpCi0gICAgbWVyZ2Vz b3J0KGNvZGVCbG9ja1NhbXBsZXMuYmVnaW4oKSwgc2NvcGVDb3VudCwgc2l6ZW9mKFNjb3BlU2Ft cGxlUmVjb3JkKiksIGNvbXBhcmVTY29wZVNhbXBsZVJlY29yZHMpOwotI2Vsc2UKLSAgICBxc29y dChjb2RlQmxvY2tTYW1wbGVzLmJlZ2luKCksIHNjb3BlQ291bnQsIHNpemVvZihTY29wZVNhbXBs ZVJlY29yZCopLCBjb21wYXJlU2NvcGVTYW1wbGVSZWNvcmRzKTsKLSNlbmRpZgorICAgIHBsYXRm b3JtU29ydChjb2RlQmxvY2tTYW1wbGVzLmJlZ2luKCksIHNjb3BlQ291bnQsIHNpemVvZihTY29w ZVNhbXBsZVJlY29yZCopLCBjb21wYXJlU2NvcGVTYW1wbGVSZWNvcmRzKTsKIAogICAgIC8vICgy KSBQcmludCBkYXRhIGZyb20gJ2NvZGVCbG9ja1NhbXBsZXMnIGFycmF5LCBjYWxjdWxhdGUgJ3Rv dGFsT3Bjb2RlU2FtcGxlcycsIHBvcHVsYXRlICdvcGNvZGVTYW1wbGVDb3VudHMnIGFycmF5Lgog CkBAIC0yMTYsMTEgKzIxMiw3IEBAIHZvaWQgU2FtcGxpbmdUb29sOjpkdW1wKEV4ZWNTdGF0ZSog ZXhlYykKICAgICAgICAgICAgICAgICAgICAgbGluZUNvdW50SW5mb1tsaW5lbm9dLmxpbmUgPSBp dGVyLT5maXJzdDsKICAgICAgICAgICAgICAgICAgICAgbGluZUNvdW50SW5mb1tsaW5lbm9dLmNv dW50ID0gaXRlci0+c2Vjb25kOwogICAgICAgICAgICAgICAgIH0KLSNpZiBIQVZFKE1FUkdFU09S VCkKLSAgICAgICAgICAgICAgICBtZXJnZXNvcnQobGluZUNvdW50SW5mby5iZWdpbigpLCBsaW5l c0NvdW50LCBzaXplb2YoTGluZUNvdW50SW5mbyksIGNvbXBhcmVMaW5lQ291bnRJbmZvU2FtcGxp bmcpOwotI2Vsc2UKLSAgICAgICAgICAgICAgICBxc29ydChsaW5lQ291bnRJbmZvLmJlZ2luKCks IGxpbmVzQ291bnQsIHNpemVvZihMaW5lQ291bnRJbmZvKSwgY29tcGFyZUxpbmVDb3VudEluZm9T YW1wbGluZyk7Ci0jZW5kaWYKKyAgICAgICAgICAgICAgICBwbGF0Zm9ybVNvcnQobGluZUNvdW50 SW5mby5iZWdpbigpLCBsaW5lc0NvdW50LCBzaXplb2YoTGluZUNvdW50SW5mbyksIGNvbXBhcmVM aW5lQ291bnRJbmZvU2FtcGxpbmcpOwogICAgICAgICAgICAgICAgIGZvciAobGluZW5vID0gMDsg bGluZW5vIDwgbGluZXNDb3VudDsgKytsaW5lbm8pIHsKICAgICAgICAgICAgICAgICAgICAgcHJp bnRmKCIgICAgTGluZSAjJWQgaGFzIHNhbXBsZSBjb3VudCAlZC5cbiIsIGxpbmVDb3VudEluZm9b bGluZW5vXS5saW5lLCBsaW5lQ291bnRJbmZvW2xpbmVub10uY291bnQpOwogICAgICAgICAgICAg ICAgIH0KQEAgLTI0OCwxMSArMjQwLDcgQEAgdm9pZCBTYW1wbGluZ1Rvb2w6OmR1bXAoRXhlY1N0 YXRlKiBleGVjKQogICAgICAgICBvcGNvZGVTYW1wbGVJbmZvW2ldLm9wY29kZSA9IChPcGNvZGVJ RClpOwogICAgICAgICBvcGNvZGVTYW1wbGVJbmZvW2ldLmNvdW50ID0gb3Bjb2RlU2FtcGxlQ291 bnRzW2ldOwogICAgIH0KLSNpZiBIQVZFKE1FUkdFU09SVCkKLSAgICBtZXJnZXNvcnQob3Bjb2Rl U2FtcGxlSW5mbywgbnVtT3Bjb2RlSURzLCBzaXplb2YoT3Bjb2RlU2FtcGxlSW5mbyksIGNvbXBh cmVPcGNvZGVJbmRpY2VzU2FtcGxpbmcpOwotI2Vsc2UKLSAgICBxc29ydChvcGNvZGVTYW1wbGVJ bmZvLCBudW1PcGNvZGVJRHMsIHNpemVvZihPcGNvZGVTYW1wbGVJbmZvKSwgY29tcGFyZU9wY29k ZUluZGljZXNTYW1wbGluZyk7Ci0jZW5kaWYKKyAgICBwbGF0Zm9ybVNvcnQob3Bjb2RlU2FtcGxl SW5mbywgbnVtT3Bjb2RlSURzLCBzaXplb2YoT3Bjb2RlU2FtcGxlSW5mbyksIGNvbXBhcmVPcGNv ZGVJbmRpY2VzU2FtcGxpbmcpOwogCiAgICAgLy8gKDQpIFByaW50IE9wY29kZSBzYW1wbGluZyBy ZXN1bHRzLgogICAgIApJbmRleDogSmF2YVNjcmlwdENvcmUva2pzL0pTQXJyYXkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2tqcy9KU0FycmF5LmNwcAkocmV2aXNpb24gMzU2MjAp CisrKyBKYXZhU2NyaXB0Q29yZS9ranMvSlNBcnJheS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3 MiwxMyArNTcyLDkgQEAgdm9pZCBKU0FycmF5Ojpzb3J0KEV4ZWNTdGF0ZSogZXhlYykKICAgICAv LyBGSVhNRTogU2luY2Ugd2Ugc29ydCBieSBzdHJpbmcgdmFsdWUsIGEgZmFzdCBhbGdvcml0aG0g bWlnaHQgYmUgdG8gdXNlIGEgcmFkaXggc29ydC4gVGhhdCB3b3VsZCBiZSBPKE4pIHJhdGhlcgog ICAgIC8vIHRoYW4gTyhOIGxvZyBOKS4KIAotI2lmIEhBVkUoTUVSR0VTT1JUKQotICAgIG1lcmdl c29ydCh2YWx1ZXMuYmVnaW4oKSwgdmFsdWVzLnNpemUoKSwgc2l6ZW9mKEFycmF5UVNvcnRQYWly KSwgY29tcGFyZUJ5U3RyaW5nUGFpckZvclFTb3J0KTsKLSNlbHNlCiAgICAgLy8gRklYTUU6IFRo ZSBxc29ydCBsaWJyYXJ5IGZ1bmN0aW9uIGlzIGxpa2VseSB0byBub3QgYmUgYSBzdGFibGUgc29y dC4KICAgICAvLyBFQ01BU2NyaXB0LTI2MiBkb2VzIG5vdCBzcGVjaWZ5IGEgc3RhYmxlIHNvcnQs IGJ1dCBpbiBwcmFjdGljZSwgYnJvd3NlcnMgcGVyZm9ybSBhIHN0YWJsZSBzb3J0LgotICAgIHFz b3J0KHZhbHVlcy5iZWdpbigpLCB2YWx1ZXMuc2l6ZSgpLCBzaXplb2YoQXJyYXlRU29ydFBhaXIp LCBjb21wYXJlQnlTdHJpbmdQYWlyRm9yUVNvcnQpOwotI2VuZGlmCisgICAgcGxhdGZvcm1Tb3J0 KHZhbHVlcy5iZWdpbigpLCB2YWx1ZXMuc2l6ZSgpLCBzaXplb2YoQXJyYXlRU29ydFBhaXIpLCBj b21wYXJlQnlTdHJpbmdQYWlyRm9yUVNvcnQpOwogCiAgICAgLy8gRklYTUU6IElmIHRoZSB0b1N0 cmluZyBmdW5jdGlvbiBjaGFuZ2VkIHRoZSBsZW5ndGggb2YgdGhlIGFycmF5LCB0aGlzIG1pZ2h0 IGJlCiAgICAgLy8gbW9kaWZ5aW5nIHRoZSB2ZWN0b3IgaW5jb3JyZWN0bHkuCkluZGV4OiBKYXZh U2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gMzU2MjApCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvUGxh dGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMzI3LDQgKzMyNywxMCBAQAogI2RlZmluZSBFTkFC TEVfU0FNUExJTkdfVE9PTCAwCiAjZW5kaWYKIAorI2lmIEhBVkUoTUVSR0VTT1JUKQorI2RlZmlu ZSBwbGF0Zm9ybVNvcnQgbWVyZ2Vzb3J0CisjZWxzZQorI2RlZmluZSBwbGF0Zm9ybVNvcnQgcXNv cnQKKyNlbmRpZgorCiAjZW5kaWYgLyogV1RGX1BsYXRmb3JtX2ggKi8K 22933 2008-08-22 04:33:40 -0700 2008-08-25 00:44:15 -0700 This is my new proposed patch. platformSort.patch text/plain 5769 ossy SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM1ODg4KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDgtMDgtMjIgIENzYWJhIE9z enRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwMjk2OiBPcGNvZGVTdGF0cyBkb2Vzbid0 IGJ1aWxkIG9uIHBsYXRmb3JtcyB3aGljaCBkb24ndCBoYXZlIG1lcmdlc29ydCgpLgorICAgICAg ICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjk2PgorCisgICAg ICAgIFVzaW5nIHBsYXRmb3JtU29ydCBtYWNybyBpbnN0ZWFkIG9mIG1lcmdlc29ydCgpLCB3aGlj aCBjYW4gYmUgcmVwbGFjZWQKKyAgICAgICAgd2l0aCBtZXJnZXNvcnQgb3IgcXNvcnQgZGVwZW5k cyBvbiBwbGF0Zm9ybS4KKworICAgICAgICAqIFZNL09wY29kZS5jcHA6CisgICAgICAgIChLSlM6 Ok9wY29kZVN0YXRzOjp+T3Bjb2RlU3RhdHMpOgorICAgICAgICAqIFZNL1NhbXBsaW5nVG9vbC5j cHA6CisgICAgICAgIChLSlM6OlNhbXBsaW5nVG9vbDo6ZHVtcCk6CisgICAgICAgICoga2pzL0pT QXJyYXkuY3BwOgorICAgICAgICAoS0pTOjpKU0FycmF5Ojpzb3J0KToKKyAgICAgICAgKiB3dGYv UGxhdGZvcm0uaDogRGVmaW5lIHBsYXRmb3JtU29ydCBtYWNyby4KKwogMjAwOC0wOC0yMCAgQWxl eGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2luZG93cyBidWls ZCBmaXguCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9WTS9PcGNvZGUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IEphdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5jcHAJKHJldmlzaW9uIDM1ODg4KQorKysgSmF2YVNj cmlwdENvcmUvVk0vT3Bjb2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDE0ICsxMDQsMTQg QEAgT3Bjb2RlU3RhdHM6On5PcGNvZGVTdGF0cygpCiAgICAgaW50IHNvcnRlZEluZGljZXNbbnVt T3Bjb2RlSURzXTsgICAgCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1PcGNvZGVJRHM7ICsr aSkKICAgICAgICAgc29ydGVkSW5kaWNlc1tpXSA9IGk7Ci0gICAgbWVyZ2Vzb3J0KHNvcnRlZElu ZGljZXMsIG51bU9wY29kZUlEcywgc2l6ZW9mKGludCksIGNvbXBhcmVPcGNvZGVJbmRpY2VzKTsK KyAgICBwbGF0Zm9ybVNvcnQoc29ydGVkSW5kaWNlcywgbnVtT3Bjb2RlSURzLCBzaXplb2YoaW50 KSwgY29tcGFyZU9wY29kZUluZGljZXMpOwogICAgIAogICAgIHBhaXI8aW50LCBpbnQ+IHNvcnRl ZFBhaXJJbmRpY2VzW251bU9wY29kZUlEcyAqIG51bU9wY29kZUlEc107CiAgICAgcGFpcjxpbnQs IGludD4qIGN1cnJlbnRQYWlySW5kZXggPSBzb3J0ZWRQYWlySW5kaWNlczsKICAgICBmb3IgKGlu dCBpID0gMDsgaSA8IG51bU9wY29kZUlEczsgKytpKQogICAgICAgICBmb3IgKGludCBqID0gMDsg aiA8IG51bU9wY29kZUlEczsgKytqKQogICAgICAgICAgICAgKihjdXJyZW50UGFpckluZGV4Kysp ID0gbWFrZV9wYWlyKGksIGopOwotICAgIG1lcmdlc29ydChzb3J0ZWRQYWlySW5kaWNlcywgbnVt T3Bjb2RlSURzICogbnVtT3Bjb2RlSURzLCBzaXplb2YocGFpcjxpbnQsIGludD4pLCBjb21wYXJl T3Bjb2RlUGFpckluZGljZXMpOworICAgIHBsYXRmb3JtU29ydChzb3J0ZWRQYWlySW5kaWNlcywg bnVtT3Bjb2RlSURzICogbnVtT3Bjb2RlSURzLCBzaXplb2YocGFpcjxpbnQsIGludD4pLCBjb21w YXJlT3Bjb2RlUGFpckluZGljZXMpOwogICAgIAogICAgIHByaW50ZigiXG5FeGVjdXRlZCBvcGNv ZGUgc3RhdGlzdGljc1xuIik7IAogICAgIApJbmRleDogSmF2YVNjcmlwdENvcmUvVk0vU2FtcGxp bmdUb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9WTS9TYW1wbGluZ1Rvb2wu Y3BwCShyZXZpc2lvbiAzNTg4OCkKKysrIEphdmFTY3JpcHRDb3JlL1ZNL1NhbXBsaW5nVG9vbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MywxMSArMTczLDcgQEAgdm9pZCBTYW1wbGluZ1Rvb2w6 OmR1bXAoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICBjb2RlQmxvY2tTYW1wbGVzW2ldID0gaXRl ci0+c2Vjb25kOwogICAgICAgICB0b3RhbENvZGVCbG9ja1NhbXBsZXMgKz0gY29kZUJsb2NrU2Ft cGxlc1tpXS0+bV90b3RhbENvdW50OwogICAgIH0KLSNpZiBIQVZFKE1FUkdFU09SVCkKLSAgICBt ZXJnZXNvcnQoY29kZUJsb2NrU2FtcGxlcy5iZWdpbigpLCBzY29wZUNvdW50LCBzaXplb2YoU2Nv cGVTYW1wbGVSZWNvcmQqKSwgY29tcGFyZVNjb3BlU2FtcGxlUmVjb3Jkcyk7Ci0jZWxzZQotICAg IHFzb3J0KGNvZGVCbG9ja1NhbXBsZXMuYmVnaW4oKSwgc2NvcGVDb3VudCwgc2l6ZW9mKFNjb3Bl U2FtcGxlUmVjb3JkKiksIGNvbXBhcmVTY29wZVNhbXBsZVJlY29yZHMpOwotI2VuZGlmCisgICAg cGxhdGZvcm1Tb3J0KGNvZGVCbG9ja1NhbXBsZXMuYmVnaW4oKSwgc2NvcGVDb3VudCwgc2l6ZW9m KFNjb3BlU2FtcGxlUmVjb3JkKiksIGNvbXBhcmVTY29wZVNhbXBsZVJlY29yZHMpOwogCiAgICAg Ly8gKDIpIFByaW50IGRhdGEgZnJvbSAnY29kZUJsb2NrU2FtcGxlcycgYXJyYXksIGNhbGN1bGF0 ZSAndG90YWxPcGNvZGVTYW1wbGVzJywgcG9wdWxhdGUgJ29wY29kZVNhbXBsZUNvdW50cycgYXJy YXkuCiAKQEAgLTIxNiwxMSArMjEyLDcgQEAgdm9pZCBTYW1wbGluZ1Rvb2w6OmR1bXAoRXhlY1N0 YXRlKiBleGVjKQogICAgICAgICAgICAgICAgICAgICBsaW5lQ291bnRJbmZvW2xpbmVub10ubGlu ZSA9IGl0ZXItPmZpcnN0OwogICAgICAgICAgICAgICAgICAgICBsaW5lQ291bnRJbmZvW2xpbmVu b10uY291bnQgPSBpdGVyLT5zZWNvbmQ7CiAgICAgICAgICAgICAgICAgfQotI2lmIEhBVkUoTUVS R0VTT1JUKQotICAgICAgICAgICAgICAgIG1lcmdlc29ydChsaW5lQ291bnRJbmZvLmJlZ2luKCks IGxpbmVzQ291bnQsIHNpemVvZihMaW5lQ291bnRJbmZvKSwgY29tcGFyZUxpbmVDb3VudEluZm9T YW1wbGluZyk7Ci0jZWxzZQotICAgICAgICAgICAgICAgIHFzb3J0KGxpbmVDb3VudEluZm8uYmVn aW4oKSwgbGluZXNDb3VudCwgc2l6ZW9mKExpbmVDb3VudEluZm8pLCBjb21wYXJlTGluZUNvdW50 SW5mb1NhbXBsaW5nKTsKLSNlbmRpZgorICAgICAgICAgICAgICAgIHBsYXRmb3JtU29ydChsaW5l Q291bnRJbmZvLmJlZ2luKCksIGxpbmVzQ291bnQsIHNpemVvZihMaW5lQ291bnRJbmZvKSwgY29t cGFyZUxpbmVDb3VudEluZm9TYW1wbGluZyk7CiAgICAgICAgICAgICAgICAgZm9yIChsaW5lbm8g PSAwOyBsaW5lbm8gPCBsaW5lc0NvdW50OyArK2xpbmVubykgewogICAgICAgICAgICAgICAgICAg ICBwcmludGYoIiAgICBMaW5lICMlZCBoYXMgc2FtcGxlIGNvdW50ICVkLlxuIiwgbGluZUNvdW50 SW5mb1tsaW5lbm9dLmxpbmUsIGxpbmVDb3VudEluZm9bbGluZW5vXS5jb3VudCk7CiAgICAgICAg ICAgICAgICAgfQpAQCAtMjQ4LDExICsyNDAsNyBAQCB2b2lkIFNhbXBsaW5nVG9vbDo6ZHVtcChF eGVjU3RhdGUqIGV4ZWMpCiAgICAgICAgIG9wY29kZVNhbXBsZUluZm9baV0ub3Bjb2RlID0gKE9w Y29kZUlEKWk7CiAgICAgICAgIG9wY29kZVNhbXBsZUluZm9baV0uY291bnQgPSBvcGNvZGVTYW1w bGVDb3VudHNbaV07CiAgICAgfQotI2lmIEhBVkUoTUVSR0VTT1JUKQotICAgIG1lcmdlc29ydChv cGNvZGVTYW1wbGVJbmZvLCBudW1PcGNvZGVJRHMsIHNpemVvZihPcGNvZGVTYW1wbGVJbmZvKSwg Y29tcGFyZU9wY29kZUluZGljZXNTYW1wbGluZyk7Ci0jZWxzZQotICAgIHFzb3J0KG9wY29kZVNh bXBsZUluZm8sIG51bU9wY29kZUlEcywgc2l6ZW9mKE9wY29kZVNhbXBsZUluZm8pLCBjb21wYXJl T3Bjb2RlSW5kaWNlc1NhbXBsaW5nKTsKLSNlbmRpZgorICAgIHBsYXRmb3JtU29ydChvcGNvZGVT YW1wbGVJbmZvLCBudW1PcGNvZGVJRHMsIHNpemVvZihPcGNvZGVTYW1wbGVJbmZvKSwgY29tcGFy ZU9wY29kZUluZGljZXNTYW1wbGluZyk7CiAKICAgICAvLyAoNCkgUHJpbnQgT3Bjb2RlIHNhbXBs aW5nIHJlc3VsdHMuCiAgICAgCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9ranMvSlNBcnJheS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUva2pzL0pTQXJyYXkuY3BwCShyZXZpc2lvbiAz NTg4OCkKKysrIEphdmFTY3JpcHRDb3JlL2tqcy9KU0FycmF5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNTY5LDEzICs1NjksOSBAQCB2b2lkIEpTQXJyYXk6OnNvcnQoRXhlY1N0YXRlKiBleGVjKQog ICAgIC8vIEZJWE1FOiBTaW5jZSB3ZSBzb3J0IGJ5IHN0cmluZyB2YWx1ZSwgYSBmYXN0IGFsZ29y aXRobSBtaWdodCBiZSB0byB1c2UgYSByYWRpeCBzb3J0LiBUaGF0IHdvdWxkIGJlIE8oTikgcmF0 aGVyCiAgICAgLy8gdGhhbiBPKE4gbG9nIE4pLgogCi0jaWYgSEFWRShNRVJHRVNPUlQpCi0gICAg bWVyZ2Vzb3J0KHZhbHVlcy5iZWdpbigpLCB2YWx1ZXMuc2l6ZSgpLCBzaXplb2YoQXJyYXlRU29y dFBhaXIpLCBjb21wYXJlQnlTdHJpbmdQYWlyRm9yUVNvcnQpOwotI2Vsc2UKICAgICAvLyBGSVhN RTogVGhlIHFzb3J0IGxpYnJhcnkgZnVuY3Rpb24gaXMgbGlrZWx5IHRvIG5vdCBiZSBhIHN0YWJs ZSBzb3J0LgogICAgIC8vIEVDTUFTY3JpcHQtMjYyIGRvZXMgbm90IHNwZWNpZnkgYSBzdGFibGUg c29ydCwgYnV0IGluIHByYWN0aWNlLCBicm93c2VycyBwZXJmb3JtIGEgc3RhYmxlIHNvcnQuCi0g ICAgcXNvcnQodmFsdWVzLmJlZ2luKCksIHZhbHVlcy5zaXplKCksIHNpemVvZihBcnJheVFTb3J0 UGFpciksIGNvbXBhcmVCeVN0cmluZ1BhaXJGb3JRU29ydCk7Ci0jZW5kaWYKKyAgICBwbGF0Zm9y bVNvcnQodmFsdWVzLmJlZ2luKCksIHZhbHVlcy5zaXplKCksIHNpemVvZihBcnJheVFTb3J0UGFp ciksIGNvbXBhcmVCeVN0cmluZ1BhaXJGb3JRU29ydCk7CiAKICAgICAvLyBGSVhNRTogSWYgdGhl IHRvU3RyaW5nIGZ1bmN0aW9uIGNoYW5nZWQgdGhlIGxlbmd0aCBvZiB0aGUgYXJyYXksIHRoaXMg bWlnaHQgYmUKICAgICAvLyBtb2RpZnlpbmcgdGhlIHZlY3RvciBpbmNvcnJlY3RseS4KSW5kZXg6 IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRD b3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAzNTg4OCkKKysrIEphdmFTY3JpcHRDb3JlL3d0 Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMjcsNCArMzI3LDEyIEBACiAjZGVmaW5l IEVOQUJMRV9TQU1QTElOR19UT09MIDAKICNlbmRpZgogCisvKiBwbGF0Zm9ybVNvcnQgKi8KKwor I2lmIEhBVkUoTUVSR0VTT1JUKQorI2RlZmluZSBwbGF0Zm9ybVNvcnQgbWVyZ2Vzb3J0CisjZWxz ZQorI2RlZmluZSBwbGF0Zm9ybVNvcnQgcXNvcnQKKyNlbmRpZgorCiAjZW5kaWYgLyogV1RGX1Bs YXRmb3JtX2ggKi8K 22974 2008-08-25 00:44:15 -0700 2008-08-25 08:58:58 -0700 proposed patch qsort.patch text/plain 1735 ossy SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM1OTEyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMDgtMjUgIENzYWJhIE9z enRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwMjk2OiBPcGNvZGVTdGF0cyBkb2Vzbid0 IGJ1aWxkIG9uIHBsYXRmb3JtcyB3aGljaCBkb24ndCBoYXZlIG1lcmdlc29ydCgpLgorICAgICAg ICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjk2PgorCisgICAg ICAgICogVk0vT3Bjb2RlLmNwcDoKKyAgICAgICAgKEtKUzo6T3Bjb2RlU3RhdHM6On5PcGNvZGVT dGF0cyk6IG1lcmdlc29ydCgpIHJlcGxhY2VkIHdpdGggcXNvcnQoKQorCiAyMDA4LTA4LTI0ICBD YW1lcm9uIFp3YXJpY2ggIDxjd3p3YXJpY2hAdXdhdGVybG9vLmNhPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogSmF2YVNjcmlwdENvcmUvVk0vT3Bjb2RlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9WTS9PcGNvZGUuY3BwCShyZXZpc2lvbiAzNTkx MikKKysrIEphdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEw NCwxNCArMTA0LDE0IEBAIE9wY29kZVN0YXRzOjp+T3Bjb2RlU3RhdHMoKQogICAgIGludCBzb3J0 ZWRJbmRpY2VzW251bU9wY29kZUlEc107ICAgIAogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVt T3Bjb2RlSURzOyArK2kpCiAgICAgICAgIHNvcnRlZEluZGljZXNbaV0gPSBpOwotICAgIG1lcmdl c29ydChzb3J0ZWRJbmRpY2VzLCBudW1PcGNvZGVJRHMsIHNpemVvZihpbnQpLCBjb21wYXJlT3Bj b2RlSW5kaWNlcyk7CisgICAgcXNvcnQoc29ydGVkSW5kaWNlcywgbnVtT3Bjb2RlSURzLCBzaXpl b2YoaW50KSwgY29tcGFyZU9wY29kZUluZGljZXMpOwogICAgIAogICAgIHBhaXI8aW50LCBpbnQ+ IHNvcnRlZFBhaXJJbmRpY2VzW251bU9wY29kZUlEcyAqIG51bU9wY29kZUlEc107CiAgICAgcGFp cjxpbnQsIGludD4qIGN1cnJlbnRQYWlySW5kZXggPSBzb3J0ZWRQYWlySW5kaWNlczsKICAgICBm b3IgKGludCBpID0gMDsgaSA8IG51bU9wY29kZUlEczsgKytpKQogICAgICAgICBmb3IgKGludCBq ID0gMDsgaiA8IG51bU9wY29kZUlEczsgKytqKQogICAgICAgICAgICAgKihjdXJyZW50UGFpcklu ZGV4KyspID0gbWFrZV9wYWlyKGksIGopOwotICAgIG1lcmdlc29ydChzb3J0ZWRQYWlySW5kaWNl cywgbnVtT3Bjb2RlSURzICogbnVtT3Bjb2RlSURzLCBzaXplb2YocGFpcjxpbnQsIGludD4pLCBj b21wYXJlT3Bjb2RlUGFpckluZGljZXMpOworICAgIHFzb3J0KHNvcnRlZFBhaXJJbmRpY2VzLCBu dW1PcGNvZGVJRHMgKiBudW1PcGNvZGVJRHMsIHNpemVvZihwYWlyPGludCwgaW50PiksIGNvbXBh cmVPcGNvZGVQYWlySW5kaWNlcyk7CiAgICAgCiAgICAgcHJpbnRmKCJcbkV4ZWN1dGVkIG9wY29k ZSBzdGF0aXN0aWNzXG4iKTsgCiAgICAgCg==