py/{objfloat,objcomplex}: Optimise MP_UNARY_OP_ABS by reusing variables.

dpgeorge · dpgeorge · commit fdb2aa81b7c7 · 2017-09-18T14:31:03.000+10:00
diff --git a/py/objcomplex.c b/py/objcomplex.c
@@ -124,11 +124,8 @@ STATIC mp_obj_t complex_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
         case MP_UNARY_OP_HASH: return MP_OBJ_NEW_SMALL_INT(mp_float_hash(o->real) ^ mp_float_hash(o->imag));
         case MP_UNARY_OP_POSITIVE: return o_in;
         case MP_UNARY_OP_NEGATIVE: return mp_obj_new_complex(-o->real, -o->imag);
-        case MP_UNARY_OP_ABS: {
-            mp_float_t real, imag;
-            mp_obj_complex_get(o_in, &real, &imag);
-            return mp_obj_new_float(MICROPY_FLOAT_C_FUN(sqrt)(real*real + imag*imag));
-        }
+        case MP_UNARY_OP_ABS:
+            return mp_obj_new_float(MICROPY_FLOAT_C_FUN(sqrt)(o->real*o->real + o->imag*o->imag));
         default: return MP_OBJ_NULL; // op not supported
     }
 }
diff --git a/py/objfloat.c b/py/objfloat.c
@@ -163,10 +163,9 @@ STATIC mp_obj_t float_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
         case MP_UNARY_OP_POSITIVE: return o_in;
         case MP_UNARY_OP_NEGATIVE: return mp_obj_new_float(-val);
         case MP_UNARY_OP_ABS: {
-            mp_float_t value = mp_obj_float_get(o_in);
             // TODO check for NaN etc
-            if (value < 0) {
-                return mp_obj_new_float(-value);
+            if (val < 0) {
+                return mp_obj_new_float(-val);
             } else {
                 return o_in;
             }

Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,8 @@ STATIC mp_obj_t complex_unary_op(mp_unary_op_t op, mp_obj_t o_in) {`
`124`	`124`	`case MP_UNARY_OP_HASH: return MP_OBJ_NEW_SMALL_INT(mp_float_hash(o->real) ^ mp_float_hash(o->imag));`
`125`	`125`	`case MP_UNARY_OP_POSITIVE: return o_in;`
`126`	`126`	`case MP_UNARY_OP_NEGATIVE: return mp_obj_new_complex(-o->real, -o->imag);`
`127`		`- case MP_UNARY_OP_ABS: {`
`128`		`- mp_float_t real, imag;`
`129`		`- mp_obj_complex_get(o_in, &real, &imag);`
`130`		`- return mp_obj_new_float(MICROPY_FLOAT_C_FUN(sqrt)(realreal + imagimag));`
`131`		`- }`
	`127`	`+ case MP_UNARY_OP_ABS:`
	`128`	`+ return mp_obj_new_float(MICROPY_FLOAT_C_FUN(sqrt)(o->realo->real + o->imago->imag));`
`132`	`129`	`default: return MP_OBJ_NULL; // op not supported`
`133`	`130`	`}`
`134`	`131`	`}`