From 5a84460d6d48b8ceba7ebd637e23984c853318f1 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 25 Sep 2015 18:35:16 -0700 Subject: [PATCH] rescaler_mips_dsp_r2: cosmetics, fix indent Change-Id: I59a432a66a658a74f383bd81b6f9abb5e5bb409e --- src/dsp/rescaler_mips_dsp_r2.c | 152 ++++++++++++++++----------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/src/dsp/rescaler_mips_dsp_r2.c b/src/dsp/rescaler_mips_dsp_r2.c index 0bdfb00a..d481f706 100644 --- a/src/dsp/rescaler_mips_dsp_r2.c +++ b/src/dsp/rescaler_mips_dsp_r2.c @@ -38,29 +38,29 @@ static void ImportRowShrink(WebPRescaler* const wrk, const uint8_t* src) { int loop_c = x_out_max; __asm__ volatile ( - "li %[sum], 0 \n\t" - "li %[accum], 0 \n\t" - "1: \n\t" - "addu %[accum], %[accum], %[x_add] \n\t" - "li %[base], 0 \n\t" - "blez %[accum], 3f \n\t" - "2: \n\t" - "lbu %[base], 0(%[src1]) \n\t" - "subu %[accum], %[accum], %[x_sub] \n\t" - "addu %[src1], %[src1], %[x_stride] \n\t" - "addu %[sum], %[sum], %[base] \n\t" - "bgtz %[accum], 2b \n\t" - "3: \n\t" - "negu %[accum1], %[accum] \n\t" - "mul %[frac], %[base], %[accum1] \n\t" - "mul %[temp3], %[sum], %[x_sub] \n\t" - "sll %[accum1], %[frac], 1 \n\t" - "subu %[loop_c], %[loop_c], %[x_stride] \n\t" - "mulq_rs.w %[sum], %[accum1], %[fx_scale] \n\t" - "subu %[temp3], %[temp3], %[frac] \n\t" - "sw %[temp3], 0(%[frow]) \n\t" - "addu %[frow], %[frow], %[x_stride1] \n\t" - "bgtz %[loop_c], 1b \n\t" + "li %[sum], 0 \n\t" + "li %[accum], 0 \n\t" + "1: \n\t" + "addu %[accum], %[accum], %[x_add] \n\t" + "li %[base], 0 \n\t" + "blez %[accum], 3f \n\t" + "2: \n\t" + "lbu %[base], 0(%[src1]) \n\t" + "subu %[accum], %[accum], %[x_sub] \n\t" + "addu %[src1], %[src1], %[x_stride] \n\t" + "addu %[sum], %[sum], %[base] \n\t" + "bgtz %[accum], 2b \n\t" + "3: \n\t" + "negu %[accum1], %[accum] \n\t" + "mul %[frac], %[base], %[accum1] \n\t" + "mul %[temp3], %[sum], %[x_sub] \n\t" + "sll %[accum1], %[frac], 1 \n\t" + "subu %[loop_c], %[loop_c], %[x_stride] \n\t" + "mulq_rs.w %[sum], %[accum1], %[fx_scale] \n\t" + "subu %[temp3], %[temp3], %[frac] \n\t" + "sw %[temp3], 0(%[frow]) \n\t" + "addu %[frow], %[frow], %[x_stride1] \n\t" + "bgtz %[loop_c], 1b \n\t" : [accum]"=&r"(accum), [src1]"+&r"(src1), [temp3]"=&r"(temp3), [sum]"=&r"(sum), [base]"=&r"(base), [frac]"=&r"(frac), [frow]"+&r"(frow), [accum1]"=&r"(accum1), @@ -149,59 +149,59 @@ static void ExportRowShrink(WebPRescaler* const wrk) { assert(!wrk->y_expand); assert(wrk->fxy_scale); __asm__ volatile ( - ".set push \n\t" - ".set noreorder \n\t" - "beq %[frow], %[loop_end], 1f \n\t" - " nop \n\t" - "0: \n\t" - "lw %[temp0], 0(%[frow]) \n\t" - "lw %[temp1], 0(%[irow]) \n\t" - "lw %[temp3], 4(%[frow]) \n\t" - "lw %[temp4], 4(%[irow]) \n\t" - "sll %[temp0], %[temp0], 1 \n\t" - "sll %[temp3], %[temp3], 1 \n\t" - "mulq_rs.w %[temp5], %[temp0], %[yscale] \n\t" - "mulq_rs.w %[temp6], %[temp3], %[yscale] \n\t" - "addiu %[frow], %[frow], 8 \n\t" - "addiu %[dst], %[dst], 2 \n\t" - "addiu %[irow], %[irow], 8 \n\t" - "subu %[temp1], %[temp1], %[temp5] \n\t" - "subu %[temp4], %[temp4], %[temp6] \n\t" - "sll %[temp1], %[temp1], 1 \n\t" - "sll %[temp4], %[temp4], 1 \n\t" - "mulq_rs.w %[temp0], %[temp1], %[temp2] \n\t" - "mulq_rs.w %[temp3], %[temp4], %[temp2] \n\t" - "sw %[temp5], -8(%[irow]) \n\t" - "sw %[temp6], -4(%[irow]) \n\t" - "shll_s.ph %[temp0], %[temp0], 7 \n\t" - "shll_s.ph %[temp3], %[temp3], 7 \n\t" - "precrqu_s.qb.ph %[temp0], %[temp0], %[temp3] \n\t" - "sb %[temp0], -1(%[dst]) \n\t" - "srl %[temp0], %[temp0], 16 \n\t" - "bne %[frow], %[loop_end], 0b \n\t" - " sb %[temp0], -2(%[dst]) \n\t" - "1: \n\t" - "beqz %[rest], 3f \n\t" - " nop \n\t" - "addiu %[temp6], $zero, -256 \n\t" - "addiu %[temp7], $zero, 255 \n\t" - "lw %[temp0], 0(%[frow]) \n\t" - "sll %[temp0], %[temp0], 1 \n\t" - "mulq_rs.w %[temp1], %[temp0], %[yscale] \n\t" - "lw %[temp0], 0(%[irow]) \n\t" - "subu %[temp0], %[temp0], %[temp1] \n\t" - "sll %[temp0], %[temp0], 1 \n\t" - "mulq_rs.w %[temp5], %[temp0], %[temp2] \n\t" - "sw %[temp1], 0(%[irow]) \n\t" - "and %[temp0], %[temp5], %[temp6] \n\t" - "beqz %[temp0], 2f \n\t" - " slti %[temp1], %[temp5], 0 \n\t" - "xor %[temp5], %[temp5], %[temp5] \n\t" - "movz %[temp5], %[temp7], %[temp1] \n\t" - "2: \n\t" - "sb %[temp5], 0(%[dst]) \n\t" - "3: \n\t" - ".set pop \n\t" + ".set push \n\t" + ".set noreorder \n\t" + "beq %[frow], %[loop_end], 1f \n\t" + " nop \n\t" + "0: \n\t" + "lw %[temp0], 0(%[frow]) \n\t" + "lw %[temp1], 0(%[irow]) \n\t" + "lw %[temp3], 4(%[frow]) \n\t" + "lw %[temp4], 4(%[irow]) \n\t" + "sll %[temp0], %[temp0], 1 \n\t" + "sll %[temp3], %[temp3], 1 \n\t" + "mulq_rs.w %[temp5], %[temp0], %[yscale] \n\t" + "mulq_rs.w %[temp6], %[temp3], %[yscale] \n\t" + "addiu %[frow], %[frow], 8 \n\t" + "addiu %[dst], %[dst], 2 \n\t" + "addiu %[irow], %[irow], 8 \n\t" + "subu %[temp1], %[temp1], %[temp5] \n\t" + "subu %[temp4], %[temp4], %[temp6] \n\t" + "sll %[temp1], %[temp1], 1 \n\t" + "sll %[temp4], %[temp4], 1 \n\t" + "mulq_rs.w %[temp0], %[temp1], %[temp2] \n\t" + "mulq_rs.w %[temp3], %[temp4], %[temp2] \n\t" + "sw %[temp5], -8(%[irow]) \n\t" + "sw %[temp6], -4(%[irow]) \n\t" + "shll_s.ph %[temp0], %[temp0], 7 \n\t" + "shll_s.ph %[temp3], %[temp3], 7 \n\t" + "precrqu_s.qb.ph %[temp0], %[temp0], %[temp3] \n\t" + "sb %[temp0], -1(%[dst]) \n\t" + "srl %[temp0], %[temp0], 16 \n\t" + "bne %[frow], %[loop_end], 0b \n\t" + " sb %[temp0], -2(%[dst]) \n\t" + "1: \n\t" + "beqz %[rest], 3f \n\t" + " nop \n\t" + "addiu %[temp6], $zero, -256 \n\t" + "addiu %[temp7], $zero, 255 \n\t" + "lw %[temp0], 0(%[frow]) \n\t" + "sll %[temp0], %[temp0], 1 \n\t" + "mulq_rs.w %[temp1], %[temp0], %[yscale] \n\t" + "lw %[temp0], 0(%[irow]) \n\t" + "subu %[temp0], %[temp0], %[temp1] \n\t" + "sll %[temp0], %[temp0], 1 \n\t" + "mulq_rs.w %[temp5], %[temp0], %[temp2] \n\t" + "sw %[temp1], 0(%[irow]) \n\t" + "and %[temp0], %[temp5], %[temp6] \n\t" + "beqz %[temp0], 2f \n\t" + " slti %[temp1], %[temp5], 0 \n\t" + "xor %[temp5], %[temp5], %[temp5] \n\t" + "movz %[temp5], %[temp7], %[temp1] \n\t" + "2: \n\t" + "sb %[temp5], 0(%[dst]) \n\t" + "3: \n\t" + ".set pop \n\t" : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp3]"=&r"(temp3), [temp4]"=&r"(temp4), [temp5]"=&r"(temp5), [temp6]"=&r"(temp6), [temp7]"=&r"(temp7), [frow]"+&r"(frow), [irow]"+&r"(irow),