aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlatmush <Flatmush@gmail.com>2011-03-14 21:02:43 +0000
committerFlatmush <Flatmush@gmail.com>2011-03-14 21:02:43 +0000
commit8f01005d110fcecae170e6c9796f4fcfdb892a24 (patch)
tree6a8d2a9bc2cba56516a9174dadfad55725380e7a
parentccf378f1e0d90506b6ebb2319daefe6691082d52 (diff)
downloadlibfixmath-8f01005d110fcecae170e6c9796f4fcfdb892a24.tar.gz
Fixed assembler error in fix16_mul, had used 'or' instead of the correct 'orr' mnemonic.
-rw-r--r--libfixmath/fix16.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libfixmath/fix16.c b/libfixmath/fix16.c
index cca8253..e2ce980 100644
--- a/libfixmath/fix16.c
+++ b/libfixmath/fix16.c
@@ -22,8 +22,8 @@ fix16_t fix16_mul(int32_t inArg0, int32_t inArg1) {
#ifndef FIXMATH_NO_ROUNDING
"add %0, %0, #0x8000\n\t"
#endif
- "mov %0, %0, LSR #16\n\t"
- "or %0, %0, r0, LSL #16"
+ "mov %0, %0, lsr #16\n\t"
+ "orr %0, %0, r0, lsl #16"
: "=r"(res)
: "r"(inArg0), "r"(inArg1)
: "r0");