ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting issues detected by checkstyle

Browse Source
This commit is contained in:
DRC
2019-11-13 14:36:37 -06:00
parent f60b6dd36f
commit 9c6f79e919
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jchuff.c
View File

@@ -493,7 +493,7 @@ flush_bits(working_state *state)
int localbuf = 0; int localbuf = 0;
if (state->simd) { if (state->simd) {
#if defined __arm__ || defined __aarch64__ #if defined(__arm__) || defined(__aarch64__)
put_bits = state->cur.free_bits; put_bits = state->cur.free_bits;
#else #else
put_bits = SIMD_BIT_BUF_SIZE - state->cur.free_bits; put_bits = SIMD_BIT_BUF_SIZE - state->cur.free_bits;
@@ -519,7 +519,7 @@ flush_bits(working_state *state)
if (state->simd) { /* and reset bit buffer to empty */ if (state->simd) { /* and reset bit buffer to empty */
state->cur.put_buffer.simd = 0; state->cur.put_buffer.simd = 0;
#if defined __arm__ || defined __aarch64__ #if defined(__arm__) || defined(__aarch64__)
state->cur.free_bits = 0; state->cur.free_bits = 0;
#else #else
state->cur.free_bits = SIMD_BIT_BUF_SIZE; state->cur.free_bits = SIMD_BIT_BUF_SIZE;

26
simd/i386/jchuff-sse2.asm
View File

@@ -646,7 +646,7 @@ EXTN(jsimd_huff_encode_one_block_sse2):
por mm_put_buffer, mm_code ; put_buffer |= code; por mm_put_buffer, mm_code ; put_buffer |= code;
cmp size, 16 ; if (size <= 16) cmp size, 16 ; if (size <= 16)
jle .ERLOOP2 ; goto .ERLOOP2; jle .ERLOOP2 ; goto .ERLOOP2;
jmp .BRLOOP2 ; } while(1); jmp .BRLOOP2 ; } while (1);
; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -728,11 +728,11 @@ EXTN(jsimd_huff_encode_one_block_sse2):
align 16 align 16
.EMIT_ERLOOP1: .EMIT_ERLOOP1:
EMIT_QWORD size, sizeb, sizeh, \ EMIT_QWORD size, sizeb, sizeh, \
{xor size, size}, \ { xor size, size }, \
{tzcnt size, index}, \ { tzcnt size, index }, \
{inc size}, \ { inc size }, \
{test index, index}, \ { test index, index }, \
{jnz .BLOOP1}, \ { jnz .BLOOP1 }, \
.ELOOP1 .ELOOP1
; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -740,8 +740,8 @@ EXTN(jsimd_huff_encode_one_block_sse2):
align 16 align 16
.EMIT_BRLOOP2: .EMIT_BRLOOP2:
EMIT_QWORD emit_temp, emit_tempb, emit_temph, , , , \ EMIT_QWORD emit_temp, emit_tempb, emit_temph, , , , \
{cmp size, 16}, \ { cmp size, 16 }, \
{jle .ERLOOP2}, \ { jle .ERLOOP2 }, \
.BRLOOP2 .BRLOOP2
; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -749,11 +749,11 @@ EXTN(jsimd_huff_encode_one_block_sse2):
align 16 align 16
.EMIT_ERLOOP2: .EMIT_ERLOOP2:
EMIT_QWORD size, sizeb, sizeh, \ EMIT_QWORD size, sizeb, sizeh, \
{xor size, size}, \ { xor size, size }, \
{tzcnt size, index}, \ { tzcnt size, index }, \
{inc size}, \ { inc size }, \
{test index, index}, \ { test index, index }, \
{jnz .BLOOP2}, \ { jnz .BLOOP2 }, \
.ELOOP2 .ELOOP2
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the

7
simd/x86_64/jchuff-sse2.asm
View File

@@ -493,7 +493,7 @@ EXTN(jsimd_huff_encode_one_block_sse2):
or put_buffer, codeq ; put_buffer |= code; or put_buffer, codeq ; put_buffer |= code;
cmp nbits, 16 ; if (nbits <= 16) cmp nbits, 16 ; if (nbits <= 16)
jle .ERLOOP ; break; jle .ERLOOP ; break;
jmp .BRLOOP ; } while(1); jmp .BRLOOP ; } while (1);
; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -573,8 +573,9 @@ EXTN(jsimd_huff_encode_one_block_sse2):
align 16 align 16
.EMIT_BRLOOP_CODE: .EMIT_BRLOOP_CODE:
EMIT_QWORD .EMIT_BRLOOP_CODE_END, {mov nbits, code_temp} ; insert code, flush buffer, EMIT_QWORD .EMIT_BRLOOP_CODE_END, { mov nbits, code_temp }
; nbits = code_temp, goto .EMIT_BRLOOP_CODE_END ; insert code, flush buffer,
; nbits = code_temp, goto .EMIT_BRLOOP_CODE_END
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.