From mboxrd@z Thu Jan 1 00:00:00 1970 From: Euan Harris Subject: [PATCH 2/9] x86/vvmx: Unify operands in struct vmx_inst_decoded Date: Thu, 26 Oct 2017 18:03:12 +0100 Message-ID: <1509037399-48926-3-git-send-email-euan.harris@citrix.com> References: <1509037399-48926-1-git-send-email-euan.harris@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e7lZT-0002dQ-C9 for xen-devel@lists.xenproject.org; Thu, 26 Oct 2017 17:03:55 +0000 In-Reply-To: <1509037399-48926-1-git-send-email-euan.harris@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: andrew.cooper3@citrix.com, kevin.tian@intel.com, Euan Harris , jun.nakajima@intel.com, jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org VGhpcyBjaGFuZ2UgcHJlcGFyZXMgdGhlIHdheSBmb3IgYWJzdHJhY3RpbmcgdGhlIGNvZGUgd2hp Y2ggcmVhZHMKbWVtb3J5IGFuZCByZWdpc3RlciBvcGVyYW5kcyBpbnRvIGEgZ2VuZXJpYyBvcGVy YW5kX3JlYWQoKSBmdW5jdGlvbiBpbgphIGZ1dHVyZSBwYXRjaC4KCk9wZXJhbmQgMSBtYXkgZWl0 aGVyIGJlIGEgbWVtb3J5IGxvY2F0aW9uIG9yIGEgcmVnaXN0ZXIsIGRlcGVuZGluZyBvbgp0aGUg aW5zdHJ1Y3Rpb24gYmVpbmcgaGFuZGxlZC4gICBPcGVyYW5kIDIgbWF5IG9ubHkgYmUgYSByZWdp c3RlciwgYnV0Cml0IGlzIG5vdyByZXByZXNlbnRlZCBpbiB0aGUgc2FtZSB3YXkgYXMgb3BlcmFu ZCAxIGFuZCBzbyBoYXMgYSB0eXBlCmZpZWxkLiAgIFRoaXMgd2lsbCBhbHdheXMgZXF1YWwgVk1Y X0lOU1RfTUVNUkVHX1RZUEVfUkVHLgoKUmVmZXJlbmNlcyB0byB0aGUgb2xkIHN0cnVjdHVyZSBt YXAgdG8gdGhlIG5ldyBvbmUgYXMgZm9sbG93czoKCiAgbWVtICAtPiBvcFswXS5tZW0KICBsZW4g IC0+IG9wWzBdLmxlbgogIHJlZzEgLT4gb3BbMF0ucmVnCiAgcmVnMiAtPiBvcFsxXS5yZWcKClJl ZmVyZW5jZXMgdG8gdHlwZSBhbHdheXMgbWFwIHRvIG9wWzBdLnR5cGUgaW4gdGhpcyBwYXRjaCBi ZWNhdXNlCnByZXZpb3VzbHkgb3BlcmFuZCAyIGNvdWxkIG9ubHkgYmUgYSByZWdpc3RlciBhbmQg c28gdHlwZSB3YXMgbmV2ZXIKY2hlY2tlZCB3aGVuIGFjY2Vzc2luZyBpdC4KClNpZ25lZC1vZmYt Ynk6IEV1YW4gSGFycmlzIDxldWFuLmhhcnJpc0BjaXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4 Ni9odm0vdm14L3Z2bXguYyB8IDUyICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdm14L3Z2bXguYyBiL3hlbi9hcmNo L3g4Ni9odm0vdm14L3Z2bXguYwppbmRleCA5ZDg3Nzg2ODk0Li4yMGU1ZTI5MDMxIDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92dm14LmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92 bXgvdnZteC5jCkBAIC0xOTUsMTYgKzE5NSwxNiBAQCBib29sX3QgbnZteF9lcHRfZW5hYmxlZChz dHJ1Y3QgdmNwdSAqdikKIHN0cnVjdCB2bXhfaW5zdF9kZWNvZGVkIHsKICNkZWZpbmUgVk1YX0lO U1RfTUVNUkVHX1RZUEVfTUVNT1JZIDAKICNkZWZpbmUgVk1YX0lOU1RfTUVNUkVHX1RZUEVfUkVH ICAgIDEKLSAgICBpbnQgdHlwZTsKLSAgICB1bmlvbiB7Ci0gICAgICAgIHN0cnVjdCB7Ci0gICAg ICAgICAgICB1bnNpZ25lZCBsb25nIG1lbTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGludCAgbGVu OworICAgIHN0cnVjdCB2bXhfaW5zdF9vcCB7CisgICAgICAgIGludCB0eXBlOworICAgICAgICB1 bmlvbiB7CisgICAgICAgICAgICBzdHJ1Y3QgeworICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxv bmcgbWVtOworICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCAgbGVuOworICAgICAgICAgICAg fTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGludCByZWdfaWR4OwogICAgICAgICB9OwotICAgICAg ICB1bnNpZ25lZCBpbnQgcmVnMTsKLSAgICB9OwotCi0gICAgdW5zaWduZWQgaW50IHJlZzI7Cisg ICAgfSBvcFsyXTsKIH07CiAKIGVudW0gdm14X29wc19yZXN1bHQgewpAQCAtNDM3LDE2ICs0Mzcs MTYgQEAgc3RhdGljIGludCBkZWNvZGVfdm14X2luc3Qoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJl Z3MsCiAgICAgaW5mby53b3JkID0gb2Zmc2V0OwogCiAgICAgaWYgKCBpbmZvLmZpZWxkcy5tZW1y ZWcgKSB7Ci0gICAgICAgIGRlY29kZS0+dHlwZSA9IFZNWF9JTlNUX01FTVJFR19UWVBFX1JFRzsK LSAgICAgICAgZGVjb2RlLT5yZWcxID0gaW5mby5maWVsZHMucmVnMTsKKyAgICAgICAgZGVjb2Rl LT5vcFswXS50eXBlID0gVk1YX0lOU1RfTUVNUkVHX1RZUEVfUkVHOworICAgICAgICBkZWNvZGUt Pm9wWzBdLnJlZ19pZHggPSBpbmZvLmZpZWxkcy5yZWcxOwogICAgICAgICBpZiAoIHBvcGVyYW5k UyAhPSBOVUxMICkKLSAgICAgICAgICAgICpwb3BlcmFuZFMgPSByZWdfcmVhZChyZWdzLCBkZWNv ZGUtPnJlZzEpOworICAgICAgICAgICAgKnBvcGVyYW5kUyA9IHJlZ19yZWFkKHJlZ3MsIGRlY29k ZS0+b3BbMF0ucmVnX2lkeCk7CiAgICAgfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIGJvb2wg bW9kZV82NGJpdCA9ICh2bXhfZ3Vlc3RfeDg2X21vZGUodikgPT0gOCk7CiAKLSAgICAgICAgZGVj b2RlLT50eXBlID0gVk1YX0lOU1RfTUVNUkVHX1RZUEVfTUVNT1JZOworICAgICAgICBkZWNvZGUt Pm9wWzBdLnR5cGUgPSBWTVhfSU5TVF9NRU1SRUdfVFlQRV9NRU1PUlk7CiAKICAgICAgICAgaWYg KCBpbmZvLmZpZWxkcy5zZWdtZW50ID4geDg2X3NlZ19ncyApCiAgICAgICAgICAgICBnb3RvIGdw X2ZhdWx0OwpAQCAtNDg2LDExICs0ODYsMTMgQEAgc3RhdGljIGludCBkZWNvZGVfdm14X2luc3Qo c3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MsCiAgICAgICAgICAgICBpZiAoIHJjICE9IEhWTVRS QU5TX29rYXkgKQogICAgICAgICAgICAgICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKICAg ICAgICAgfQotICAgICAgICBkZWNvZGUtPm1lbSA9IGJhc2U7Ci0gICAgICAgIGRlY29kZS0+bGVu ID0gc2l6ZTsKKworICAgICAgICBkZWNvZGUtPm9wWzBdLm1lbSA9IGJhc2U7CisgICAgICAgIGRl Y29kZS0+b3BbMF0ubGVuID0gc2l6ZTsKICAgICB9CiAKLSAgICBkZWNvZGUtPnJlZzIgPSBpbmZv LmZpZWxkcy5yZWcyOworICAgIGRlY29kZS0+b3BbMV0udHlwZSA9IFZNWF9JTlNUX01FTVJFR19U WVBFX1JFRzsKKyAgICBkZWNvZGUtPm9wWzFdLnJlZ19pZHggPSBpbmZvLmZpZWxkcy5yZWcyOwog CiAgICAgcmV0dXJuIFg4NkVNVUxfT0tBWTsKIApAQCAtMTc3MCw3ICsxNzcyLDggQEAgaW50IG52 bXhfaGFuZGxlX3ZtcHRyc3Qoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAKICAgICBncGEg PSBudmNwdS0+bnZfdnZtY3hhZGRyOwogCi0gICAgcmMgPSBodm1fY29weV90b19ndWVzdF9saW5l YXIoZGVjb2RlLm1lbSwgJmdwYSwgZGVjb2RlLmxlbiwgMCwgJnBmaW5mbyk7CisgICAgcmMgPSBo dm1fY29weV90b19ndWVzdF9saW5lYXIoZGVjb2RlLm9wWzBdLm1lbSwgJmdwYSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkZWNvZGUub3BbMF0ubGVuLCAwLCAmcGZpbmZvKTsK ICAgICBpZiAoIHJjID09IEhWTVRSQU5TX2JhZF9saW5lYXJfdG9fZ2ZuICkKICAgICAgICAgaHZt X2luamVjdF9wYWdlX2ZhdWx0KHBmaW5mby5lYywgcGZpbmZvLmxpbmVhcik7CiAgICAgaWYgKCBy YyAhPSBIVk1UUkFOU19va2F5ICkKQEAgLTE4NTAsMjMgKzE4NTMsMjQgQEAgaW50IG52bXhfaGFu ZGxlX3ZtcmVhZChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICAgICAgcmV0dXJuIFg4 NkVNVUxfT0tBWTsKICAgICB9CiAKLSAgICByYyA9IGdldF92dm1jc19zYWZlKHYsIHJlZ19yZWFk KHJlZ3MsIGRlY29kZS5yZWcyKSwgJnZhbHVlKTsKKyAgICByYyA9IGdldF92dm1jc19zYWZlKHYs IHJlZ19yZWFkKHJlZ3MsIGRlY29kZS5vcFsxXS5yZWdfaWR4KSwgJnZhbHVlKTsKICAgICBpZiAo IHJjICE9IFZNWF9JTlNOX1NVQ0NFRUQgKQogICAgIHsKICAgICAgICAgdm1mYWlsKHJlZ3MsIHJj KTsKICAgICAgICAgcmV0dXJuIFg4NkVNVUxfT0tBWTsKICAgICB9CiAKLSAgICBzd2l0Y2ggKCBk ZWNvZGUudHlwZSApIHsKKyAgICBzd2l0Y2ggKCBkZWNvZGUub3BbMF0udHlwZSApIHsKICAgICBj YXNlIFZNWF9JTlNUX01FTVJFR19UWVBFX01FTU9SWToKLSAgICAgICAgcmMgPSBodm1fY29weV90 b19ndWVzdF9saW5lYXIoZGVjb2RlLm1lbSwgJnZhbHVlLCBkZWNvZGUubGVuLCAwLCAmcGZpbmZv KTsKKyAgICAgICAgcmMgPSBodm1fY29weV90b19ndWVzdF9saW5lYXIoZGVjb2RlLm9wWzBdLm1l bSwgJnZhbHVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZWNvZGUu b3BbMF0ubGVuLCAwLCAmcGZpbmZvKTsKICAgICAgICAgaWYgKCByYyA9PSBIVk1UUkFOU19iYWRf bGluZWFyX3RvX2dmbiApCiAgICAgICAgICAgICBodm1faW5qZWN0X3BhZ2VfZmF1bHQocGZpbmZv LmVjLCBwZmluZm8ubGluZWFyKTsKICAgICAgICAgaWYgKCByYyAhPSBIVk1UUkFOU19va2F5ICkK ICAgICAgICAgICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBWTVhfSU5TVF9NRU1SRUdfVFlQRV9SRUc6Ci0gICAgICAgIHJlZ193cml0ZShyZWdz LCBkZWNvZGUucmVnMSwgdmFsdWUpOworICAgICAgICByZWdfd3JpdGUocmVncywgZGVjb2RlLm9w WzBdLnJlZ19pZHgsIHZhbHVlKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBAIC0xODkzLDcg KzE4OTcsNyBAQCBpbnQgbnZteF9oYW5kbGVfdm13cml0ZShzdHJ1Y3QgY3B1X3VzZXJfcmVncyAq cmVncykKICAgICAgICAgcmV0dXJuIFg4NkVNVUxfT0tBWTsKICAgICB9CiAKLSAgICB2bWNzX2Vu Y29kaW5nID0gcmVnX3JlYWQocmVncywgZGVjb2RlLnJlZzIpOworICAgIHZtY3NfZW5jb2Rpbmcg PSByZWdfcmVhZChyZWdzLCBkZWNvZGUub3BbMV0ucmVnX2lkeCk7CiAgICAgZXJyID0gc2V0X3Z2 bWNzX3NhZmUodiwgdm1jc19lbmNvZGluZywgb3BlcmFuZCk7CiAgICAgaWYgKCBlcnIgIT0gVk1Y X0lOU05fU1VDQ0VFRCApCiAgICAgewpAQCAtMTkzMSw3ICsxOTM1LDcgQEAgaW50IG52bXhfaGFu ZGxlX2ludmVwdChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICBpZiAoIChyZXQgPSBk ZWNvZGVfdm14X2luc3QocmVncywgJmRlY29kZSwgJmVwdHAsIDApKSAhPSBYODZFTVVMX09LQVkg KQogICAgICAgICByZXR1cm4gcmV0OwogCi0gICAgc3dpdGNoICggcmVnX3JlYWQocmVncywgZGVj b2RlLnJlZzIpICkKKyAgICBzd2l0Y2ggKCByZWdfcmVhZChyZWdzLCBkZWNvZGUub3BbMV0ucmVn X2lkeCkgKQogICAgIHsKICAgICBjYXNlIElOVkVQVF9TSU5HTEVfQ09OVEVYVDoKICAgICB7CkBA IC0xOTU5LDcgKzE5NjMsNyBAQCBpbnQgbnZteF9oYW5kbGVfaW52dnBpZChzdHJ1Y3QgY3B1X3Vz ZXJfcmVncyAqcmVncykKICAgICBpZiAoIChyZXQgPSBkZWNvZGVfdm14X2luc3QocmVncywgJmRl Y29kZSwgJnZwaWQsIDApKSAhPSBYODZFTVVMX09LQVkgKQogICAgICAgICByZXR1cm4gcmV0Owog Ci0gICAgc3dpdGNoICggcmVnX3JlYWQocmVncywgZGVjb2RlLnJlZzIpICkKKyAgICBzd2l0Y2gg KCByZWdfcmVhZChyZWdzLCBkZWNvZGUub3BbMV0ucmVnX2lkeCkgKQogICAgIHsKICAgICAvKiBK dXN0IGludmFsaWRhdGUgYWxsIHRsYiBlbnRyaWVzIGZvciBhbGwgdHlwZXMhICovCiAgICAgY2Fz ZSBJTlZWUElEX0lORElWSURVQUxfQUREUjoKLS0gCjIuMTMuNgoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=