X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fplat.c;h=06c315e830212e7b394344c649aab84cc534e176;hb=26ea18173c1228dd5ce39e2a88ffe1ae10fcb365;hp=4ed1e65d6bd19db099bcf2c5b79df64487df30b8;hpb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;p=libpicofe.git

diff --git a/linux/plat.c b/linux/plat.c
index 4ed1e65..06c315e 100644
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -1,10 +1,11 @@
 /*
- * (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.
  */
 
@@ -18,8 +19,9 @@
 #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)
@@ -39,24 +41,56 @@ int plat_is_dir(const char *path)
 	return 0;
 }
 
-int plat_get_root_dir(char *dst, int len)
+static int plat_get_data_dir(char *dst, int len)
 {
-	int j, ret;
-
-	ret = readlink("/proc/self/exe", dst, len - 1);
+#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
+}
+
+int plat_get_skin_dir(char *dst, int len)
+{
+	int ret = plat_get_data_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(__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_data_dir(dst, len);
 }
 
 #ifdef __GP2X__
@@ -136,7 +170,7 @@ int plat_wait_event(int *fds_hnds, int count, int timeout_ms)
 
 void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
 {
-	static int hugetlb_disabled;
+	static int hugetlb_warned;
 	int prot = PROT_READ | PROT_WRITE;
 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
 	void *req, *ret;
@@ -144,26 +178,35 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
 	req = (void *)addr;
 	if (need_exec)
 		prot |= PROT_EXEC;
+	/* avoid MAP_FIXED, it overrides existing mappings..
 	if (is_fixed)
 		flags |= MAP_FIXED;
-	if (size >= HUGETLB_THRESHOLD && !hugetlb_disabled)
+	*/
+	if (size >= HUGETLB_THRESHOLD)
 		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;
+		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 (req != NULL && ret != req)
-		fprintf(stderr,
-			"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;
 }
@@ -197,6 +240,16 @@ void plat_munmap(void *ptr, size_t size)
 	}
 }
 
+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 */
 void lprintf(const char *fmt, ...)
 {