From 68a26bf6cb26ce8f0ddef72084993b75903c166e Mon Sep 17 00:00:00 2001
From: hanzhelii <18221254@bjtu.edu.cn>
Date: Mon, 17 May 2021 19:48:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20unzip-6.0-crc-builtin.patch.=20reason:?=
 =?UTF-8?q?=20this=20patch=20is=20created=20for=20performance=20optimizati?=
 =?UTF-8?q?on=20in=20crc=20calculation=20only=20=20suitable=20for=20openeu?=
 =?UTF-8?q?ler=20of=20aarch64=20architecture=E3=80=82=20you=20can=20patch?=
 =?UTF-8?q?=20it=20to=20the=20source=20code=20of=20unzip=20software=20pack?=
 =?UTF-8?q?age=20and=20install=20the=20unzip=20software=20as=20usual?=
 =?UTF-8?q?=E3=80=82=20effect:=20with=20this=20patch,=20the=20unzip=20soft?=
 =?UTF-8?q?ware=20can=20speed=20up=20nearly=20100%=20when=20running=20than?=
 =?UTF-8?q?=20before=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unzip-6.0-crc-builtin.patch | 143 ++++++++++++++++++++----------------
 1 file changed, 81 insertions(+), 62 deletions(-)

diff --git a/unzip-6.0-crc-builtin.patch b/unzip-6.0-crc-builtin.patch
index c43cf29..fb7fa87 100644
--- a/unzip-6.0-crc-builtin.patch
+++ b/unzip-6.0-crc-builtin.patch
@@ -1,41 +1,54 @@
-diff -Nabur unzip60/crc32.c unzip604/crc32.c
---- unzip60/crc32.c	2007-01-22 13:34:38.000000000 +0800
-+++ unzip604/crc32.c	2021-05-12 15:08:34.409893493 +0800
-@@ -675,7 +675,32 @@
- 
+From 1ae8eea237f05a590d8da38528dceab8a7b4290b Mon Sep 17 00:00:00 2001
+From: Euler Hanzh <18221254@bjtu.edu.cn>
+Date: Mon, 17 May 2021 19:28:18 +0800
+Subject: [PATCH] This patch is created for performance optimization in crc calculation only suitable for openeuler of aarch64 architecture. 
+                 The speed of unzip software when running can be accelerate by nearly 100% than before.
+
+---
+ unzip60/crc32.c       |  28 ++++++++++++++++++++++++++++
+ unzip60/crc32.h       |   4 ++++
+ unzip60/unix/Makefile |  19 ++++++++++++++-----
+ 3 files changed, 46 insertions(+), 5 deletions(-)
+
+diff --git a/unzip60/crc32.c b/unzip60/crc32.c
+index 02f504d..fa73a3e 100644
+--- a/unzip60/crc32.c
++++ b/unzip60/crc32.c
+@@ -675,7 +675,32 @@ void free_crc_table()
+
  #endif /* (IZ_CRC_BE_OPTIMIZ || IZ_CRC_LE_OPTIMIZ) */
- 
+
 +#ifdef ARCH_AARCH64
 +u_int32_t crc32(u_int32_t crc,const u_int8_t *p, unsigned int len)
 +{
-+int64_t length = len;
++  int64_t length = len;
 +
-+while ((length -= sizeof(u_int64_t)) >=0) {
-+        __builtin_aarch64_crc32cx(crc, *((u_int64_t *)p));
-+        p += sizeof(u_int64_t);
-+}
- 
-+if (length & sizeof(u_int32_t)) {
-+        __builtin_aarch64_crc32cw(crc, *((u_int32_t *)p));
-+        p += sizeof(u_int32_t);
-+}
++  while ((length -= sizeof(u_int64_t)) >=0) {
++    __builtin_aarch64_crc32cx(crc, *((u_int64_t *)p));
++    p += sizeof(u_int64_t);
++  }
+
++  if (length & sizeof(u_int32_t)) {
++    __builtin_aarch64_crc32cw(crc, *((u_int32_t *)p));
++    p += sizeof(u_int32_t);
++  }
 +
-+if (length & sizeof(u_int16_t)) {
-+        __builtin_aarch64_crc32ch(crc, *((u_int16_t *)p));
-+        p += sizeof(u_int16_t);
-+}
++  if (length & sizeof(u_int16_t)) {
++    __builtin_aarch64_crc32ch(crc, *((u_int16_t *)p));
++    p += sizeof(u_int16_t);
++  }
 +
-+if (length & sizeof(u_int8_t))
-+        __builtin_aarch64_crc32cb(crc, *p);
++  if (length & sizeof(u_int8_t))
++    __builtin_aarch64_crc32cb(crc, *p);
 +
-+return crc;
++  return crc;
 +}
 +#else
  /* ========================================================================= */
  ulg crc32(crc, buf, len)
      ulg crc;                    /* crc shift register */
-@@ -726,6 +751,9 @@
- 
+@@ -726,6 +751,9 @@ ulg crc32(crc, buf, len)
+
    return REV_BE(c) ^ 0xffffffffL;   /* (instead of ~c for 64-bit machines) */
  }
 +
@@ -44,38 +57,40 @@ diff -Nabur unzip60/crc32.c unzip604/crc32.c
  #endif /* !ASM_CRC */
  #endif /* !CRC_TABLE_ONLY */
  #endif /* !USE_ZLIB */
-diff -Nabur unzip60/crc32.h unzip604/crc32.h
---- unzip60/crc32.h	2008-03-09 02:40:20.000000000 +0800
-+++ unzip604/crc32.h	2021-05-12 15:08:34.409893493 +0800
+diff --git a/unzip60/crc32.h b/unzip60/crc32.h
+index 83af240..b5e386a 100644
+--- a/unzip60/crc32.h
++++ b/unzip60/crc32.h
 @@ -36,7 +36,11 @@
  #    undef IZ_CRC_BE_OPTIMIZ
  #  endif
  #else /* !(USE_ZLIB || CRC_TABLE_ONLY) */
 +#  ifdef ARCH_AARCH64
-+  u_int32_t crc32(u_int32_t crc,const u_int8_t *p, unsigned int len);
++    u_int32_t crc32(u_int32_t crc,const u_int8_t *p, unsigned int len);
 +#  else
-    ulg      crc32           OF((ulg crc, ZCONST uch *buf, extent len));
+       ulg      crc32           OF((ulg crc, ZCONST uch *buf, extent len));
 +#  endif 
  #endif /* ?(USE_ZLIB || CRC_TABLE_ONLY) */
- 
+
  #ifndef CRC_32_TAB
-diff -Nabur unzip60/unix/Makefile unzip604/unix/Makefile
---- unzip60/unix/Makefile	2009-01-19 06:41:18.000000000 +0800
-+++ unzip604/unix/Makefile	2021-05-12 15:09:05.698385219 +0800
+diff --git a/unzip60/unix/Makefile b/unzip60/unix/Makefile
+index ab32270..39b2263 100644
+--- a/unzip60/unix/Makefile
++++ b/unzip60/unix/Makefile
 @@ -40,7 +40,8 @@
- 
+
  # Defaults most systems use (use LOCAL_UNZIP in environment to add flags,
  # such as -DDOSWILD).
 -
 +TARGET_ARCH = $(shell uname -m)
 +ARCH = $(shell getconf LONG_BIT)
  # UnZip flags
- CC = cc#	try using "gcc" target rather than changing this (CC and LD
- LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
-@@ -54,6 +55,12 @@
+ CC = cc#       try using "gcc" target rather than changing this (CC and LD
+ LD = $(CC)#    must match, else "unresolved symbol:  ___main" is possible)
+@@ -54,6 +55,12 @@ LFLAGS1 =
  LF = -o unzip$E $(LFLAGS1)
  LF2 = -s
- 
+
 +ifeq ($(TARGET_ARCH),aarch64)
 +CFF = -DARCH=$(ARCH) -march=armv8.1-a -D ARCH_AARCH64
 +else
@@ -85,38 +100,42 @@ diff -Nabur unzip60/unix/Makefile unzip604/unix/Makefile
  # UnZipSFX flags
  SL = -o unzipsfx$E $(LFLAGS1)
  SL2 = $(LF2)
-@@ -77,6 +84,8 @@
+@@ -77,6 +84,8 @@ M = unix
  SHELL = /bin/sh
  MAKEF = -f unix/Makefile
- 
+
 +
 +
  # Version info for unix/unix.c
  HOST_VERSINFO=-DIZ_CC_NAME='\"\$$(CC) \"' -DIZ_OS_NAME='\"`uname -a`\"'
- 
-@@ -231,13 +240,13 @@
+
+@@ -231,13 +240,13 @@ generic_msg:
  # yes, we should be able to use the $O macro to combine these two, but it
  # fails on some brain-damaged makes (e.g., AIX's)...no big deal
  .c.o:
--	$(CC) -c $(CF) $*.c
-+	$(CC) -c $(CF) $(CFF)  $*.c
- 
+-       $(CC) -c $(CF) $*.c
++       $(CC) -c $(CF) $(CFF)  $*.c
+
  .c.obj:
--	$(CC) -c $(CF) $*.c
-+	$(CC) -c $(CF) $(CFF)  $*.c
- 
+-       $(CC) -c $(CF) $*.c
++       $(CC) -c $(CF) $(CFF)  $*.c
+
  .c.pic.o:
--	$(CC) -c $(CF) -o $@ $*.c
-+	$(CC) -c $(CF) $(CFF)  -o $@ $*.c
- 
+-       $(CC) -c $(CF) -o $@ $*.c
++       $(CC) -c $(CF) $(CFF)  -o $@ $*.c
+
  # this doesn't work...directories are always a pain with implicit rules
- #.1.txt:		man/$<
-@@ -329,7 +338,7 @@
- 	$(CC) -c $(CF) -DSFX -o $@ unzip.c
- 
- crc32_$O:	crc32.c $(UNZIP_H) zip.h crc32.h
--	$(CC) -c $(CF) -DSFX -o $@ crc32.c
-+	$(CC) -c $(CF) -DSFX $(CFF)  -o $@ crc32.c
- 
- crypt_$O:	crypt.c $(UNZIP_H) zip.h crypt.h crc32.h ttyio.h
- 	$(CC) -c $(CF) -DSFX -o $@ crypt.c
+ #.1.txt:               man/$<
+@@ -329,7 +338,7 @@ unzipsfx$O: unzip.c $(UNZIP_H) crypt.h unzvers.h consts.h
+        $(CC) -c $(CF) -DSFX -o $@ unzip.c
+
+ crc32_$O:      crc32.c $(UNZIP_H) zip.h crc32.h
+-       $(CC) -c $(CF) -DSFX -o $@ crc32.c
++       $(CC) -c $(CF) -DSFX $(CFF)  -o $@ crc32.c
+
+ crypt_$O:      crypt.c $(UNZIP_H) zip.h crypt.h crc32.h ttyio.h
+        $(CC) -c $(CF) -DSFX -o $@ crypt.c
+-- 
+2.23.0
+
+