root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

liblzma: Enable Intel CET in x86 CRC assembly codes 

When Intel CET is enabled, we need to include <cet.h> in assembly codes
to mark Intel CET support and add _CET_ENDBR to indirect jump targets.

Tested on Intel Tiger Lake under CET enabled Linux.
This commit is contained in:
H.J. Lu 2020-12-23 06:49:04 -08:00 committed by Lasse Collin
parent bb3b8c6a23
commit 4fd79b90c5
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/liblzma/check/crc32_x86.S
View File

@ -51,6 +51,14 @@ init_table(void)
* extern uint32_t lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc); * extern uint32_t lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc);
*/ */
/* When Intel CET is enabled, include <cet.h> in assembly code to mark
Intel CET support. */
#ifdef __CET__
# include <cet.h>
#else
# define _CET_ENDBR
#endif
/* /*
* On some systems, the functions need to be prefixed. The prefix is * On some systems, the functions need to be prefixed. The prefix is
* usually an underscore. * usually an underscore.
@ -83,6 +91,7 @@ init_table(void)
ALIGN(4, 16) ALIGN(4, 16)
LZMA_CRC32: LZMA_CRC32:
_CET_ENDBR
/* /*
* Register usage: * Register usage:
* %eax crc * %eax crc

9
src/liblzma/check/crc64_x86.S
View File

@ -41,6 +41,14 @@ init_table(void)
* extern uint64_t lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc); * extern uint64_t lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc);
*/ */
/* When Intel CET is enabled, include <cet.h> in assembly code to mark
Intel CET support. */
#ifdef __CET__
# include <cet.h>
#else
# define _CET_ENDBR
#endif
/* /*
* On some systems, the functions need to be prefixed. The prefix is * On some systems, the functions need to be prefixed. The prefix is
* usually an underscore. * usually an underscore.
@ -73,6 +81,7 @@ init_table(void)
ALIGN(4, 16) ALIGN(4, 16)
LZMA_CRC64: LZMA_CRC64:
_CET_ENDBR
/* /*
* Register usage: * Register usage:
* %eax crc LSB * %eax crc LSB