altos: 8051 64 * 16 multiply function was broken for negative 64-bit

[fw/altos] / src / kernel / ao_int64.c

diff --git a/src/kernel/ao_int64.c b/src/kernel/ao_int64.c
index aa23dbe0f9cc27d37ff7a821cb20ec8f5c64105f..ca75751b21d6625219e033ba01392d3e9c56aa52 100644 (file)
--- a/src/kernel/ao_int64.c
+++ b/src/kernel/ao_int64.c
@@ -17,8 +17,6 @@
 
 #include <ao_int64.h>
 
 
 #include <ao_int64.h>
 

-__pdata ao_int64_t *__data ao_64r, *__data ao_64a, *__data ao_64b;
-

 void ao_plus64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, __pdata ao_int64_t *b) __FATTR {
        __LOCAL uint32_t        t;
 
 void ao_plus64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, __pdata ao_int64_t *b) __FATTR {
        __LOCAL uint32_t        t;
 


@@ -151,8 +149,8 @@ void ao_mul64_64_16(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG uint16_t b)
                ao_neg64(&ap, a);
                a = &ap;
                negative++;
                ao_neg64(&ap, a);
                a = &ap;
                negative++;

-       } else
-               ao_umul64_64_16(r, a, b);
+       }
+       ao_umul64_64_16(r, a, b);

        if (negative)
                ao_neg64(r, r);
 }
        if (negative)
                ao_neg64(r, r);
 }