From ba3460640a39395ddd44bdd93acd45c8ab8deda1 Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Sat, 21 Sep 2024 15:01:01 +0200 Subject: [PATCH] update isa-l comit --- isal-sys/build.rs | 3 +-- isal-sys/isa-l | 2 +- isal-sys/src/igzip_lib.rs | 26 +++++++++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/isal-sys/build.rs b/isal-sys/build.rs index ab07d92..3e500e9 100644 --- a/isal-sys/build.rs +++ b/isal-sys/build.rs @@ -73,9 +73,8 @@ fn main() { panic!("configure failed"); } - let make_args = vec!["install-libLTLIBRARIES".to_string()]; Command::new("make") - .args(&make_args) + .args(&["install-libLTLIBRARIES"]) .stdout(Stdio::piped()) .stderr(Stdio::piped()) .spawn() diff --git a/isal-sys/isa-l b/isal-sys/isa-l index 8f2634a..496255c 160000 --- a/isal-sys/isa-l +++ b/isal-sys/isa-l @@ -1 +1 @@ -Subproject commit 8f2634aeac2de02bf66f543fc07ce725913cf12c +Subproject commit 496255cda61000814a5297477ba3d5d0c184c4f3 diff --git a/isal-sys/src/igzip_lib.rs b/isal-sys/src/igzip_lib.rs index a2be694..dff227e 100644 --- a/isal-sys/src/igzip_lib.rs +++ b/isal-sys/src/igzip_lib.rs @@ -8,7 +8,6 @@ pub mod bindings { // copy from target dir when updating bindings #[cfg(not(feature = "regenerate-bindings"))] pub mod bindings { - /* automatically generated by rust-bindgen 0.69.4 */ pub const _STDINT_H: u32 = 1; @@ -397,7 +396,7 @@ pub mod bindings { #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct isal_huff_histogram { - #[doc = "!< Histogram of Literal/Len symbols seen"] + #[doc = "!< Histogram of Literal/Len symbols\n!< seen"] pub lit_len_histogram: [u64; 286usize], #[doc = "!< Histogram of Distance Symbols seen"] pub dist_histogram: [u64; 30usize], @@ -450,9 +449,11 @@ pub mod bindings { ) ); } + #[doc = " @brief Holds modified histogram"] #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct isal_mod_hist { + #[doc = "!< Distance"] pub d_hist: [u32; 30usize], pub ll_hist: [u32; 513usize], } @@ -571,6 +572,7 @@ pub mod bindings { ) ); } + #[doc = " @brief Holds Zlib header information"] #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct isal_zlib_header { @@ -638,6 +640,7 @@ pub mod bindings { ) ); } + #[doc = " @brief Holds Gzip header information"] #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct isal_gzip_header { @@ -1094,9 +1097,9 @@ pub mod bindings { pub deflate_hdr_count: u32, #[doc = "!< Number of bits in the partial byte in header"] pub deflate_hdr_extra_bits: u32, - #[doc = "!< bits 4:0 are the code length, bits 31:5 are the code"] + #[doc = "!< bits 4:0 are the code length, bits 31:5 are\n!< the code"] pub dist_table: [u32; 2usize], - #[doc = "!< bits 4:0 are the code length, bits 31:5 are the code"] + #[doc = "!< bits 4:0 are the code length, bits 31:5 are\n!< the code"] pub len_table: [u32; 256usize], #[doc = "!< literal code"] pub lit_table: [u16; 257usize], @@ -1412,10 +1415,13 @@ pub mod bindings { ) ); } + #[doc = " @brief Large lookup table for decoding huffman codes"] #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct inflate_huff_code_large { + #[doc = "!< Short code lookup table"] pub short_code_lookup: [u32; 4096usize], + #[doc = "!< Long code lookup table"] pub long_code_lookup: [u16; 1264usize], } #[test] @@ -1454,10 +1460,13 @@ pub mod bindings { ) ); } + #[doc = " @brief Small lookup table for decoding huffman codes"] #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct inflate_huff_code_small { + #[doc = "!< Short code lookup table"] pub short_code_lookup: [u16; 1024usize], + #[doc = "!< Long code lookup table"] pub long_code_lookup: [u16; 80usize], } #[test] @@ -1544,15 +1553,14 @@ pub mod bindings { pub tmp_out_valid: i32, #[doc = "!< Number of bytes processed in tmp_out_buffer"] pub tmp_out_processed: i32, - #[doc = "!< Temporary buffer containing data from the input stream"] + #[doc = "!< Temporary buffer containing data from the\n!< input stream"] pub tmp_in_buffer: [u8; 328usize], - #[doc = "!< Temporary buffer containing data from the output stream"] pub tmp_out_buffer: [u8; 65824usize], } #[repr(C)] #[derive(Copy, Clone)] pub union inflate_state__bindgen_ty_1 { - #[doc = "!< Length left to read of type 0 block when outbuffer overflow occurred"] + #[doc = "!< Length left to read of type 0 block when outbuffer\n!< overflow occurred"] pub type0_block_len: i32, #[doc = "!< Count of bytes remaining to be parsed"] pub count: i32, @@ -1903,6 +1911,10 @@ pub mod bindings { #[doc = " @brief Set gzip header default values\n\n @param gz_hdr: Gzip header to initialize."] pub fn isal_gzip_header_init(gz_hdr: *mut isal_gzip_header); } + extern "C" { + #[doc = " @brief Set zlib header default values\n\n @param z_hdr: zlib header to initialize."] + pub fn isal_zlib_header_init(z_hdr: *mut isal_zlib_header); + } extern "C" { #[doc = " @brief Write gzip header to output stream\n\n Writes the gzip header to the output stream. On entry this function assumes\n that the output buffer has been initialized, so stream->next_out,\n stream->avail_out and stream->total_out have been set. If the output buffer\n contains insufficient space, stream is not modified.\n\n @param stream: Structure holding state information on the compression stream.\n @param gz_hdr: Structure holding the gzip header information to encode.\n\n @returns Returns 0 if the header is successfully written, otherwise returns\n the minimum size required to successfully write the gzip header to the output\n buffer."] pub fn isal_write_gzip_header(