generic-library/isa-l
1
0
Fork 0
mirror of https://github.com/intel/isa-l.git synced 2025-10-29 20:59:43 +01:00
Code Issues Projects Releases Wiki Activity

build: fix wrong use the register name

Browse Source 
The third parameter must be 32bit register . Those assmebly
put 64bit register here , it is wrong .

Change-Id: Iebe17516b555a6a9b94ea7baa4778ad4b9dd0878
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2019-10-23 13:56:35 +08:00
parent b441659879
commit 5d7724898d
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
igzip/aarch64/igzip_deflate_body_aarch64.S
View File

@@ -149,7 +149,7 @@ isal_deflate_body_aarch64:
//file_start = (uint8_t *) ((uintptr_t) stream->next_in - stream->total_in); //file_start = (uint8_t *) ((uintptr_t) stream->next_in - stream->total_in);
ldr w_file_start,[stream,_total_in] ldr w_file_start,[stream,_total_in]
sub file_start,next_in,file_start,uxtw sub file_start,next_in,w_file_start,uxtw
//uint32_t hist_size = state->dist_mask; //uint32_t hist_size = state->dist_mask;
ldr hist_size,[stream,_internal_state + _dist_mask] ldr hist_size,[stream,_internal_state + _dist_mask]

2
igzip/aarch64/igzip_deflate_finish_aarch64.S
View File

@@ -153,7 +153,7 @@ isal_deflate_finish_aarch64:
//file_start = (uint8_t *) ((uintptr_t) stream->next_in - stream->total_in); //file_start = (uint8_t *) ((uintptr_t) stream->next_in - stream->total_in);
ldr w_file_start,[stream,_total_in] ldr w_file_start,[stream,_total_in]
sub file_start,next_in,file_start,uxtw sub file_start, next_in, w_file_start, uxtw
//uint32_t hist_size = state->dist_mask; //uint32_t hist_size = state->dist_mask;
ldr hist_size,[stream,_internal_state + _dist_mask] ldr hist_size,[stream,_internal_state + _dist_mask]

10
igzip/aarch64/isal_deflate_icf_body_hash_hist.S
View File

@@ -162,12 +162,12 @@ isal_deflate_icf_body_hash_hist_aarch64:
mov next_in, start_in mov next_in, start_in
and x0, x0, -4 and x0, x0, -4
ldp hist_size, hash_mask, [state, offset_dist_mask] // 12 ldp hist_size, hash_mask, [state, offset_dist_mask] // 12
add end_in, start_in, x_avail_in, uxtw add end_in, start_in, avail_in, uxtw
mov next_out, start_out mov next_out, start_out
add end_out, start_out, x0 add end_out, start_out, x0
add x0, next_in, ISAL_LOOK_AHEAD // 288 add x0, next_in, ISAL_LOOK_AHEAD // 288
sub file_start, start_in, total_in, uxtw sub file_start, start_in, w_total_in, uxtw
mov NULL_DIST_SYM, 30 mov NULL_DIST_SYM, 30
add next_in_iter, next_in, 1 add next_in_iter, next_in, 1
cmp end_in, x0 cmp end_in, x0
@@ -199,7 +199,7 @@ isal_deflate_icf_body_hash_hist_aarch64:
and w_literal, w_literal, 255 and w_literal, w_literal, 255
mov next_in, next_in_iter mov next_in, next_in_iter
add next_out, next_out, 4 add next_out, next_out, 4
add x1, level_buf, literal, uxtb 2 add x1, level_buf, w_literal, uxtb 2
ldr w0, [x1, 2296] ldr w0, [x1, 2296]
add w0, w0, 1 add w0, w0, 1
str w0, [x1, 2296] str w0, [x1, 2296]
@@ -223,7 +223,7 @@ isal_deflate_icf_body_hash_hist_aarch64:
.dist_vs_hist_size: .dist_vs_hist_size:
mov x1, next_in mov x1, next_in
mov w2, 258 mov w2, 258
sub x0, next_in, dist, uxth sub x0, next_in, w_dist, uxth
compare_258_bytes param0,param1,match_length,tmp0,tmp1 compare_258_bytes param0,param1,match_length,tmp0,tmp1
and w1, w_match_length, 65535 // 0xffff and w1, w_match_length, 65535 // 0xffff
@@ -232,7 +232,7 @@ isal_deflate_icf_body_hash_hist_aarch64:
ldr w0, [next_in, 1] ldr w0, [next_in, 1]
mov x4, next_in mov x4, next_in
add next_in, next_in, x1, uxth add next_in, next_in, w1, uxth
crc32cw w0, wzr, w0 crc32cw w0, wzr, w0
and w0, hash_mask, w0 and w0, hash_mask, w0

14
igzip/aarch64/isal_deflate_icf_finish_hash_hist.S
View File

@@ -206,7 +206,7 @@ isal_deflate_icf_finish_hash_hist_aarch64:
ldr w_file_start, [stream, offset_total_in] // 12 ldr w_file_start, [stream, offset_total_in] // 12
mov tmp0, offset_hash_hist // 4712 mov tmp0, offset_hash_hist // 4712
add last_seen, level_buf, tmp0 add last_seen, level_buf, tmp0
add end_in, start_in, end_in, uxtw add end_in, start_in, w_end_in, uxtw
and end_out, end_out, -4 and end_out, end_out, -4
mov next_out, start_out mov next_out, start_out
ldp hist_size, hash_mask, [state, offset_dist_mask] // 12 ldp hist_size, hash_mask, [state, offset_dist_mask] // 12
@@ -231,7 +231,7 @@ isal_deflate_icf_finish_hash_hist_aarch64:
ldrh dist, [last_seen, x0] ldrh dist, [last_seen, x0]
strh w2, [last_seen, x0] strh w2, [last_seen, x0]
sub w2, w2, dist sub w2, w2, dist
and dist, w2, 65535 and w_dist, w2, 65535
sub dist_inc, dist, #1 sub dist_inc, dist, #1
cmp dist_inc, hist_size cmp dist_inc, hist_size
bcs .skip_compare258 bcs .skip_compare258
@@ -239,7 +239,7 @@ isal_deflate_icf_finish_hash_hist_aarch64:
mov x2, 0 mov x2, 0
sub w2, w_end_in, w8 sub w2, w_end_in, w8
mov x1, next_in mov x1, next_in
sub x0, next_in, x7, uxth sub x0, next_in, w_dist, uxth
compare_max_258_bytes param0,param1,param2,tmp2,tmp0,tmp1 compare_max_258_bytes param0,param1,param2,tmp2,tmp0,tmp1
mov w0, w_tmp2 mov w0, w_tmp2
@@ -253,7 +253,7 @@ isal_deflate_icf_finish_hash_hist_aarch64:
add next_in, next_in, 1 add next_in, next_in, 1
mov w1, literal_code mov w1, literal_code
mov x0, next_out mov x0, next_out
add x_literal_code, level_buf, x_literal_code, uxtb 2 // level_buf->hist.ll_hist add x_literal_code, level_buf, literal_code, uxtb 2 // level_buf->hist.ll_hist
ldr w_tmp0, [x_literal_code, offset_hist_ll_hist] // 2296 ldr w_tmp0, [x_literal_code, offset_hist_ll_hist] // 2296
add w_tmp0, w_tmp0, 1 add w_tmp0, w_tmp0, 1
@@ -286,7 +286,7 @@ isal_deflate_icf_finish_hash_hist_aarch64:
mov x0, next_out_iter mov x0, next_out_iter
add next_out_iter, next_out_iter, 4 add next_out_iter, next_out_iter, 4
mov w1, w2 mov w1, w2
add x2, level_buf, x2, uxtb 2 add x2, level_buf, w2, uxtb 2
ldr w_tmp0, [x2, offset_hist_ll_hist] // 2296 ldr w_tmp0, [x2, offset_hist_ll_hist] // 2296
add w_tmp0, w_tmp0, 1 add w_tmp0, w_tmp0, 1
@@ -309,10 +309,10 @@ isal_deflate_icf_finish_hash_hist_aarch64:
.while_first_match_length_end: .while_first_match_length_end:
ubfiz x_tmp2, x1, 2, 17 ubfiz x_tmp2, x1, 2, 17
add x_tmp1, level_buf, x24, uxtw 2 add x_tmp1, level_buf, dist_inc, uxtw 2
add x_tmp2, level_buf, x_tmp2 add x_tmp2, level_buf, x_tmp2
add next_in, next_in, x2, uxth add next_in, next_in, w2, uxth
mov w2, dist_inc mov w2, dist_inc
ldr w_tmp0, [x_tmp2, offset_hist_ll_hist] // 2296 ldr w_tmp0, [x_tmp2, offset_hist_ll_hist] // 2296

4
igzip/aarch64/isal_update_histogram.S
View File

@@ -168,7 +168,7 @@ isal_update_histogram_aarch64:
str x23, [sp, 48] str x23, [sp, 48]
add last_seen, histogram, hash_offset add last_seen, histogram, hash_offset
add end_stream, start_stream, length, sxtw add end_stream, start_stream, w_length, sxtw
mov current, start_stream mov current, start_stream
sub loop_end_iter, end_stream, #3 sub loop_end_iter, end_stream, #3
mov histogram_saved, histogram mov histogram_saved, histogram
@@ -217,7 +217,7 @@ isal_update_histogram_aarch64:
sub w2, w_end_stream, w_current sub w2, w_end_stream, w_current
mov x1, current mov x1, current
sub x0, current, dist, uxth sub x0, current, w_dist, uxth
compare_max_258_bytes param0,param1,param2,match_length,tmp0,tmp1 compare_max_258_bytes param0,param1,param2,match_length,tmp0,tmp1
cmp match_length, 3 cmp match_length, 3