Merge pull request #1 from pcercuei/for_upstream

[libpicofe.git] / linux / plat.c

diff --git a/linux/plat.c b/linux/plat.c
index f793910..ec381fa 100644 (file)
--- 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,6 +19,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 #include "../plat.h"
 
@@ -39,24 +41,54 @@ 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)
+       return plat_get_data_dir(dst, len);
+#else
+       char *home = getenv("HOME");
+       size_t nb = strlen(home);
+
+       memcpy(dst, home, nb);
+       memcpy(dst + nb, PICO_HOME_DIR, sizeof PICO_HOME_DIR);
+       mkdir(dst, 0755);
+       return nb + sizeof(PICO_HOME_DIR) - 1;
+#endif
 }
 
 #ifdef __GP2X__
@@ -136,7 +168,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 +178,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 +231,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, ...)
 {