wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 568068 - fix jscntxt/jsnativestack build breaks on OS/2 (r=wuno)

Browse Source
This commit is contained in:
Rich Walsh 2010-06-01 14:48:58 -07:00
parent 4057e31aea
commit ea28a37159
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/jscntxt.cpp
View File

@ -77,6 +77,9 @@
#ifdef XP_WIN
# include <windows.h>
#elif defined(XP_OS2)
# define INCL_DOSMEMMGR
# include <os2.h>
#else
# include <unistd.h>
# include <sys/mman.h>
@ -136,6 +139,12 @@ StackSpace::init()
base = reinterpret_cast<jsval *>(p);
commitEnd = base + COMMIT_VALS;
end = base + CAPACITY_VALS;
#elif defined(XP_OS2)
if (DosAllocMem(&p, CAPACITY_BYTES, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY) &&
DosAllocMem(&p, CAPACITY_BYTES, PAG_COMMIT | PAG_READ | PAG_WRITE))
return false;
base = reinterpret_cast<jsval *>(p);
end = base + CAPACITY_VALS;
#else
JS_ASSERT(CAPACITY_BYTES % getpagesize() == 0);
p = mmap(NULL, CAPACITY_BYTES, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
@ -153,6 +162,8 @@ StackSpace::finish()
#ifdef XP_WIN
VirtualFree(base, (commitEnd - base) * sizeof(jsval), MEM_DECOMMIT);
VirtualFree(base, 0, MEM_RELEASE);
#elif defined(XP_OS2)
DosFreeMem(base);
#else
munmap(base, CAPACITY_BYTES);
#endif

18
js/src/jsnativestack.cpp
View File

@ -43,6 +43,10 @@
#ifdef XP_WIN
# include <windows.h>
#elif defined(XP_OS2)
# define INCL_DOSPROCESS
# include <os2.h>
#elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
# include <pthread.h>
@ -142,7 +146,19 @@ GetNativeStackBaseImpl()
# endif
}
#else /* !XP_WIN */
#elif defined(XP_OS2)
void *
GetNativeStackBaseImpl()
{
PTIB ptib;
PPIB ppib;
DosGetInfoBlocks(&ptib, &ppib);
return ptib->tib_pstacklimit;
}
#else /* XP_UNIX */
void *
GetNativeStackBaseImpl()