notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix deadlock on list seek
[libpicofe.git]
/
linux
/
plat.c
diff --git
a/linux/plat.c
b/linux/plat.c
index
f793910
..
c34beea
100644
(file)
--- a/
linux/plat.c
+++ b/
linux/plat.c
@@
-1,10
+1,11
@@
/*
/*
- * (C) Gražvydas "notaz" Ignotas, 2008-201
0
+ * (C) Gražvydas "notaz" Ignotas, 2008-201
2
*
* 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.
*
* 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.
*/
* 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)
{
void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
{
- static int hugetlb_
disabl
ed;
+ static int hugetlb_
warn
ed;
int prot = PROT_READ | PROT_WRITE;
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
void *req, *ret;
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;
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)) {
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);
}
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, ...)
{
/* lprintf */
void lprintf(const char *fmt, ...)
{