From nobody Sun Jul 10 23:32:05 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ED35117F841A; Sun, 10 Jul 2022 23:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lh3Fd6T6jz3LwN; Sun, 10 Jul 2022 23:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657495925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G2ZCLtDKTjh7eTNyMIJhem5O/h5YoQ9Qlwr2N6v17Xg=; b=mOhJvTmH6yWqQafOLrPRCDhy6C8k0idSLyyPUP5X4RyP5C4TL3eeFTl0fSJD00Ncvb8MzK hGP5RT/FcmPAgfT8bXdqjDOKCE92/F2Fn+RLCMAS0pjoBeL0oigVb9E3AfBc9hJYoy3Fq9 2Fx0JwuewaNu4ia41HtvDMxP6kS0cmXUeyO+CYqhOLNVm1o2I90vIqAPxumyw1kO3+TrPb eR4P5Kd6Gu4DpzFGKoPk6hBi6JH1nbZtlz6Rsxkd9gjkvIfxFff0jhXIk7DWHm2AVADXyq zTEstGABoYhsqNc/bk0XRM37om38FYR+KmQ9od6tW1Vr/7C/S6QFFdrZHVCjwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lh3Fd5YxNzjXf; Sun, 10 Jul 2022 23:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26ANW5k0047547; Sun, 10 Jul 2022 23:32:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ANW5En047546; Sun, 10 Jul 2022 23:32:05 GMT (envelope-from git) Date: Sun, 10 Jul 2022 23:32:05 GMT Message-Id: <202207102332.26ANW5En047546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 0bbf2702963a - main - libproc: replace home grown crc32 with zlib implementation. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bbf2702963a2fe6f7bb025d5d07ee4195856b8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657495925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G2ZCLtDKTjh7eTNyMIJhem5O/h5YoQ9Qlwr2N6v17Xg=; b=rdcvOdwoO2jOXbAfMjPAU+QYIedMX8ubzalVughBHqJf8eFxUQaD5VpJQvAHsE5Hlqev7t NcvMGqOQo3XotYjtt4OvfIEe1p2ZMQ6SZRIQEodmpuW0yOARoJUYuDhaYVL+WEFoqyurs6 MqHQxytJmTXE/daJ6K5uRI8aShE6BKDi+XCPs4jEwwD2oyPDsT7EZOmLl5Dz9Le76+kQOh dZYzgrxbiKH91SV5/ni7qwL6intCxpPbfjVBnB7FQQWEo6K7ME7Ar4g1aHQDGxFY0SZCim KorIoG6giajxRiAqJO/WcwPKAjXaOQ1OUt1PBy2epU98yxEkATIZKqaH3pmygA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657495925; a=rsa-sha256; cv=none; b=a3vJYNwuxJ39poGdBLwewh4CxfLbGYCqGKZTyEWvh1KECqRArsrk7cX8GzGCe6H339fiyL PLCBVwZO4NNK7dDFR7g/hyg4liWJ/NJC50lw0v7YJ0+SSw9vtna1tLjsI/MEFObVl3iT7F n7zeYkeSAG35FWMiz6fGyzz+wHNUOjzW9edBRSTmgSC3Civc6Kcb3AGyW2cY3FeW/lb8VP 4SHkVolbKIlutAbrT5b5iYFpK+QliQyC3TXS/jt9SjhDjIcOINZZhqsfeX1RgUnoD3J538 5jF0XMbwQrQUDTTex/pWvP2CEiGV+C/4mdhb3Ne5aPl5iTwxyYBPmV5CwXrRWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=0bbf2702963a2fe6f7bb025d5d07ee4195856b8f commit 0bbf2702963a2fe6f7bb025d5d07ee4195856b8f Author: Xin LI AuthorDate: 2022-07-10 23:31:35 +0000 Commit: Xin LI CommitDate: 2022-07-10 23:31:35 +0000 libproc: replace home grown crc32 with zlib implementation. MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D35766 --- lib/libproc/Makefile | 5 ++--- lib/libproc/crc32.c | 57 ------------------------------------------------ lib/libproc/crc32.h | 28 ------------------------ lib/libproc/proc_sym.c | 17 ++++++--------- share/mk/src.libnames.mk | 2 +- 5 files changed, 10 insertions(+), 99 deletions(-) diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 434d78bb6933..37d550cb22e3 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -4,8 +4,7 @@ LIB= proc -SRCS= crc32.c \ - proc_bkpt.c \ +SRCS= proc_bkpt.c \ proc_create.c \ proc_regs.c \ proc_sym.c \ @@ -22,7 +21,7 @@ CFLAGS+= -DNO_CXA_DEMANGLE LIBADD+= cxxrt .endif -LIBADD+= elf procstat rtld_db util +LIBADD+= elf procstat rtld_db util z .if ${MK_CDDL} != "no" LIBADD+= ctf diff --git a/lib/libproc/crc32.c b/lib/libproc/crc32.c deleted file mode 100644 index 90f022bc3878..000000000000 --- a/lib/libproc/crc32.c +++ /dev/null @@ -1,57 +0,0 @@ -/*- - * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or - * code or tables extracted from it, as desired without restriction. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include - -#include - -uint32_t crc32_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; diff --git a/lib/libproc/crc32.h b/lib/libproc/crc32.h deleted file mode 100644 index 3812a83f971f..000000000000 --- a/lib/libproc/crc32.h +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or - * code or tables extracted from it, as desired without restriction. - * - * $FreeBSD$ - */ - -#ifndef _CRC32_H_ -#define _CRC32_H_ - -#include /* uint32_t */ -#include /* size_t */ - -extern uint32_t crc32_tab[]; - -static __inline uint32_t -crc32(const void *buf, size_t size) -{ - const uint8_t *p = buf; - uint32_t crc; - - crc = ~0U; - while (size--) - crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - return (crc ^ ~0U); -} - -#endif /* !_CRC32_H_ */ diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c index ad6673f9f9ba..27b0fc15a2ab 100644 --- a/lib/libproc/proc_sym.c +++ b/lib/libproc/proc_sym.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #endif #include -#include "crc32.h" +#include #include "_libproc.h" #define PATH_DEBUG_DIR "/usr/lib/debug" @@ -70,17 +70,14 @@ extern char *__cxa_demangle(const char *, char *, size_t *, int *); static int crc32_file(int fd, uint32_t *crc) { - uint8_t buf[PAGE_SIZE], *p; - size_t n; + char buf[MAXPHYS]; + ssize_t nr; - *crc = ~0; - while ((n = read(fd, buf, sizeof(buf))) > 0) { - p = &buf[0]; - while (n-- > 0) - *crc = crc32_tab[(*crc ^ *p++) & 0xff] ^ (*crc >> 8); + *crc = crc32(0L, Z_NULL, 0); + while ((nr = read(fd, buf, sizeof(buf))) > 0) { + *crc = crc32(*crc, (char *)buf, nr); } - *crc = ~*crc; - return (n); + return (!!nr); } static void diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index d71af4a326c4..1df6bb8827f9 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -332,7 +332,7 @@ _DP_proc= cxxrt .if ${MK_CDDL} != "no" _DP_proc+= ctf .endif -_DP_proc+= elf procstat rtld_db util +_DP_proc+= elf procstat rtld_db util z _DP_mp= crypto _DP_memstat= kvm _DP_magic= z