[general] Replace PRINT_FLOAT with new way of printing float (#1840)

Instead of using %f formating to print a floating point value,
use JerryScript to convert the float to a string.

Signed-off-by: Jimmy Huang <[email protected]>

Author: Jimmy Huang

Makefile

@@ -168,9 +168,6 @@ endif  # BOARD = arduino_101
 
 # Print callback statistics during runtime
 CB_STATS ?= off
-# Print floats (uses -u _printf_float flag). This is a workaround on the A101
-# otherwise floats will not print correctly. It does use ~11k extra ROM though
-PRINT_FLOAT ?= off
 
 ifeq ($(BOARD), linux)
 	SNAPSHOT = off
@@ -285,10 +282,6 @@ analyze: $(JS)
 	@if [ "$(SNAPSHOT)" = "on" ]; then \
 		echo "add_definitions(-DZJS_SNAPSHOT_BUILD)" >> $(OUT)/$(BOARD)/generated.cmake; \
 	fi
-	@# Build NEWLIB with float print support, this will increase ROM size
-	@if [ "$(PRINT_FLOAT)" = "on" ]; then \
-		echo "CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y" >> prj.conf; \
-	fi
 	@# Add bluetooth debug configs if BLE is enabled
 	@if grep -q BUILD_MODULE_BLE $(OUT)/$(BOARD)/generated.cmake; then \
 		if [ "$(VARIANT)" = "debug" ]; then \
@@ -318,7 +311,6 @@ analyze: $(JS)
 		-DJERRY_BASE=$(JERRY_BASE) \
 		-DJERRY_OUTPUT=$(JERRY_OUTPUT) \
 		-DJERRY_PROFILE=$(OUT)/$(BOARD)/jerry_feature.profile \
-		-DPRINT_FLOAT=$(PRINT_FLOAT) \
 		-DSNAPSHOT=$(SNAPSHOT) \
 		-DVARIANT=$(VARIANT) \
 		-DVERBOSITY=$(VERBOSITY) \

cmake/zjs.cmake

@@ -41,10 +41,6 @@ if("${CB_STATS}" STREQUAL "on")
   add_definitions(-DZJS_PRINT_CALLBACK_STATS)
 endif()
 
-if("${PRINT_FLOAT}" STREQUAL "on")
-  add_definitions(-DZJS_PRINT_FLOATS)
-endif()
-
 if("${VARIANT}" STREQUAL "debug")
   add_definitions(-DDEBUG_BUILD -DOC_DEBUG)
 endif()

cmake/zjs_linux.cmake

@@ -69,7 +69,6 @@ add_definitions(
   -DZJS_LINUX_BUILD
   -DZJS_GPIO_MOCK
   -DZJS_FIND_FUNC_NAME
-  -DZJS_PRINT_FLOATS
   )
 
 set(APP_COMPILE_OPTIONS

scripts/trlite

@@ -299,18 +299,11 @@ if [ "$RUN" == "all" -o "$RUN" == "1" ]; then
     MODULES=(aio ble dgram events gpio grove_lcd i2c performance pwm uart)
     SENSORS=(Accelerometer AmbientLightSensor Gyroscope Magnetometer TemperatureSensor)
     write_modules_test $TMPFILE $MODULES $SENSORS
-
-    # also, try printing a float w/o PRINT_FLOAT
-    echo "console.log(3.14159);" >> $TMPFILE
     try_command "modules" make $VERBOSE JS=$TMPFILE ROM=255
 
     MODULES=(net pme ws)
     write_modules_test $TMPFILE $MODULES
-
-    # also, try printing a float w/ PRINT_FLOAT
-    echo "console.log(3.14159);" >> $TMPFILE
-
-    try_command "net" make $VERBOSE JS=$TMPFILE PRINT_FLOAT=on ROM=259
+    try_command "net" make $VERBOSE JS=$TMPFILE ROM=255
 
     # OCF test
     echo "var ocf = require('ocf');" > $TMPFILE
@@ -333,18 +326,11 @@ if [ "$RUN" == "all" -o "$RUN" == "2" ]; then
     MODULES=(ble board dgram events fs gpio grove_lcd i2c performance pwm uart)
     SENSORS=(Accelerometer)
     write_modules_test $TMPFILE $MODULES $SENSORS
-
-    # also, try printing a float w/o PRINT_FLOAT
-    echo "console.log(3.14159);" >> $TMPFILE
     try_command "k64f module" make $VERBOSE JS=$TMPFILE ROM=256 BOARD=frdm_k64f
 
     MODULES=(net ws)
     write_modules_test $TMPFILE $MODULES $SENSORS
-
-    # also, try printing a float w/ PRINT_FLOAT
-    echo "console.log(3.14159);" >> $TMPFILE
-
-    try_command "k64f net" make $VERBOSE JS=$TMPFILE PRINT_FLOAT=on ROM=256 BOARD=frdm_k64f
+    try_command "k64f net" make $VERBOSE JS=$TMPFILE ROM=256 BOARD=frdm_k64f
 
     # OCF test
     echo "var ocf = require('ocf');" > $TMPFILE

src/zjs_console.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2017, Intel Corporation.
+// Copyright (c) 2016-2018, Intel Corporation.
 
 #ifdef BUILD_MODULE_CONSOLE
 
@@ -54,6 +54,9 @@ static bool value2str(const jerry_value_t value, char *buf, int maxlen,
     //             is true
     //  returns: true if the representation was complete or false if it
     //             was abbreviated
+    ZVAL_MUTABLE str_val;
+    bool is_string = false;
+
     if (jerry_value_is_array(value)) {
         unsigned int len = jerry_get_array_length(value);
         sprintf(buf, "[Array - length %u]", len);
@@ -66,13 +69,8 @@ static bool value2str(const jerry_value_t value, char *buf, int maxlen,
     } else if (jerry_value_is_number(value)) {
         int type = is_int(value);
         if (type == IS_NUMBER) {
-#ifdef ZJS_PRINT_FLOATS
-            double num = jerry_get_number_value(value);
-            sprintf(buf, "%f", num);
-#else
-            int num = (int)jerry_get_number_value(value);
-            sprintf(buf, "[Float ~%d]", num);
-#endif
+            str_val = jerry_value_to_string(value);
+            is_string = true;
         } else if (type == IS_UINT) {
             unsigned int num = jerry_get_number_value(value);
             sprintf(buf, "%u", num);
@@ -87,23 +85,28 @@ static bool value2str(const jerry_value_t value, char *buf, int maxlen,
     else if (jerry_value_is_object(value)) {
         sprintf(buf, "[Object]");
     } else if (jerry_value_is_string(value)) {
-        jerry_size_t size = jerry_get_string_size(value);
+        str_val = jerry_value_to_string(value);
+        is_string = true;
+    } else if (jerry_value_is_undefined(value)) {
+        sprintf(buf, "undefined");
+    } else {
+        // should never get this
+        sprintf(buf, "UNKNOWN");
+    }
+
+    if (is_string) {
+        jerry_size_t size = jerry_get_string_size(str_val);
         if (size >= maxlen) {
             sprintf(buf, "[String - length %u]", (unsigned int)size);
         } else {
             char buffer[++size];
-            zjs_copy_jstring(value, buffer, &size);
+            zjs_copy_jstring(str_val, buffer, &size);
             if (quotes) {
                 sprintf(buf, "\"%s\"", buffer);
             } else {
                 sprintf(buf, "%s", buffer);
             }
         }
-    } else if (jerry_value_is_undefined(value)) {
-        sprintf(buf, "undefined");
-    } else {
-        // should never get this
-        sprintf(buf, "UNKNOWN");
     }
     return true;
 }

tools/Makefile.snapshot

@@ -44,8 +44,7 @@ ifeq ($(shell uname -s), Linux)
 SNAPSHOT_LIBS +=	-pthread
 endif
 
-SNAPSHOT_DEFINES +=	-DZJS_LINUX_BUILD \
-			-DZJS_PRINT_FLOATS
+SNAPSHOT_DEFINES +=	-DZJS_LINUX_BUILD
 
 SNAPSHOT_FLAGS += 	-fno-asynchronous-unwind-tables \
 			-fno-omit-frame-pointer \