source: webkit/trunk/Source/JavaScriptCore/config.h@ 130303

Last change on this file since 130303 was 127199, checked in by [email protected], 13 years ago

Render unto #ifdef's that which belong to them.
​https://bugs.webkit.org/show_bug.cgi?id=95482.

Patch by Mark Lam <​[email protected]> on 2012-08-30
Reviewed by Filip Pizlo.

Source/JavaScriptCore:

Refining / disambiguating between #ifdefs and adding some. For
example, ENABLE(JIT) is conflated with ENABLE(LLINT) in some places.
Also, we need to add ENABLE(COMPUTED_GOTO_OPCODES) to indicate that we
want interpreted opcodes to use COMPUTED GOTOs apart from ENABLE(LLINT)
and ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER). Also cleaned up #ifdefs
in certain places which were previously incorrect.

  • bytecode/CodeBlock.cpp:

(JSC):
(JSC::CodeBlock::bytecodeOffset):

  • bytecode/CodeBlock.h:

(CodeBlock):

  • bytecode/Opcode.h:

(JSC::padOpcodeName):

  • config.h:
  • dfg/DFGOperations.cpp:
  • interpreter/AbstractPC.cpp:

(JSC::AbstractPC::AbstractPC):

  • interpreter/CallFrame.h:

(ExecState):

  • interpreter/Interpreter.cpp:

(JSC::Interpreter::~Interpreter):
(JSC::Interpreter::initialize):
(JSC::Interpreter::isOpcode):
(JSC::Interpreter::unwindCallFrame):
(JSC::getLineNumberForCallFrame):
(JSC::getCallerInfo):
(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
(JSC::Interpreter::privateExecute):

  • interpreter/Interpreter.h:

(JSC::Interpreter::getOpcode):
(JSC::Interpreter::getOpcodeID):
(Interpreter):

  • jit/HostCallReturnValue.h:
  • jit/JITCode.h:

(JITCode):

  • jit/JITExceptions.cpp:
  • jit/JITExceptions.h:
  • jit/JSInterfaceJIT.h:
  • llint/LLIntData.h:

(JSC::LLInt::getOpcode):

  • llint/LLIntEntrypoints.cpp:

(JSC::LLInt::getFunctionEntrypoint):
(JSC::LLInt::getEvalEntrypoint):
(JSC::LLInt::getProgramEntrypoint):

  • llint/LLIntOffsetsExtractor.cpp:

(JSC::LLIntOffsetsExtractor::dummy):

  • llint/LLIntSlowPaths.cpp:

(LLInt):

  • runtime/JSGlobalData.cpp:

(JSC):

Source/WTF:

  • wtf/Platform.h: Added ENABLE(COMPUTED_GOTO_OPCODES).
  • Property svn:eol-style set to native
File size: 2.1 KB
Line 
1/*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2006 Samuel Weinig <[email protected]>
4 *
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version.
9 *
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details.
14 *
15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA.
19 *
20 */
21
22#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
23#ifdef BUILDING_WITH_CMAKE
24#include "cmakeconfig.h"
25#else
26#include "autotoolsconfig.h"
27#endif
28#endif
29
30#include <wtf/Platform.h>
31#include <wtf/ExportMacros.h>
32// WTF cannot depend on JSC even if USE(JSC).
33#if USE(JSC) && !defined(BUILDING_WTF)
34#include "JSExportMacros.h"
35#elif PLATFORM(CHROMIUM)
36// Chromium doesn't have runtime/ in its include paths.
37#include "runtime/JSExportMacros.h"
38#endif
39
40#if OS(WINDOWS)
41
42#ifndef _WIN32_WINNT
43#define _WIN32_WINNT 0x0500
44#endif
45
46#ifndef WINVER
47#define WINVER 0x0500
48#endif
49
50// If we don't define these, they get defined in windef.h.
51// We want to use std::min and std::max
52#define max max
53#define min min
54
55#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
56// We need to define this before the first #include of stdlib.h or it won't contain rand_s.
57#ifndef _CRT_RAND_S
58#define _CRT_RAND_S
59#endif
60#endif // !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
61
62#endif // OS(WINDOWS)
63
64#define WTF_CHANGES 1
65
66#ifdef __cplusplus
67#undef new
68#undef delete
69#include <wtf/FastMalloc.h>
70#endif
71
72#include <wtf/DisallowCType.h>
73
74#if COMPILER(MSVC)
75#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
76#else
77#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
78#endif
Note: See TracBrowser for help on using the repository browser.