Index: third_party/opus/src/celt/arm/fixed_armv4.h |
diff --git a/third_party/opus/src/celt/arm/fixed_armv4.h b/third_party/opus/src/celt/arm/fixed_armv4.h |
index efb3b1896a866b1d5ec861fedbb334575a464c4d..d84888a772acf9b8534b8e030f204189dffe748c 100644 |
--- a/third_party/opus/src/celt/arm/fixed_armv4.h |
+++ b/third_party/opus/src/celt/arm/fixed_armv4.h |
@@ -37,7 +37,7 @@ static OPUS_INLINE opus_val32 MULT16_32_Q16_armv4(opus_val16 a, opus_val32 b) |
"#MULT16_32_Q16\n\t" |
"smull %0, %1, %2, %3\n\t" |
: "=&r"(rd_lo), "=&r"(rd_hi) |
- : "%r"(b),"r"(a<<16) |
+ : "%r"(b),"r"(SHL32(a,16)) |
); |
return rd_hi; |
} |
@@ -54,10 +54,10 @@ static OPUS_INLINE opus_val32 MULT16_32_Q15_armv4(opus_val16 a, opus_val32 b) |
"#MULT16_32_Q15\n\t" |
"smull %0, %1, %2, %3\n\t" |
: "=&r"(rd_lo), "=&r"(rd_hi) |
- : "%r"(b), "r"(a<<16) |
+ : "%r"(b), "r"(SHL32(a,16)) |
); |
/*We intentionally don't OR in the high bit of rd_lo for speed.*/ |
- return rd_hi<<1; |
+ return SHL32(rd_hi,1); |
} |
#define MULT16_32_Q15(a, b) (MULT16_32_Q15_armv4(a, b)) |