21317 2008-10-02 14:53:20 -0700 Replace RegisterFile size and capacity information with Register pointers 2008-10-02 16:04:34 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 20812 1 zwarich zwarich oldest_to_newest 93800 0 zwarich 2008-10-02 14:53:20 -0700 I have a patch to do this. It removes some unnecessary logic from slideRegisterWindowForCall() and its callers. 93802 1 24031 zwarich 2008-10-02 15:01:49 -0700 Created attachment 24031 Proposed patch 93804 2 24031 ggaren 2008-10-02 15:13:38 -0700 Comment on attachment 24031 Proposed patch r=me 93805 3 zwarich 2008-10-02 15:20:57 -0700 Landed in r37213. 24031 2008-10-02 15:01:49 -0700 2008-10-02 15:13:38 -0700 Proposed patch registerfile.diff text/plain 15551 zwarich SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM3MjEy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMDgtMTAt MDIgIENhbWVyb24gWndhcmljaCAgPHp3YXJpY2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAyMTMxNzogUmVwbGFjZSBSZWdp c3RlckZpbGUgc2l6ZSBhbmQgY2FwYWNpdHkgaW5mb3JtYXRpb24gd2l0aCBSZWdpc3RlciBwb2lu dGVycworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MzE3PgorCisgICAgICAgIFRoaXMgaXMgYSAyLjMlIHNwZWVkdXAgb24gdGhlIFY4IERlbHRhQmx1 ZSBiZW5jaG1hcmssIGEgMy4zJSBzcGVlZHVwIG9uCisgICAgICAgIHRoZSBWOCBSYXl0cmFjZSBi ZW5jaG1hcmssIGFuZCBhIDEuMCUgc3BlZWR1cCBvbiBTdW5TcGlkZXIuCisKKyAgICAgICAgKiBW TS9NYWNoaW5lLmNwcDoKKyAgICAgICAgKEpTQzo6c2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwp OgorICAgICAgICAoSlNDOjpNYWNoaW5lOjpjYWxsRXZhbCk6CisgICAgICAgIChKU0M6Ok1hY2hp bmU6OmV4ZWN1dGUpOgorICAgICAgICAoSlNDOjpNYWNoaW5lOjpwcml2YXRlRXhlY3V0ZSk6Cisg ICAgICAgIChKU0M6Ok1hY2hpbmU6OmN0aV9vcF9jYWxsX0pTRnVuY3Rpb24pOgorICAgICAgICAo SlNDOjpNYWNoaW5lOjpjdGlfb3BfY29uc3RydWN0X0pTQ29uc3RydWN0KToKKyAgICAgICAgKiBW TS9SZWdpc3RlckZpbGUuY3BwOgorICAgICAgICAoSlNDOjpSZWdpc3RlckZpbGU6On5SZWdpc3Rl ckZpbGUpOgorICAgICAgICAqIFZNL1JlZ2lzdGVyRmlsZS5oOgorICAgICAgICAoSlNDOjpSZWdp c3RlckZpbGU6OlJlZ2lzdGVyRmlsZSk6CisgICAgICAgIChKU0M6OlJlZ2lzdGVyRmlsZTo6c3Rh cnQpOgorICAgICAgICAoSlNDOjpSZWdpc3RlckZpbGU6OmVuZCk6CisgICAgICAgIChKU0M6OlJl Z2lzdGVyRmlsZTo6c2l6ZSk6CisgICAgICAgIChKU0M6OlJlZ2lzdGVyRmlsZTo6c2hyaW5rKToK KyAgICAgICAgKEpTQzo6UmVnaXN0ZXJGaWxlOjpncm93KToKKyAgICAgICAgKEpTQzo6UmVnaXN0 ZXJGaWxlOjpsYXN0R2xvYmFsKToKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXJGaWxlOjptYXJrR2xv YmFscyk6CisgICAgICAgIChKU0M6OlJlZ2lzdGVyRmlsZTo6bWFya0NhbGxGcmFtZXMpOgorICAg ICAgICAqIGtqcy9KU0dsb2JhbE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2Jq ZWN0Ojpjb3B5R2xvYmFsc1RvKToKKwogMjAwOC0xMC0wMiAgQ2FtZXJvbiBad2FyaWNoICA8endh cmljaEBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgRGFyaW4gQWRsZXIu CkluZGV4OiBWTS9NYWNoaW5lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBWTS9NYWNoaW5lLmNwcAkocmV2 aXNpb24gMzcyMTApCisrKyBWTS9NYWNoaW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMyLDEy ICs1MzIsMTIgQEAgTkVWRVJfSU5MSU5FIGJvb2wgTWFjaGluZTo6cmVzb2x2ZUJhc2VBbgogICAg IHJldHVybiBmYWxzZTsKIH0KIAotQUxXQVlTX0lOTElORSBSZWdpc3Rlciogc2xpZGVSZWdpc3Rl cldpbmRvd0ZvckNhbGwoRXhlY1N0YXRlKiBleGVjLCBDb2RlQmxvY2sqIG5ld0NvZGVCbG9jaywg UmVnaXN0ZXJGaWxlKiByZWdpc3RlckZpbGUsIFJlZ2lzdGVyKiByZWdpc3RlckJhc2UsIFJlZ2lz dGVyKiByLCBzaXplX3QgcmVnaXN0ZXJPZmZzZXQsIGludCBhcmdjLCBKU1ZhbHVlKiYgZXhjZXB0 aW9uVmFsdWUpCitBTFdBWVNfSU5MSU5FIFJlZ2lzdGVyKiBzbGlkZVJlZ2lzdGVyV2luZG93Rm9y Q2FsbChFeGVjU3RhdGUqIGV4ZWMsIENvZGVCbG9jayogbmV3Q29kZUJsb2NrLCBSZWdpc3RlckZp bGUqIHJlZ2lzdGVyRmlsZSwgUmVnaXN0ZXIqIHIsIHNpemVfdCByZWdpc3Rlck9mZnNldCwgaW50 IGFyZ2MsIEpTVmFsdWUqJiBleGNlcHRpb25WYWx1ZSkKIHsKLSAgICBzaXplX3Qgc2l6ZSA9IHIg LSByZWdpc3RlckJhc2UgKyByZWdpc3Rlck9mZnNldCArIG5ld0NvZGVCbG9jay0+bnVtQ2FsbGVl UmVnaXN0ZXJzOworICAgIFJlZ2lzdGVyKiBuZXdFbmQgPSByICsgcmVnaXN0ZXJPZmZzZXQgKyBu ZXdDb2RlQmxvY2stPm51bUNhbGxlZVJlZ2lzdGVyczsKIAogICAgIGlmIChhcmdjID09IG5ld0Nv ZGVCbG9jay0+bnVtUGFyYW1ldGVycykgeyAvLyBjb3JyZWN0IG51bWJlciBvZiBhcmd1bWVudHMK LSAgICAgICAgaWYgKCFyZWdpc3RlckZpbGUtPmdyb3coc2l6ZSkpIHsKKyAgICAgICAgaWYgKCFy ZWdpc3RlckZpbGUtPmdyb3cobmV3RW5kKSkgewogICAgICAgICAgICAgZXhjZXB0aW9uVmFsdWUg PSBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoZXhlYyk7CiAgICAgICAgICAgICByZXR1cm4gcjsK ICAgICAgICAgfQpAQCAtNTQ1LDggKzU0NSw4IEBAIEFMV0FZU19JTkxJTkUgUmVnaXN0ZXIqIHNs aWRlUmVnaXN0ZXJXaW4KICAgICB9IGVsc2UgaWYgKGFyZ2MgPCBuZXdDb2RlQmxvY2stPm51bVBh cmFtZXRlcnMpIHsgLy8gdG9vIGZldyBhcmd1bWVudHMgLS0gZmlsbCBpbiB0aGUgYmxhbmtzCiAg ICAgICAgIHNpemVfdCBvbWl0dGVkQXJnQ291bnQgPSBuZXdDb2RlQmxvY2stPm51bVBhcmFtZXRl cnMgLSBhcmdjOwogICAgICAgICByZWdpc3Rlck9mZnNldCArPSBvbWl0dGVkQXJnQ291bnQ7Ci0g ICAgICAgIHNpemUgKz0gb21pdHRlZEFyZ0NvdW50OwotICAgICAgICBpZiAoIXJlZ2lzdGVyRmls ZS0+Z3JvdyhzaXplKSkgeworICAgICAgICBuZXdFbmQgKz0gb21pdHRlZEFyZ0NvdW50OworICAg ICAgICBpZiAoIXJlZ2lzdGVyRmlsZS0+Z3JvdyhuZXdFbmQpKSB7CiAgICAgICAgICAgICBleGNl cHRpb25WYWx1ZSA9IGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJvcihleGVjKTsKICAgICAgICAgICAg IHJldHVybiByOwogICAgICAgICB9CkBAIC01NTgsOSArNTU4LDkgQEAgQUxXQVlTX0lOTElORSBS ZWdpc3Rlciogc2xpZGVSZWdpc3RlcldpbgogICAgIH0gZWxzZSB7IC8vIHRvbyBtYW55IGFyZ3Vt ZW50cyAtLSBjb3B5IGV4cGVjdGVkIGFyZ3VtZW50cywgbGVhdmluZyB0aGUgZXh0cmEgYXJndW1l bnRzIGJlaGluZAogICAgICAgICBzaXplX3QgbnVtUGFyYW1ldGVycyA9IG5ld0NvZGVCbG9jay0+ bnVtUGFyYW1ldGVyczsKICAgICAgICAgcmVnaXN0ZXJPZmZzZXQgKz0gbnVtUGFyYW1ldGVyczsK LSAgICAgICAgc2l6ZSArPSBudW1QYXJhbWV0ZXJzOworICAgICAgICBuZXdFbmQgKz0gbnVtUGFy YW1ldGVyczsKIAotICAgICAgICBpZiAoIXJlZ2lzdGVyRmlsZS0+Z3JvdyhzaXplKSkgeworICAg ICAgICBpZiAoIXJlZ2lzdGVyRmlsZS0+Z3JvdyhuZXdFbmQpKSB7CiAgICAgICAgICAgICBleGNl cHRpb25WYWx1ZSA9IGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJvcihleGVjKTsKICAgICAgICAgICAg IHJldHVybiByOwogICAgICAgICB9CkBAIC02MDMsNyArNjAzLDcgQEAgTkVWRVJfSU5MSU5FIEpT VmFsdWUqIE1hY2hpbmU6OmNhbGxFdmFsKAogCiAgICAgSlNWYWx1ZSogcmVzdWx0ID0gMDsKICAg ICBpZiAoZXZhbE5vZGUpCi0gICAgICAgIHJlc3VsdCA9IGV4ZWMtPmdsb2JhbERhdGEoKS5tYWNo aW5lLT5leGVjdXRlKGV2YWxOb2RlLmdldCgpLCBleGVjLCB0aGlzT2JqLCByIC0gcmVnaXN0ZXJG aWxlLT5iYXNlKCkgKyBhcmd2ICsgMSArIFJlZ2lzdGVyRmlsZTo6Q2FsbEZyYW1lSGVhZGVyU2l6 ZSwgc2NvcGVDaGFpbiwgJmV4Y2VwdGlvblZhbHVlKTsKKyAgICAgICAgcmVzdWx0ID0gZXhlYy0+ Z2xvYmFsRGF0YSgpLm1hY2hpbmUtPmV4ZWN1dGUoZXZhbE5vZGUuZ2V0KCksIGV4ZWMsIHRoaXNP YmosIHIgLSByZWdpc3RlckZpbGUtPnN0YXJ0KCkgKyBhcmd2ICsgMSArIFJlZ2lzdGVyRmlsZTo6 Q2FsbEZyYW1lSGVhZGVyU2l6ZSwgc2NvcGVDaGFpbiwgJmV4Y2VwdGlvblZhbHVlKTsKIAogICAg IGlmICgqcHJvZmlsZXIpCiAgICAgICAgICgqcHJvZmlsZXIpLT5kaWRFeGVjdXRlKGV4ZWMsIHNj b3BlQ2hhaW4tPmdsb2JhbE9iamVjdCgpLT5ldmFsRnVuY3Rpb24oKSk7CkBAIC04ODYsOSArODg2 LDkgQEAgSlNWYWx1ZSogTWFjaGluZTo6ZXhlY3V0ZShQcm9ncmFtTm9kZSogcAogCiAgICAgQ29k ZUJsb2NrKiBjb2RlQmxvY2sgPSAmcHJvZ3JhbU5vZGUtPmJ5dGVDb2RlKHNjb3BlQ2hhaW4pOwog Ci0gICAgc2l6ZV90IG9sZFNpemUgPSBtX3JlZ2lzdGVyRmlsZS5zaXplKCk7Ci0gICAgc2l6ZV90 IG5ld1NpemUgPSBvbGRTaXplICsgY29kZUJsb2NrLT5udW1QYXJhbWV0ZXJzICsgUmVnaXN0ZXJG aWxlOjpDYWxsRnJhbWVIZWFkZXJTaXplICsgY29kZUJsb2NrLT5udW1DYWxsZWVSZWdpc3RlcnM7 Ci0gICAgaWYgKCFtX3JlZ2lzdGVyRmlsZS5ncm93KG5ld1NpemUpKSB7CisgICAgUmVnaXN0ZXIq IG9sZEVuZCA9IG1fcmVnaXN0ZXJGaWxlLmVuZCgpOworICAgIFJlZ2lzdGVyKiBuZXdFbmQgPSBv bGRFbmQgKyBjb2RlQmxvY2stPm51bVBhcmFtZXRlcnMgKyBSZWdpc3RlckZpbGU6OkNhbGxGcmFt ZUhlYWRlclNpemUgKyBjb2RlQmxvY2stPm51bUNhbGxlZVJlZ2lzdGVyczsKKyAgICBpZiAoIW1f cmVnaXN0ZXJGaWxlLmdyb3cobmV3RW5kKSkgewogICAgICAgICAqZXhjZXB0aW9uID0gY3JlYXRl U3RhY2tPdmVyZmxvd0Vycm9yKGV4ZWMpOwogICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAgICAg fQpAQCAtODk3LDcgKzg5Nyw3IEBAIEpTVmFsdWUqIE1hY2hpbmU6OmV4ZWN1dGUoUHJvZ3JhbU5v ZGUqIHAKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gZXhlYy0+ZHluYW1pY0ds b2JhbE9iamVjdCgpOwogICAgIGdsb2JhbE9iamVjdC0+Y29weUdsb2JhbHNUbyhtX3JlZ2lzdGVy RmlsZSk7CiAKLSAgICBSZWdpc3RlciogciA9IG1fcmVnaXN0ZXJGaWxlLmJhc2UoKSArIG9sZFNp emUgKyBjb2RlQmxvY2stPm51bVBhcmFtZXRlcnMgKyBSZWdpc3RlckZpbGU6OkNhbGxGcmFtZUhl YWRlclNpemU7CisgICAgUmVnaXN0ZXIqIHIgPSBvbGRFbmQgKyBjb2RlQmxvY2stPm51bVBhcmFt ZXRlcnMgKyBSZWdpc3RlckZpbGU6OkNhbGxGcmFtZUhlYWRlclNpemU7CiAgICAgcltjb2RlQmxv Y2stPnRoaXNSZWdpc3Rlcl0gPSB0aGlzT2JqOwogICAgIGluaXRpYWxpemVDYWxsRnJhbWUociwg Y29kZUJsb2NrLCAwLCBzY29wZUNoYWluLCBtYWtlSG9zdENhbGxGcmFtZVBvaW50ZXIoMCksIDAs IDAsIDApOwogCkBAIC05MjgsNyArOTI4LDcgQEAgSlNWYWx1ZSogTWFjaGluZTo6ZXhlY3V0ZShQ cm9ncmFtTm9kZSogcAogICAgIGlmIChtX3JlZW50cnlEZXB0aCAmJiBsYXN0R2xvYmFsT2JqZWN0 ICYmIGdsb2JhbE9iamVjdCAhPSBsYXN0R2xvYmFsT2JqZWN0KQogICAgICAgICBsYXN0R2xvYmFs T2JqZWN0LT5jb3B5R2xvYmFsc1RvKG1fcmVnaXN0ZXJGaWxlKTsKIAotICAgIG1fcmVnaXN0ZXJG aWxlLnNocmluayhvbGRTaXplKTsKKyAgICBtX3JlZ2lzdGVyRmlsZS5zaHJpbmsob2xkRW5kKTsK ICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC05NDEsMTUgKzk0MSwxNSBAQCBKU1ZhbHVlKiBN YWNoaW5lOjpleGVjdXRlKEZ1bmN0aW9uQm9keU5vCiAgICAgICAgIHJldHVybiBqc051bGwoKTsK ICAgICB9CiAKLSAgICBzaXplX3Qgb2xkU2l6ZSA9IG1fcmVnaXN0ZXJGaWxlLnNpemUoKTsKKyAg ICBSZWdpc3Rlciogb2xkRW5kID0gbV9yZWdpc3RlckZpbGUuZW5kKCk7CiAgICAgaW50IGFyZ2Mg PSAxICsgYXJncy5zaXplKCk7IC8vIGltcGxpY2l0ICJ0aGlzIiBwYXJhbWV0ZXIKIAotICAgIGlm ICghbV9yZWdpc3RlckZpbGUuZ3JvdyhvbGRTaXplICsgYXJnYykpIHsKKyAgICBpZiAoIW1fcmVn aXN0ZXJGaWxlLmdyb3cob2xkRW5kICsgYXJnYykpIHsKICAgICAgICAgKmV4Y2VwdGlvbiA9IGNy ZWF0ZVN0YWNrT3ZlcmZsb3dFcnJvcihleGVjKTsKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwog ICAgIH0KIAotICAgIFJlZ2lzdGVyKiBhcmd2ID0gbV9yZWdpc3RlckZpbGUuYmFzZSgpICsgb2xk U2l6ZTsKKyAgICBSZWdpc3RlciogYXJndiA9IG9sZEVuZDsKICAgICBzaXplX3QgZHN0ID0gMDsK ICAgICBhcmd2W2RzdF0gPSB0aGlzT2JqOwogCkBAIC05NTgsOSArOTU4LDkgQEAgSlNWYWx1ZSog TWFjaGluZTo6ZXhlY3V0ZShGdW5jdGlvbkJvZHlObwogICAgICAgICBhcmd2WysrZHN0XSA9ICpp dDsKIAogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gJmZ1bmN0aW9uQm9keU5vZGUtPmJ5dGVD b2RlKHNjb3BlQ2hhaW4pOwotICAgIFJlZ2lzdGVyKiByID0gc2xpZGVSZWdpc3RlcldpbmRvd0Zv ckNhbGwoZXhlYywgY29kZUJsb2NrLCAmbV9yZWdpc3RlckZpbGUsIG1fcmVnaXN0ZXJGaWxlLmJh c2UoKSwgYXJndiwgYXJnYyArIFJlZ2lzdGVyRmlsZTo6Q2FsbEZyYW1lSGVhZGVyU2l6ZSwgYXJn YywgKmV4Y2VwdGlvbik7CisgICAgUmVnaXN0ZXIqIHIgPSBzbGlkZVJlZ2lzdGVyV2luZG93Rm9y Q2FsbChleGVjLCBjb2RlQmxvY2ssICZtX3JlZ2lzdGVyRmlsZSwgYXJndiwgYXJnYyArIFJlZ2lz dGVyRmlsZTo6Q2FsbEZyYW1lSGVhZGVyU2l6ZSwgYXJnYywgKmV4Y2VwdGlvbik7CiAgICAgaWYg KFVOTElLRUxZKCpleGNlcHRpb24gIT0gMCkpIHsKLSAgICAgICAgbV9yZWdpc3RlckZpbGUuc2hy aW5rKG9sZFNpemUpOworICAgICAgICBtX3JlZ2lzdGVyRmlsZS5zaHJpbmsob2xkRW5kKTsKICAg ICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgIH0KICAgICAvLyBhIDAgY29kZUJsb2NrIGluZGlj YXRlcyBhIGJ1aWx0LWluIGNhbGxlcgpAQCAtOTg0LDcgKzk4NCw3IEBAIEpTVmFsdWUqIE1hY2hp bmU6OmV4ZWN1dGUoRnVuY3Rpb25Cb2R5Tm8KIAogICAgIE1BQ0hJTkVfU0FNUExJTkdfcHJpdmF0 ZUV4ZWN1dGVSZXR1cm5lZCgpOwogCi0gICAgbV9yZWdpc3RlckZpbGUuc2hyaW5rKG9sZFNpemUp OworICAgIG1fcmVnaXN0ZXJGaWxlLnNocmluayhvbGRFbmQpOwogICAgIHJldHVybiByZXN1bHQ7 CiB9CiAKQEAgLTEwMzYsMTQgKzEwMzYsMTQgQEAgSlNWYWx1ZSogTWFjaGluZTo6ZXhlY3V0ZShF dmFsTm9kZSogZXZhbAogCiAgICAgfQogCi0gICAgc2l6ZV90IG9sZFNpemUgPSBtX3JlZ2lzdGVy RmlsZS5zaXplKCk7Ci0gICAgc2l6ZV90IG5ld1NpemUgPSByZWdpc3Rlck9mZnNldCArIGNvZGVC bG9jay0+bnVtQ2FsbGVlUmVnaXN0ZXJzOwotICAgIGlmICghbV9yZWdpc3RlckZpbGUuZ3Jvdyhu ZXdTaXplKSkgeworICAgIFJlZ2lzdGVyKiBvbGRFbmQgPSBtX3JlZ2lzdGVyRmlsZS5lbmQoKTsK KyAgICBSZWdpc3RlciogbmV3RW5kID0gbV9yZWdpc3RlckZpbGUuc3RhcnQoKSArIHJlZ2lzdGVy T2Zmc2V0ICsgY29kZUJsb2NrLT5udW1DYWxsZWVSZWdpc3RlcnM7CisgICAgaWYgKCFtX3JlZ2lz dGVyRmlsZS5ncm93KG5ld0VuZCkpIHsKICAgICAgICAgKmV4Y2VwdGlvbiA9IGNyZWF0ZVN0YWNr T3ZlcmZsb3dFcnJvcihleGVjKTsKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgIH0KIAot ICAgIFJlZ2lzdGVyKiByID0gbV9yZWdpc3RlckZpbGUuYmFzZSgpICsgcmVnaXN0ZXJPZmZzZXQ7 CisgICAgUmVnaXN0ZXIqIHIgPSBtX3JlZ2lzdGVyRmlsZS5zdGFydCgpICsgcmVnaXN0ZXJPZmZz ZXQ7CiAKICAgICAvLyBhIDAgY29kZUJsb2NrIGluZGljYXRlcyBhIGJ1aWx0LWluIGNhbGxlcgog ICAgIHJbY29kZUJsb2NrLT50aGlzUmVnaXN0ZXJdID0gdGhpc09iajsKQEAgLTEwNzMsNyArMTA3 Myw3IEBAIEpTVmFsdWUqIE1hY2hpbmU6OmV4ZWN1dGUoRXZhbE5vZGUqIGV2YWwKICAgICBpZiAo KnByb2ZpbGVyKQogICAgICAgICAoKnByb2ZpbGVyKS0+ZGlkRXhlY3V0ZShleGVjLCBldmFsTm9k ZS0+c291cmNlVVJMKCksIGV2YWxOb2RlLT5saW5lTm8oKSk7CiAKLSAgICBtX3JlZ2lzdGVyRmls ZS5zaHJpbmsob2xkU2l6ZSk7CisgICAgbV9yZWdpc3RlckZpbGUuc2hyaW5rKG9sZEVuZCk7CiAg ICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtMTQ0Niw3ICsxNDQ2LDYgQEAgSlNWYWx1ZSogTWFj aGluZTo6cHJpdmF0ZUV4ZWN1dGUoRXhlY3V0aQogICAgIEpTVmFsdWUqIGV4Y2VwdGlvblZhbHVl ID0gMDsKICAgICBJbnN0cnVjdGlvbiogaGFuZGxlclZQQyA9IDA7CiAKLSAgICBSZWdpc3Rlciog cmVnaXN0ZXJCYXNlID0gcmVnaXN0ZXJGaWxlLT5iYXNlKCk7CiAgICAgSW5zdHJ1Y3Rpb24qIHZQ QyA9IHRoaXMtPmNvZGVCbG9jayhyKS0+aW5zdHJ1Y3Rpb25zLmJlZ2luKCk7CiAgICAgUHJvZmls ZXIqKiBlbmFibGVkUHJvZmlsZXJSZWZlcmVuY2UgPSBQcm9maWxlcjo6ZW5hYmxlZFByb2ZpbGVy UmVmZXJlbmNlKCk7CiAgICAgdW5zaWduZWQgdGlja0NvdW50ID0gbV90aWNrc1VudGlsTmV4dFRp bWVvdXRDaGVjayArIDE7CkBAIC0zMjg0LDcgKzMyODMsNyBAQCBKU1ZhbHVlKiBNYWNoaW5lOjpw cml2YXRlRXhlY3V0ZShFeGVjdXRpCiAgICAgICAgICAgICAKICAgICAgICAgICAgIFJlZ2lzdGVy KiBzYXZlZFIgPSByOwogCi0gICAgICAgICAgICByID0gc2xpZGVSZWdpc3RlcldpbmRvd0ZvckNh bGwoZXhlYywgbmV3Q29kZUJsb2NrLCByZWdpc3RlckZpbGUsIHJlZ2lzdGVyQmFzZSwgciwgcmVn aXN0ZXJPZmZzZXQsIGFyZ0NvdW50LCBleGNlcHRpb25WYWx1ZSk7CisgICAgICAgICAgICByID0g c2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwoZXhlYywgbmV3Q29kZUJsb2NrLCByZWdpc3RlckZp bGUsIHIsIHJlZ2lzdGVyT2Zmc2V0LCBhcmdDb3VudCwgZXhjZXB0aW9uVmFsdWUpOwogICAgICAg ICAgICAgZXhlYy0+bV9jYWxsRnJhbWUgPSByOwogICAgICAgICAgICAgaWYgKFVOTElLRUxZKGV4 Y2VwdGlvblZhbHVlICE9IDApKQogICAgICAgICAgICAgICAgIGdvdG8gdm1fdGhyb3c7CkBAIC0z NDY3LDcgKzM0NjYsNyBAQCBKU1ZhbHVlKiBNYWNoaW5lOjpwcml2YXRlRXhlY3V0ZShFeGVjdXRp CiAKICAgICAgICAgICAgIFJlZ2lzdGVyKiBzYXZlZFIgPSByOwogCi0gICAgICAgICAgICByID0g c2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwoZXhlYywgbmV3Q29kZUJsb2NrLCByZWdpc3RlckZp bGUsIHJlZ2lzdGVyQmFzZSwgciwgcmVnaXN0ZXJPZmZzZXQsIGFyZ0NvdW50LCBleGNlcHRpb25W YWx1ZSk7CisgICAgICAgICAgICByID0gc2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwoZXhlYywg bmV3Q29kZUJsb2NrLCByZWdpc3RlckZpbGUsIHIsIHJlZ2lzdGVyT2Zmc2V0LCBhcmdDb3VudCwg ZXhjZXB0aW9uVmFsdWUpOwogICAgICAgICAgICAgZXhlYy0+bV9jYWxsRnJhbWUgPSByOwogICAg ICAgICAgICAgaWYgKFVOTElLRUxZKGV4Y2VwdGlvblZhbHVlICE9IDApKQogICAgICAgICAgICAg ICAgIGdvdG8gdm1fdGhyb3c7CkBAIC00NDg5LDggKzQ0ODgsNiBAQCB2b2lkKiBNYWNoaW5lOjpj dGlfb3BfY2FsbF9KU0Z1bmN0aW9uKENUCiAgICAgUmVnaXN0ZXJGaWxlKiByZWdpc3RlckZpbGUg PSBBUkdfcmVnaXN0ZXJGaWxlOwogICAgIFJlZ2lzdGVyKiByID0gQVJHX3I7CiAKLSAgICBSZWdp c3RlciogcmVnaXN0ZXJCYXNlID0gcmVnaXN0ZXJGaWxlLT5iYXNlKCk7Ci0gICAgCiAgICAgSlNW YWx1ZSogZnVuY1ZhbCA9IEFSR19zcmMxOwogICAgIGludCByZWdpc3Rlck9mZnNldCA9IEFSR19p bnQyOwogICAgIGludCBhcmdDb3VudCA9IEFSR19pbnQzOwpAQCAtNDUxMSw3ICs0NTA4LDcgQEAg dm9pZCogTWFjaGluZTo6Y3RpX29wX2NhbGxfSlNGdW5jdGlvbihDVAogICAgIFJlZ2lzdGVyKiBz YXZlZFIgPSByOwogCiAgICAgSlNWYWx1ZSogZXhjZXB0aW9uVmFsdWUgPSAwOwotICAgIHIgPSBz bGlkZVJlZ2lzdGVyV2luZG93Rm9yQ2FsbChleGVjLCBuZXdDb2RlQmxvY2ssIHJlZ2lzdGVyRmls ZSwgcmVnaXN0ZXJCYXNlLCByLCByZWdpc3Rlck9mZnNldCwgYXJnQ291bnQsIGV4Y2VwdGlvblZh bHVlKTsKKyAgICByID0gc2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwoZXhlYywgbmV3Q29kZUJs b2NrLCByZWdpc3RlckZpbGUsIHIsIHJlZ2lzdGVyT2Zmc2V0LCBhcmdDb3VudCwgZXhjZXB0aW9u VmFsdWUpOwogICAgIEpTVkFMVUVfVk1fQ0hFQ0tfRVhDRVBUSU9OX0FSRyhleGNlcHRpb25WYWx1 ZSk7CiAKICAgICByW1JlZ2lzdGVyRmlsZTo6Q29kZUJsb2NrXSA9IG5ld0NvZGVCbG9jazsKQEAg LTQ2OTAsOCArNDY4Nyw2IEBAIHZvaWQqIE1hY2hpbmU6OmN0aV9vcF9jb25zdHJ1Y3RfSlNDb25z dHIKICAgICBSZWdpc3RlckZpbGUqIHJlZ2lzdGVyRmlsZSA9IEFSR19yZWdpc3RlckZpbGU7CiAg ICAgUmVnaXN0ZXIqIHIgPSBBUkdfcjsKIAotICAgIFJlZ2lzdGVyKiByZWdpc3RlckJhc2UgPSBy ZWdpc3RlckZpbGUtPmJhc2UoKTsKLSAgICAKICAgICBKU1ZhbHVlKiBjb25zdHJWYWwgPSBBUkdf c3JjMTsKICAgICBKU1ZhbHVlKiBjb25zdHJQcm90b1ZhbCA9IEFSR19zcmMyOwogICAgIGludCBm aXJzdEFyZyA9IEFSR19pbnQzOwpAQCAtNDcyNCw3ICs0NzE5LDcgQEAgdm9pZCogTWFjaGluZTo6 Y3RpX29wX2NvbnN0cnVjdF9KU0NvbnN0cgogICAgIFJlZ2lzdGVyKiBzYXZlZFIgPSByOwogCiAg ICAgSlNWYWx1ZSogZXhjZXB0aW9uVmFsdWUgPSAwOwotICAgIHIgPSBzbGlkZVJlZ2lzdGVyV2lu ZG93Rm9yQ2FsbChleGVjLCBuZXdDb2RlQmxvY2ssIHJlZ2lzdGVyRmlsZSwgcmVnaXN0ZXJCYXNl LCByLCByZWdpc3Rlck9mZnNldCwgYXJnQ291bnQsIGV4Y2VwdGlvblZhbHVlKTsKKyAgICByID0g c2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwoZXhlYywgbmV3Q29kZUJsb2NrLCByZWdpc3RlckZp bGUsIHIsIHJlZ2lzdGVyT2Zmc2V0LCBhcmdDb3VudCwgZXhjZXB0aW9uVmFsdWUpOwogICAgIEpT VkFMVUVfVk1fQ0hFQ0tfRVhDRVBUSU9OX0FSRyhleGNlcHRpb25WYWx1ZSk7CiAKICAgICByW1Jl Z2lzdGVyRmlsZTo6Q29kZUJsb2NrXSA9IG5ld0NvZGVCbG9jazsKSW5kZXg6IFZNL1JlZ2lzdGVy RmlsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVk0vUmVnaXN0ZXJGaWxlLmNwcAkocmV2aXNpb24gMzcy MTApCisrKyBWTS9SZWdpc3RlckZpbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3ICszNCw3 IEBAIG5hbWVzcGFjZSBKU0MgewogUmVnaXN0ZXJGaWxlOjp+UmVnaXN0ZXJGaWxlKCkKIHsKICNp ZiBIQVZFKE1NQVApCi0gICAgbXVubWFwKG1fYnVmZmVyLCAobV9jYXBhY2l0eSArIG1fbWF4R2xv YmFscykgKiBzaXplb2YoUmVnaXN0ZXIpKTsKKyAgICBtdW5tYXAobV9idWZmZXIsICgobV9tYXgg LSBtX3N0YXJ0KSArIG1fbWF4R2xvYmFscykgKiBzaXplb2YoUmVnaXN0ZXIpKTsKICNlbGlmIEhB VkUoVklSVFVBTEFMTE9DKQogICAgIC8vIEZJWE1FOiBVc2UgVmlydHVhbEZyZWUuCiAgICAgZmFz dEZyZWUobV9idWZmZXIpOwpJbmRleDogVk0vUmVnaXN0ZXJGaWxlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g Vk0vUmVnaXN0ZXJGaWxlLmgJKHJldmlzaW9uIDM3MjEwKQorKysgVk0vUmVnaXN0ZXJGaWxlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTExMCwxMSArMTEwLDExIEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICBlbnVtIHsgRGVmYXVsdE1heEdsb2JhbHMgPSA4ICogMTAyNCB9OwogCiAgICAgICAgIFJl Z2lzdGVyRmlsZShzaXplX3QgY2FwYWNpdHkgPSBEZWZhdWx0Q2FwYWNpdHksIHNpemVfdCBtYXhH bG9iYWxzID0gRGVmYXVsdE1heEdsb2JhbHMpCi0gICAgICAgICAgICA6IG1fc2l6ZSgwKQotICAg ICAgICAgICAgLCBtX2NhcGFjaXR5KGNhcGFjaXR5KQotICAgICAgICAgICAgLCBtX251bUdsb2Jh bHMoMCkKKyAgICAgICAgICAgIDogbV9udW1HbG9iYWxzKDApCiAgICAgICAgICAgICAsIG1fbWF4 R2xvYmFscyhtYXhHbG9iYWxzKQotICAgICAgICAgICAgLCBtX2Jhc2UoMCkKKyAgICAgICAgICAg ICwgbV9zdGFydCgwKQorICAgICAgICAgICAgLCBtX2VuZCgwKQorICAgICAgICAgICAgLCBtX21h eCgwKQogICAgICAgICAgICAgLCBtX2J1ZmZlcigwKQogICAgICAgICAgICAgLCBtX2dsb2JhbE9i amVjdCgwKQogICAgICAgICB7CkBAIC0xMjgsNTIgKzEyOCw1NCBAQCBuYW1lc3BhY2UgSlNDIHsK ICNlbHNlCiAgICAgICAgICAgICAjZXJyb3IgIkRvbid0IGtub3cgaG93IHRvIHJlc2VydmUgdmly dHVhbCBtZW1vcnkgb24gdGhpcyBwbGF0Zm9ybS4iCiAjZW5kaWYKLSAgICAgICAgICAgIG1fYmFz ZSA9IG1fYnVmZmVyICsgbWF4R2xvYmFsczsKKyAgICAgICAgICAgIG1fc3RhcnQgPSBtX2J1ZmZl ciArIG1heEdsb2JhbHM7CisgICAgICAgICAgICBtX2VuZCA9IG1fc3RhcnQ7CisgICAgICAgICAg ICBtX21heCA9IG1fc3RhcnQgKyBjYXBhY2l0eTsKICAgICAgICAgfQogCiAgICAgICAgIH5SZWdp c3RlckZpbGUoKTsKIAotICAgICAgICBSZWdpc3RlciogYmFzZSgpIGNvbnN0IHsgcmV0dXJuIG1f YmFzZTsgfQotICAgICAgICAKKyAgICAgICAgUmVnaXN0ZXIqIHN0YXJ0KCkgY29uc3QgeyByZXR1 cm4gbV9zdGFydDsgfQorICAgICAgICBSZWdpc3RlciogZW5kKCkgY29uc3QgeyByZXR1cm4gbV9l bmQ7IH0KKyAgICAgICAgc2l6ZV90IHNpemUoKSBjb25zdCB7IHJldHVybiBtX2VuZCAtIG1fc3Rh cnQ7IH0KKwogICAgICAgICB2b2lkIHNldEdsb2JhbE9iamVjdChKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0KSB7IG1fZ2xvYmFsT2JqZWN0ID0gZ2xvYmFsT2JqZWN0OyB9CiAgICAgICAgIEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QoKSB7IHJldHVybiBtX2dsb2JhbE9iamVjdDsgfQog Ci0gICAgICAgIHZvaWQgc2hyaW5rKHNpemVfdCBzaXplKQorICAgICAgICB2b2lkIHNocmluayhS ZWdpc3RlciogbmV3RW5kKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoc2l6ZSA8IG1fc2l6 ZSkKLSAgICAgICAgICAgICAgICBtX3NpemUgPSBzaXplOworICAgICAgICAgICAgaWYgKG5ld0Vu ZCA8IG1fZW5kKQorICAgICAgICAgICAgICAgIG1fZW5kID0gbmV3RW5kOwogICAgICAgICB9CiAK LSAgICAgICAgYm9vbCBncm93KHNpemVfdCBzaXplKQorICAgICAgICBib29sIGdyb3coUmVnaXN0 ZXIqIG5ld0VuZCkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKHNpemUgPiBtX3NpemUpIHsK LSAgICAgICAgICAgICAgICBpZiAoc2l6ZSA+IG1fY2FwYWNpdHkpCisgICAgICAgICAgICBpZiAo bmV3RW5kID4gbV9lbmQpIHsKKyAgICAgICAgICAgICAgICBpZiAobmV3RW5kID4gbV9tYXgpCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICNpZiAhSEFWRShNTUFQKSAmJiBIQVZF KFZJUlRVQUxBTExPQykKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogVXNlIFZpcnR1YWxBbGxv YywgYW5kIGNvbW1pdCBwYWdlcyBhcyB3ZSBnby4KICNlbmRpZgotICAgICAgICAgICAgICAgIG1f c2l6ZSA9IHNpemU7CisgICAgICAgICAgICAgICAgbV9lbmQgPSBuZXdFbmQ7CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQotCi0gICAgICAgIHNpemVf dCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9zaXplOyB9CiAgICAgICAgIAogICAgICAgICB2b2lk IHNldE51bUdsb2JhbHMoc2l6ZV90IG51bUdsb2JhbHMpIHsgbV9udW1HbG9iYWxzID0gbnVtR2xv YmFsczsgfQogICAgICAgICBpbnQgbnVtR2xvYmFscygpIGNvbnN0IHsgcmV0dXJuIG1fbnVtR2xv YmFsczsgfQogICAgICAgICBzaXplX3QgbWF4R2xvYmFscygpIGNvbnN0IHsgcmV0dXJuIG1fbWF4 R2xvYmFsczsgfQogCi0gICAgICAgIFJlZ2lzdGVyKiBsYXN0R2xvYmFsKCkgY29uc3QgeyByZXR1 cm4gbV9iYXNlIC0gbV9udW1HbG9iYWxzOyB9CisgICAgICAgIFJlZ2lzdGVyKiBsYXN0R2xvYmFs KCkgY29uc3QgeyByZXR1cm4gbV9zdGFydCAtIG1fbnVtR2xvYmFsczsgfQogICAgICAgICAKLSAg ICAgICAgdm9pZCBtYXJrR2xvYmFscyhIZWFwKiBoZWFwKSB7IGhlYXAtPm1hcmtDb25zZXJ2YXRp dmVseShsYXN0R2xvYmFsKCksIG1fYmFzZSk7IH0KLSAgICAgICAgdm9pZCBtYXJrQ2FsbEZyYW1l cyhIZWFwKiBoZWFwKSB7IGhlYXAtPm1hcmtDb25zZXJ2YXRpdmVseShtX2Jhc2UsIG1fYmFzZSAr IG1fc2l6ZSk7IH0KKyAgICAgICAgdm9pZCBtYXJrR2xvYmFscyhIZWFwKiBoZWFwKSB7IGhlYXAt Pm1hcmtDb25zZXJ2YXRpdmVseShsYXN0R2xvYmFsKCksIG1fc3RhcnQpOyB9CisgICAgICAgIHZv aWQgbWFya0NhbGxGcmFtZXMoSGVhcCogaGVhcCkgeyBoZWFwLT5tYXJrQ29uc2VydmF0aXZlbHko bV9zdGFydCwgbV9lbmQpOyB9CiAKICAgICBwcml2YXRlOgotICAgICAgICBzaXplX3QgbV9zaXpl OwotICAgICAgICBjb25zdCBzaXplX3QgbV9jYXBhY2l0eTsKICAgICAgICAgc2l6ZV90IG1fbnVt R2xvYmFsczsKICAgICAgICAgY29uc3Qgc2l6ZV90IG1fbWF4R2xvYmFsczsKLSAgICAgICAgUmVn aXN0ZXIqIG1fYmFzZTsKKyAgICAgICAgUmVnaXN0ZXIqIG1fc3RhcnQ7CisgICAgICAgIFJlZ2lz dGVyKiBtX2VuZDsKKyAgICAgICAgUmVnaXN0ZXIqIG1fbWF4OwogICAgICAgICBSZWdpc3Rlciog bV9idWZmZXI7CiAgICAgICAgIEpTR2xvYmFsT2JqZWN0KiBtX2dsb2JhbE9iamVjdDsgLy8gVGhl IGdsb2JhbCBvYmplY3Qgd2hvc2UgdmFycyBhcmUgY3VycmVudGx5IHN0b3JlZCBpbiB0aGUgcmVn aXN0ZXIgZmlsZS4KICAgICB9OwpJbmRleDoga2pzL0pTR2xvYmFsT2JqZWN0LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBranMvSlNHbG9iYWxPYmplY3QuY3BwCShyZXZpc2lvbiAzNzIxMCkKKysrIGtqcy9K U0dsb2JhbE9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0MCw4ICs0NDAsOCBAQCB2b2lk IEpTR2xvYmFsT2JqZWN0Ojpjb3B5R2xvYmFsc1RvKFJlZ2lzCiAgICAgcmVnaXN0ZXJGaWxlLnNl dE51bUdsb2JhbHMoc3ltYm9sVGFibGUoKS5zaXplKCkpOwogCiAgICAgaWYgKGQoKS0+cmVnaXN0 ZXJBcnJheSkgewotICAgICAgICBtZW1jcHkocmVnaXN0ZXJGaWxlLmJhc2UoKSAtIGQoKS0+cmVn aXN0ZXJBcnJheVNpemUsIGQoKS0+cmVnaXN0ZXJBcnJheS5nZXQoKSwgZCgpLT5yZWdpc3RlckFy cmF5U2l6ZSAqIHNpemVvZihSZWdpc3RlcikpOwotICAgICAgICBzZXRSZWdpc3RlcnMocmVnaXN0 ZXJGaWxlLmJhc2UoKSwgMCwgMCk7CisgICAgICAgIG1lbWNweShyZWdpc3RlckZpbGUuc3RhcnQo KSAtIGQoKS0+cmVnaXN0ZXJBcnJheVNpemUsIGQoKS0+cmVnaXN0ZXJBcnJheS5nZXQoKSwgZCgp LT5yZWdpc3RlckFycmF5U2l6ZSAqIHNpemVvZihSZWdpc3RlcikpOworICAgICAgICBzZXRSZWdp c3RlcnMocmVnaXN0ZXJGaWxlLnN0YXJ0KCksIDAsIDApOwogICAgIH0KIH0KIAo=