X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fplat.c;h=1f2c9f2af81e8fb15a3d45773683fa839831973d;hb=f89d84717ae3536779f04cdfb57cf940d2bd8ade;hp=492007cd853474ac02eb614d5525f02dfc735018;hpb=997b2e4ff9773b32d81bb8e1faa17bb9c379f68b;p=libpicofe.git

diff --git a/linux/plat.c b/linux/plat.c
index 492007c..1f2c9f2 100644
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -1,12 +1,33 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2008-2012
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
+#define _GNU_SOURCE 1
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
 #include <dirent.h>
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <errno.h>
 
-#include "../common/plat.h"
+#include "../plat.h"
+
+/* XXX: maybe unhardcode pagesize? */
+#define HUGETLB_PAGESIZE (2 * 1024 * 1024)
+#define HUGETLB_THRESHOLD (HUGETLB_PAGESIZE / 2)
+#ifndef MAP_HUGETLB
+#define MAP_HUGETLB 0x40000 /* arch specific */
+#endif
 
 
 int plat_is_dir(const char *path)
@@ -21,17 +42,22 @@ int plat_is_dir(const char *path)
 
 int plat_get_root_dir(char *dst, int len)
 {
-	extern char **g_argv;
-	int j;
+	int j, ret;
+
+	ret = readlink("/proc/self/exe", dst, len - 1);
+	if (ret < 0) {
+		perror("readlink");
+		ret = 0;
+	}
+	dst[ret] = 0;
 
-	strncpy(dst, g_argv[0], len);
-	len -= 32; // reserve
-	if (len < 0) len = 0;
-	dst[len] = 0;
 	for (j = strlen(dst); j > 0; j--)
-		if (dst[j] == '/') { dst[j+1] = 0; break; }
+		if (dst[j] == '/') {
+			dst[++j] = 0;
+			break;
+		}
 
-	return j + 1;
+	return j;
 }
 
 #ifdef __GP2X__
@@ -109,21 +135,76 @@ int plat_wait_event(int *fds_hnds, int count, int timeout_ms)
 	return ret;
 }
 
-void *plat_mmap(unsigned long addr, size_t size)
+void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
 {
+	static int hugetlb_disabled;
+	int prot = PROT_READ | PROT_WRITE;
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
 	void *req, *ret;
+
 	req = (void *)addr;
-	ret = mmap(req, size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
+	if (need_exec)
+		prot |= PROT_EXEC;
+	if (is_fixed)
+		flags |= MAP_FIXED;
+	if (size >= HUGETLB_THRESHOLD && !hugetlb_disabled)
+		flags |= MAP_HUGETLB;
+
+	ret = mmap(req, size, prot, flags, -1, 0);
+	if (ret == MAP_FAILED && (flags & MAP_HUGETLB)) {
+		fprintf(stderr,
+			"warning: failed to do hugetlb mmap (%p, %zu): %d\n",
+			req, size, errno);
+		hugetlb_disabled = 1;
+		flags &= ~MAP_HUGETLB;
+		ret = mmap(req, size, prot, flags, -1, 0);
+	}
+	if (ret == MAP_FAILED)
+		return NULL;
+
+	if (req != NULL && ret != req)
+		fprintf(stderr,
+			"warning: mmaped to %p, requested %p\n", ret, req);
+
+	return ret;
+}
+
+void *plat_mremap(void *ptr, size_t oldsize, size_t newsize)
+{
+	void *ret;
+
+	ret = mremap(ptr, oldsize, newsize, MREMAP_MAYMOVE);
 	if (ret == MAP_FAILED)
 		return NULL;
-	if (ret != req)
-		printf("warning: mmaped to %p, requested %p\n", ret, req);
+	if (ret != ptr)
+		printf("warning: mremap moved: %p -> %p\n", ptr, ret);
 
 	return ret;
 }
 
 void plat_munmap(void *ptr, size_t size)
 {
-	munmap(ptr, size);
+	int ret;
+
+	ret = munmap(ptr, size);
+	if (ret != 0 && (size & (HUGETLB_PAGESIZE - 1))) {
+		// prehaps an autorounded hugetlb mapping?
+		size = (size + HUGETLB_PAGESIZE - 1) & ~(HUGETLB_PAGESIZE - 1);
+		ret = munmap(ptr, size);
+	}
+	if (ret != 0) {
+		fprintf(stderr,
+			"munmap(%p, %zu) failed: %d\n", ptr, size, errno);
+	}
+}
+
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+	va_list vl;
+
+	va_start(vl, fmt);
+	vprintf(fmt, vl);
+	va_end(vl);
 }