Changeset 857


Ignore:
Timestamp:
May 14, 2011, 6:13:50 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

3rdparty/JavaScriptCore: Use the provided simple MarkStack implementation instead of hacking the Posix implementation on OS/2.

Location:
trunk/src/3rdparty
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri

    r846 r857  
    226226    yarr/RegexJIT.cpp
    227227
     228
     229
     230
    228231# Generated files, simply list them for JavaScriptCore
    229232SOURCES += \

  • trunk/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackPosix.cpp

    r846 r857  
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    … …  
    2727#include "MarkStack.h"
    2828
    29 #if (OS(UNIX) && !OS(SYMBIAN)) || OS(OS2)
     29#if )
    3030
    3131#include <unistd.h>
    … …  
    4141void* MarkStack::allocateStack(size_t size)
    4242{
    43 #if OS(OS2)
    44     return fastMalloc(size);
    45 #else
    4643    return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
    47 #endif
    4844}
    4945void MarkStack::releaseStack(void* addr, size_t size)
    5046{
    51 #if OS(OS2)
    52     fastFree(addr);
    53 #else
    5447    munmap(reinterpret_cast<char*>(addr), size);
    55 #endif
    5648}
    5749

  • trunk/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri

    r846 r857  
    7676    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
    7777
    78     win32-msvc*|wince* {
     78    win32-msvc*|wince* {
    7979        LIBS += -L$$pathToJavaScriptCoreOutput
    8080        LIBS += -l$$JAVASCRIPTCORE_TARGET

  • trunk/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro

    r846 r857  
    221221    yarr/RegexJIT.cpp
    222222
     223
     224
     225
    223226# Generated files, simply list them for JavaScriptCore
    224227SOURCES += \

  • trunk/src/3rdparty/webkit/JavaScriptCore/runtime/MarkStackPosix.cpp

    r846 r857  
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    … …  
    4141void* MarkStack::allocateStack(size_t size)
    4242{
    43 #if defined (__OS2__)
    44     return fastMalloc(size);
    45 #else
    4643    return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
    47 #endif
    4844}
    4945void MarkStack::releaseStack(void* addr, size_t size)
    5046{
    51 #if defined (__OS2__)
    52     fastFree(addr);
    53 #else
    5447    munmap(addr, size);
    55 #endif
    5648}
    5749
Note: See TracChangeset for help on using the changeset viewer.