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

diff --git a/linux/plat.c b/linux/plat.c
index 660a095..45ae371 100644
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -41,7 +41,15 @@ int plat_is_dir(const char *path)
 	return 0;
 }
 
-static int plat_get_data_dir(char *dst, int len)
+int plat_get_data_dir(char *dst, int len)
+{
+	if (len > 1)
+		strcpy(dst, "/");
+	else	*dst = 0;
+	return strlen(dst);
+}
+
+static int plat_get_exe_dir(char *dst, int len)
 {
 #ifdef PICO_DATA_DIR
 	memcpy(dst, PICO_DATA_DIR, sizeof PICO_DATA_DIR);
@@ -65,7 +73,7 @@ static int plat_get_data_dir(char *dst, int len)
 
 int plat_get_skin_dir(char *dst, int len)
 {
-	int ret = plat_get_data_dir(dst, len);
+	int ret = plat_get_exe_dir(dst, len);
 	if (ret < 0)
 		return ret;
 
@@ -78,7 +86,7 @@ int plat_get_skin_dir(char *dst, int len)
 #endif
 int plat_get_root_dir(char *dst, int len)
 {
-#if !defined(__GP2X__) && !defined(PANDORA)
+#if !defined(NO_HOME_DIR) && !defined(__GP2X__) && !defined(PANDORA)
 	const char *home = getenv("HOME");
 	int ret;
 
@@ -90,7 +98,7 @@ int plat_get_root_dir(char *dst, int len)
 		return ret;
 	}
 #endif
-	return plat_get_data_dir(dst, len);
+	return plat_get_exe_dir(dst, len);
 }
 
 #ifdef __GP2X__
@@ -178,8 +186,10 @@ 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)
 		flags |= MAP_HUGETLB;
 
@@ -197,9 +207,14 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
 	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;
 }
@@ -209,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);