X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fplat.c;h=45ae37189cd23e72fbe23a10709e8f15d9777d58;hb=e50d6e0656e2a31d45ddc52c13b3da6738e93a17;hp=1e107f4e89ed098ad926f4d9a8918c65fae2c1fb;hpb=957a9eac908ae7ad5c46089346e51433fe6f74ec;p=libpicofe.git

diff --git a/linux/plat.c b/linux/plat.c
index 1e107f4..45ae371 100644
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -1,14 +1,15 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2008-2010
+ * (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
+#define _GNU_SOURCE 1
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -17,8 +18,17 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <errno.h>
+#include <sys/stat.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)
@@ -31,24 +41,64 @@ int plat_is_dir(const char *path)
 	return 0;
 }
 
-int plat_get_root_dir(char *dst, int len)
+int plat_get_data_dir(char *dst, int len)
 {
-	int j, ret;
+	if (len > 1)
+		strcpy(dst, "/");
+	else	*dst = 0;
+	return strlen(dst);
+}
 
-	ret = readlink("/proc/self/exe", dst, len - 1);
+static int plat_get_exe_dir(char *dst, int len)
+{
+#ifdef PICO_DATA_DIR
+	memcpy(dst, PICO_DATA_DIR, sizeof PICO_DATA_DIR);
+	return sizeof(PICO_DATA_DIR) - 1;
+#else
+	int j, ret = readlink("/proc/self/exe", dst, len - 1);
 	if (ret < 0) {
 		perror("readlink");
 		ret = 0;
 	}
 	dst[ret] = 0;
 
-	for (j = strlen(dst); j > 0; j--)
+	for (j = ret - 1; j > 0; j--)
 		if (dst[j] == '/') {
 			dst[++j] = 0;
 			break;
 		}
+	return j;
+#endif
+}
 
-	return 0;
+int plat_get_skin_dir(char *dst, int len)
+{
+	int ret = plat_get_exe_dir(dst, len);
+	if (ret < 0)
+		return ret;
+
+	memcpy(dst + ret, "skin/", sizeof "skin/");
+	return ret + sizeof("skin/") - 1;
+}
+
+#ifndef PICO_HOME_DIR
+#define PICO_HOME_DIR "/.picodrive/"
+#endif
+int plat_get_root_dir(char *dst, int len)
+{
+#if !defined(NO_HOME_DIR) && !defined(__GP2X__) && !defined(PANDORA)
+	const char *home = getenv("HOME");
+	int ret;
+
+	if (home != NULL) {
+		ret = snprintf(dst, len, "%s%s", home, PICO_HOME_DIR);
+		if (ret >= len)
+			ret = len - 1;
+		mkdir(dst, 0755);
+		return ret;
+	}
+#endif
+	return plat_get_exe_dir(dst, len);
 }
 
 #ifdef __GP2X__
@@ -126,16 +176,45 @@ 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_warned;
+	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_PRIVATE|MAP_ANONYMOUS, -1, 0);
+	if (need_exec)
+		prot |= PROT_EXEC;
+	/* avoid MAP_FIXED, it overrides existing mappings..
+	if (is_fixed)
+		flags |= MAP_FIXED;
+	*/
+	if (size >= HUGETLB_THRESHOLD)
+		flags |= MAP_HUGETLB;
+
+	ret = mmap(req, size, prot, flags, -1, 0);
+	if (ret == MAP_FAILED && (flags & MAP_HUGETLB)) {
+		if (!hugetlb_warned) {
+			fprintf(stderr,
+				"warning: failed to do hugetlb mmap (%p, %zu): %d\n",
+				req, size, errno);
+			hugetlb_warned = 1;
+		}
+		flags &= ~MAP_HUGETLB;
+		ret = mmap(req, size, prot, flags, -1, 0);
+	}
 	if (ret == MAP_FAILED)
 		return NULL;
-	if (ret != req)
-		printf("warning: mmaped to %p, requested %p\n", ret, req);
+
+	if (req != NULL && ret != req) {
+		fprintf(stderr, "%s: mmaped to %p, requested %p\n",
+			is_fixed ? "error" : "warning", ret, req);
+		if (is_fixed) {
+			munmap(ret, size);
+			return NULL;
+		}
+	}
 
 	return ret;
 }
@@ -145,8 +224,18 @@ 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 == MAP_FAILED) {
+		fprintf(stderr, "mremap %p %zd %zd: ",
+			ptr, oldsize, newsize);
+		perror(NULL);
+		// might be because huge pages can't be remapped,
+		// just make a new mapping
+		ret = plat_mmap(0, newsize, 0, 0);
+		if (ret == MAP_FAILED)
+			return NULL;
+		memcpy(ret, ptr, oldsize);
+		munmap(ptr, oldsize);
+	}
 	if (ret != ptr)
 		printf("warning: mremap moved: %p -> %p\n", ptr, ret);
 
@@ -155,7 +244,28 @@ void *plat_mremap(void *ptr, size_t oldsize, size_t newsize)
 
 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);
+	}
+}
+
+int plat_mem_set_exec(void *ptr, size_t size)
+{
+	int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC);
+	if (ret != 0)
+		fprintf(stderr, "mprotect(%p, %zd) failed: %d\n",
+			ptr, size, errno);
+
+	return ret;
 }
 
 /* lprintf */