sup. FreeRTOS riscV-64 (k210 cpu). 6th stepHEADmaster

6 files changed, 198 insertions, 7 deletions

diff --git a/emu/FreeRTOS/os.c b/emu/FreeRTOS/os.c
index 12056dc..38ed207 100644
--- a/emu/FreeRTOS/os.c
+++ b/emu/FreeRTOS/os.c
@@ -51,6 +51,9 @@ int	gidnobody = -1;
 int	uidnobody = -1;
 //{} static struct 	termios tinit;
 
+void	(*coherence)(void) = nofence;
+
+
 static void
 sysfsa_flagsault(char *what, void *addr)
 {
@@ -176,37 +179,42 @@ osreboot(char *file, char **argv)
 {
 	if(dflag == 0)
 		termrestore();
-	execvp(file, argv);
+//	execvp(file, argv);
 	error("reboot failure");
 }
 
 void
 libinit(char *imod)
 {
-	struct sigaction act;
-	struct passwd *pw;
+//	struct sigaction act;
+//	struct passwd *pw;
 	Proc *p;
-	char sys[64];
+//	char sys[64];
+	char* sys = "k210-freertos";
 
-	setsid();
+//	setsid();
 
-	gethostname(sys, sizeof(sys));
+//	gethostname(sys, sizeof(sys));
 	kstrdup(&ossysname, sys);
+/*
 	pw = getpwnam("nobody");
 	if(pw != nil) {
 		uidnobody = pw->pw_uid;
 		gidnobody = pw->pw_gid;
 	}
+*/
 
 	if(dflag == 0)
 		termset();
 
+/*
 	memset(&act, 0, sizeof(act));
 	act.sa_handler = trapUSR1;
 	sigaction(SIGUSR1, &act, nil);
 
 	act.sa_handler = SIG_IGN;
 	sigaction(SIGCHLD, &act, nil);
+*/
 
 	/*
 	 * For the correct functioning of devcmd in the
@@ -235,6 +243,7 @@ libinit(char *imod)
 	p = newproc();
 	kprocinit(p);
 
+/*
 	pw = getpwuid(getuid());
 	if(pw != nil)
 		kstrdup(&eve, pw->pw_name);
@@ -243,6 +252,7 @@ libinit(char *imod)
 
 	p->env->uid = getuid();
 	p->env->gid = getgid();
+*/
 
 	emuinit(imod);
 }
diff --git a/emu/port/fns.h b/emu/port/fns.h
index 9ff80f2..75960e4 100644
--- a/emu/port/fns.h
+++ b/emu/port/fns.h
@@ -30,7 +30,7 @@ Dir*		chandirstat(Chan*);
 void		cinit(void);
 char*	clipread(void);
 int		clipwrite(char*);
-void	(*coherence)(void);
+extern void	(*coherence)(void);
 void		copen(Chan*);
 void		cmderror(Cmdbuf*, char*);
 Block*	concatblock(Block*);
diff --git a/libiot/sys/chdir.c b/libiot/sys/chdir.c
new file mode 100644
index 0000000..872a37e
--- /dev/null
+++ b/libiot/sys/chdir.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 - 2018, IBEROXARXA SERVICIOS INTEGRALES, S.L.
+ * Copyright (C) 2015 - 2018, Jaume Olivé Petrus (jolive@whitecatboard.org)
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *     * The WHITECAT logotype cannot be changed, you can remove it, but you
+ *       cannot change it in any way. The WHITECAT logotype is:
+ *
+ *          /\       /\
+ *         /  \_____/  \
+ *        /_____________\
+ *        W H I T E C A T
+ *
+ *     * Redistributions in binary form must retain all copyright notices printed
+ *       to any local or remote output device. This include any reference to
+ *       Lua RTOS, whitecatboard.org, Lua, and other copyright notices that may
+ *       appear in the future.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Lua RTOS, chdir implementation
+ *
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <unistd.h>
+
+//#include <sys/mount.h>
+#include <sys/fcntl.h>
+
+char currdir[PATH_MAX + 1] = "/";
+
+int chdir(const char *path) {
+    struct stat statb;
+
+    if (!path) {
+        errno = EFAULT;
+        return -1;
+    }
+
+    if (!*path) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    char *npath = mount_normalize_path(path);
+
+    if (stat(npath, &statb) || !S_ISDIR(statb.st_mode)) {
+        free(npath);
+        errno = ENOTDIR;
+        return -1;
+    }
+
+    strncpy(currdir, npath, PATH_MAX);
+
+    free(npath);
+
+    return 0;
+}
diff --git a/libiot/sys/getcwd.c b/libiot/sys/getcwd.c
new file mode 100644
index 0000000..8ba2fd2
--- /dev/null
+++ b/libiot/sys/getcwd.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2015 - 2018, IBEROXARXA SERVICIOS INTEGRALES, S.L.
+ * Copyright (C) 2015 - 2018, Jaume Olivé Petrus (jolive@whitecatboard.org)
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the <organization> nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *     * The WHITECAT logotype cannot be changed, you can remove it, but you
+ *       cannot change it in any way. The WHITECAT logotype is:
+ *
+ *          /\       /\
+ *         /  \_____/  \
+ *        /_____________\
+ *        W H I T E C A T
+ *
+ *     * Redistributions in binary form must retain all copyright notices printed
+ *       to any local or remote output device. This include any reference to
+ *       Lua RTOS, whitecatboard.org, Lua, and other copyright notices that may
+ *       appear in the future.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Lua RTOS getcwd
+ *
+ */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <fcntl.h>
+
+//#include <sys/mount.h>
+
+extern char currdir[];
+
+char *getcwd(char *buff, size_t size) {
+    if ((buff == NULL) || ((buff != NULL) && (size == 0))) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    if (strlen(currdir) + 1 > PATH_MAX) {
+        errno = ENAMETOOLONG;
+        return NULL;
+    }
+
+    if (size < strlen(currdir) + 1) {
+        errno = ERANGE;
+        return NULL;
+    }
+
+    char *pt = buff;
+    *pt = '\0';
+
+    if (*currdir != '/') {
+        *pt++ = '/';
+        *pt = '\0';
+    }
+
+    strcat(pt, currdir);
+
+    return pt;
+}
+
+char *realpath(const char *path, char *resolved) {
+    strcpy(resolved, path);
+
+    return resolved;
+}
diff --git a/libiot/sys/mkfile b/libiot/sys/mkfile
index 6eafd7a..3f47cff 100644
--- a/libiot/sys/mkfile
+++ b/libiot/sys/mkfile
@@ -3,3 +3,5 @@ OFILES=\
 	sys/panic.$O\
 	sys/mutex.$O\
 	sys/list.$O\
+	sys/chdir.$O\
+	sys/getcwd.$O\
diff --git a/mkfiles/mkfile-FreeRTOS-riscv64 b/mkfiles/mkfile-FreeRTOS-riscv64
index 6fa18c5..4e44a89 100644
--- a/mkfiles/mkfile-FreeRTOS-riscv64
+++ b/mkfiles/mkfile-FreeRTOS-riscv64
@@ -13,6 +13,9 @@ ASFLAGS=
 
 CC=		${CROSS}gcc -c 
 CFLAGS=		-O\
+		-mcmodel=medany\
+		-mabi=lp64f -march=rv64imafc\
+		-fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -ffast-math -fno-math-errno -fsingle-precision-constant\
 		-Wuninitialized -Wunused-variable -Wreturn-type -Wimplicit\
 		-I$ROOT/FreeRTOS/riscv64/include\
 		-I$FreeRTOS_ROOT/include\