From: Robert Bragg Subject: [PATCH igt 3/3] igt/gem_exec_parse: update for version 8 changes Date: Wed, 26 Oct 2016 17:01:33 +0100 Message-ID: <20161026160133.6926-4-robert@sixbynine.org> References: <20161026160133.6926-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 459AD6E8C9 for ; Wed, 26 Oct 2016 16:01:48 +0000 (UTC) Received: by mail-pf0-x242.google.com with SMTP id s8so23113669pfj.2 for ; Wed, 26 Oct 2016 09:01:48 -0700 (PDT) In-Reply-To: <20161026160133.6926-1-robert@sixbynine.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBhZGFwdHMgdGhlIHRlc3RzIHRvIGFjY291bnQgZm9yIHRoZSBwYXJzZXIgbm8gbG9uZ2Vy IHJlcG9ydGluZwpwcml2aWxlZ2UgdmlvbGF0aW9ucyBiYWNrIHRvIHVzZXJzcGFjZSBhcyBFSU5W QUwgZXJyb3JzICh0aGV5IGFyZSBsZWZ0CnRvIHRoZSBIVyBjb21tYW5kIHBhcnNlciB0byBzcXVh c2ggdGhlIGNvbW1hbmRzIHRvIE5PT1BTKS4KClRoZSBpbnRlcmZhY2UgY2hhbmdlIGlzbid0IGV4 cGVjdGVkIHRvIGFmZmVjdCB1c2Vyc3BhY2UgYW5kIGluIGZhY3QgaXQKbG9va3MgbGlrZSB0aGUg cHJldmlvdXMgYmVoYXZpb3VyIHdhcyBsaWFibGUgdG8gYnJlYWsgdXNlcnNwYWNlLCBzdWNoIGFz Ck1lc2Egd2hpY2ggZXhwbGljaXRseSB0cmllcyB0byBvYnNlcnZlIHdoZXRoZXIgT0FDT05UUk9M IExSSXMgYXJlCnNxdWFzaGVkIHRvIE5PT1BzIGJ1dCBNZXNhIHdpbGwgYWJvcnQgZm9yIGV4ZWNi dWZmZXIgZXJyb3JzLgoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0IEJyYWdnIDxyb2JlcnRAc2l4Ynlu aW5lLm9yZz4KLS0tCiB0ZXN0cy9nZW1fZXhlY19wYXJzZS5jIHwgMzY4ICsrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMDAg aW5zZXJ0aW9ucygrKSwgMTY4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV9l eGVjX3BhcnNlLmMgYi90ZXN0cy9nZW1fZXhlY19wYXJzZS5jCmluZGV4IDM2YmY1N2QuLjQyOTA3 MDEgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9leGVjX3BhcnNlLmMKKysrIGIvdGVzdHMvZ2VtX2V4 ZWNfcGFyc2UuYwpAQCAtMzQsNyArMzQsMjQgQEAKICNkZWZpbmUgSTkxNV9QQVJBTV9DTURfUEFS U0VSX1ZFUlNJT04gICAgICAgMjgKICNlbmRpZgogCisjZGVmaW5lIEFSUkFZX0xFTihBKSAoc2l6 ZW9mKEEpIC8gc2l6ZW9mKEFbMF0pKQorCisjZGVmaW5lIE9BQ09OVFJPTCAweDIzNjAKICNkZWZp bmUgREVSUk1SIDB4NDQwNTAKKyNkZWZpbmUgU09fV1JJVEVfT0ZGU0VUXzAgMHg1MjgwCisjZGVm aW5lIEhTV19DU19HUFIobikgKDB4MjYwMCArIDgqKG4pKQorI2RlZmluZSBIU1dfQ1NfR1BSMCBI U1dfQ1NfR1BSKDApCisjZGVmaW5lIEhTV19DU19HUFIxIEhTV19DU19HUFIoMSkKKworI2RlZmlu ZSBNSV9MT0FEX1JFR0lTVEVSX1JFRyAoMHgyYSA8PCAyMykKKyNkZWZpbmUgTUlfU1RPUkVfUkVH SVNURVJfTUVNICgweDI0IDw8IDIzKQorI2RlZmluZSBNSV9BUkJfT05fT0ZGICgweDggPDwgMjMp CisjZGVmaW5lIE1JX0RJU1BMQVlfRkxJUCAoKDB4MTQgPDwgMjMpIHwgMSkKKworI2RlZmluZSBH RlhfT1BfUElQRV9DT05UUk9MCSgoMHgzPDwyOSl8KDB4Mzw8MjcpfCgweDI8PDI0KXwyKQorI2Rl ZmluZSAgIFBJUEVfQ09OVFJPTF9RV19XUklURQkoMTw8MTQpCisjZGVmaW5lICAgUElQRV9DT05U Uk9MX0xSSV9QT1NUX09QICgxPDwyMykKKwogCiBzdGF0aWMgaW50IGNvbW1hbmRfcGFyc2VyX3Zl cnNpb24oaW50IGZkKQogewpAQCAtNTAsMTAxICs2Nyw4IEBAIHN0YXRpYyBpbnQgY29tbWFuZF9w YXJzZXJfdmVyc2lvbihpbnQgZmQpCiAJcmV0dXJuIC0xOwogfQogCi0jZGVmaW5lIEhTV19DU19H UFIobikgKDB4MjYwMCArIDgqKG4pKQotI2RlZmluZSBIU1dfQ1NfR1BSMCBIU1dfQ1NfR1BSKDAp Ci0jZGVmaW5lIEhTV19DU19HUFIxIEhTV19DU19HUFIoMSkKLQotI2RlZmluZSBNSV9MT0FEX1JF R0lTVEVSX1JFRyAoMHgyYSA8PCAyMykKLSNkZWZpbmUgTUlfU1RPUkVfUkVHSVNURVJfTUVNICgw eDI0IDw8IDIzKQotc3RhdGljIHZvaWQgaHN3X2xvYWRfcmVnaXN0ZXJfcmVnKHZvaWQpCi17Ci0J dWludDMyX3QgYnVmWzE2XSA9IHsKLQkJTUlfTE9BRF9SRUdJU1RFUl9JTU0gfCAoNSAtIDIpLAot CQlIU1dfQ1NfR1BSMCwKLQkJMHhhYmNkYWJjZCwKLQkJSFNXX0NTX0dQUjEsCi0JCTB4ZGVhZGJl ZWYsCi0KLQkJTUlfU1RPUkVfUkVHSVNURVJfTUVNIHwgKDMgLSAyKSwKLQkJSFNXX0NTX0dQUjEs Ci0JCTAsIC8qIGFkZHJlc3MwICovCi0KLQkJTUlfTE9BRF9SRUdJU1RFUl9SRUcgfCAoMyAtIDIp LAotCQlIU1dfQ1NfR1BSMCwKLQkJSFNXX0NTX0dQUjEsCi0KLQkJTUlfU1RPUkVfUkVHSVNURVJf TUVNIHwgKDMgLSAyKSwKLQkJSFNXX0NTX0dQUjEsCi0JCTQsIC8qIGFkZHJlc3MxICovCi0KLQkJ TUlfQkFUQ0hfQlVGRkVSX0VORCwKLQl9OwotCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZl cjIgZXhlY2J1ZjsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBvYmpbMl07Ci0J c3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5IHJlbG9jWzJdOwotCWludCBmZDsK LQotCS8qIE9wZW4gYWdhaW4gdG8gZ2V0IGEgbm9uLW1hc3RlciBmaWxlIGRlc2NyaXB0b3IgKi8K LQlmZCA9IGRybV9vcGVuX2RyaXZlcihEUklWRVJfSU5URUwpOwotCi0JaWd0X3JlcXVpcmUoSVNf SEFTV0VMTChpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSkpOwotCWlndF9yZXF1aXJlKGNvbW1hbmRf cGFyc2VyX3ZlcnNpb24oZmQpID49IDcpOwotCi0JbWVtc2V0KG9iaiwgMCwgc2l6ZW9mKG9iaikp OwotCW9ialswXS5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsKLQlvYmpbMV0uaGFuZGxl ID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7Ci0JZ2VtX3dyaXRlKGZkLCBvYmpbMV0uaGFuZGxlLCAw LCBidWYsIHNpemVvZihidWYpKTsKLQotCW1lbXNldChyZWxvYywgMCwgc2l6ZW9mKHJlbG9jKSk7 Ci0JcmVsb2NbMF0ub2Zmc2V0ID0gNypzaXplb2YodWludDMyX3QpOwotCXJlbG9jWzBdLnRhcmdl dF9oYW5kbGUgPSBvYmpbMF0uaGFuZGxlOwotCXJlbG9jWzBdLmRlbHRhID0gMDsKLQlyZWxvY1sw XS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fSU5TVFJVQ1RJT047Ci0JcmVsb2NbMF0u d3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX0lOU1RSVUNUSU9OOwotCXJlbG9jWzFdLm9m ZnNldCA9IDEzKnNpemVvZih1aW50MzJfdCk7Ci0JcmVsb2NbMV0udGFyZ2V0X2hhbmRsZSA9IG9i alswXS5oYW5kbGU7Ci0JcmVsb2NbMV0uZGVsdGEgPSBzaXplb2YodWludDMyX3QpOwotCXJlbG9j WzFdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9JTlNUUlVDVElPTjsKLQlyZWxvY1sx XS53cml0ZV9kb21haW4gPSBJOTE1X0dFTV9ET01BSU5fSU5TVFJVQ1RJT047Ci0Jb2JqWzFdLnJl bG9jc19wdHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmpbMV0ucmVsb2NhdGlvbl9jb3VudCA9 IDI7Ci0KLQltZW1zZXQoJmV4ZWNidWYsIDAsIHNpemVvZihleGVjYnVmKSk7Ci0JZXhlY2J1Zi5i dWZmZXJzX3B0ciA9ICh1aW50cHRyX3Qpb2JqOwotCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMjsK LQlleGVjYnVmLmJhdGNoX2xlbiA9IHNpemVvZihidWYpOwotCWV4ZWNidWYuZmxhZ3MgPSBJOTE1 X0VYRUNfUkVOREVSOwotCWdlbV9leGVjYnVmKGZkLCAmZXhlY2J1Zik7Ci0JZ2VtX2Nsb3NlKGZk LCBvYmpbMV0uaGFuZGxlKTsKLQotCWdlbV9yZWFkKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYs IDIqc2l6ZW9mKGJ1ZlswXSkpOwotCWlndF9hc3NlcnRfZXFfdTMyKGJ1ZlswXSwgMHhkZWFkYmVl Zik7IC8qIGJlZm9yZSBjb3B5ICovCi0JaWd0X2Fzc2VydF9lcV91MzIoYnVmWzFdLCAweGFiY2Rh YmNkKTsgLyogYWZ0ZXIgY29weSAqLwotCi0JLyogTm93IGEgY291cGxlIG9mIG5lZ2F0aXZlIHRl c3RzIHRoYXQgc2hvdWxkIGJlIGZpbHRlcmVkICovCi0JZXhlY2J1Zi5idWZmZXJfY291bnQgPSAx OwotCWV4ZWNidWYuYmF0Y2hfbGVuID0gNCpzaXplb2YoYnVmWzBdKTsKLQotCWJ1ZlswXSA9IE1J X0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKTsKLQlidWZbMV0gPSBIU1dfQ1NfR1BSMDsKLQli dWZbMl0gPSAwOwotCWJ1ZlszXSA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7Ci0JZ2VtX3dyaXRlKGZk LCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0 X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSBE RVJSTVI7IC8qIG1hc3RlciBvbmx5ICovCi0JZ2VtX3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAw LCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYo ZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSAweDIwMzg7IC8qIFJJTkdfU1RB UlQ6IGludmFsaWQgKi8KLQlnZW1fd3JpdGUoZmQsIG9ialswXS5oYW5kbGUsIDAsIGJ1ZiwgZXhl Y2J1Zi5iYXRjaF9sZW4pOwotCWlndF9hc3NlcnRfZXEoX19nZW1fZXhlY2J1ZihmZCwgJmV4ZWNi dWYpLCAtRUlOVkFMKTsKLQotCWNsb3NlKGZkKTsKLX0KLQotc3RhdGljIHZvaWQgZXhlY19iYXRj aF9wYXRjaGVkKGludCBmZCwgdWludDMyX3QgY21kX2JvLCB1aW50MzJfdCAqY21kcywKLQkJCSAg ICAgICBpbnQgc2l6ZSwgaW50IHBhdGNoX29mZnNldCwgdWludDY0X3QgZXhwZWN0ZWRfdmFsdWUp CitzdGF0aWMgdWludDY0X3QgX19leGVjX2JhdGNoX3BhdGNoZWQoaW50IGZkLCB1aW50MzJfdCBj bWRfYm8sIHVpbnQzMl90ICpjbWRzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGludCBzaXplLCBpbnQgcGF0Y2hfb2Zmc2V0KQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1f ZXhlY2J1ZmZlcjIgZXhlY2J1ZjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBv YmpzWzJdOwpAQCAtMTU1LDUwICs3OSw0MyBAQCBzdGF0aWMgdm9pZCBleGVjX2JhdGNoX3BhdGNo ZWQoaW50IGZkLCB1aW50MzJfdCBjbWRfYm8sIHVpbnQzMl90ICpjbWRzLAogCiAJZ2VtX3dyaXRl KGZkLCBjbWRfYm8sIDAsIGNtZHMsIHNpemUpOwogCi0JcmVsb2NbMF0ub2Zmc2V0ID0gcGF0Y2hf b2Zmc2V0OwotCXJlbG9jWzBdLmRlbHRhID0gMDsKLQlyZWxvY1swXS50YXJnZXRfaGFuZGxlID0g dGFyZ2V0X2JvOwotCXJlbG9jWzBdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9SRU5E RVI7Ci0JcmVsb2NbMF0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX1JFTkRFUjsKLQly ZWxvY1swXS5wcmVzdW1lZF9vZmZzZXQgPSAwOworCW1lbXNldChvYmpzLCAwLCBzaXplb2Yob2Jq cykpOwogCiAJb2Jqc1swXS5oYW5kbGUgPSB0YXJnZXRfYm87Ci0Jb2Jqc1swXS5yZWxvY2F0aW9u X2NvdW50ID0gMDsKLQlvYmpzWzBdLnJlbG9jc19wdHIgPSAwOwotCW9ianNbMF0uYWxpZ25tZW50 ID0gMDsKLQlvYmpzWzBdLm9mZnNldCA9IDA7Ci0Jb2Jqc1swXS5mbGFncyA9IDA7Ci0Jb2Jqc1sw XS5yc3ZkMSA9IDA7Ci0Jb2Jqc1swXS5yc3ZkMiA9IDA7Ci0KIAlvYmpzWzFdLmhhbmRsZSA9IGNt ZF9ibzsKLQlvYmpzWzFdLnJlbG9jYXRpb25fY291bnQgPSAxOworCisJbWVtc2V0KHJlbG9jLCAw LCBzaXplb2YocmVsb2MpKTsKKwlyZWxvY1swXS5vZmZzZXQgPSBwYXRjaF9vZmZzZXQ7CisJcmVs b2NbMF0udGFyZ2V0X2hhbmRsZSA9IG9ianNbMF0uaGFuZGxlOworCXJlbG9jWzBdLmRlbHRhID0g MDsKKwlyZWxvY1swXS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKKwly ZWxvY1swXS53cml0ZV9kb21haW4gPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKIAlvYmpzWzFd LnJlbG9jc19wdHIgPSAodWludHB0cl90KXJlbG9jOwotCW9ianNbMV0uYWxpZ25tZW50ID0gMDsK LQlvYmpzWzFdLm9mZnNldCA9IDA7Ci0Jb2Jqc1sxXS5mbGFncyA9IDA7Ci0Jb2Jqc1sxXS5yc3Zk MSA9IDA7Ci0Jb2Jqc1sxXS5yc3ZkMiA9IDA7CisJb2Jqc1sxXS5yZWxvY2F0aW9uX2NvdW50ID0g MTsKIAorCW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6ZW9mKGV4ZWNidWYpKTsKIAlleGVjYnVmLmJ1 ZmZlcnNfcHRyID0gKHVpbnRwdHJfdClvYmpzOwogCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMjsK LQlleGVjYnVmLmJhdGNoX3N0YXJ0X29mZnNldCA9IDA7CiAJZXhlY2J1Zi5iYXRjaF9sZW4gPSBz aXplOwotCWV4ZWNidWYuY2xpcHJlY3RzX3B0ciA9IDA7Ci0JZXhlY2J1Zi5udW1fY2xpcHJlY3Rz ID0gMDsKLQlleGVjYnVmLkRSMSA9IDA7Ci0JZXhlY2J1Zi5EUjQgPSAwOwogCWV4ZWNidWYuZmxh Z3MgPSBJOTE1X0VYRUNfUkVOREVSOwotCWk5MTVfZXhlY2J1ZmZlcjJfc2V0X2NvbnRleHRfaWQo ZXhlY2J1ZiwgMCk7Ci0JZXhlY2J1Zi5yc3ZkMiA9IDA7CiAKIAlnZW1fZXhlY2J1ZihmZCwgJmV4 ZWNidWYpOwogCWdlbV9zeW5jKGZkLCBjbWRfYm8pOwogCiAJZ2VtX3JlYWQoZmQsdGFyZ2V0X2Jv LCAwLCAmYWN0dWFsX3ZhbHVlLCBzaXplb2YoYWN0dWFsX3ZhbHVlKSk7Ci0JaWd0X2Fzc2VydF9l cShleHBlY3RlZF92YWx1ZSwgYWN0dWFsX3ZhbHVlKTsKIAogCWdlbV9jbG9zZShmZCwgdGFyZ2V0 X2JvKTsKKworICAgICAgICByZXR1cm4gYWN0dWFsX3ZhbHVlOworfQorCitzdGF0aWMgdm9pZCBl eGVjX2JhdGNoX3BhdGNoZWQoaW50IGZkLCB1aW50MzJfdCBjbWRfYm8sIHVpbnQzMl90ICpjbWRz LAorCQkJICAgICAgIGludCBzaXplLCBpbnQgcGF0Y2hfb2Zmc2V0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHVpbnQ2NF90IGV4cGVjdGVkX3ZhbHVlKQoreworCWlndF9hc3NlcnRf ZXEoX19leGVjX2JhdGNoX3BhdGNoZWQoZmQsIGNtZF9ibywgY21kcywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplLCBwYXRjaF9vZmZzZXQpLAorICAgICAg ICAgICAgICAgICAgICAgIGV4cGVjdGVkX3ZhbHVlKTsKIH0KIAogc3RhdGljIGludCBfX2V4ZWNf YmF0Y2goaW50IGZkLCB1aW50MzJfdCBjbWRfYm8sIHVpbnQzMl90ICpjbWRzLApAQCAtMzIwLDE0 ICsyMzcsMTQgQEAgc3RhdGljIHZvaWQgZXhlY19iYXRjaF9jaGFpbmVkKGludCBmZCwgdWludDMy X3QgY21kX2JvLCB1aW50MzJfdCAqY21kcywKIAlyZWxvYy5vZmZzZXQgPSBwYXRjaF9vZmZzZXQ7 CiAJcmVsb2MuZGVsdGEgPSAwOwogCXJlbG9jLnRhcmdldF9oYW5kbGUgPSB0YXJnZXRfYm87Ci0J cmVsb2MucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlOX1JFTkRFUjsKLQlyZWxvYy53cml0 ZV9kb21haW4gPSBJOTE1X0dFTV9ET01BSU5fUkVOREVSOworCXJlbG9jLnJlYWRfZG9tYWlucyA9 IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOworCXJlbG9jLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VN X0RPTUFJTl9DT01NQU5EOwogCXJlbG9jLnByZXN1bWVkX29mZnNldCA9IDA7CiAKIAlmaXJzdF9s ZXZlbF9yZWxvYy5vZmZzZXQgPSA0OwogCWZpcnN0X2xldmVsX3JlbG9jLmRlbHRhID0gMDsKIAlm aXJzdF9sZXZlbF9yZWxvYy50YXJnZXRfaGFuZGxlID0gY21kX2JvOwotCWZpcnN0X2xldmVsX3Jl bG9jLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9JTlNUUlVDVElPTjsKKwlmaXJzdF9s ZXZlbF9yZWxvYy5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKIAlmaXJz dF9sZXZlbF9yZWxvYy53cml0ZV9kb21haW4gPSAwOwogCWZpcnN0X2xldmVsX3JlbG9jLnByZXN1 bWVkX29mZnNldCA9IDA7CiAKQEAgLTM4MCwxNSArMjk3LDkxIEBAIHN0YXRpYyB2b2lkIGV4ZWNf YmF0Y2hfY2hhaW5lZChpbnQgZmQsIHVpbnQzMl90IGNtZF9ibywgdWludDMyX3QgKmNtZHMsCiAJ Z2VtX2Nsb3NlKGZkLCB0YXJnZXRfYm8pOwogfQogCi11aW50MzJfdCBoYW5kbGU7Ci1pbnQgZmQ7 CitzdGF0aWMgdm9pZCBoc3dfbG9hZF9yZWdpc3Rlcl9yZWcodm9pZCkKK3sKKwl1aW50MzJfdCBp bml0X2dwcjBbMTZdID0geworCQlNSV9MT0FEX1JFR0lTVEVSX0lNTSB8ICgzIC0gMiksCisJCUhT V19DU19HUFIwLAorCQkweGFiY2RhYmMwLCAvKiBsZWF2ZSBbMTowXSB6ZXJvICovCisJCU1JX0JB VENIX0JVRkZFUl9FTkQsCisgICAgICAgIH07CisJdWludDMyX3Qgc3RvcmVfZ3ByMFsxNl0gPSB7 CisJCU1JX1NUT1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiksCisJCUhTV19DU19HUFIwLAorCQkw LCAvKiByZWxvYyovCisJCU1JX0JBVENIX0JVRkZFUl9FTkQsCisgICAgICAgIH07CisJdWludDMy X3QgZG9fbHJyWzE2XSA9IHsKKwkJTUlfTE9BRF9SRUdJU1RFUl9SRUcgfCAoMyAtIDIpLAorCQkw LCAvKiBbMV0gPSBzcmMgKi8KKwkJSFNXX0NTX0dQUjAsIC8qIGRzdCAqLworCQlNSV9CQVRDSF9C VUZGRVJfRU5ELAorCX07CisgICAgICAgIHVpbnQzMl90IGFsbG93ZWRfcmVnc1tdID0geworCQlI U1dfQ1NfR1BSMSwKKyAgICAgICAgICAgICAgICBTT19XUklURV9PRkZTRVRfMCwKKyAgICAgICAg fTsKKyAgICAgICAgdWludDMyX3QgZGlzYWxsb3dlZF9yZWdzW10gPSB7CisgICAgICAgICAgICAg ICAgMCwKKyAgICAgICAgICAgICAgICBERVJSTVIsIC8qIG1hc3RlciBvbmx5ICovCisgICAgICAg ICAgICAgICAgMHgyMDM4LCAvKiBSSU5HX1NUQVJUOiBpbnZhbGlkICovCisgICAgICAgIH07Cisg ICAgICAgIGludCBmZDsKKyAgICAgICAgdWludDMyX3QgaGFuZGxlOwogCi0jZGVmaW5lIE1JX0FS Ql9PTl9PRkYgKDB4OCA8PCAyMykKLSNkZWZpbmUgTUlfRElTUExBWV9GTElQICgoMHgxNCA8PCAy MykgfCAxKQorCS8qIE9wZW4gYWdhaW4gdG8gZ2V0IGEgbm9uLW1hc3RlciBmaWxlIGRlc2NyaXB0 b3IgKi8KKwlmZCA9IGRybV9vcGVuX2RyaXZlcihEUklWRVJfSU5URUwpOworCisgICAgICAgIGln dF9yZXF1aXJlKElTX0hBU1dFTEwoaW50ZWxfZ2V0X2RybV9kZXZpZChmZCkpKTsKKyAgICAgICAg aWd0X3JlcXVpcmUoY29tbWFuZF9wYXJzZXJfdmVyc2lvbihmZCkgPj0gNyk7CisKKyAgICAgICAg aGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7CisKKyAgICAgICAgZm9yIChpbnQgaSA9IDAg OyBpIDwgQVJSQVlfTEVOKGFsbG93ZWRfcmVncyk7IGkrKykgeworICAgICAgICAgICAgICAgIHVp bnQzMl90IHZhcjsKKworICAgICAgICAgICAgICAgIGV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwgaW5p dF9ncHIwLCBzaXplb2YoaW5pdF9ncHIwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIEk5 MTVfRVhFQ19SRU5ERVIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICAgICAg ICAgICAgICBleGVjX2JhdGNoX3BhdGNoZWQoZmQsIGhhbmRsZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RvcmVfZ3ByMCwgc2l6ZW9mKHN0b3JlX2dwcjApLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAyICogc2l6ZW9mKHVpbnQzMl90KSwgLyogcmVs b2MgKi8KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMHhhYmNkYWJjMCk7Cisg ICAgICAgICAgICAgICAgZG9fbHJyWzFdID0gYWxsb3dlZF9yZWdzW2ldOworICAgICAgICAgICAg ICAgIGV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwgZG9fbHJyLCBzaXplb2YoZG9fbHJyKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgIEk5MTVfRVhFQ19SRU5ERVIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAwKTsKKyAgICAgICAgICAgICAgICB2YXIgPSBfX2V4ZWNfYmF0Y2hfcGF0Y2hl ZChmZCwgaGFuZGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0b3JlX2dwcjAsIHNpemVvZihzdG9yZV9ncHIwKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAyICogc2l6ZW9mKHVpbnQzMl90KSk7IC8qIHJlbG9jICovCisg ICAgICAgICAgICAgICAgaWd0X2Fzc2VydF9uZXEodmFyLCAweGFiY2RhYmMwKTsKKworICAgICAg ICB9CisKKyAgICAgICAgZm9yIChpbnQgaSA9IDAgOyBpIDwgQVJSQVlfTEVOKGRpc2FsbG93ZWRf cmVncyk7IGkrKykgeworICAgICAgICAgICAgICAgIGV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwgaW5p dF9ncHIwLCBzaXplb2YoaW5pdF9ncHIwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIEk5 MTVfRVhFQ19SRU5ERVIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICAgICAg ICAgICAgICBleGVjX2JhdGNoX3BhdGNoZWQoZmQsIGhhbmRsZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RvcmVfZ3ByMCwgc2l6ZW9mKHN0b3JlX2dwcjApLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAyICogc2l6ZW9mKHVpbnQzMl90KSwgLyogcmVs b2MgKi8KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMHhhYmNkYWJjMCk7Cisg ICAgICAgICAgICAgICAgZG9fbHJyWzFdID0gZGlzYWxsb3dlZF9yZWdzW2ldOworICAgICAgICAg ICAgICAgIGV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwgZG9fbHJyLCBzaXplb2YoZG9fbHJyKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgIEk5MTVfRVhFQ19SRU5ERVIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAwKTsKKyAgICAgICAgICAgICAgICBleGVjX2JhdGNoX3BhdGNoZWQoZmQs IGhhbmRsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RvcmVfZ3ByMCwg c2l6ZW9mKHN0b3JlX2dwcjApLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAy ICogc2l6ZW9mKHVpbnQzMl90KSwgLyogcmVsb2MgKi8KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgMHhhYmNkYWJjMCk7CisgICAgICAgIH0KKworCWNsb3NlKGZkKTsKK30KIAot I2RlZmluZSBHRlhfT1BfUElQRV9DT05UUk9MCSgoMHgzPDwyOSl8KDB4Mzw8MjcpfCgweDI8PDI0 KXwyKQotI2RlZmluZSAgIFBJUEVfQ09OVFJPTF9RV19XUklURQkoMTw8MTQpCi0jZGVmaW5lICAg UElQRV9DT05UUk9MX0xSSV9QT1NUX09QICgxPDwyMykKKwordWludDMyX3QgaGFuZGxlOworaW50 IGZkOwogCiBpZ3RfbWFpbgogewpAQCAtNDI4LDU3ICs0MjEsOTMgQEAgaWd0X21haW4KIAl9CiAK IAlpZ3Rfc3VidGVzdCgiYmFzaWMtcmVqZWN0ZWQiKSB7Ci0JCXVpbnQzMl90IGFyYl9vbl9vZmZb XSA9IHsKLQkJCU1JX0FSQl9PTl9PRkYsCisJCXVpbnQzMl90IGludmFsaWRfY21kW10gPSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAoMHg3PDwyOSksIC8qIFJlc2VydmVkIGNvbW1hbmQgdHlw ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWNyb3NzIGFsbCBlbmdp bmVzICovCiAJCQlNSV9CQVRDSF9CVUZGRVJfRU5ELAogCQl9OwotCQl1aW50MzJfdCBkaXNwbGF5 X2ZsaXBbXSA9IHsKLQkJCU1JX0RJU1BMQVlfRkxJUCwKLQkJCTAsIDAsIDAsCisJCXVpbnQzMl90 IGludmFsaWRfc2V0X2NvbnRleHRbXSA9IHsKKwkJCU1JX1NFVF9DT05URVhUIHwgMzIsIC8qIGlu dmFsaWQgbGVuZ3RoICovCiAJCQlNSV9CQVRDSF9CVUZGRVJfRU5ELAotCQkJMAogCQl9OwogCQll eGVjX2JhdGNoKGZkLCBoYW5kbGUsCi0JCQkgICBhcmJfb25fb2ZmLCBzaXplb2YoYXJiX29uX29m ZiksCisJCQkgICBpbnZhbGlkX2NtZCwgc2l6ZW9mKGludmFsaWRfY21kKSwKIAkJCSAgIEk5MTVf RVhFQ19SRU5ERVIsCiAJCQkgICAtRUlOVkFMKTsKIAkJZXhlY19iYXRjaChmZCwgaGFuZGxlLAot CQkJICAgYXJiX29uX29mZiwgc2l6ZW9mKGFyYl9vbl9vZmYpLAorCQkJICAgaW52YWxpZF9jbWQs IHNpemVvZihpbnZhbGlkX2NtZCksCiAJCQkgICBJOTE1X0VYRUNfQlNELAogCQkJICAgLUVJTlZB TCk7CisJCWV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwKKwkJCSAgIGludmFsaWRfY21kLCBzaXplb2Yo aW52YWxpZF9jbWQpLAorCQkJICAgSTkxNV9FWEVDX0JMVCwKKwkJCSAgIC1FSU5WQUwpOwogCQlp ZiAoZ2VtX2hhc192ZWJveChmZCkpIHsKLQkJCWV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwKLQkJCQkg ICBhcmJfb25fb2ZmLCBzaXplb2YoYXJiX29uX29mZiksCi0JCQkJICAgSTkxNV9FWEVDX1ZFQk9Y LAotCQkJCSAgIC1FSU5WQUwpOworICAgICAgICAgICAgICAgICAgICAgICAgZXhlY19iYXRjaChm ZCwgaGFuZGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnZhbGlkX2Nt ZCwgc2l6ZW9mKGludmFsaWRfY21kKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgSTkxNV9FWEVDX1ZFQk9YLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAt RUlOVkFMKTsKIAkJfQorCiAJCWV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwKLQkJCSAgIGRpc3BsYXlf ZmxpcCwgc2l6ZW9mKGRpc3BsYXlfZmxpcCksCi0JCQkgICBJOTE1X0VYRUNfQkxULAorCQkJICAg aW52YWxpZF9zZXRfY29udGV4dCwgc2l6ZW9mKGludmFsaWRfc2V0X2NvbnRleHQpLAorCQkJICAg STkxNV9FWEVDX1JFTkRFUiwKIAkJCSAgIC1FSU5WQUwpOwogCX0KIAogCWlndF9zdWJ0ZXN0KCJy ZWdpc3RlcnMiKSB7Ci0JCXVpbnQzMl90IGxyaV9iYWRbXSA9IHsKLQkJCU1JX0xPQURfUkVHSVNU RVJfSU1NLAotCQkJMCwgLyogZGlzYWxsb3dlZCByZWdpc3RlciBhZGRyZXNzICovCi0JCQkweDEy MDAwMDAwLAotCQkJTUlfQkFUQ0hfQlVGRkVSX0VORCwKLQkJfTsKKyAgICAgICAgICAgICAgICB1 aW50MzJfdCBscmlfYmFkW10gPSB7CisgICAgICAgICAgICAgICAgICAgICAgICBNSV9MT0FEX1JF R0lTVEVSX0lNTSwKKyAgICAgICAgICAgICAgICAgICAgICAgIE9BQ09OVFJPTCwgLyogZGlzYWxs b3dlZCByZWdpc3RlciBhZGRyZXNzICovCisgICAgICAgICAgICAgICAgICAgICAgICAweDMxMzM3 MDAwLAorICAgICAgICAgICAgICAgICAgICAgICAgTUlfQkFUQ0hfQlVGRkVSX0VORCwKKyAgICAg ICAgICAgICAgICB9OwogCQl1aW50MzJfdCBscmlfb2tbXSA9IHsKLQkJCU1JX0xPQURfUkVHSVNU RVJfSU1NLAotCQkJMHg1MjgwLCAvKiBhbGxvd2VkIHJlZ2lzdGVyIGFkZHJlc3MgKFNPX1dSSVRF X09GRlNFVFswXSkgKi8KLQkJCTB4MSwKKyAgICAgICAgICAgICAgICAgICAgICAgIE1JX0xPQURf UkVHSVNURVJfSU1NIHwgKDMgLSAyKSwKKwkJCVNPX1dSSVRFX09GRlNFVF8wLCAvKiBhbGxvd2Vk IHJlZ2lzdGVyIGFkZHJlc3MgKi8KKyAgICAgICAgICAgICAgICAgICAgICAgIDB4YWJjZGFiYzAs IC8qIFsxOjBdIE1CWiAqLwogCQkJTUlfQkFUQ0hfQlVGRkVSX0VORCwKIAkJfTsKLQkJZXhlY19i YXRjaChmZCwgaGFuZGxlLAotCQkJICAgbHJpX2JhZCwgc2l6ZW9mKGxyaV9iYWQpLAotCQkJICAg STkxNV9FWEVDX1JFTkRFUiwKLQkJCSAgIC1FSU5WQUwpOwotCQlleGVjX2JhdGNoKGZkLCBoYW5k bGUsCi0JCQkgICBscmlfb2ssIHNpemVvZihscmlfb2spLAotCQkJICAgSTkxNV9FWEVDX1JFTkRF UiwKLQkJCSAgIDApOworICAgICAgICAgICAgICAgIHVpbnQzMl90IHN0b3JlX3JlZ1tdID0gewor ICAgICAgICAgICAgICAgICAgICAgICAgTUlfU1RPUkVfUkVHSVNURVJfTUVNIHwgKDMgLSAyKSwK KyAgICAgICAgICAgICAgICAgICAgICAgIDAsIC8qIHJlZyAqLworICAgICAgICAgICAgICAgICAg ICAgICAgMCwgLyogcmVsb2MgKi8KKyAgICAgICAgICAgICAgICAgICAgICAgIE1JX0JBVENIX0JV RkZFUl9FTkQsCisgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgICAgICB1aW50NjRfdCB2 YWw7CisKKyAgICAgICAgICAgICAgICAvKiBOb3RlOiB3ZSBpbnRlbnRpb25hbGx5IHBpY2sgT0FD T05UUk9MIGFzIHRoZSBkaXNhbGxvd2VkCisgICAgICAgICAgICAgICAgICogcmVnaXN0ZXIgdG8g dGVzdCBoZXJlIHNpbmNlIGl0IHVzZWQgdG8gYmUgd2hpdGUgbGlzdGVkIGJ5CisgICAgICAgICAg ICAgICAgICogdGhlIGNvbW1hbmQgcGFyc2VyLgorICAgICAgICAgICAgICAgICAqCisgICAgICAg ICAgICAgICAgICogSXQncyBlc3BlY2lhbGx5IGltcG9ydGFudCB0byBjaGVjayB0aGF0IGFuIExS SSB0byBPQUNPTlRST0wKKyAgICAgICAgICAgICAgICAgKiBkb2Vzbid0IHJlc3VsdCBpbiBhbiBF SU5WQUwgZXJyb3IgYmVjYXVzZSBNZXNhIGF0dGVtcHRzCisgICAgICAgICAgICAgICAgICogd3Jp dGluZyB0byBPQUNPTlRST0wgdG8gZGV0ZXJtaW5lIHdoYXQgZXh0ZW5zaW9ucyB0byBleHBvc2UK KyAgICAgICAgICAgICAgICAgKiBhbmQgd2lsbCBhYm9ydCgpIGZvciBleGVjYnVmZmVyKCkgZXJy b3JzLgorICAgICAgICAgICAgICAgICAqCisgICAgICAgICAgICAgICAgICogTWVzYSBjYW4gZ3Jh Y2VmdWxseSByZWNvZ25pc2UgYW5kIGhhbmRsZSB0aGUgTFJJIGJlY29taW5nCisgICAgICAgICAg ICAgICAgICogYSBOT09QLgorICAgICAgICAgICAgICAgICAqLworICAgICAgICAgICAgICAgIGV4 ZWNfYmF0Y2goZmQsIGhhbmRsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGxyaV9iYWQs IHNpemVvZihscmlfYmFkKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIEk5MTVfRVhFQ19S RU5ERVIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICAgICAgICAgICAgICBz dG9yZV9yZWdbMV0gPSBPQUNPTlRST0w7CisgICAgICAgICAgICAgICAgdmFsID0gX19leGVjX2Jh dGNoX3BhdGNoZWQoZmQsIGhhbmRsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzdG9yZV9yZWcsIHNpemVvZihzdG9yZV9yZWcpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDgpOyAvKiByZWxvYyBvZmZzZXQgKi8KKyAgICAg ICAgICAgICAgICBpZ3RfYXNzZXJ0X25lcSh2YWwsIDB4MzEzMzcwMDApOworCisgICAgICAgICAg ICAgICAgZXhlY19iYXRjaChmZCwgaGFuZGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg bHJpX29rLCBzaXplb2YobHJpX29rKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIEk5MTVf RVhFQ19SRU5ERVIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICAgICAgICAg ICAgICBzdG9yZV9yZWdbMV0gPSBTT19XUklURV9PRkZTRVRfMDsKKyAgICAgICAgICAgICAgICBl eGVjX2JhdGNoX3BhdGNoZWQoZmQsIGhhbmRsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3RvcmVfcmVnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz aXplb2Yoc3RvcmVfcmVnKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMiAq IHNpemVvZih1aW50MzJfdCksIC8qIHJlbG9jIG9mZnNldCAqLworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAweGFiY2RhYmMwKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdCgiYml0bWFz a3MiKSB7CkBAIC00OTEsMTAgKzUyMCwxMyBAQCBpZ3RfbWFpbgogCQkJMCwKIAkJCU1JX0JBVENI X0JVRkZFUl9FTkQsCiAJCX07Ci0JCWV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwKLQkJCSAgIHBjLCBz aXplb2YocGMpLAotCQkJICAgSTkxNV9FWEVDX1JFTkRFUiwKLQkJCSAgIC1FSU5WQUwpOworICAg ICAgICAgICAgICAgIC8qIEV4cGVjdCB0byByZWFkIGJhY2sgemVybyBzaW5jZSB0aGUgY29tbWFu ZCBzaG91bGQgYmUKKyAgICAgICAgICAgICAgICAgKiBzcXVhc2hlZCB0byBhIE5PT1AKKyAgICAg ICAgICAgICAgICAgKi8KKwkJZXhlY19iYXRjaF9wYXRjaGVkKGZkLCBoYW5kbGUsCisJCQkJICAg cGMsIHNpemVvZihwYyksCisJCQkJICAgOCwgLyogcGF0Y2ggb2Zmc2V0LCAqLworCQkJCSAgIDB4 MCk7CiAJfQogCiAJaWd0X3N1YnRlc3QoImJhdGNoLXdpdGhvdXQtZW5kIikgewotLSAKMi4xMC4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK