mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 683403 - rm JS_LONE_INTERPRET (r=igor)
--HG-- extra : rebase_source : 73f7db4fae965860767a6ae52d278a85990a67df
This commit is contained in:
Luke Wagner
parent
15e0958a5f
commit
9a46e50fad
@ -124,7 +124,6 @@ CPPSRCS = \
|
||||
jshash.cpp \
|
||||
jsinfer.cpp \
|
||||
jsinterp.cpp \
|
||||
jsinvoke.cpp \
|
||||
jsiter.cpp \
|
||||
jslock.cpp \
|
||||
jslog2.cpp \
|
||||
|
||||
@ -110,9 +110,6 @@ using namespace js;
|
||||
using namespace js::gc;
|
||||
using namespace js::types;
|
||||
|
||||
/* jsinvoke_cpp___ indicates inclusion from jsinvoke.cpp. */
|
||||
#if !JS_LONE_INTERPRET ^ defined jsinvoke_cpp___
|
||||
|
||||
JSObject *
|
||||
js::GetScopeChain(JSContext *cx)
|
||||
{
|
||||
@ -1322,7 +1319,7 @@ ValueToId(JSContext *cx, const Value &v, jsid *idp)
|
||||
* Enter the new with scope using an object at sp[-1] and associate the depth
|
||||
* of the with block with sp + stackIndex.
|
||||
*/
|
||||
JS_STATIC_INTERPRET JS_REQUIRES_STACK JSBool
|
||||
JS_REQUIRES_STACK JSBool
|
||||
js_EnterWith(JSContext *cx, jsint stackIndex, JSOp op, size_t oplen)
|
||||
{
|
||||
StackFrame *fp = cx->fp();
|
||||
@ -1357,7 +1354,7 @@ js_EnterWith(JSContext *cx, jsint stackIndex, JSOp op, size_t oplen)
|
||||
return JS_TRUE;
|
||||
}
|
||||
|
||||
JS_STATIC_INTERPRET JS_REQUIRES_STACK void
|
||||
JS_REQUIRES_STACK void
|
||||
js_LeaveWith(JSContext *cx)
|
||||
{
|
||||
JSObject *withobj;
|
||||
@ -1413,7 +1410,7 @@ js_UnwindScope(JSContext *cx, jsint stackDepth, JSBool normalUnwind)
|
||||
return normalUnwind;
|
||||
}
|
||||
|
||||
JS_STATIC_INTERPRET JSBool
|
||||
JSBool
|
||||
js_DoIncDec(JSContext *cx, const JSCodeSpec *cs, Value *vp, Value *vp2)
|
||||
{
|
||||
if (cs->format & JOF_POST) {
|
||||
@ -1475,10 +1472,6 @@ js::FindUpvarFrame(JSContext *cx, uintN targetLevel)
|
||||
return fp;
|
||||
}
|
||||
|
||||
#endif /* !JS_LONE_INTERPRET ^ defined jsinvoke_cpp___ */
|
||||
|
||||
#ifndef jsinvoke_cpp___
|
||||
|
||||
#define PUSH_COPY(v) do { *regs.sp++ = v; assertSameCompartment(cx, regs.sp[-1]); } while (0)
|
||||
#define PUSH_COPY_SKIP_CHECK(v) *regs.sp++ = v
|
||||
#define PUSH_NULL() regs.sp++->setNull()
|
||||
@ -6371,5 +6364,3 @@ END_CASE(JSOP_ARRAYPUSH)
|
||||
}
|
||||
|
||||
} /* namespace js */
|
||||
|
||||
#endif /* !defined jsinvoke_cpp___ */
|
||||
|
||||
@ -362,30 +362,6 @@ class InterpreterFrames {
|
||||
|
||||
} /* namespace js */
|
||||
|
||||
/*
|
||||
* JS_LONE_INTERPRET indicates that the compiler should see just the code for
|
||||
* the js_Interpret function when compiling jsinterp.cpp. The rest of the code
|
||||
* from the file should be visible only when compiling jsinvoke.cpp. It allows
|
||||
* platform builds to optimize selectively js_Interpret when the granularity
|
||||
* of the optimizations with the given compiler is a compilation unit.
|
||||
*
|
||||
* JS_STATIC_INTERPRET is the modifier for functions defined in jsinterp.cpp
|
||||
* that only js_Interpret calls. When JS_LONE_INTERPRET is true all such
|
||||
* functions are declared below.
|
||||
*/
|
||||
#ifndef JS_LONE_INTERPRET
|
||||
# ifdef _MSC_VER
|
||||
# define JS_LONE_INTERPRET 0
|
||||
# else
|
||||
# define JS_LONE_INTERPRET 1
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if !JS_LONE_INTERPRET
|
||||
# define JS_STATIC_INTERPRET static
|
||||
#else
|
||||
# define JS_STATIC_INTERPRET
|
||||
|
||||
extern JS_REQUIRES_STACK JSBool
|
||||
js_EnterWith(JSContext *cx, jsint stackIndex, JSOp op, size_t oplen);
|
||||
|
||||
@ -401,7 +377,6 @@ js_LeaveWith(JSContext *cx);
|
||||
extern JSBool
|
||||
js_DoIncDec(JSContext *cx, const JSCodeSpec *cs, js::Value *vp, js::Value *vp2);
|
||||
|
||||
#endif /* JS_LONE_INTERPRET */
|
||||
/*
|
||||
* Unwind block and scope chains to match the given depth. The function sets
|
||||
* fp->sp on return to stackDepth.
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
* vim: set ts=8 sw=4 et tw=78:
|
||||
*
|
||||
* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla SpiderMonkey JavaScript 1.8 code, released
|
||||
* March 4, 2008.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Igor Bukanov <igor@mir2.org>
|
||||
*
|
||||
* Contributor(s):
|
||||
* Brendan Eich <brendan@mozilla.org
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#define jsinvoke_cpp___
|
||||
|
||||
#include "jsinterp.cpp"
|
||||
Loading…
Reference in New Issue
Block a user