From 8f01005d110fcecae170e6c9796f4fcfdb892a24 Mon Sep 17 00:00:00 2001
From: Flatmush <Flatmush@gmail.com>
Date: Mon, 14 Mar 2011 21:02:43 +0000
Subject: Fixed assembler error in fix16_mul, had used 'or' instead of the
 correct 'orr' mnemonic.

---
 libfixmath/fix16.c | 4 ++--
 1 file 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");
-- 
cgit v1.2.3