From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9NBc-0003tB-Md for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:12:52 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9NBb-0003sU-PH for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:12:52 -0500 Received: from [199.232.76.173] (port=48847 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9NBb-0003sM-KR for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:12:51 -0500 Received: from fg-out-1718.google.com ([72.14.220.155]:29157) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L9NBb-0007xH-33 for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:12:51 -0500 Received: by fg-out-1718.google.com with SMTP id l26so611781fgb.8 for ; Sun, 07 Dec 2008 09:12:50 -0800 (PST) Message-ID: <761ea48b0812070912q5a1961d9t3bbf5905238daee8@mail.gmail.com> Date: Sun, 7 Dec 2008 18:12:50 +0100 From: "Laurent Desnogues" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_40768_28106585.1228669970265" Subject: [Qemu-devel] [PATCH] Some cleanups after dyngen removal Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_40768_28106585.1228669970265 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, this patch removes some now unused things after dyngen removal. 1. dyngen-exec.h: op_param, op _jmp and some associated macros are now unused; 2. Makefile.target: tcg-dyngen is not needed anymore 2. tcg/tcg-op.h, tcg/tcg-opc.h: gen-op.h is dead 3. tcg.c: - INDEX_op_end is now the first op - CONFIG_DYNGEN_OP is never defined 4. tcg.h: dyngen_op not needed anymore 5. exec-all.h: remove some ASM macros. Note tcg/tcg-dyngen.c can be removed. I think dyngen-exec.h should be renamed (it's included by the various exec.h targets). I tested all targets still compile on my x86_64 machine. This patch is probably not complete for possible removals, but I hope it's a good start. Laurent Signed-off-by: Laurent Desnogues ------=_Part_40768_28106585.1228669970265 Content-Type: text/x-patch; name=tcg-no-dyngen.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fofy90qe0 Content-Disposition: attachment; filename=tcg-no-dyngen.patch SW5kZXg6IGR5bmdlbi1leGVjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZHluZ2VuLWV4ZWMuaAkocmV2aXNp b24gNTkxNSkKKysrIGR5bmdlbi1leGVjLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwMSwxMCArMjAx LDYgQEAKIC8qIGZvcmNlIEdDQyB0byBnZW5lcmF0ZSBvbmx5IG9uZSBlcGlsb2cgYXQgdGhlIGVu ZCBvZiB0aGUgZnVuY3Rpb24gKi8KICNkZWZpbmUgRk9SQ0VfUkVUKCkgX19hc21fXyBfX3ZvbGF0 aWxlX18oIiIgOiA6IDogIm1lbW9yeSIpOwogCi0jaWZuZGVmIE9QUFJPVE8KLSNkZWZpbmUgT1BQ Uk9UTwotI2VuZGlmCi0KICNkZWZpbmUgeGdsdWUoeCwgeSkgeCAjIyB5CiAjZGVmaW5lIGdsdWUo eCwgeSkgeGdsdWUoeCwgeSkKICNkZWZpbmUgc3RyaW5naWZ5KHMpCXRvc3RyaW5nKHMpCkBAIC0y MTcsNzkgKzIxMyw2IEBACiAjZGVmaW5lIF9faGlkZGVuCiAjZW5kaWYKIAotI2lmIGRlZmluZWQo X19hbHBoYV9fKQotLyogU3VnZ2VzdGVkIGJ5IFJpY2hhcmQgSGVuZGVyc29uLiBUaGlzIHdpbGwg cmVzdWx0IGluIGNvZGUgbGlrZQotICAgICAgICBsZGFoICQwLF9fb3BfcGFyYW0xKCQyOSkgICAg ICAgICFncHJlbGhpZ2gKLSAgICAgICAgbGRhICQwLF9fb3BfcGFyYW0xKCQwKSAgICAgICAgICAh Z3ByZWxsb3cKLSAgIFdlIGNhbiB0aGVuIGNvbnZlbmllbnRseSBjaGFuZ2UgJDI5IHRvICQzMSBh bmQgYWRhcHQgdGhlIG9mZnNldHMgdG8KLSAgIGVtaXQgdGhlIGFwcHJvcHJpYXRlIGNvbnN0YW50 LiAgKi8KLWV4dGVybiBpbnQgX19vcF9wYXJhbTEgX19oaWRkZW47Ci1leHRlcm4gaW50IF9fb3Bf cGFyYW0yIF9faGlkZGVuOwotZXh0ZXJuIGludCBfX29wX3BhcmFtMyBfX2hpZGRlbjsKLSNkZWZp bmUgUEFSQU0xICh7IGludCBfcjsgYXNtKCIiIDogIj1yIihfcikgOiAiMCIgKCZfX29wX3BhcmFt MSkpOyBfcjsgfSkKLSNkZWZpbmUgUEFSQU0yICh7IGludCBfcjsgYXNtKCIiIDogIj1yIihfcikg OiAiMCIgKCZfX29wX3BhcmFtMikpOyBfcjsgfSkKLSNkZWZpbmUgUEFSQU0zICh7IGludCBfcjsg YXNtKCIiIDogIj1yIihfcikgOiAiMCIgKCZfX29wX3BhcmFtMykpOyBfcjsgfSkKLSNlbGlmIGRl ZmluZWQoX19zMzkwX18pCi1leHRlcm4gaW50IF9fb3BfcGFyYW0xIF9faGlkZGVuOwotZXh0ZXJu IGludCBfX29wX3BhcmFtMiBfX2hpZGRlbjsKLWV4dGVybiBpbnQgX19vcF9wYXJhbTMgX19oaWRk ZW47Ci0jZGVmaW5lIFBBUkFNMSAoeyBpbnQgX3I7IGFzbSgiYnJhcyAlMCw4OyAubG9uZyAiIEFT TV9OQU1FKF9fb3BfcGFyYW0xKSAiOyBsICUwLDAoJTApIiA6ICI9ciIoX3IpIDogKTsgX3I7IH0p Ci0jZGVmaW5lIFBBUkFNMiAoeyBpbnQgX3I7IGFzbSgiYnJhcyAlMCw4OyAubG9uZyAiIEFTTV9O QU1FKF9fb3BfcGFyYW0yKSAiOyBsICUwLDAoJTApIiA6ICI9ciIoX3IpIDogKTsgX3I7IH0pCi0j ZGVmaW5lIFBBUkFNMyAoeyBpbnQgX3I7IGFzbSgiYnJhcyAlMCw4OyAubG9uZyAiIEFTTV9OQU1F KF9fb3BfcGFyYW0zKSAiOyBsICUwLDAoJTApIiA6ICI9ciIoX3IpIDogKTsgX3I7IH0pCi0jZWxz ZQotI2lmIGRlZmluZWQoX19BUFBMRV9fKQotc3RhdGljIGludCBfX29wX3BhcmFtMSwgX19vcF9w YXJhbTIsIF9fb3BfcGFyYW0zOwotI2Vsc2UKLWV4dGVybiBpbnQgX19vcF9wYXJhbTEsIF9fb3Bf cGFyYW0yLCBfX29wX3BhcmFtMzsKLSNlbmRpZgotI2RlZmluZSBQQVJBTTEgKChsb25nKSgmX19v cF9wYXJhbTEpKQotI2RlZmluZSBQQVJBTTIgKChsb25nKSgmX19vcF9wYXJhbTIpKQotI2RlZmlu ZSBQQVJBTTMgKChsb25nKSgmX19vcF9wYXJhbTMpKQotI2VuZGlmIC8qICFkZWZpbmVkKF9fYWxw aGFfXykgKi8KLQotZXh0ZXJuIGludCBfX29wX2ptcDAsIF9fb3Bfam1wMSwgX19vcF9qbXAyLCBf X29wX2ptcDM7Ci0KLSNpZiBkZWZpbmVkKF9XSU4zMikgfHwgZGVmaW5lZChfX0FQUExFX18pCi0j ZGVmaW5lIEFTTV9OQU1FKHgpICJfIiAjeAotI2Vsc2UKLSNkZWZpbmUgQVNNX05BTUUoeCkgI3gK LSNlbmRpZgotCi0jaWYgZGVmaW5lZChfX2kzODZfXykKLSNkZWZpbmUgRVhJVF9UQigpIGFzbSB2 b2xhdGlsZSAoInJldCIpCi0jZGVmaW5lIEdPVE9fTEFCRUxfUEFSQU0obikgYXNtIHZvbGF0aWxl ICgiam1wICIgQVNNX05BTUUoX19vcF9nZW5fbGFiZWwpICNuKQotI2VsaWYgZGVmaW5lZChfX3g4 Nl82NF9fKQotI2RlZmluZSBFWElUX1RCKCkgYXNtIHZvbGF0aWxlICgicmV0IikKLSNkZWZpbmUg R09UT19MQUJFTF9QQVJBTShuKSBhc20gdm9sYXRpbGUgKCJqbXAgIiBBU01fTkFNRShfX29wX2dl bl9sYWJlbCkgI24pCi0jZWxpZiBkZWZpbmVkKF9fcG93ZXJwY19fKQotI2RlZmluZSBFWElUX1RC KCkgYXNtIHZvbGF0aWxlICgiYmxyIikKLSNkZWZpbmUgR09UT19MQUJFTF9QQVJBTShuKSBhc20g dm9sYXRpbGUgKCJiICIgQVNNX05BTUUoX19vcF9nZW5fbGFiZWwpICNuKQotI2VsaWYgZGVmaW5l ZChfX3MzOTBfXykKLSNkZWZpbmUgRVhJVF9UQigpIGFzbSB2b2xhdGlsZSAoImJyICVyMTQiKQot I2RlZmluZSBHT1RPX0xBQkVMX1BBUkFNKG4pIGFzbSB2b2xhdGlsZSAoImxhcmwgJXI3LDEyOyBs ICVyNywwKCVyNyk7IGJyICVyNzsgLmxvbmcgIiBBU01fTkFNRShfX29wX2dlbl9sYWJlbCkgI24p Ci0jZWxpZiBkZWZpbmVkKF9fYWxwaGFfXykKLSNkZWZpbmUgRVhJVF9UQigpIGFzbSB2b2xhdGls ZSAoInJldCIpCi0jZWxpZiBkZWZpbmVkKF9faWE2NF9fKQotI2RlZmluZSBFWElUX1RCKCkgYXNt IHZvbGF0aWxlICgiYnIucmV0LnNwdGsubWFueSBiMDs7IikKLSNkZWZpbmUgR09UT19MQUJFTF9Q QVJBTShuKSBhc20gdm9sYXRpbGUgKCJici5zcHRrLm1hbnkgIiBcCi0JCQkJCSAgQVNNX05BTUUo X19vcF9nZW5fbGFiZWwpICNuKQotI2VsaWYgZGVmaW5lZChfX3NwYXJjX18pCi0jZGVmaW5lIEVY SVRfVEIoKSBhc20gdm9sYXRpbGUgKCJqbXBsICVpMCArIDgsICVnMDsgbm9wIikKLSNkZWZpbmUg R09UT19MQUJFTF9QQVJBTShuKSBhc20gdm9sYXRpbGUgKCJiYSAiIEFTTV9OQU1FKF9fb3BfZ2Vu X2xhYmVsKSAjbiAiO25vcCIpCi0jZWxpZiBkZWZpbmVkKF9fYXJtX18pCi0jZGVmaW5lIEVYSVRf VEIoKSBhc20gdm9sYXRpbGUgKCJiIGV4ZWNfbG9vcCIpCi0jZGVmaW5lIEdPVE9fTEFCRUxfUEFS QU0obikgYXNtIHZvbGF0aWxlICgiYiAiIEFTTV9OQU1FKF9fb3BfZ2VuX2xhYmVsKSAjbikKLSNl bGlmIGRlZmluZWQoX19tYzY4MDAwKQotI2RlZmluZSBFWElUX1RCKCkgYXNtIHZvbGF0aWxlICgi cnRzIikKLSNlbGlmIGRlZmluZWQoX19taXBzX18pCi0jZGVmaW5lIEVYSVRfVEIoKSBhc20gdm9s YXRpbGUgKCJqciAkcmEiKQotI2RlZmluZSBHT1RPX0xBQkVMX1BBUkFNKG4pIGFzbSB2b2xhdGls ZSAoIi5zZXQgbm9hdDsgbGEgJDEsICIgQVNNX05BTUUoX19vcF9nZW5fbGFiZWwpICNuICI7IGpy ICQxOyAuc2V0IGF0IikKLSNlbGlmIGRlZmluZWQoX19ocHBhX18pCi0jZGVmaW5lIEdPVE9fTEFC RUxfUEFSQU0obikgYXNtIHZvbGF0aWxlICgiYixuICIgQVNNX05BTUUoX19vcF9nZW5fbGFiZWwp ICNuKQotI2Vsc2UKLSNlcnJvciB1bnN1cHBvcnRlZCBDUFUKLSNlbmRpZgotCiAvKiBUaGUgcmV0 dXJuIGFkZHJlc3MgbWF5IHBvaW50IHRvIHRoZSBzdGFydCBvZiB0aGUgbmV4dCBpbnN0cnVjdGlv bi4KICAgIFN1YnRyYWN0aW5nIG9uZSBnZXRzIHVzIHRoZSBjYWxsIGluc3RydWN0aW9uIGl0c2Vs Zi4gICovCiAjaWYgZGVmaW5lZChfX3MzOTBfXykKSW5kZXg6IE1ha2VmaWxlLnRhcmdldAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBNYWtlZmlsZS50YXJnZXQJKHJldmlzaW9uIDU5MTUpCisrKyBNYWtlZmlsZS50 YXJnZXQJKHdvcmtpbmcgY29weSkKQEAgLTE4Niw3ICsxODYsNyBAQAogTElCT0JKUz1leGVjLm8g a3FlbXUubyB0cmFuc2xhdGUtYWxsLm8gY3B1LWV4ZWMub1wKICAgICAgICAgdHJhbnNsYXRlLm8g aG9zdC11dGlscy5vCiAjIFRDRyBjb2RlIGdlbmVyYXRvcgotTElCT0JKUys9IHRjZy90Y2cubyB0 Y2cvdGNnLWR5bmdlbi5vIHRjZy90Y2ctcnVudGltZS5vCitMSUJPQkpTKz0gdGNnL3RjZy5vIHRj Zy90Y2ctcnVudGltZS5vCiBDUFBGTEFHUys9LUkkKFNSQ19QQVRIKS90Y2cgLUkkKFNSQ19QQVRI KS90Y2cvJChBUkNIKQogaWZlcSAoJChBUkNIKSxzcGFyYzY0KQogQ1BQRkxBR1MrPS1JJChTUkNf UEFUSCkvdGNnL3NwYXJjCkluZGV4OiB0Y2cvdGNnLW9wLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdGNnL3Rj Zy1vcC5oCShyZXZpc2lvbiA1OTE1KQorKysgdGNnL3RjZy1vcC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yMywxMSArMjMsNiBAQAogICovCiAjaW5jbHVkZSAidGNnLmgiCiAKLSNpZmRlZiBDT05GSUdf RFlOR0VOX09QCi0vKiBsZWdhY3kgZHluZ2VuIG9wZXJhdGlvbnMgKi8KLSNpbmNsdWRlICJnZW4t b3AuaCIKLSNlbmRpZgotCiBpbnQgZ2VuX25ld19sYWJlbCh2b2lkKTsKIAogc3RhdGljIGlubGlu ZSB2b2lkIHRjZ19nZW5fb3AxX2kzMihpbnQgb3BjLCBUQ0d2X2kzMiBhcmcxKQpJbmRleDogdGNn L3RjZy1vcGMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0Y2cvdGNnLW9wYy5oCShyZXZpc2lvbiA1OTE1KQor KysgdGNnL3RjZy1vcGMuaAkod29ya2luZyBjb3B5KQpAQCAtMjEsMTAgKzIxLDYgQEAKICAqIE9V VCBPRiBPUiBJTiBDT05ORUNUSU9OIFdJVEggVEhFIFNPRlRXQVJFIE9SIFRIRSBVU0UgT1IgT1RI RVIgREVBTElOR1MgSU4KICAqIFRIRSBTT0ZUV0FSRS4KICAqLwotI2lmZGVmIENPTkZJR19EWU5H RU5fT1AKLSNpbmNsdWRlICJkeW5nZW4tb3BjLmgiCi0jZW5kaWYKLQogI2lmbmRlZiBERUYyCiAj ZGVmaW5lIERFRjIobmFtZSwgb2FyZ3MsIGlhcmdzLCBjYXJncywgZmxhZ3MpIERFRihuYW1lLCBv YXJncyArIGlhcmdzICsgY2FyZ3MsIDApCiAjZW5kaWYKSW5kZXg6IHRjZy90Y2cuYwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSB0Y2cvdGNnLmMJKHJldmlzaW9uIDU5MTUpCisrKyB0Y2cvdGNnLmMJKHdvcmtpbmcg Y29weSkKQEAgLTExOTgsNTcgKzExOTgsNTAgQEAKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgLyogWFhYOiBvcHRpbWl6ZSBieSBoYXJkY29kaW5nIGNvbW1vbiBjYXNlcyAoZS5nLiB0 cmlhZGljIG9wcykgKi8KICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGlmIChvcCA+IElO REVYX29wX2VuZCkgewotICAgICAgICAgICAgICAgIGFyZ3MgLT0gZGVmLT5uYl9hcmdzOwotICAg ICAgICAgICAgICAgIG5iX2lhcmdzID0gZGVmLT5uYl9pYXJnczsKLSAgICAgICAgICAgICAgICBu Yl9vYXJncyA9IGRlZi0+bmJfb2FyZ3M7CisgICAgICAgICAgICBhcmdzIC09IGRlZi0+bmJfYXJn czsKKyAgICAgICAgICAgIG5iX2lhcmdzID0gZGVmLT5uYl9pYXJnczsKKyAgICAgICAgICAgIG5i X29hcmdzID0gZGVmLT5uYl9vYXJnczsKIAotICAgICAgICAgICAgICAgIC8qIFRlc3QgaWYgdGhl IG9wZXJhdGlvbiBjYW4gYmUgcmVtb3ZlZCBiZWNhdXNlIGFsbAotICAgICAgICAgICAgICAgICAg IGl0cyBvdXRwdXRzIGFyZSBkZWFkLiBXZSBhc3N1bWUgdGhhdCBuYl9vYXJncyA9PSAwCi0gICAg ICAgICAgICAgICAgICAgaW1wbGllcyBzaWRlIGVmZmVjdHMgKi8KLSAgICAgICAgICAgICAgICBp ZiAoIShkZWYtPmZsYWdzICYgVENHX09QRl9TSURFX0VGRkVDVFMpICYmIG5iX29hcmdzICE9IDAp IHsKLSAgICAgICAgICAgICAgICAgICAgZm9yKGkgPSAwOyBpIDwgbmJfb2FyZ3M7IGkrKykgewot ICAgICAgICAgICAgICAgICAgICAgICAgYXJnID0gYXJnc1tpXTsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGlmICghZGVhZF90ZW1wc1thcmddKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdvdG8gZG9fbm90X3JlbW92ZTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg ICAgICAgICB0Y2dfc2V0X25vcChzLCBnZW5fb3BjX2J1ZiArIG9wX2luZGV4LCBhcmdzLCBkZWYt Pm5iX2FyZ3MpOworICAgICAgICAgICAgLyogVGVzdCBpZiB0aGUgb3BlcmF0aW9uIGNhbiBiZSBy ZW1vdmVkIGJlY2F1c2UgYWxsCisgICAgICAgICAgICAgICBpdHMgb3V0cHV0cyBhcmUgZGVhZC4g V2UgYXNzdW1lIHRoYXQgbmJfb2FyZ3MgPT0gMAorICAgICAgICAgICAgICAgaW1wbGllcyBzaWRl IGVmZmVjdHMgKi8KKyAgICAgICAgICAgIGlmICghKGRlZi0+ZmxhZ3MgJiBUQ0dfT1BGX1NJREVf RUZGRUNUUykgJiYgbmJfb2FyZ3MgIT0gMCkgeworICAgICAgICAgICAgICAgIGZvcihpID0gMDsg aSA8IG5iX29hcmdzOyBpKyspIHsKKyAgICAgICAgICAgICAgICAgICAgYXJnID0gYXJnc1tpXTsK KyAgICAgICAgICAgICAgICAgICAgaWYgKCFkZWFkX3RlbXBzW2FyZ10pCisgICAgICAgICAgICAg ICAgICAgICAgICBnb3RvIGRvX25vdF9yZW1vdmU7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIHRjZ19zZXRfbm9wKHMsIGdlbl9vcGNfYnVmICsgb3BfaW5kZXgsIGFyZ3MsIGRl Zi0+bmJfYXJncyk7CiAjaWZkZWYgQ09ORklHX1BST0ZJTEVSCi0gICAgICAgICAgICAgICAgICAg IHMtPmRlbF9vcF9jb3VudCsrOworICAgICAgICAgICAgICAgIHMtPmRlbF9vcF9jb3VudCsrOwog I2VuZGlmCi0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBkb19ub3Rf cmVtb3ZlOgorICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGRvX25vdF9yZW1vdmU6 CiAKLSAgICAgICAgICAgICAgICAgICAgLyogb3V0cHV0IGFyZ3MgYXJlIGRlYWQgKi8KLSAgICAg ICAgICAgICAgICAgICAgZm9yKGkgPSAwOyBpIDwgbmJfb2FyZ3M7IGkrKykgewotICAgICAgICAg ICAgICAgICAgICAgICAgYXJnID0gYXJnc1tpXTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRl YWRfdGVtcHNbYXJnXSA9IDE7CisgICAgICAgICAgICAgICAgLyogb3V0cHV0IGFyZ3MgYXJlIGRl YWQgKi8KKyAgICAgICAgICAgICAgICBmb3IoaSA9IDA7IGkgPCBuYl9vYXJnczsgaSsrKSB7Cisg ICAgICAgICAgICAgICAgICAgIGFyZyA9IGFyZ3NbaV07CisgICAgICAgICAgICAgICAgICAgIGRl YWRfdGVtcHNbYXJnXSA9IDE7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIAor ICAgICAgICAgICAgICAgIC8qIGlmIGVuZCBvZiBiYXNpYyBibG9jaywgdXBkYXRlICovCisgICAg ICAgICAgICAgICAgaWYgKGRlZi0+ZmxhZ3MgJiBUQ0dfT1BGX0JCX0VORCkgeworICAgICAgICAg ICAgICAgICAgICB0Y2dfbGFfYmJfZW5kKHMsIGRlYWRfdGVtcHMpOworICAgICAgICAgICAgICAg IH0gZWxzZSBpZiAoZGVmLT5mbGFncyAmIFRDR19PUEZfQ0FMTF9DTE9CQkVSKSB7CisgICAgICAg ICAgICAgICAgICAgIC8qIGdsb2JhbHMgYXJlIGxpdmUgKi8KKyAgICAgICAgICAgICAgICAgICAg bWVtc2V0KGRlYWRfdGVtcHMsIDAsIHMtPm5iX2dsb2JhbHMpOworICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAvKiBpbnB1dCBhcmdzIGFyZSBsaXZl ICovCisgICAgICAgICAgICAgICAgZGVhZF9pYXJncyA9IDA7CisgICAgICAgICAgICAgICAgZm9y KGkgPSAwOyBpIDwgbmJfaWFyZ3M7IGkrKykgeworICAgICAgICAgICAgICAgICAgICBhcmcgPSBh cmdzW2kgKyBuYl9vYXJnc107CisgICAgICAgICAgICAgICAgICAgIGlmIChkZWFkX3RlbXBzW2Fy Z10pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlYWRfaWFyZ3MgfD0gKDEgPDwgaSk7CiAg ICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAg ICAgICAgIC8qIGlmIGVuZCBvZiBiYXNpYyBibG9jaywgdXBkYXRlICovCi0gICAgICAgICAgICAg ICAgICAgIGlmIChkZWYtPmZsYWdzICYgVENHX09QRl9CQl9FTkQpIHsKLSAgICAgICAgICAgICAg ICAgICAgICAgIHRjZ19sYV9iYl9lbmQocywgZGVhZF90ZW1wcyk7Ci0gICAgICAgICAgICAgICAg ICAgIH0gZWxzZSBpZiAoZGVmLT5mbGFncyAmIFRDR19PUEZfQ0FMTF9DTE9CQkVSKSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAvKiBnbG9iYWxzIGFyZSBsaXZlICovCi0gICAgICAgICAgICAg ICAgICAgICAgICBtZW1zZXQoZGVhZF90ZW1wcywgMCwgcy0+bmJfZ2xvYmFscyk7Ci0gICAgICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgICAg IC8qIGlucHV0IGFyZ3MgYXJlIGxpdmUgKi8KLSAgICAgICAgICAgICAgICAgICAgZGVhZF9pYXJn cyA9IDA7Ci0gICAgICAgICAgICAgICAgICAgIGZvcihpID0gMDsgaSA8IG5iX2lhcmdzOyBpKysp IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGFyZyA9IGFyZ3NbaSArIG5iX29hcmdzXTsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChkZWFkX3RlbXBzW2FyZ10pIHsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkZWFkX2lhcmdzIHw9ICgxIDw8IGkpOwotICAgICAgICAgICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgZGVhZF90ZW1wc1thcmddID0gMDsK LSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBzLT5vcF9kZWFkX2lh cmdzW29wX2luZGV4XSA9IGRlYWRfaWFyZ3M7CisgICAgICAgICAgICAgICAgICAgIGRlYWRfdGVt cHNbYXJnXSA9IDA7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICAgICAvKiBsZWdhY3kgZHluZ2VuIG9wZXJhdGlvbnMgKi8KLSAgICAgICAgICAg ICAgICBhcmdzIC09IGRlZi0+bmJfYXJnczsKLSAgICAgICAgICAgICAgICAvKiBtYXJrIGVuZCBv ZiBiYXNpYyBibG9jayAqLwotICAgICAgICAgICAgICAgIHRjZ19sYV9iYl9lbmQocywgZGVhZF90 ZW1wcyk7CisgICAgICAgICAgICAgICAgcy0+b3BfZGVhZF9pYXJnc1tvcF9pbmRleF0gPSBkZWFk X2lhcmdzOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAg LTIwMTYsMjEgKzIwMDksNiBAQAogICAgICAgICBjYXNlIElOREVYX29wX2VuZDoKICAgICAgICAg ICAgIGdvdG8gdGhlX2VuZDsKIAotI2lmZGVmIENPTkZJR19EWU5HRU5fT1AKLSAgICAgICAgY2Fz ZSAwIC4uLiBJTkRFWF9vcF9lbmQgLSAxOgotICAgICAgICAgICAgLyogbGVnYWN5IGR5bmdlbiBv cHMgKi8KLSNpZmRlZiBDT05GSUdfUFJPRklMRVIKLSAgICAgICAgICAgIHMtPm9sZF9vcF9jb3Vu dCsrOwotI2VuZGlmCi0gICAgICAgICAgICB0Y2dfcmVnX2FsbG9jX2JiX2VuZChzLCBzLT5yZXNl cnZlZF9yZWdzKTsKLSAgICAgICAgICAgIGlmIChzZWFyY2hfcGMgPj0gMCkgewotICAgICAgICAg ICAgICAgIHMtPmNvZGVfcHRyICs9IGRlZi0+Y29weV9zaXplOwotICAgICAgICAgICAgICAgIGFy Z3MgKz0gZGVmLT5uYl9hcmdzOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAg ICBhcmdzID0gZHluZ2VuX29wKHMsIG9wYywgYXJncyk7Ci0gICAgICAgICAgICB9Ci0gICAgICAg ICAgICBnb3RvIG5leHQ7Ci0jZW5kaWYKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIC8q IE5vdGU6IGluIG9yZGVyIHRvIHNwZWVkIHVwIHRoZSBjb2RlLCBpdCB3b3VsZCBiZSBtdWNoCiAg ICAgICAgICAgICAgICBmYXN0ZXIgdG8gaGF2ZSBzcGVjaWFsaXplZCByZWdpc3RlciBhbGxvY2F0 b3IgZnVuY3Rpb25zIGZvcgpJbmRleDogdGNnL3RjZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRjZy90Y2cu aAkocmV2aXNpb24gNTkxNSkKKysrIHRjZy90Y2cuaAkod29ya2luZyBjb3B5KQpAQCAtNDQ5LDgg KzQ0OSw2IEBACiBjb25zdCBUQ0dBcmcgKnRjZ19nZW5fY29kZV9vcChUQ0dDb250ZXh0ICpzLCBp bnQgb3BjLCBjb25zdCBUQ0dBcmcgKmFyZ3MxLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgaW50IGRlYWRfaWFyZ3MpOwogCi1jb25zdCBUQ0dBcmcgKmR5bmdlbl9vcChU Q0dDb250ZXh0ICpzLCBpbnQgb3BjLCBjb25zdCBUQ0dBcmcgKm9wcGFyYW1fcHRyKTsKLQogLyog dGNnLXJ1bnRpbWUuYyAqLwogaW50NjRfdCB0Y2dfaGVscGVyX3NobF9pNjQoaW50NjRfdCBhcmcx LCBpbnQ2NF90IGFyZzIpOwogaW50NjRfdCB0Y2dfaGVscGVyX3Nocl9pNjQoaW50NjRfdCBhcmcx LCBpbnQ2NF90IGFyZzIpOwpJbmRleDogZXhlYy1hbGwuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBleGVjLWFs bC5oCShyZXZpc2lvbiA1OTE1KQorKysgZXhlYy1hbGwuaAkod29ya2luZyBjb3B5KQpAQCAtMjY3 LDIwICsyNjcsNiBAQAogCiBUcmFuc2xhdGlvbkJsb2NrICp0Yl9maW5kX3BjKHVuc2lnbmVkIGxv bmcgcGNfcHRyKTsKIAotI2lmIGRlZmluZWQoX1dJTjMyKQotI2RlZmluZSBBU01fREFUQV9TRUNU SU9OICIuc2VjdGlvbiBcIi5kYXRhXCJcbiIKLSNkZWZpbmUgQVNNX1BSRVZJT1VTX1NFQ1RJT04g Ii5zZWN0aW9uIC50ZXh0XG4iCi0jZWxpZiBkZWZpbmVkKF9fQVBQTEVfXykKLSNkZWZpbmUgQVNN X0RBVEFfU0VDVElPTiAiLmRhdGFcbiIKLSNkZWZpbmUgQVNNX1BSRVZJT1VTX1NFQ1RJT04gIi50 ZXh0XG4iCi0jZWxzZQotI2RlZmluZSBBU01fREFUQV9TRUNUSU9OICIuc2VjdGlvbiBcIi5kYXRh XCJcbiIKLSNkZWZpbmUgQVNNX1BSRVZJT1VTX1NFQ1RJT04gIi5wcmV2aW91c1xuIgotI2VuZGlm Ci0KLSNkZWZpbmUgQVNNX09QX0xBQkVMX05BTUUobiwgb3BuYW1lKSBcCi0gICAgQVNNX05BTUUo X19vcF9sYWJlbCkgI24gIi4iIEFTTV9OQU1FKG9wbmFtZSkKLQogZXh0ZXJuIENQVVdyaXRlTWVt b3J5RnVuYyAqaW9fbWVtX3dyaXRlW0lPX01FTV9OQl9FTlRSSUVTXVs0XTsKIGV4dGVybiBDUFVS ZWFkTWVtb3J5RnVuYyAqaW9fbWVtX3JlYWRbSU9fTUVNX05CX0VOVFJJRVNdWzRdOwogZXh0ZXJu IHZvaWQgKmlvX21lbV9vcGFxdWVbSU9fTUVNX05CX0VOVFJJRVNdOwo= ------=_Part_40768_28106585.1228669970265--