[{"id":3632,"web_url":"https://patchwork.libcamera.org/comment/3632/","msgid":"<86b32e77-8cd3-3be7-9cb2-6ddace4db6f2@ideasonboard.com>","date":"2020-02-07T09:24:50","subject":"Re: [libcamera-devel] [PATCH] libcamera: ipa_module: Use ElfW()\n\tmacro for native word size","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 06/02/2020 21:59, Laurent Pinchart wrote:\n> Access the ELF types corresponding to the native word size using the\n> ElfW() macro instead of template types. This is the standard method and\n> simplifies the code.\n\nExcellent, You beat me to it. I was going to look at this having\nidentified the ElfW macro from the other series.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/ipa_module.cpp | 27 ++++++++++-----------------\n> 1 file changed, 10 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp\n> index 2c355ea8b5e5..de65525b8319 100644\n> --- a/src/libcamera/ipa_module.cpp\n> +++ b/src/libcamera/ipa_module.cpp\n> @@ -13,6 +13,7 @@\n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> @@ -94,25 +95,24 @@ int elfVerifyIdent(void *map, size_t soSize)\n> * \\return zero or error code, address or nullptr, size of symbol or zero,\n> * respectively\n> */\n> -template\n> std::tuple\n> elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n> {\n> -\tElfHeader *eHdr = elfPointer(map, 0, soSize);\n> +\tElfW(Ehdr) *eHdr = elfPointer(map, 0, soSize);\n> \tif (!eHdr)\n> \t\treturn std::make_tuple(nullptr, 0);\n> \n> \toff_t offset = eHdr->e_shoff + eHdr->e_shentsize * eHdr->e_shstrndx;\n> -\tSecHeader *sHdr = elfPointer(map, offset, soSize);\n> +\tElfW(Shdr) *sHdr = elfPointer(map, offset, soSize);\n> \tif (!sHdr)\n> \t\treturn std::make_tuple(nullptr, 0);\n> \toff_t shnameoff = sHdr->sh_offset;\n> \n> \t/* Locate .dynsym section header. */\n> -\tSecHeader *dynsym = nullptr;\n> +\tElfW(Shdr) *dynsym = nullptr;\n> \tfor (unsigned int i = 0; i < eHdr->e_shnum; i++) {\n> \t\toffset = eHdr->e_shoff + eHdr->e_shentsize * i;\n> -\t\tsHdr = elfPointer(map, offset, soSize);\n> +\t\tsHdr = elfPointer(map, offset, soSize);\n> \t\tif (!sHdr)\n> \t\t\treturn std::make_tuple(nullptr, 0);\n> \n> @@ -133,17 +133,17 @@ elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n> \t}\n> \n> \toffset = eHdr->e_shoff + eHdr->e_shentsize * dynsym->sh_link;\n> -\tsHdr = elfPointer(map, offset, soSize);\n> +\tsHdr = elfPointer(map, offset, soSize);\n> \tif (!sHdr)\n> \t\treturn std::make_tuple(nullptr, 0);\n> \toff_t dynsym_nameoff = sHdr->sh_offset;\n> \n> \t/* Locate symbol in the .dynsym section. */\n> -\tSymHeader *targetSymbol = nullptr;\n> +\tElfW(Sym) *targetSymbol = nullptr;\n> \tunsigned int dynsym_num = dynsym->sh_size / dynsym->sh_entsize;\n> \tfor (unsigned int i = 0; i < dynsym_num; i++) {\n> \t\toffset = dynsym->sh_offset + dynsym->sh_entsize * i;\n> -\t\tSymHeader *sym = elfPointer(map, offset, soSize);\n> +\t\tElfW(Sym) *sym = elfPointer(map, offset, soSize);\n> \t\tif (!sym)\n> \t\t\treturn std::make_tuple(nullptr, 0);\n> \n> @@ -169,7 +169,7 @@ elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n> \tif (targetSymbol->st_shndx >= eHdr->e_shnum)\n> \t\treturn std::make_tuple(nullptr, 0);\n> \toffset = eHdr->e_shoff + targetSymbol->st_shndx * eHdr->e_shentsize;\n> -\tsHdr = elfPointer(map, offset, soSize);\n> +\tsHdr = elfPointer(map, offset, soSize);\n> \tif (!sHdr)\n> \t\treturn std::make_tuple(nullptr, 0);\n> \toffset = sHdr->sh_offset + (targetSymbol->st_value - sHdr->sh_addr);\n> @@ -310,14 +310,7 @@ int IPAModule::loadIPAModuleInfo()\n> \tif (ret)\n> \t\tgoto unmap;\n> \n> -\tif (sizeof(unsigned long) == 4)\n> -\t\tstd::tie(data, dataSize) =\n> -\t\t\telfLoadSymbol\n> -\t\t\t\t (map, soSize, \"ipaModuleInfo\");\n> -\telse\n> -\t\tstd::tie(data, dataSize) =\n> -\t\t\telfLoadSymbol\n> -\t\t\t\t (map, soSize, \"ipaModuleInfo\");\n> +\tstd::tie(data, dataSize) = elfLoadSymbol(map, soSize, \"ipaModuleInfo\");\n> \n> \tif (data && dataSize == sizeof(info_))\n> \t\tmemcpy(&info_, data, dataSize);\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6F11560440\n\tfor ;\n\tFri, 7 Feb 2020 10:24:54 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D67DE52F;\n\tFri, 7 Feb 2020 10:24:53 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1581067494;\n\tbh=1sT+xGKMBl7pnrq+Aoxp/tp55/+9aGilcbrrRumR3mg=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=R46prmj0/X0RKp0kLqRnVZIcZ+gCP2R3HpFGLLdQSHrwr8tPemgXJrCPPP3kyDF6D\n\tQWQFs7CmgVG8KT/r7mXaq5iyvkh7teWNkiuFu+zE0tXEDOifBODkux59z9A/sIJyVO\n\t5olLyHfSViExxz0x9XrQhebG3aBb+PYBo9V04sVU=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200206215914.25008-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<86b32e77-8cd3-3be7-9cb2-6ddace4db6f2@ideasonboard.com>","Date":"Fri, 7 Feb 2020 09:24:50 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200206215914.25008-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] libcamera: ipa_module: Use ElfW()\n\tmacro for native word size","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 07 Feb 2020 09:24:54 -0000"}}]