Run coremark with floats enabled

Author: object-Object

Makefile

@@ -14,7 +14,7 @@ rust: $(RUST_PROGRAMS)
 
 .PHONY: coremark
 coremark:
-	cd coremark/coremark && $(MAKE) PORT_DIR=../mlogv32 ITERATIONS=10 load
+	cd coremark/coremark && $(MAKE) PORT_DIR=../mlogv32 ITERATIONS=10 clean load
 
 $(ASM_PROGRAMS): %: build/%.bin build/%.dump
 

coremark/mlogv32/core_portme.h

@@ -29,7 +29,7 @@ Original Author: Shay Gal-on
         Define to 1 if the platform supports floating point.
 */
 #ifndef HAS_FLOAT
-#define HAS_FLOAT 0
+#define HAS_FLOAT 1
 #endif
 /* Configuration : HAS_TIME_H
         Define to 1 if platform has the time.h header file,
@@ -70,8 +70,7 @@ Original Author: Shay Gal-on
 #endif
 #endif
 #ifndef COMPILER_FLAGS
-#define COMPILER_FLAGS \
-    FLAGS_STR /* "Please put compiler flags here (e.g. -o3)" */
+#define COMPILER_FLAGS FLAGS_STR
 #endif
 #ifndef MEM_LOCATION
 #define MEM_LOCATION "STACK"

coremark/mlogv32/core_portme.mak

@@ -32,30 +32,30 @@ LD		= riscv32-unknown-elf-gcc
 AS		= riscv32-unknown-elf-gcc
 # Flag : CFLAGS
 #	Use this flag to define compiler options. Note, you can add compiler options from the command line using XCFLAGS="other flags"
-PORT_CFLAGS = -march=$(RISCV_ARCH) --compile -O0 -g -nostdlib -nostartfiles
-FLAGS_STR = "$(PORT_CFLAGS) $(XCFLAGS) $(XLFLAGS) $(LFLAGS_END)"
-CFLAGS = $(PORT_CFLAGS) -I$(PORT_DIR) -I. -DFLAGS_STR=\"$(FLAGS_STR)\" 
+PORT_CFLAGS = -march=$(RISCV_ARCH) -O0 -g -ffreestanding
+FLAGS_STR = "$(strip $(PORT_CFLAGS) $(XCFLAGS) $(XLFLAGS) $(LFLAGS_END)) "
+CFLAGS = $(PORT_CFLAGS) --compile -I$(PORT_DIR) -I. -DFLAGS_STR=\"$(FLAGS_STR)\" 
 #Flag : LFLAGS_END
 #	Define any libraries needed for linking or other flags that should come at the end of the link line (e.g. linker scripts). 
 #	Note : On certain platforms, the default clock_gettime implementation is supported but requires linking of librt.
 SEPARATE_COMPILE=1
 # Flag : SEPARATE_COMPILE
 # You must also define below how to create an object file, and how to link.
 OBJOUT 	= -o
-LFLAGS 	= -T$(PORT_DIR)/../../rust/mlogv32/link.x -nostartfiles
+LFLAGS 	= -T$(PORT_DIR)/../../rust/mlogv32/link.x
 ASFLAGS = --compile
 OFLAG 	= -o
 COUT 	= -c
 
-LFLAGS_END = 
+LFLAGS_END = -nostartfiles -nolibc
 # Flag : PORT_SRCS
 # 	Port specific source files can be added here
 #	You may also need cvt.c if the fcvt functions are not provided as intrinsics by your compiler!
-PORT_SRCS = $(PORT_DIR)/core_portme.c $(PORT_DIR)/ee_printf.c $(PORT_DIR)/ecall.c $(PORT_DIR)/entry.s
+PORT_SRCS = $(PORT_DIR)/core_portme.c $(PORT_DIR)/ee_printf.c $(PORT_DIR)/ecall.c $(PORT_DIR)/entry.s $(PORT_DIR)/cvt.c
 vpath %.c $(PORT_DIR)
 vpath %.s $(PORT_DIR)
 
-PORT_OBJS = $(PORT_DIR)/core_portme.o $(PORT_DIR)/ee_printf.o $(PORT_DIR)/ecall.o $(PORT_DIR)/entry.o
+PORT_OBJS = $(PORT_DIR)/core_portme.o $(PORT_DIR)/ee_printf.o $(PORT_DIR)/ecall.o $(PORT_DIR)/entry.o $(PORT_DIR)/cvt.o
 
 # Flag : LOAD
 #	For a simple port, we assume self hosted compile and run, no load needed.

coremark/mlogv32/cvt.c

@@ -13,10 +13,42 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-#include <math.h>
 #define CVTBUFSIZE 80
 static char CVTBUF[CVTBUFSIZE];
 
+double modf(double x, double *iptr)
+{
+	union {double f; unsigned long long i;} u = {x};
+	unsigned long long mask;
+	int e = (int)(u.i>>52 & 0x7ff) - 0x3ff;
+
+	/* no fractional part */
+	if (e >= 52) {
+		*iptr = x;
+		if (e == 0x400 && u.i<<12 != 0) /* nan */
+			return x;
+		u.i &= 1ULL<<63;
+		return u.f;
+	}
+
+	/* no integral part*/
+	if (e < 0) {
+		u.i &= 1ULL<<63;
+		*iptr = u.f;
+		return x;
+	}
+
+	mask = -1ULL>>12>>e;
+	if ((u.i & mask) == 0) {
+		*iptr = x;
+		u.i &= 1ULL<<63;
+		return u.f;
+	}
+	u.i &= ~mask;
+	*iptr = u.f;
+	return x - u.f;
+}
+
 static char *
 cvt(double arg, int ndigits, int *decpt, int *sign, char *buf, int eflag)
 {

coremark/mlogv32/ee_printf.c

@@ -660,7 +660,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
     return str - buf;
 }
 
-static unsigned int print_width = 0;
+static unsigned int print_x = 7;
 static unsigned int print_y = 508;
 
 void
@@ -670,7 +670,7 @@ uart_send_char(char c)
 }
 
 void init_printf() {
-    print_width = 0;
+    print_x = 7;
     print_y = 508;
     ecall(0, 0, 0, 0, 0, 0, 0, DrawReset);
     ecall(0, 0, 0, 0, 0, 0, 0, DrawClear);
@@ -685,31 +685,33 @@ ee_printf(const char *fmt, ...)
     va_list args;
     int     n = 0;
 
-    int new_print_y = print_y;
+    int old_print_x = print_x;
+    int old_print_y = print_y;
 
     va_start(args, fmt);
     ee_vsprintf(buf, fmt, args);
     va_end(args);
     p = buf;
     while (*p)
     {
-        uart_send_char(*p);
-        n++;
-        p++;
-        print_width += 1;
-        if (*p == '\n' || print_width > 70) {
-            if (print_width > 70) {
+        if (*p == '\n') {
+            print_x = 7;
+            print_y -= 13;
+        } else {
+            print_x += 7;
+            if (print_x > 504) {
                 uart_send_char('\n');
+                print_x = 7;
+                print_y -= 13;
             }
-            new_print_y -= 13;
-            print_width = 0;
         }
+        uart_send_char(*p);
+        n++;
+        p++;
     }
 
-    ecall(7, print_y, 7, 0, 0, 0, 0, DrawPrint);
+    ecall(old_print_x, old_print_y, 7, 0, 0, 0, 0, DrawPrint);
     ecall(0, 0, 0, 0, 0, 0, 0, DrawFlush);
-    print_width = 0;
-    print_y = new_print_y;
 
     return n;
 }