From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [PATCH v4 08/19] x86/boot/reloc: Rename some variables and rearrange code a bit Date: Sat, 6 Aug 2016 01:04:31 +0200 Message-ID: <1470438282-4226-9-git-send-email-daniel.kiper@oracle.com> References: <1470438282-4226-1-git-send-email-daniel.kiper@oracle.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 1bVoBV-0003CM-Bb for xen-devel@lists.xenproject.org; Fri, 05 Aug 2016 23:05:45 +0000 In-Reply-To: <1470438282-4226-1-git-send-email-daniel.kiper@oracle.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: jgross@suse.com, sstabellini@kernel.org, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org List-Id: xen-devel@lists.xenproject.org UmVwbGFjZSBtYmkgd2l0aCBtYmlfb3V0IGFuZCBtYmlfb2xkIHdpdGggbWJpX2luIGFuZCByZWFy cmFuZ2UgY29kZQphIGJpdCB0byBtYWtlIGl0IG1vcmUgcmVhZGFibGUuIEFkZGl0aW9uYWxseSwg dGhpcyB3YXkgbXVsdGlib290ICh2MSkKcHJvdG9jb2wgaW1wbGVtZW50YXRpb24gYW5kIGZ1dHVy ZSBtdWx0aWJvb3QyIHByb3RvY29sIGltcGxlbWVudGF0aW9uCndpbGwgdXNlIHRoZSBzYW1lIHZh cmlhYmxlIG5hbWluZyBjb252ZW50aW9uLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIEtpcGVyIDxk YW5pZWwua2lwZXJAb3JhY2xlLmNvbT4KLS0tCnY0IC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0g bW92ZSB0byBzdGRjYWxsIGNhbGxpbmcgY29udmVudGlvbi4KCnYzIC0gc3VnZ2VzdGlvbnMvZml4 ZXM6CiAgIC0gaW1wcm92ZSBjb21taXQgbWVzc2FnZQogICAgIChzdWdnZXN0ZWQgYnkgS29ucmFk IFJ6ZXN6dXRlayBXaWxrKS4KCnYyIC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0gZXh0cmFjdCB0 aGlzIGNoYW5nZSBmcm9tIG1haW4gbXV0bGlib290MgogICAgIHByb3RvY29sIGltcGxlbWVudGF0 aW9uCiAgICAgKHN1Z2dlc3RlZCBieSBKYW4gQmV1bGljaCkuCi0tLQogeGVuL2FyY2gveDg2L2Jv b3QvcmVsb2MuYyB8ICAgMzkgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L2Jvb3QvcmVsb2MuYyBiL3hlbi9hcmNoL3g4Ni9ib290L3Jl bG9jLmMKaW5kZXggMjFiMWYzMi4uZGM2YTQzNSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2Jv b3QvcmVsb2MuYworKysgYi94ZW4vYXJjaC94ODYvYm9vdC9yZWxvYy5jCkBAIC02Myw0NSArNjMs NDYgQEAgc3RhdGljIHUzMiBjb3B5X3N0cmluZyh1MzIgc3JjKQogICAgIHJldHVybiBjb3B5X21l bShzcmMsIHAgLSBzcmMgKyAxKTsKIH0KIAotbXVsdGlib290X2luZm9fdCBfX3N0ZGNhbGwgKnJl bG9jKHUzMiBtYmlfb2xkLCB1MzIgdHJhbXBvbGluZSkKK211bHRpYm9vdF9pbmZvX3QgX19zdGRj YWxsICpyZWxvYyh1MzIgbWJpX2luLCB1MzIgdHJhbXBvbGluZSkKIHsKLSAgICBtdWx0aWJvb3Rf aW5mb190ICptYmk7CiAgICAgaW50IGk7CisgICAgbXVsdGlib290X2luZm9fdCAqbWJpX291dDsK IAogICAgIGFsbG9jID0gdHJhbXBvbGluZTsKIAotICAgIG1iaSA9IChtdWx0aWJvb3RfaW5mb190 ICopY29weV9tZW0obWJpX29sZCwgc2l6ZW9mKCptYmkpKTsKKyAgICBtYmlfb3V0ID0gKG11bHRp Ym9vdF9pbmZvX3QgKiljb3B5X21lbShtYmlfaW4sIHNpemVvZigqbWJpX291dCkpOwogCi0gICAg aWYgKCBtYmktPmZsYWdzICYgTUJJX0NNRExJTkUgKQotICAgICAgICBtYmktPmNtZGxpbmUgPSBj b3B5X3N0cmluZyhtYmktPmNtZGxpbmUpOworICAgIGlmICggbWJpX291dC0+ZmxhZ3MgJiBNQklf Q01ETElORSApCisgICAgICAgIG1iaV9vdXQtPmNtZGxpbmUgPSBjb3B5X3N0cmluZyhtYmlfb3V0 LT5jbWRsaW5lKTsKIAotICAgIGlmICggbWJpLT5mbGFncyAmIE1CSV9NT0RVTEVTICkKKyAgICBp ZiAoIG1iaV9vdXQtPmZsYWdzICYgTUJJX01PRFVMRVMgKQogICAgIHsKICAgICAgICAgbW9kdWxl X3QgKm1vZHM7CiAKLSAgICAgICAgbWJpLT5tb2RzX2FkZHIgPSBjb3B5X21lbShtYmktPm1vZHNf YWRkciwgbWJpLT5tb2RzX2NvdW50ICogc2l6ZW9mKG1vZHVsZV90KSk7CisgICAgICAgIG1iaV9v dXQtPm1vZHNfYWRkciA9IGNvcHlfbWVtKG1iaV9vdXQtPm1vZHNfYWRkciwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbWJpX291dC0+bW9kc19jb3VudCAqIHNpemVvZiht b2R1bGVfdCkpOwogCi0gICAgICAgIG1vZHMgPSAobW9kdWxlX3QgKiltYmktPm1vZHNfYWRkcjsK KyAgICAgICAgbW9kcyA9IChtb2R1bGVfdCAqKW1iaV9vdXQtPm1vZHNfYWRkcjsKIAotICAgICAg ICBmb3IgKCBpID0gMDsgaSA8IG1iaS0+bW9kc19jb3VudDsgaSsrICkKKyAgICAgICAgZm9yICgg aSA9IDA7IGkgPCBtYmlfb3V0LT5tb2RzX2NvdW50OyBpKysgKQogICAgICAgICB7CiAgICAgICAg ICAgICBpZiAoIG1vZHNbaV0uc3RyaW5nICkKICAgICAgICAgICAgICAgICBtb2RzW2ldLnN0cmlu ZyA9IGNvcHlfc3RyaW5nKG1vZHNbaV0uc3RyaW5nKTsKICAgICAgICAgfQogICAgIH0KIAotICAg IGlmICggbWJpLT5mbGFncyAmIE1CSV9NRU1NQVAgKQotICAgICAgICBtYmktPm1tYXBfYWRkciA9 IGNvcHlfbWVtKG1iaS0+bW1hcF9hZGRyLCBtYmktPm1tYXBfbGVuZ3RoKTsKKyAgICBpZiAoIG1i aV9vdXQtPmZsYWdzICYgTUJJX01FTU1BUCApCisgICAgICAgIG1iaV9vdXQtPm1tYXBfYWRkciA9 IGNvcHlfbWVtKG1iaV9vdXQtPm1tYXBfYWRkciwgbWJpX291dC0+bW1hcF9sZW5ndGgpOwogCi0g ICAgaWYgKCBtYmktPmZsYWdzICYgTUJJX0xPQURFUk5BTUUgKQotICAgICAgICBtYmktPmJvb3Rf bG9hZGVyX25hbWUgPSBjb3B5X3N0cmluZyhtYmktPmJvb3RfbG9hZGVyX25hbWUpOworICAgIGlm ICggbWJpX291dC0+ZmxhZ3MgJiBNQklfTE9BREVSTkFNRSApCisgICAgICAgIG1iaV9vdXQtPmJv b3RfbG9hZGVyX25hbWUgPSBjb3B5X3N0cmluZyhtYmlfb3V0LT5ib290X2xvYWRlcl9uYW1lKTsK IAogICAgIC8qIE1hc2sgZmVhdHVyZXMgd2UgZG9uJ3QgdW5kZXJzdGFuZCBvciBkb24ndCByZWxv Y2F0ZS4gKi8KLSAgICBtYmktPmZsYWdzICY9IChNQklfTUVNTElNSVRTIHwKLSAgICAgICAgICAg ICAgICAgICBNQklfQ01ETElORSB8Ci0gICAgICAgICAgICAgICAgICAgTUJJX01PRFVMRVMgfAot ICAgICAgICAgICAgICAgICAgIE1CSV9NRU1NQVAgfAotICAgICAgICAgICAgICAgICAgIE1CSV9M T0FERVJOQU1FKTsKKyAgICBtYmlfb3V0LT5mbGFncyAmPSAoTUJJX01FTUxJTUlUUyB8CisgICAg ICAgICAgICAgICAgICAgICAgIE1CSV9DTURMSU5FIHwKKyAgICAgICAgICAgICAgICAgICAgICAg TUJJX01PRFVMRVMgfAorICAgICAgICAgICAgICAgICAgICAgICBNQklfTUVNTUFQIHwKKyAgICAg ICAgICAgICAgICAgICAgICAgTUJJX0xPQURFUk5BTUUpOwogCi0gICAgcmV0dXJuIG1iaTsKKyAg ICByZXR1cm4gbWJpX291dDsKIH0KLS0gCjEuNy4xMC40CgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==