X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fplat.c;h=c34beeaa355a43e51b334ce72c7cf07a483d8f96;hb=ebf0e111a84cbd73511cc2b935c7bd688638cf5e;hp=f793910a81fdb24a3fd3980d96dfb4048009825e;hpb=a86e9a3e58f55bf49d99dfd5e5d6413e17149593;p=libpicofe.git

diff --git a/linux/plat.c b/linux/plat.c
index f793910..c34beea 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.
  */
 
@@ -136,7 +137,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;
@@ -146,15 +147,17 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
 		prot |= PROT_EXEC;
 	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);
 	}
@@ -197,6 +200,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, ...)
 {