mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 506821: clean up trailing whitespace, r=brendan

This commit is contained in:
David Mandelin 2009-07-27 18:40:12 -07:00
Родитель f9b40174d4
Коммит 5c1ca3e00a
22 изменённых файлов: 86 добавлений и 86 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
js/src/jsapi.cpp
Просмотреть файл

@ -1328,7 +1328,7 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
/* Define a top-level property 'undefined' with the undefined value. */
atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
if (!OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT,
JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT,
NULL)) {
return JS_FALSE;
}
@ -1535,7 +1535,7 @@ JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id,
if (idstr == ATOM_TO_STRING(atom)) {
*resolved = JS_TRUE;
return OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub,
JSPROP_PERMANENT, NULL);
}
@ -1630,7 +1630,7 @@ JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj)
atom = rt->atomState.typeAtoms[JSTYPE_VOID];
if (!AlreadyHasOwnProperty(cx, obj, atom) &&
!OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT,
JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT,
NULL)) {
return JS_FALSE;
}
@ -3001,7 +3001,7 @@ DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, jsval value,
attrs, flags, tinyid, NULL);
}
return OBJ_DEFINE_PROPERTY(cx, obj, id, value, getter, setter, attrs,
NULL);
NULL);
}
static JSBool
@ -3720,7 +3720,7 @@ JS_HasUCProperty(JSContext *cx, JSObject *obj,
JSProperty *prop;
CHECK_REQUEST(cx);
ok = LookupUCProperty(cx, obj, name, namelen,
ok = LookupUCProperty(cx, obj, name, namelen,
JSRESOLVE_QUALIFIED | JSRESOLVE_DETECTING,
&obj2, &prop);
if (ok) {
@ -5197,7 +5197,7 @@ JS_SetOperationCallback(JSContext *cx, JSOperationCallback callback)
{
#ifdef JS_THREADSAFE
JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread));
#endif
#endif
JSOperationCallback old = cx->operationCallback;
cx->operationCallback = callback;
return old;

6
js/src/jsapi.h
Просмотреть файл

@ -2298,14 +2298,14 @@ JS_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval, uintN argc,
* These functions allow setting an operation callback that will be called
* from the thread the context is associated with some time after any thread
* triggered the callback using JS_TriggerOperationCallback(cx).
*
*
* In a threadsafe build the engine internally triggers operation callbacks
* under certain circumstances (i.e. GC and title transfer) to force the
* context to yield its current request, which the engine always
* context to yield its current request, which the engine always
* automatically does immediately prior to calling the callback function.
* The embedding should thus not rely on callbacks being triggered through
* the external API only.
*
*
* Important note: Additional callbacks can occur inside the callback handler
* if it re-enters the JS engine. The embedding must ensure that the callback
* is disconnected before attempting such re-entry.

4
js/src/jsarray.cpp
Просмотреть файл

@ -1368,7 +1368,7 @@ array_toSource(JSContext *cx, uintN argc, jsval *vp)
JSBool ok = JS_TRUE;
/*
* This object will take responsibility for the jschar buffer until the
* This object will take responsibility for the jschar buffer until the
* buffer is transferred to the returned JSString.
*/
JSTempVector<jschar> buf(cx);
@ -1520,7 +1520,7 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
}
/*
* This object will take responsibility for the jschar buffer until the
* This object will take responsibility for the jschar buffer until the
* buffer is transferred to the returned JSString.
*/
JSTempVector<jschar> buf(cx);

2
js/src/jsbuiltins.cpp
Просмотреть файл

@ -129,7 +129,7 @@ js_BoxInt32(JSContext* cx, int32 i)
if (!js_NewDoubleInRootedValue(cx, d, &v))
return JSVAL_ERROR_COOKIE;
return v;
}
}
JS_DEFINE_CALLINFO_2(extern, JSVAL, js_BoxInt32, CONTEXT, INT32, 1, 1)
jsdouble FASTCALL

6
js/src/jsbuiltins.h
Просмотреть файл

@ -86,7 +86,7 @@ struct JSTraceableNative {
const nanojit::CallInfo *builtin;
const char *prefix;
const char *argtypes;
uintN flags; /* JSTNErrType | JSTN_UNBOX_AFTER | JSTN_MORE |
uintN flags; /* JSTNErrType | JSTN_UNBOX_AFTER | JSTN_MORE |
JSTN_CONSTRUCTOR */
};
@ -117,7 +117,7 @@ struct JSTraceableNative {
#endif
/*
* Supported types for builtin functions.
* Supported types for builtin functions.
*
* Types with -- for the two string fields are not permitted as argument types
* in JS_DEFINE_TRCINFO.
@ -165,7 +165,7 @@ struct JSTraceableNative {
* trace. If an exception is pending, it is thrown; otherwise, we assume the
* builtin had no side effects and retry the current bytecode in the
* interpreter.
*
*
* So a builtin must not return a value indicating failure after causing side
* effects (such as reporting an error), without setting an exception pending.
* The operation would be retried, despite the first attempt's observable

8
js/src/jscntxt.cpp
Просмотреть файл

@ -819,7 +819,7 @@ js_NextActiveContext(JSRuntime *rt, JSContext *cx)
return cx;
#else
return js_ContextIterator(rt, JS_FALSE, &iter);
#endif
#endif
}
#ifdef JS_THREADSAFE
@ -1738,10 +1738,10 @@ JSBool
js_InvokeOperationCallback(JSContext *cx)
{
JS_ASSERT(cx->operationCallbackFlag);
/*
* Reset the callback flag first, then yield. If another thread is racing
* us here we will accumulate another callback request which will be
* us here we will accumulate another callback request which will be
* serviced at the next opportunity.
*/
cx->operationCallbackFlag = 0;
@ -1755,7 +1755,7 @@ js_InvokeOperationCallback(JSContext *cx)
*/
if (cx->runtime->gcIsNeeded)
js_GC(cx, GC_NORMAL);
#ifdef JS_THREADSAFE
#ifdef JS_THREADSAFE
else
JS_YieldRequest(cx);
#endif

2
js/src/jsfun.h
Просмотреть файл

@ -289,7 +289,7 @@ extern JSBool
SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
/*
* js_SetCallArg and js_SetCallVar are extern fastcall copies of the setter
* js_SetCallArg and js_SetCallVar are extern fastcall copies of the setter
* functions. These versions are required in order to set call vars from traces.
* The normal versions must not be fastcall because they are stored in the
* property ops map.

8
js/src/jsinterp.cpp
Просмотреть файл

@ -1534,7 +1534,7 @@ js_Execute(JSContext *cx, JSObject *chain, JSScript *script,
js_LeaveTrace(cx);
#ifdef JS_TRACER
/*
/*
* The JIT requires that the scope chain here is equal to its global
* object. Disable the JIT for this call if this condition is not true.
*/
@ -2095,7 +2095,7 @@ js_GetUpvar(JSContext *cx, uintN level, uintN cookie)
} else if (slot == CALLEE_UPVAR_SLOT) {
vp = &fp->argv[-2];
slot = 0;
} else {
} else {
slot -= fp->fun->nargs;
JS_ASSERT(slot < fp->script->nslots);
vp = fp->slots;
@ -2132,7 +2132,7 @@ js_TraceOpcode(JSContext *cx)
fp->script, cx->tracePrevPc);
/*
* If there aren't that many elements on the stack, then
* If there aren't that many elements on the stack, then
* we have probably entered a new frame, and printing output
* would just be misleading.
*/
@ -2717,7 +2717,7 @@ js_Interpret(JSContext *cx)
* 'op=x; DO_OP()' to let another opcode's implementation finish
* their work, and many opcodes share entry points with a run of
* consecutive BEGIN_CASEs.
*
*
* Take care to trace OP only when it is the opcode fetched from
* the instruction stream, so the trace matches what one would
* expect from looking at the code. (We do omit POPs after SETs;

6
js/src/jsinterp.h
Просмотреть файл

@ -90,7 +90,7 @@ struct JSStackFrame {
* variables on the stack initially, note when they are closed
* over, and copy those that are out to the heap when we leave
* their dynamic scope.
*
*
* The bytecode compiler produces a tree of block objects
* accompanying each JSScript representing those lexical blocks in
* the script that have let-bound variables associated with them.
@ -102,7 +102,7 @@ struct JSStackFrame {
* When we are in the static scope of such a block, blockChain
* points to its compiler-allocated block object; otherwise, it is
* NULL.
*
*
* scopeChain is the current scope chain, including 'call' and
* 'block' objects for those function calls and lexical blocks
* whose static scope we are currently executing in, and 'with'
@ -158,7 +158,7 @@ static JS_INLINE uintN
GlobalVarCount(JSStackFrame *fp)
{
uintN n;
JS_ASSERT(!fp->fun);
n = fp->script->nfixed;
if (fp->script->regexpsOffset != 0)

2
js/src/jsinttypes.h
Просмотреть файл

@ -43,7 +43,7 @@
* Types:
* JSInt<N>, JSUint<N> (for <N> = 8, 16, 32, and 64)
* JSIntPtr, JSUIntPtr
*
*
* JSInt<N> and JSUint<N> are signed and unsigned types known to be
* <N> bits long. Note that neither JSInt8 nor JSUInt8 is necessarily
* equivalent to a plain "char".

2
js/src/jsmath.cpp
Просмотреть файл

@ -231,7 +231,7 @@ static inline jsdouble JS_FASTCALL
math_ceil_kernel(jsdouble x)
{
#ifdef __APPLE__
if (x < 0 && x > -1.0)
if (x < 0 && x > -1.0)
return js_copysign(0, -1);
#endif
return ceil(x);

22
js/src/json.cpp
Просмотреть файл

@ -78,7 +78,7 @@ js_json_parse(JSContext *cx, uintN argc, jsval *vp)
jsval *argv = vp + 2;
jsval reviver = JSVAL_NULL;
JSAutoTempValueRooter(cx, 1, &reviver);
if (!JS_ConvertArguments(cx, argc, argv, "S / v", &s, &reviver))
return JS_FALSE;
@ -523,7 +523,7 @@ Str(JSContext *cx, jsid id, JSObject *holder, StringifyContext *scx, jsval *vp,
char numBuf[DTOSTR_STANDARD_BUFFER_SIZE], *numStr;
jsdouble d = JSVAL_IS_INT(*vp) ? jsdouble(JSVAL_TO_INT(*vp)) : *JSVAL_TO_DOUBLE(*vp);
numStr = JS_dtostr(numBuf, sizeof numBuf, DTOSTR_STANDARD, 0, d);
numStr = JS_dtostr(numBuf, sizeof numBuf, DTOSTR_STANDARD, 0, d);
if (!numStr) {
JS_ReportOutOfMemory(cx);
return JS_FALSE;
@ -546,7 +546,7 @@ Str(JSContext *cx, jsid id, JSObject *holder, StringifyContext *scx, jsval *vp,
return ok;
}
*vp = JSVAL_VOID;
return JS_TRUE;
}
@ -640,7 +640,7 @@ static JSBool
Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp)
{
JS_CHECK_RECURSION(cx, return JS_FALSE);
if (!OBJ_GET_PROPERTY(cx, holder, id, vp))
return JS_FALSE;
@ -649,7 +649,7 @@ Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp)
if (!JSVAL_IS_PRIMITIVE(*vp) && !js_IsCallable(obj = JSVAL_TO_OBJECT(*vp), cx)) {
jsval propValue = JSVAL_NULL;
JSAutoTempValueRooter tvr(cx, 1, &propValue);
if(OBJ_IS_ARRAY(cx, obj)) {
jsuint length = 0;
if (!js_GetLengthProperty(cx, obj, &length))
@ -713,7 +713,7 @@ Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp)
static JSBool
Revive(JSContext *cx, jsval reviver, jsval *vp)
{
JSObject *obj = js_NewObject(cx, &js_ObjectClass, NULL, NULL);
if (!obj)
return JS_FALSE;
@ -820,7 +820,7 @@ PushState(JSContext *cx, JSONParser *jp, JSONParserState state)
if (*jp->statep == JSON_PARSE_STATE_FINISHED) {
// extra input
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_JSON_BAD_PARSE);
return JS_FALSE;
return JS_FALSE;
}
jp->statep++;
@ -993,10 +993,10 @@ HandleNumber(JSContext *cx, JSONParser *jp, const jschar *buf, uint32 len)
return JS_FALSE;
}
jsval numVal;
jsval numVal;
if (!JS_NewNumberValue(cx, val, &numVal))
return JS_FALSE;
return PushPrimitive(cx, jp, numVal);
}
@ -1248,7 +1248,7 @@ js_ConsumeJSONText(JSContext *cx, JSONParser *jp, const jschar *data, uint32 len
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_JSON_BAD_PARSE);
return JS_FALSE;
}
if (++(jp->numHex) == 4) {
js_FastAppendChar(&jp->buffer, jp->hexChar);
jp->hexChar = 0;
@ -1265,7 +1265,7 @@ js_ConsumeJSONText(JSContext *cx, JSONParser *jp, const jschar *data, uint32 len
i--;
if (!PopState(cx, jp))
return JS_FALSE;
if (!HandleData(cx, jp, JSON_DATA_KEYWORD))
return JS_FALSE;
}

2
js/src/jsparse.cpp
Просмотреть файл

@ -3802,7 +3802,7 @@ CheckDestructuring(JSContext *cx, BindData *data,
/*
* This is a greatly pared down version of CheckDestructuring that extends the
* pn_pos.end source coordinate of each name in a destructuring binding such as
*
*
* var [x, y] = [function () y, 42];
*
* to cover its corresponding initializer, so that the initialized binding does

4
js/src/jspubtd.h
Просмотреть файл

@ -106,8 +106,8 @@ typedef enum JSAccessMode {
JSACC_PROTO = 0, /* XXXbe redundant w.r.t. id */
JSACC_PARENT = 1, /* XXXbe redundant w.r.t. id */
/*
* enum value #2 formerly called JSACC_IMPORT,
/*
* enum value #2 formerly called JSACC_IMPORT,
* gap preserved for ABI compatibility.
*/

6
js/src/jsregexp.cpp
Просмотреть файл

@ -1997,7 +1997,7 @@ CompileRegExpToAST(JSContext* cx, JSTokenStream* ts,
+ GetCompactIndexWidth(len);
return JS_TRUE;
}
return ParseRegExp(&state);
}
@ -2410,7 +2410,7 @@ class RegExpNativeCompiler {
LIns *branch = lir->insBranch(LIR_jt, test, 0);
extras[i].match = branch;
}
fails.pushBack(lir->insBranch(LIR_jf, lir->ins2(LIR_eq, text_ch, lir->insImm(ch)), 0));
for (int i = 0; i < nextras; ++i)
@ -2418,7 +2418,7 @@ class RegExpNativeCompiler {
return lir->ins2(LIR_piadd, pos, lir->insImm(2));
}
JS_INLINE bool hasCases(jschar ch)
JS_INLINE bool hasCases(jschar ch)
{
return JS_TOLOWER(ch) != JS_TOUPPER(ch);
}

14
js/src/jsscan.cpp
Просмотреть файл

@ -308,7 +308,7 @@ GetChar(JSTokenStream *ts)
ts->flags |= TSF_EOF;
return EOF;
}
/* Fill ts->userbuf so that \r and \r\n convert to \n. */
crflag = (ts->flags & TSF_CRFLAG) != 0;
len = js_fgets(cbuf, JS_LINE_LIMIT - crflag, ts->file);
@ -336,7 +336,7 @@ GetChar(JSTokenStream *ts)
ts->listener(ts->filename, ts->lineno, ts->userbuf.ptr, len,
&ts->listenerTSData, ts->listenerData);
}
nl = ts->saveEOL;
if (!nl) {
/*
@ -362,7 +362,7 @@ GetChar(JSTokenStream *ts)
}
}
}
/*
* If there was a line terminator, copy thru it into linebuf.
* Else copy JS_LINE_LIMIT-1 bytes into linebuf.
@ -378,7 +378,7 @@ GetChar(JSTokenStream *ts)
js_strncpy(ts->linebuf.base, ts->userbuf.ptr, len);
ts->userbuf.ptr += len;
olen = len;
/*
* Make sure linebuf contains \n for EOL (don't do this in
* userbuf because the user's string might be readonly).
@ -420,11 +420,11 @@ GetChar(JSTokenStream *ts)
ts->linebuf.base[len-1] = '\n';
}
}
/* Reset linebuf based on adjusted segment length. */
ts->linebuf.limit = ts->linebuf.base + len;
ts->linebuf.ptr = ts->linebuf.base;
/* Update position of linebuf within physical userbuf line. */
if (!(ts->flags & TSF_NLFLAG))
ts->linepos += ts->linelen;
@ -434,7 +434,7 @@ GetChar(JSTokenStream *ts)
ts->flags |= TSF_NLFLAG;
else
ts->flags &= ~TSF_NLFLAG;
/* Update linelen from original segment length. */
ts->linelen = olen;
}

4
js/src/jsscope.cpp
Просмотреть файл

@ -1594,7 +1594,7 @@ JSScope::replacingShapeChange(JSContext *cx, JSScopeProperty *sprop, JSScopeProp
{
if (shape == sprop->shape)
shape = newsprop->shape;
else
else
generateOwnShape(cx);
}
@ -1604,7 +1604,7 @@ JSScope::sealingShapeChange(JSContext *cx)
generateOwnShape(cx);
}
void
void
JSScope::shadowingShapeChange(JSContext *cx, JSScopeProperty *sprop)
{
generateOwnShape(cx);

2
js/src/jsstdint.h
Просмотреть файл

@ -40,7 +40,7 @@
/*
* This header provides definitions for the <stdint.h> types we use,
* even on systems that lack <stdint.h>.
*
*
* NOTE: This header should only be included in private SpiderMonkey
* code; public headers should use only the JS{Int,Uint}N types; see
* the comment for them in "jsinttypes.h".

34
js/src/jstracer.cpp
Просмотреть файл

@ -1757,7 +1757,7 @@ TraceRecorder::isGlobal(jsval* p) const
(size_t(p - globalObj->dslots) < (STOBJ_NSLOTS(globalObj) - JS_INITIAL_NSLOTS)));
}
/*
/*
* Return the offset in the native stack for the given jsval. More formally,
* |p| must be the address of a jsval that is represented in the native stack
* area. The return value is the offset, from InterpState::stackBase, in bytes,
@ -2240,7 +2240,7 @@ js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 cal
}
/*
* Generic function to read upvars from Call objects of active heavyweight functions.
* Generic function to read upvars from Call objects of active heavyweight functions.
* callee Callee Function object in which the upvar is accessed.
* scopeIndex Number of parent steps to make from |callee| to find upvar definition.
* This must be at least 1 because |callee| is a Function and we must reach a Call.
@ -2249,7 +2249,7 @@ js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 cal
*/
template<typename T>
uint32 JS_INLINE
js_GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
js_GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
double* result)
{
JS_ASSERT(scopeIndex >= 1);
@ -2305,7 +2305,7 @@ private:
};
uint32 JS_FASTCALL
js_GetClosureArg(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
js_GetClosureArg(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
double* result)
{
return js_GetFromClosure<ArgClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
@ -2320,7 +2320,7 @@ private:
};
uint32 JS_FASTCALL
js_GetClosureVar(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
js_GetClosureVar(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
double* result)
{
return js_GetFromClosure<VarClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
@ -4788,14 +4788,14 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
if (e2->numGlobalSlots < e1->numGlobalSlots) {
/*
* Watch out for an extremely rare case (bug 502714). The sequence of events is:
*
*
* 1) Inner tree compiles not knowing about global X (which has type A).
* 2) Inner tree learns about global X and specializes it to a different type
* (type B).
* 3) Outer tree records inner tree with global X as type A, exiting as B.
* 4) Outer tree now has a nesting guard with typeof(X)=B.
* 5) Inner tree takes its original exit that does not know about X.
*
*
* In this case, the nesting guard fails, and now it is illegal to use the nested
* typemap entry for X. The correct entry is in the inner guard's TreeInfo,
* analogous to the solution for bug 476653.
@ -6523,9 +6523,9 @@ TraceRecorder::frameIfInRange(JSObject* obj, unsigned* depthp) const
return NULL;
}
JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureVar, CONTEXT, OBJECT, UINT32,
JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureVar, CONTEXT, OBJECT, UINT32,
UINT32, UINT32, DOUBLEPTR, 0, 0)
JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureArg, CONTEXT, OBJECT, UINT32,
JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureArg, CONTEXT, OBJECT, UINT32,
UINT32, UINT32, DOUBLEPTR, 0, 0)
/*
@ -6622,13 +6622,13 @@ TraceRecorder::scopeChainProp(JSObject* obj, jsval*& vp, LIns*& ins, bool& track
LIns* callee_ins = get(&cx->fp->argv[-2]);
LIns* outp = lir->insAlloc(sizeof(double));
LIns* args[] = {
LIns* args[] = {
outp,
INS_CONST(callDepth),
INS_CONST(slot),
INS_CONST(scopeIndex),
INS_CONST(scopeIndex),
callee_ins,
cx_ins
cx_ins
};
const CallInfo* ci;
if (sprop->getter == js_GetCallArg)
@ -9700,7 +9700,7 @@ TraceRecorder::record_JSOP_GETELEM()
typemap_ins = lir->ins2(LIR_add, fip_ins, INS_CONST(sizeof(FrameInfo) + 2/*callee,this*/ * sizeof(JSTraceType)));
}
LIns* typep_ins = lir->ins2(LIR_add, typemap_ins,
LIns* typep_ins = lir->ins2(LIR_add, typemap_ins,
lir->ins2(LIR_mul, idx_ins, INS_CONST(sizeof(JSTraceType))));
LIns* type_ins = lir->insLoad(LIR_ldcb, typep_ins, 0);
guard(true,
@ -9709,7 +9709,7 @@ TraceRecorder::record_JSOP_GETELEM()
BRANCH_EXIT);
// Read the value out of the native stack area.
guard(true, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)),
guard(true, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)),
snapshot(BRANCH_EXIT));
size_t stackOffset = -treeInfo->nativeStackBase + nativeStackOffset(&afp->argv[0]);
LIns* args_addr_ins = lir->ins2(LIR_add, lirbuf->sp, INS_CONST(stackOffset));
@ -9717,7 +9717,7 @@ TraceRecorder::record_JSOP_GETELEM()
lir->ins2(LIR_mul, idx_ins, INS_CONST(sizeof(double))));
v_ins = stackLoad(argi_addr_ins, type);
} else {
guard(false, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)),
guard(false, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)),
snapshot(BRANCH_EXIT));
v_ins = INS_VOID();
}
@ -10225,7 +10225,7 @@ TraceRecorder::record_JSOP_APPLY()
aobj = JSVAL_TO_OBJECT(vp[3]);
aobj_ins = get(&vp[3]);
/*
/*
* We trace dense arrays and arguments objects. The code we generate for apply
* uses imacros to handle a specific number of arguments.
*/
@ -11093,7 +11093,7 @@ TraceRecorder::record_JSOP_BINDNAME()
/*
* If obj is a js_CallClass object, then we are tracing a reference to an
* upvar in a heavyweight function. We cannot reach this point of the trace
* with a different call object because of the guard on the function call,
* with a different call object because of the guard on the function call,
* so we can assume the result of the bindname is constant on this trace.
*/
if (obj != globalObj && OBJ_GET_CLASS(cx, obj) != &js_CallClass)

12
js/src/jstracer.h
Просмотреть файл

@ -281,7 +281,7 @@ typedef int8_t JSTraceType;
/*
* This indicates an invalid type or error. Note that it should not be used in typemaps,
* because it is the wrong size. It can only be used as a uint32, for example as the
* because it is the wrong size. It can only be used as a uint32, for example as the
* return value from a function that returns a type as a uint32.
*/
const uint32 TT_INVALID = uint32(-1);
@ -332,7 +332,7 @@ public:
_(TIMEOUT) \
_(DEEP_BAIL) \
_(STATUS)
enum ExitType {
#define MAKE_EXIT_CODE(x) x##_EXIT,
@ -408,7 +408,7 @@ struct FrameInfo {
* stack frame for the caller *before* the slots covered by spdist.
* This may be negative if the caller is the top level script.
* The key fact is that if we let 'cpos' be the start of the caller's
* native stack frame, then (cpos + spoffset) points to the first
* native stack frame, then (cpos + spoffset) points to the first
* non-argument slot in the callee's native stack frame.
*/
int32 spoffset;
@ -548,7 +548,7 @@ struct JSRecordingStatus JSRS_ERROR = { JSRS_ERROR_code };
#define STATUS_ABORTS_RECORDING(s) ((s) == JSRS_STOP || (s) == JSRS_ERROR)
#else
enum JSRecordingStatus {
JSRS_ERROR, // Error; propagate to interpreter.
JSRS_ERROR, // Error; propagate to interpreter.
JSRS_STOP, // Abort recording.
JSRS_CONTINUE, // Continue recording.
JSRS_IMACRO // Entered imacro; continue recording.
@ -995,13 +995,13 @@ js_LogTraceVisState(TraceVisState s, TraceVisExitReason r)
}
}
static inline void
static inline void
js_EnterTraceVisState(TraceVisState s, TraceVisExitReason r)
{
js_LogTraceVisState(s, r);
}
static inline void
static inline void
js_ExitTraceVisState(TraceVisExitReason r)
{
js_LogTraceVisState(S_EXITLAST, r);

12
js/src/prmjtime.cpp
Просмотреть файл

@ -109,7 +109,7 @@ PRMJ_LocalGMTDifference()
#if defined(XP_WIN) && !defined(WINCE)
/* Windows does not follow POSIX. Updates to the
* TZ environment variable are not reflected
* TZ environment variable are not reflected
* immediately on that platform as they are
* on UNIX systems without this call.
*/
@ -170,8 +170,8 @@ static const JSInt64 win2un = JSLL_INIT(0x19DB1DE, 0xD53E8000);
#if defined(HAVE_GETSYSTEMTIMEASFILETIME)
inline void
LowResTime(LPFILETIME lpft)
{
GetSystemTimeAsFileTime(lpft);
{
GetSystemTimeAsFileTime(lpft);
}
#elif defined(HAVE_SYSTEMTIMETOFILETIME)
inline void
@ -229,9 +229,9 @@ NowCalibrate()
LowResTime(&ft);
} while (memcmp(&ftStart,&ft, sizeof(ft)) == 0);
timeEndPeriod(1);
#ifdef WINCE
calibration.granularity = (FILETIME2INT64(ft) -
calibration.granularity = (FILETIME2INT64(ft) -
FILETIME2INT64(ftStart))/10;
#endif
/*
@ -581,7 +581,7 @@ PRMJ_DSTOffset(JSInt64 local_time)
#if defined(XP_WIN) && !defined(WINCE)
/* Windows does not follow POSIX. Updates to the
* TZ environment variable are not reflected
* TZ environment variable are not reflected
* immediately on that platform as they are
* on UNIX systems without this call.
*/

2
js/src/resource.h
Просмотреть файл

@ -4,7 +4,7 @@
//
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101