fatval tweaks: bump XDR version, remove spurious comment and #defines, realign JSStackFrame

This commit is contained in:
Luke Wagner 2010-07-15 13:18:12 -07:00
Родитель 3249518de8
Коммит 130283c1f7
4 изменённых файлов: 3 добавлений и 14 удалений

Просмотреть файл

@ -40,7 +40,6 @@
#ifndef jsgchunk_h__ #ifndef jsgchunk_h__
#define jsgchunk_h__ #define jsgchunk_h__
#include "jsapi.h"
#include "jsprvtd.h" #include "jsprvtd.h"
#include "jsutil.h" #include "jsutil.h"
@ -55,10 +54,6 @@ const size_t GC_CHUNK_SHIFT = 20;
const size_t GC_CHUNK_SIZE = size_t(1) << GC_CHUNK_SHIFT; const size_t GC_CHUNK_SIZE = size_t(1) << GC_CHUNK_SHIFT;
const size_t GC_CHUNK_MASK = GC_CHUNK_SIZE - 1; const size_t GC_CHUNK_MASK = GC_CHUNK_SIZE - 1;
#if defined(XP_WIN) && defined(_M_X64)
bool InitNtAllocAPIs();
#endif
JS_FRIEND_API(void *) JS_FRIEND_API(void *)
AllocGCChunk(); AllocGCChunk();

Просмотреть файл

@ -86,12 +86,12 @@ struct JSStackFrame
JSObject *callobj; /* lazily created Call object */ JSObject *callobj; /* lazily created Call object */
JSObject *argsobj; /* lazily created arguments object */ JSObject *argsobj; /* lazily created arguments object */
JSScript *script; /* script being interpreted */ JSScript *script; /* script being interpreted */
JSFunction *fun; /* function being called or null */
js::Value thisv; /* "this" pointer if in method */ js::Value thisv; /* "this" pointer if in method */
JSFunction *fun; /* function being called or null */
uintN argc; /* actual argument count */ uintN argc; /* actual argument count */
js::Value *argv; /* base of argument stack slots */ js::Value *argv; /* base of argument stack slots */
js::Value rval; /* function return value */
void *annotation; /* used by Java security */ void *annotation; /* used by Java security */
js::Value rval; /* function return value */
/* Maintained by StackSpace operations */ /* Maintained by StackSpace operations */
JSStackFrame *down; /* previous frame, part of JSStackFrame *down; /* previous frame, part of

Просмотреть файл

@ -205,7 +205,7 @@ JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
* before deserialization of bytecode. If the saved version does not match * before deserialization of bytecode. If the saved version does not match
* the current version, abort deserialization and invalidate the file. * the current version, abort deserialization and invalidate the file.
*/ */
#define JSXDR_BYTECODE_VERSION (0xb973c0de - 64) #define JSXDR_BYTECODE_VERSION (0xb973c0de - 65)
/* /*
* Library-private functions. * Library-private functions.

Просмотреть файл

@ -116,12 +116,6 @@ namespace mozilla {
namespace plugins { namespace plugins {
namespace parent { namespace parent {
// On 32-bit platforms, sizeof(jsval) != sizeof(NPIdentifier), so we need to
// use an alternate encoding scheme. The following inline helpers provide an
// abstraction for setting and getting the values of NPIdentifiers that should
// always be used instead of casting an NPIdentifier to a jsval and using the
// jsapi.
JS_STATIC_ASSERT(sizeof(NPIdentifier) == sizeof(jsid)); JS_STATIC_ASSERT(sizeof(NPIdentifier) == sizeof(jsid));
static inline jsid static inline jsid