This commit was manufactured by cvs2svn to create tag

'SpiderMonkey140_BASE'.

git-svn-id: svn://10.0.0.236/tags/SpiderMonkey140_BASE@11360 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js/src/MANIFEST

@@ -0,0 +1,31 @@
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsapi.h
+jspubtd.h
+jsarray.h
+jsatom.h
+jsbool.h
+jscntxt.h
+jscompat.h
+jsconfig.h
+jsdate.h
+jsdbgapi.h
+jsemit.h
+jsfun.h
+jsgc.h
+jsinterp.h
+jslock.h
+jsmath.h
+jsnum.h
+jsobj.h
+jsopcode.def
+jsopcode.h
+jsparse.h
+jsprvtd.h
+jspubtd.h
+jsregexp.h
+jsscan.h
+jsscope.h
+jsscript.h
+jsstr.h

mozilla/js/src/Makefile

@@ -0,0 +1,236 @@
+#! gmake
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+include $(DEPTH)/config/config.mk
+
+ifdef MOZ_OJI
+DIRS = liveconnect
+endif
+
+LIBRARY_NAME	= js
+
+ifeq ($(subst /,_,$(shell uname -s)),OS2)
+ifndef XCFLAGS
+OS2_IMPLIB=1
+LIBRARY	= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+DEF_FILE	= jsos2$(VERSION_NUMBER).def
+EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA)
+else
+EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
+endif
+endif
+
+MODULE		= js
+
+CSRCS		= jsapi.c \
+		  jsarray.c \
+		  jsatom.c \
+		  jsbool.c \
+		  jscntxt.c \
+		  jsdate.c \
+		  jsdbgapi.c \
+		  jsemit.c \
+		  jsfun.c \
+		  jsgc.c \
+		  jsinterp.c \
+		  jsmath.c \
+		  jsnum.c \
+		  jsobj.c \
+		  jsopcode.c \
+		  jsparse.c \
+		  jsregexp.c \
+		  jsscan.c \
+		  jsscope.c \
+		  jsscript.c \
+		  jsstr.c \
+		  jslock.c \
+		  jsxdrapi.c \
+		  prmjtime.c \
+		  $(NULL)
+
+EXPORTS		= jsapi.h \
+		  jsarray.h \
+		  jsatom.h \
+		  jsbool.h \
+		  jscntxt.h \
+		  jscompat.h \
+		  jsconfig.h \
+		  jsdate.h \
+		  jsdbgapi.h \
+		  jsemit.h \
+		  jsfun.h \
+		  jsgc.h \
+		  jsinterp.h \
+		  jslock.h \
+		  jsmath.h \
+		  jsnum.h \
+		  jsobj.h \
+		  jsopcode.def \
+		  jsopcode.h \
+		  jsparse.h \
+		  jsprvtd.h \
+		  jspubtd.h \
+		  jsregexp.h \
+		  jsscan.h \
+		  jsscope.h \
+		  jsscript.h \
+		  jsstr.h \
+		  jsxdrapi.h \
+		  $(NULL)
+
+# when using gcc the assembly is inlined in the C-file (see jslock.c)
+ifdef NS_USE_NATIVE
+ASFILES = $(wildcard *_$(OS_ARCH).s)
+endif
+
+JS_SAFE_ARENA = 1
+
+ifdef JS_SAFE_ARENA
+DEFINES += -DJS_USE_SAFE_ARENA
+CSRCS += prarena.c
+endif
+
+include $(DEPTH)/config/rules.mk
+
+ifndef BUILD_OPT
+MOCHAFILE	= 1
+endif
+
+ifdef JSFILE
+DEFINES		+= -DJSFILE
+endif
+
+ifdef JS_THREADSAFE
+DEFINES += -DJS_THREADSAFE
+endif
+
+ifdef JS_NO_THIN_LOCKS
+DEFINES += -DJS_USE_ONLY_NSPR_LOCKS
+endif
+
+ifdef JS_VERSION
+DEFINES += -DJS_VERSION=$(JS_VERSION)
+endif
+
+ifeq ($(CPU_ARCH),sparc)
+
+ifndef JS_NO_ULTRA
+ULTRA_OPTIONS := -xarch=v8plus,-DULTRA_SPARC
+ULTRA_OPTIONSCC := -DULTRA_SPARC
+else
+ULTRA_OPTIONS := -xarch=v8
+ULTRA_OPTIONSCC :=
+endif
+
+ifeq ($(shell uname -m),sun4u)
+ASFLAGS	+= -Wa,$(ULTRA_OPTIONS),-P,-L,-D_ASM,-D__STDC__=0 $(ULTRA_OPTIONSCC)
+else
+ASFLAGS	+= -Wa,-xarch=v8,-P,-L,-D_ASM,-D__STDC__=0
+endif
+
+endif # sparc
+
+INCLUDES	+= -I. 
+
+ifdef NSPR20
+INCLUDES	+= -I$(DIST)/include/nspr20/pr
+else
+INCLUDES	+= -I$(XPDIST)/public/nspr
+endif
+
+ifndef NSBUILDROOT
+JSJAVA_STUBHEADERS = -I$(DEPTH)/sun-java/include/_gen \
+		     -I$(DEPTH)/sun-java/netscape/javascript/_jri \
+		     -I$(DEPTH)/sun-java/netscape/security/_jri
+else
+JSJAVA_STUBHEADERS = -I$(JRI_GEN_DIR) -I$(JDK_GEN_DIR)
+endif
+
+JSJAVA_CFLAGS	= -I$(DEPTH)/sun-java/md-include \
+		  -I$(DEPTH)/sun-java/include \
+		  $(JSJAVA_STUBHEADERS)
+
+# LIBNSPR includes unneeded libmsgc21.a, but abstracts nspr version,
+# etc. nicely.
+LDFLAGS 	= $(LIBNSPR) -lm
+
+ifeq ($(OS_ARCH), OSF1)
+LDFLAGS += -lc_r
+endif
+ifeq ($(OS_ARCH), SunOS)
+LDFLAGS += -lposix4 -ldl -lnsl -lsocket
+endif
+ifeq ($(OS_ARCH), Linux)
+LDFLAGS += -ldl
+endif
+
+# this requires clobbering and recompiling with XCFLAGS=-DJSFILE
+js:
+	$(MAKE) clobber
+	$(MAKE) XCFLAGS=-DJSFILE $(OBJDIR)/js$(BIN_SUFFIX)
+
+.PHONY: js$(BIN_SUFFIX)
+
+ifneq ($(OS_ARCH),OS2)
+$(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
+	    @$(MAKE_OBJDIR)
+	    $(CC) -o $@ $(OBJDIR)/js.o $(LIBRARY) $(LDFLAGS)
+else
+OS_CFLAGS += -tm-
+$(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
+	    @$(MAKE_OBJDIR)
+	    $(LINK_EXE) -OUT:$@ $(OBJDIR)/js.o  $(LIBRARIES) $(EXTRA_LIBS)
+endif
+
+# hardwire dependencies on jsopcode.def
+jsopcode.h jsopcode.c: jsopcode.def
+
+# this section was put in the merged by danda into the
+# JAVA_*_MERGE section and normally would have
+# been removed.  However it looks like it shouldn't have
+# been put there in the first place, so we're leaving it
+# here until danda can confirm (we don't have OS/2 machines
+# to build on) - hshaw/sudu
+#
+ifeq ($(OS_ARCH),OS2)
+$(OBJDIR)/js.o: js.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(CFLAGS) $(JSJAVA_CFLAGS) js.c
+endif
+
+
+refdiff:
+	@for f in `cat commfiles`; do                                         \
+	    t=/tmp/refdiff.$$$$;                                              \
+	    trap 'rm -f $$t' 0 1 2 15;                                        \
+	    sed -f prconv.sed ../ref/$$f > $$t;                               \
+	    cmp -s $$t $$f;                                                   \
+	    if test $$? -ne 0; then                                           \
+		echo "=== $$f";                                               \
+		diff $$f $$t;                                                 \
+	    fi;                                                               \
+	    rm -f $$t;                                                        \
+	done
+
+refconv:
+	@for f in `cat commfiles`; do                                         \
+	    echo "=== $$f";                                                   \
+	    sed -f prconv.sed ../ref/$$f > $$f;                               \
+	done
+
+.PHONY: refdiff refconv

mozilla/js/src/Makefile.in

@@ -0,0 +1,241 @@
+#! gmake
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifdef MOZ_OJI
+DIRS = liveconnect
+endif
+
+LIBRARY_NAME	= js
+
+ifeq ($(subst /,_,$(shell uname -s)),OS2)
+ifndef XCFLAGS
+OS2_IMPLIB=1
+LIBRARY	= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+DEF_FILE	= jsos2$(VERSION_NUMBER).def
+EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA)
+else
+EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
+endif
+endif
+
+MODULE		= js
+
+CSRCS		= jsapi.c \
+		  jsarray.c \
+		  jsatom.c \
+		  jsbool.c \
+		  jscntxt.c \
+		  jsdate.c \
+		  jsdbgapi.c \
+		  jsemit.c \
+		  jsfun.c \
+		  jsgc.c \
+		  jsinterp.c \
+		  jsmath.c \
+		  jsnum.c \
+		  jsobj.c \
+		  jsopcode.c \
+		  jsparse.c \
+		  jsregexp.c \
+		  jsscan.c \
+		  jsscope.c \
+		  jsscript.c \
+		  jsstr.c \
+		  jslock.c \
+		  jsxdrapi.c \
+		  prmjtime.c \
+		  $(NULL)
+
+EXPORTS		= jsapi.h \
+		  jsarray.h \
+		  jsatom.h \
+		  jsbool.h \
+		  jscntxt.h \
+		  jscompat.h \
+		  jsconfig.h \
+		  jsdate.h \
+		  jsdbgapi.h \
+		  jsemit.h \
+		  jsfun.h \
+		  jsgc.h \
+		  jsinterp.h \
+		  jslock.h \
+		  jsmath.h \
+		  jsnum.h \
+		  jsobj.h \
+		  jsopcode.def \
+		  jsopcode.h \
+		  jsparse.h \
+		  jsprvtd.h \
+		  jspubtd.h \
+		  jsregexp.h \
+		  jsscan.h \
+		  jsscope.h \
+		  jsscript.h \
+		  jsstr.h \
+		  jsxdrapi.h \
+		  $(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+# when using gcc the assembly is inlined in the C-file (see jslock.c)
+ifdef NS_USE_NATIVE
+ASFILES = $(wildcard $(srcdir)/*_$(OS_ARCH).s)
+endif
+
+JS_SAFE_ARENA = 1
+
+ifdef JS_SAFE_ARENA
+DEFINES += -DJS_USE_SAFE_ARENA
+CSRCS += prarena.c
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifndef BUILD_OPT
+MOCHAFILE	= 1
+endif
+
+ifdef JSFILE
+DEFINES		+= -DJSFILE
+endif
+
+ifdef JS_THREADSAFE
+DEFINES += -DJS_THREADSAFE
+endif
+
+ifdef JS_NO_THIN_LOCKS
+DEFINES += -DJS_USE_ONLY_NSPR_LOCKS
+endif
+
+ifdef JS_VERSION
+DEFINES += -DJS_VERSION=$(JS_VERSION)
+endif
+
+ifeq ($(CPU_ARCH),sparc)
+
+ifndef JS_NO_ULTRA
+ULTRA_OPTIONS := -xarch=v8plus,-DULTRA_SPARC
+ULTRA_OPTIONSCC := -DULTRA_SPARC
+else
+ULTRA_OPTIONS := -xarch=v8
+ULTRA_OPTIONSCC :=
+endif
+
+ifeq ($(shell uname -m),sun4u)
+ASFLAGS	+= -Wa,$(ULTRA_OPTIONS),-P,-L,-D_ASM,-D__STDC__=0 $(ULTRA_OPTIONSCC)
+else
+ASFLAGS	+= -Wa,-xarch=v8,-P,-L,-D_ASM,-D__STDC__=0
+endif
+
+endif # sparc
+
+INCLUDES	+= -I$(srcdir)
+
+ifdef NSPR20
+INCLUDES	+= -I$(DIST)/include/nspr20/pr
+else
+INCLUDES	+= -I$(XPDIST)/public/nspr
+endif
+
+ifndef NSBUILDROOT
+JSJAVA_STUBHEADERS = -I$(topsrcdir)/sun-java/include/_gen \
+		     -I$(topsrcdir)/sun-java/netscape/javascript/_jri \
+		     -I$(topsrcdir)/sun-java/netscape/security/_jri
+else
+JSJAVA_STUBHEADERS = -I$(JRI_GEN_DIR) -I$(JDK_GEN_DIR)
+endif
+
+JSJAVA_CFLAGS	= -I$(topsrcdir)/sun-java/md-include \
+		  -I$(topsrcdir)/sun-java/include \
+		  $(JSJAVA_STUBHEADERS)
+
+# LIBNSPR includes unneeded libmsgc21.a, but abstracts nspr version,
+# etc. nicely.
+LDFLAGS 	= $(LIBNSPR) -lm
+
+ifeq ($(OS_ARCH), OSF1)
+LDFLAGS += -lc_r
+endif
+ifeq ($(OS_ARCH), SunOS)
+LDFLAGS += -lposix4 -ldl -lnsl -lsocket
+endif
+ifeq ($(OS_ARCH), Linux)
+LDFLAGS += -ldl
+endif
+
+# this requires clobbering and recompiling with XCFLAGS=-DJSFILE
+js:
+	$(MAKE) clobber
+	$(MAKE) XCFLAGS=-DJSFILE $(OBJDIR)/js$(BIN_SUFFIX)
+
+.PHONY: js$(BIN_SUFFIX)
+
+ifneq ($(OS_ARCH),OS2)
+$(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
+	    @$(MAKE_OBJDIR)
+	    $(CC) -o $@ $(OBJDIR)/js.o $(LIBRARY) $(LDFLAGS)
+else
+OS_CFLAGS += -tm-
+$(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
+	    @$(MAKE_OBJDIR)
+	    $(LINK_EXE) -OUT:$@ $(OBJDIR)/js.o  $(LIBRARIES) $(EXTRA_LIBS)
+endif
+
+# hardwire dependencies on jsopcode.def
+jsopcode.h jsopcode.c: jsopcode.def
+
+# this section was put in the merged by danda into the
+# JAVA_*_MERGE section and normally would have
+# been removed.  However it looks like it shouldn't have
+# been put there in the first place, so we're leaving it
+# here until danda can confirm (we don't have OS/2 machines
+# to build on) - hshaw/sudu
+#
+ifeq ($(OS_ARCH),OS2)
+$(OBJDIR)/js.o: js.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(CFLAGS) $(JSJAVA_CFLAGS) js.c
+endif
+
+
+refdiff:
+	@for f in `cat commfiles`; do                                         \
+	    t=/tmp/refdiff.$$$$;                                              \
+	    trap 'rm -f $$t' 0 1 2 15;                                        \
+	    sed -f prconv.sed ../ref/$$f > $$t;                               \
+	    cmp -s $$t $$f;                                                   \
+	    if test $$? -ne 0; then                                           \
+		echo "=== $$f";                                               \
+		diff $$f $$t;                                                 \
+	    fi;                                                               \
+	    rm -f $$t;                                                        \
+	done
+
+refconv:
+	@for f in `cat commfiles`; do                                         \
+	    echo "=== $$f";                                                   \
+	    sed -f prconv.sed ../ref/$$f > $$f;                               \
+	done
+
+.PHONY: refdiff refconv

mozilla/js/src/README

@@ -0,0 +1,17 @@
+The js/ref directory contains standalone ANSI-C source for the Netscape
+JavaScript Reference implementation, JSRef, which was licensed to over 180
+companies as part of Netscape ONE, starting in fall 1996.  Now, JSRef is
+available under NPL from http://www.mozilla.org.
+
+The js/src directory contains source files listed in the file "commfiles",
+that are derived via prconv.sed from counterparts in the js/ref directory.
+It also contains files such as jscompat.h that are not needed in js/ref.
+The Makefile in js/src has refconv and refdiff targets to help keep js/ref
+and js/src in synch.
+
+If you think you need to change a file listed in commfiles here, please
+make the change in js/ref first and then use prconv.sed or gmake refconv to
+get it into js/src.  If you have trouble, please let us know by mailing the
+JS owner and peers listed in http://www.mozilla.org/owners.html#JavaScript.
+
+Brendan Eich (brendan@mozilla.org), 15-May-98

mozilla/js/src/actra.mk

@@ -0,0 +1,100 @@
+#! gmake
+
+#
+# Since everyone seems to need to have their own build configuration
+#   system these days, this is yet another makefile to build JavaScript.
+#   This makefile conforms to the NSPR20 build rules.  If you have built
+#   NSPR20 this will build JS and stick the lib and bin files over in 
+#   the dist area created by NSPR (which is different from the dist 
+#   expected by the client and also the dist expected by LiveWire, but
+#   don't get me started).
+#
+# I don't currently know enough about what sort of JS-engine the Actra
+#   projects are going to expect so I don't know if we need to add
+#   to CFLAGS for -DJS_THREADSAFE or -DJSFILE 
+#
+
+MOD_DEPTH = ../../nspr20
+
+include $(MOD_DEPTH)/config/config.mk
+
+INCLUDES = -I$(DIST)/include
+CFLAGS += -DNSPR20
+
+CSRCS = prmjtime.c \
+		  jsapi.c \
+		  jsarray.c \
+		  jsatom.c \
+		  jsbool.c \
+		  jscntxt.c \
+		  jsdate.c \
+		  jsdbgapi.c \
+		  jsemit.c \
+		  jsfun.c \
+		  jsgc.c \
+		  jsinterp.c \
+		  jsmath.c \
+		  jsnum.c \
+		  jsobj.c \
+		  jsopcode.c \
+		  jsparse.c \
+		  jsregexp.c \
+		  jsscan.c \
+		  jsscope.c \
+		  jsscript.c \
+		  jsstr.c \
+		  jslock.c \
+		  $(NULL)
+
+HEADERS = jsapi.h \
+		  jsarray.h \
+		  jsatom.h \
+		  jsbool.h \
+		  jscntxt.h \
+		  jscompat.h \
+		  jsconfig.h \
+		  jsdate.h \
+		  jsdbgapi.h \
+		  jsemit.h \
+		  jsfun.h \
+		  jsgc.h \
+		  jsinterp.h \
+		  jslock.h \
+		  jsmath.h \
+		  jsnum.h \
+		  jsobj.h \
+		  jsopcode.def \
+		  jsopcode.h \
+		  jsparse.h \
+		  jsprvtd.h \
+		  jspubtd.h \
+		  jsregexp.h \
+		  jsscan.h \
+		  jsscope.h \
+		  jsscript.h \
+		  jsstr.h \
+		  $(NULL)
+
+ifeq ($(OS_ARCH), WINNT)
+EXTRA_LIBS += $(DIST)/lib/libnspr$(MOD_VERSION).lib
+EXTRA_LIBS += $(DIST)/lib/libplds$(MOD_VERSION).lib
+else
+EXTRA_LIBS += -L$(DIST)/lib -lnspr$(MOD_VERSION) -lnplds$(MOD_VERSION)
+endif
+
+LIBRARY_NAME	= js
+LIBRARY_VERSION	= $(MOD_VERSION)
+
+RELEASE_HEADERS = $(HEADERS)
+RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
+RELEASE_LIBS	= $(TARGETS)
+
+include $(MOD_DEPTH)/config/rules.mk
+
+export:: $(TARGETS)
+	$(INSTALL) -m 444 $(HEADERS) $(MOD_DEPTH)/../dist/public/$(LIBRARY_NAME)
+	$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
+	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
+
+install:: export
+

mozilla/js/src/commfiles

@@ -0,0 +1,51 @@
+js.c
+jsapi.c
+jsapi.h
+jsarray.c
+jsarray.h
+jsatom.c
+jsatom.h
+jsbool.c
+jsbool.h
+jscntxt.c
+jscntxt.h
+jsconfig.h
+jsdate.c
+jsdate.h
+jsdbgapi.c
+jsdbgapi.h
+jsemit.c
+jsemit.h
+jsfun.c
+jsfun.h
+jsgc.c
+jsgc.h
+jsinterp.c
+jsinterp.h
+jslock.h
+jslock.c
+jsmath.c
+jsmath.h
+jsnum.c
+jsnum.h
+jsobj.c
+jsobj.h
+jsopcode.c
+jsopcode.def
+jsopcode.h
+jsparse.c
+jsparse.h
+jsprvtd.h
+jspubtd.h
+jsregexp.c
+jsregexp.h
+jsscan.c
+jsscan.h
+jsscope.c
+jsscope.h
+jsscript.c
+jsscript.h
+jsstr.c
+jsstr.h
+jsxdrapi.h
+jsxdrapi.c

mozilla/js/src/export.mac

@@ -0,0 +1,30 @@
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsapi.h
+jsarray.h
+jsatom.h
+jsbool.h
+jscntxt.h
+jscompat.h
+jsconfig.h
+jsdate.h
+jsdbgapi.h
+jsemit.h
+jsfun.h
+jsgc.h
+jsinterp.h
+jslock.h
+jsmath.h
+jsnum.h
+jsobj.h
+jsopcode.def
+jsopcode.h
+jsparse.h
+jsprvtd.h
+jspubtd.h
+jsregexp.h
+jsscan.h
+jsscope.h
+jsscript.h
+jsstr.h

mozilla/js/src/js.dsp

@@ -0,0 +1,184 @@
+# Microsoft Developer Studio Project File - Name="jsshell" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=jsshell - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "js.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "js.mak" CFG="jsshell - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "jsshell - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "jsshell - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "jsshell - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\jsshell_"
+# PROP BASE Intermediate_Dir ".\jsshell_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release"
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "mininspr" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "WIN32" /D "XP_PC" /D "_WINDOWS" /D "JSFILE" /D "MINI_NSPR" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:".\Release\jsshell.exe"
+
+!ELSEIF  "$(CFG)" == "jsshell - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\jsshell0"
+# PROP BASE Intermediate_Dir ".\jsshell0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug"
+# PROP Intermediate_Dir ".\Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "mininspr" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /D "_WIN32" /D "WIN32" /D "XP_PC" /D "_WINDOWS" /D "JSFILE" /D "MINI_NSPR" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\Debug\jsshell.exe"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "jsshell - Win32 Release"
+# Name "jsshell - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\js.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=.\jsapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsatom.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jscntxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsdbgapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsemit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsfun.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsgc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsinterp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jslock.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsopcode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsprvtd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jspubtd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsregexp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscan.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscope.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscript.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsstddef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsstr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\prarena.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

mozilla/js/src/js.dsw

@@ -0,0 +1,56 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "js32"=.\js32.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "jsshell"=.\js.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name js32
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "miniNSPR"=.\miniNSPR.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

mozilla/js/src/js11640.def

@@ -0,0 +1,130 @@
+; The contents of this file are subject to the Netscape Public License
+; Version 1.0 (the "NPL"); you may not use this file except in
+; compliance with the NPL.  You may obtain a copy of the NPL at
+; http://www.mozilla.org/NPL/
+;
+; Software distributed under the NPL is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+; for the specific language governing rights and limitations under the
+; NPL.
+;
+; The Initial Developer of this code under the NPL is Netscape
+; Communications Corporation.  Portions created by Netscape are
+; Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+; Reserved.
+LIBRARY JS1640.DLL
+EXETYPE WINDOWS
+PROTMODE
+
+DESCRIPTION 'Netscape 16-bit JavaScript Library'
+
+CODE    LOADONCALL MOVEABLE DISCARDABLE
+DATA	PRELOAD MOVEABLE SINGLE
+
+HEAPSIZE    8192
+
+EXPORTS
+	WEP															@1 RESIDENTNAME	NONAME
+	_JS_Init						= _JS_Init					@2
+	_JS_Finish						= _JS_Finish				@3
+	_JS_GetNaNValue
+	_JS_GetNegativeInfinityValue
+	_JS_GetPositiveInfinityValue
+	_JS_GetEmptyStringValue
+	_JS_ConvertValue
+	_JS_ValueToObject
+	_JS_ValueToFunction
+	_JS_ValueToString
+	_JS_ValueToNumber
+	_JS_ValueToBoolean
+	_JS_TypeOfValue
+	_JS_GetTypeName
+	_JS_Lock
+	_JS_Unlock
+	_JS_NewContext
+	_JS_DestroyContext
+	_JS_ContextIterator
+	_JS_GetGlobalObject
+	_JS_SetGlobalObject
+	_JS_InitStandardClasses
+;	_JS_GetStaticLink
+	_JS_malloc
+	_JS_realloc
+	_JS_free
+	_JS_strdup
+	_JS_NewDouble
+	_JS_NewDoubleValue
+	_JS_AddRoot
+	_JS_RemoveRoot
+	_JS_LockGCThing
+	_JS_UnlockGCThing
+	_JS_GC
+	_JS_PropertyStub
+	_JS_EnumerateStub
+	_JS_ResolveStub
+	_JS_ConvertStub
+	_JS_FinalizeStub
+	_JS_InitClass
+	_JS_GetClass
+	_JS_InstanceOf
+	_JS_GetPrivate
+	_JS_SetPrivate
+	_JS_GetInstancePrivate
+	_JS_GetPrototype
+	_JS_GetParent
+	_JS_SetParent
+	_JS_GetConstructor
+	_JS_NewObject
+	_JS_DefineObject
+	_JS_DefineConstDoubles
+	_JS_DefineProperties
+	_JS_DefineProperty
+	_JS_DefinePropertyWithTinyId
+	_JS_AliasProperty
+	_JS_LookupProperty
+	_JS_GetProperty
+	_JS_SetProperty
+	_JS_DeleteProperty
+	_JS_NewArrayObject
+	_JS_DefineElement
+	_JS_AliasElement
+	_JS_LookupElement
+	_JS_GetElement
+	_JS_SetElement
+	_JS_DeleteElement
+	_JS_ClearScope
+	_JS_NewFunction
+	_JS_GetFunctionObject
+	_JS_GetFunctionName
+	_JS_DefineFunctions
+	_JS_DefineFunction
+	_JS_CompileScript
+	_JS_DestroyScript
+	_JS_CompileFunction
+	_JS_DecompileScript
+	_JS_DecompileFunction
+	_JS_DecompileFunctionBody
+	_JS_ExecuteScript
+	_JS_EvaluateScript
+	_JS_CallFunction
+	_JS_CallFunctionName
+	_JS_CallFunctionValue
+	_JS_SetBranchCallback
+	_JS_IsRunning
+	_JS_NewString
+	_JS_NewStringCopyN
+	_JS_NewStringCopyZ
+	_JS_InternString
+	_JS_GetStringBytes
+	_JS_GetStringLength
+	_JS_CompareStrings
+	_JS_ReportError
+	_JS_ReportOutOfMemory
+	_JS_SetErrorReporter
+	_JS_NewRegExpObject
+	_JS_SetRegExpInput
+	_JS_ClearRegExpStatics
+	
+IMPORTS
+	_printf		= nspr21.11
+	_strftime	= nspr21.13

mozilla/js/src/js1640.def

@@ -0,0 +1,137 @@
+LIBRARY JS1640.DLL
+EXETYPE WINDOWS
+PROTMODE
+
+DESCRIPTION 'Netscape 16-bit JavaScript Library'
+
+CODE    LOADONCALL MOVEABLE DISCARDABLE
+DATA	PRELOAD MOVEABLE SINGLE
+
+HEAPSIZE    8192
+
+EXPORTS
+	WEP															@1 RESIDENTNAME	NONAME
+	_JS_Init						= _JS_Init					@2
+	_JS_Finish						= _JS_Finish				@3
+	_JS_GetNaNValue
+	_JS_GetNegativeInfinityValue
+	_JS_GetPositiveInfinityValue
+	_JS_GetEmptyStringValue
+	_JS_ConvertValue
+	_JS_ValueToObject
+	_JS_ValueToFunction
+	_JS_ValueToString
+	_JS_ValueToNumber
+	_JS_ValueToBoolean
+	_JS_TypeOfValue
+	_JS_GetTypeName
+	_JS_Lock
+	_JS_Unlock
+	_JS_NewContext
+	_JS_DestroyContext
+	_JS_ContextIterator
+	_JS_GetGlobalObject
+	_JS_SetGlobalObject
+	_JS_InitStandardClasses
+;	_JS_GetStaticLink
+	_JS_malloc
+	_JS_realloc
+	_JS_free
+	_JS_strdup
+	_JS_NewDouble
+	_JS_NewDoubleValue
+	_JS_AddRoot
+	_JS_RemoveRoot
+	_JS_LockGCThing
+	_JS_UnlockGCThing
+	_JS_GC
+	_JS_PropertyStub
+	_JS_EnumerateStub
+	_JS_ResolveStub
+	_JS_ConvertStub
+	_JS_FinalizeStub
+	_JS_InitClass
+	_JS_GetClass
+	_JS_InstanceOf
+	_JS_GetPrivate
+	_JS_SetPrivate
+	_JS_GetInstancePrivate
+	_JS_GetPrototype
+	_JS_GetParent
+	_JS_SetParent
+	_JS_GetConstructor
+	_JS_NewObject
+	_JS_DefineObject
+	_JS_DefineConstDoubles
+	_JS_DefineProperties
+	_JS_DefineProperty
+	_JS_DefinePropertyWithTinyId
+	_JS_AliasProperty
+	_JS_LookupProperty
+	_JS_GetProperty
+	_JS_SetProperty
+	_JS_DeleteProperty
+	_JS_NewArrayObject
+	_JS_DefineElement
+	_JS_AliasElement
+	_JS_LookupElement
+	_JS_GetElement
+	_JS_SetElement
+	_JS_DeleteElement
+	_JS_ClearScope
+	_JS_NewFunction
+	_JS_GetFunctionObject
+	_JS_GetFunctionName
+	_JS_DefineFunctions
+	_JS_DefineFunction
+	_JS_CompileScript
+	_JS_DestroyScript
+	_JS_CompileFunction
+	_JS_DecompileScript
+	_JS_DecompileFunction
+	_JS_DecompileFunctionBody
+	_JS_ExecuteScript
+	_JS_EvaluateScript
+	_JS_CallFunction
+	_JS_CallFunctionName
+	_JS_CallFunctionValue
+	_JS_SetBranchCallback
+	_JS_IsRunning
+	_JS_NewString
+	_JS_NewStringCopyN
+	_JS_NewStringCopyZ
+	_JS_InternString
+	_JS_GetStringBytes
+	_JS_GetStringLength
+	_JS_CompareStrings
+	_JS_ReportError
+	_JS_ReportOutOfMemory
+	_JS_SetErrorReporter
+	_JS_NewRegExpObject
+	_JS_SetRegExpInput
+	_JS_ClearRegExpStatics
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

mozilla/js/src/js1640.rc

@@ -0,0 +1,60 @@
+/////////////////////////////////////////////////////////////////////////////
+
+// Version stamp for this .DLL
+
+#include <windows.h>
+
+#include <ver.h>
+
+
+
+VS_VERSION_INFO     VERSIONINFO
+
+  FILEVERSION       4 // major, minor, release (alpha 1), build #
+
+  PRODUCTVERSION    4
+
+  FILEFLAGSMASK     0
+
+  FILEFLAGS         0 // final version
+
+  FILEOS            VOS_DOS_WINDOWS16
+
+  FILETYPE          VFT_DLL
+
+  FILESUBTYPE       0   // not used
+
+BEGIN
+
+    BLOCK "StringFileInfo"
+
+    BEGIN
+
+        BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
+
+        BEGIN
+
+            VALUE "CompanyName",     "Netscape Communications Corporation\0"
+
+            VALUE "FileDescription", "Netscape 16-bit JavaScript Module\0"
+
+            VALUE "FileVersion",     "4.0\0"
+
+            VALUE "InternalName",    "JS1640\0"
+
+            VALUE "LegalCopyright",  "Copyright Netscape Communications. 1994-96\0"
+
+            VALUE "LegalTrademarks", "Netscape, Mozilla\0"
+
+            VALUE "OriginalFilename","JS1640.DLL\0"
+
+            VALUE "ProductName",     "NETSCAPE\0"
+
+            VALUE "ProductVersion",  "4.0\0"
+
+        END
+
+    END
+
+END
+

mozilla/js/src/js32.dsp

@@ -0,0 +1,318 @@
+# Microsoft Developer Studio Project File - Name="js32" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=js32 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "js32.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "js32.mak" CFG="js32 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "js32 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "js32 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "js32 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\js32\Release"
+# PROP BASE Intermediate_Dir ".\js32\Release"
+# PROP BASE Target_Dir ".\js32"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release"
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\js32"
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "mininspr" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "WIN32" /D "XP_PC" /D "JSFILE" /D "EXPORT_JS_API" /D "MINI_NSPR" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 H:\ns\dist\WINNT4.0_OPT.OBJ\lib\libnspr21_s.lib H:\ns\dist\WINNT4.0_OPT.OBJ\lib\libplds21_s.lib winmm.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+
+!ELSEIF  "$(CFG)" == "js32 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\js32\Debug"
+# PROP BASE Intermediate_Dir ".\js32\Debug"
+# PROP BASE Target_Dir ".\js32"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug"
+# PROP Intermediate_Dir ".\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\js32"
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "mininspr" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "_WIN32" /D "WIN32" /D "XP_PC" /D "JSFILE" /D "EXPORT_JS_API" /D "MINI_NSPR" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 H:\ns\dist\WINNT4.0_DBG.OBJ\lib\libnspr21_s.lib H:\ns\dist\WINNT4.0_DBG.OBJ\lib\libplds21_s.lib winmm.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+
+!ENDIF 
+
+# Begin Target
+
+# Name "js32 - Win32 Release"
+# Name "js32 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\jsapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsarray.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsatom.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsbool.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jscntxt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsdate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsdbgapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsemit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsfun.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsgc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsinterp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jslock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsmath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsnum.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsobj.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsopcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsregexp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscope.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscript.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsxdrapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\prarena.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\prmjtime.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=.\jsapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsarray.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsatom.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsbool.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jscntxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsdate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsdbgapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsemit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsfun.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsgc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsinterp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jslock.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsmath.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsnum.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsopcode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsprvtd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jspubtd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsregexp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscan.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscope.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsscript.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsstddef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsstr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jsxdrapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\prarena.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\prdtoa.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

mozilla/js/src/js3240.rc

@@ -0,0 +1,79 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winver.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 4,0,0,0
+ PRODUCTVERSION 4,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x10004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "Netscape Communications Corporation\0"
+            VALUE "FileDescription", "Netscape 32-bit JavaScript Module\0"
+            VALUE "FileVersion", "4.0\0"
+            VALUE "InternalName", "JS3240\0"
+            VALUE "LegalCopyright", "Copyright Netscape Communications. 1994-96\0"
+            VALUE "LegalTrademarks", "Netscape, Mozilla\0"
+            VALUE "OriginalFilename", "js3240.dll\0"
+            VALUE "ProductName", "NETSCAPE\0"
+            VALUE "ProductVersion", "4.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""winver.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////

mozilla/js/src/jsOS240.def

@@ -0,0 +1,623 @@
+; The contents of this file are subject to the Netscape Public License
+; Version 1.0 (the "NPL"); you may not use this file except in
+; compliance with the NPL.  You may obtain a copy of the NPL at
+; http://www.mozilla.org/NPL/
+;
+; Software distributed under the NPL is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+; for the specific language governing rights and limitations under the
+; NPL.
+;
+; The Initial Developer of this code under the NPL is Netscape
+; Communications Corporation.  Portions created by Netscape are
+; Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+; Reserved.
+
+LIBRARY JS3240 INITINSTANCE TERMINSTANCE
+PROTMODE
+
+DESCRIPTION 'Netscape OS/2 JavaScript Library'
+
+
+CODE    LOADONCALL MOVEABLE DISCARDABLE
+DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED
+
+
+EXPORTS
+;====================== win16 exports these at least... ===========
+;	JS_Init				= JS_Init		@2
+;	JS_Finish			= JS_Finish		@3
+;	JS_GetNaNValue
+;	JS_GetNegativeInfinityValue
+;	JS_GetPositiveInfinityValue
+;	JS_GetEmptyStringValue
+;	JS_ConvertValue
+;	JS_ValueToObject
+;	JS_ValueToFunction
+;	JS_ValueToString
+;	JS_ValueToNumber
+;	JS_ValueToBoolean
+;	JS_TypeOfValue
+;	JS_GetTypeName
+;	JS_Lock
+;	JS_Unlock
+;	JS_NewContext
+;	JS_DestroyContext
+;	JS_ContextIterator
+;	JS_GetGlobalObject
+;	JS_SetGlobalObject
+;	JS_InitStandardClasses
+;;	JS_GetStaticLink
+;	JS_malloc
+;	JS_realloc
+;	JS_free
+;	JS_strdup
+;	JS_NewDouble
+;	JS_NewDoubleValue
+;	JS_AddRoot
+;	JS_RemoveRoot
+;	JS_LockGCThing
+;	JS_UnlockGCThing
+;	JS_GC
+;	JS_PropertyStub
+;	JS_EnumerateStub
+;	JS_ResolveStub
+;	JS_ConvertStub
+;	JS_FinalizeStub
+;	JS_InitClass
+;	JS_GetClass
+;	JS_InstanceOf
+;	JS_GetPrivate
+;	JS_SetPrivate
+;	JS_GetInstancePrivate
+;	JS_GetPrototype
+;	JS_GetParent
+;	JS_SetParent
+;	JS_GetConstructor
+;	JS_NewObject
+;	JS_DefineObject
+;	JS_DefineConstDoubles
+;	JS_DefineProperties
+;	JS_DefineProperty
+;	JS_DefinePropertyWithTinyId
+;	JS_AliasProperty
+;	JS_LookupProperty
+;	JS_GetProperty
+;	JS_SetProperty
+;	JS_DeleteProperty
+;	JS_NewArrayObject
+;	JS_DefineElement
+;	JS_AliasElement
+;	JS_LookupElement
+;	JS_GetElement
+;	JS_SetElement
+;	JS_DeleteElement
+;	JS_ClearScope
+;	JS_NewFunction
+;	JS_GetFunctionObject
+;	JS_GetFunctionName
+;	JS_DefineFunctions
+;	JS_DefineFunction
+;	JS_CompileScript
+;	JS_DestroyScript
+;	JS_CompileFunction
+;	JS_DecompileScript
+;	JS_DecompileFunction
+;	JS_DecompileFunctionBody
+;	JS_ExecuteScript
+;	JS_EvaluateScript
+;	JS_CallFunction
+;	JS_CallFunctionName
+;	JS_CallFunctionValue
+;	JS_SetBranchCallback
+;	JS_IsRunning
+;	JS_NewString
+;	JS_NewStringCopyN
+;	JS_NewStringCopyZ
+;	JS_InternString
+;	JS_GetStringBytes
+;	JS_GetStringLength
+;	JS_CompareStrings
+;	JS_ReportError
+;	JS_ReportOutOfMemory
+;	JS_SetErrorReporter
+;	JS_NewRegExpObject
+;	JS_SetRegExpInput
+;	JS_ClearRegExpStatics
+;=================================================
+
+
+;00001:jsstr (OFFSET:0x00002e17, SIZE:0x0000ae17):
+; - Public Definitions:
+;     js_EmptySubString
+;     js_CompareStrings
+;     js_HashString
+;     js_ValueToString
+;     js_StringToObject
+;     js_FinalizeString
+;     js_NewStringCopyZ
+;     js_NewString
+;     js_InitStringClass
+;     js_NewStringCopyN
+;     js_BoyerMooreHorspool
+;
+;
+;00002:jsscript (OFFSET:0x0000dc2e, SIZE:0x00003abb):
+; - Public Definitions:
+;     js_LineNumberToPC
+;     js_PCToLineNumber
+;     js_GetSrcNote
+;     js_DestroyScript
+;     js_NewScript
+;
+;
+;00003:jsscope (OFFSET:0x000116e9, SIZE:0x00004f82):
+; - Public Definitions:
+;     js_hash_scope_ops
+;     js_list_scope_ops
+;     js_DestroyProperty
+;     js_NewProperty
+;     js_IdToValue
+;     js_HashValue
+;     js_DestroyScope
+;     js_MutateScope
+;     js_DropScope
+;     js_HoldScope
+;     js_NewScope
+;     js_GetMutableScope
+;     js_HoldProperty
+;     js_DropProperty
+;
+;
+;00004:jsscan (OFFSET:0x0001666b, SIZE:0x00008890):
+; - Public Definitions:
+;     js_MatchToken
+;     js_FlushNewlines
+;     js_PeekTokenSameLine
+;     js_UngetToken
+;     js_GetToken
+;     js_PeekToken
+;     js_ReportCompileError
+      js_CloseTokenStream
+      js_NewBufferTokenStream
+;     js_NewTokenStream
+;     js_InitScanner
+;
+;
+;00005:jsregexp (OFFSET:0x0001eefb, SIZE:0x0000eee4):
+; - Public Definitions:
+;     js_RegExpClass
+;     reopsize
+;     js_NewRegExpObject
+;     js_InitRegExpClass
+;     js_FreeRegExpStatics
+;     js_InitRegExpStatics
+;     js_ExecuteRegExp
+;     js_NewRegExpOpt
+;     js_DestroyRegExp
+;     js_NewRegExp
+;
+;
+;00006:jsparse (OFFSET:0x0002dddf, SIZE:0x00010b71):
+; - Public Definitions:
+;     js_ParseFunctionBody
+      js_Parse
+;
+;
+;00007:jsopcode (OFFSET:0x0003e950, SIZE:0x0000d362):
+; - Public Definitions:
+;     js_EscapeMap
+;     js_NumCodeSpecs
+;     js_CodeSpec
+;     js_incop_str
+;     js_true_str
+;     js_false_str
+;     js_this_str
+;     js_null_str
+;     js_void_str
+;     js_typeof_str
+;     js_delete_str
+;     js_new_str
+;     js_ValueToSource
+;     js_DecompileScript
+;     js_DecompileCode
+;     js_DecompileFunction
+;     js_puts
+;     js_printf
+;     js_GetPrinterOutput
+;     js_DestroyPrinter
+;     js_NewPrinter
+;     js_EscapeString
+;     js_Disassemble1
+;     js_Disassemble
+;
+;00008:jsobj (OFFSET:0x0004bcb2, SIZE:0x000090a4):
+; - Public Definitions:
+;     js_WithClass
+;     js_ObjectClass
+;     js_TryValueOf
+;     js_ValueToNonNullObject
+;     js_TryMethod
+;     js_ObjectToString
+;     js_SetClassPrototype
+;     js_DeleteProperty2
+;     js_DeleteProperty
+;     js_SetProperty
+;     js_GetProperty
+;     js_FindVariableScope
+;     js_FindVariable
+;     js_FindProperty
+;     js_LookupProperty
+;     js_DefineProperty
+;     js_FreeSlot
+;     js_AllocSlot
+;     js_FinalizeObject
+;     js_GetClassPrototype
+;     js_NewObject
+;     js_InitObjectClass
+;     js_ValueToObject
+;     js_obj_toString
+;     js_SetSlot
+;     js_GetSlot
+;
+;
+;00009:jsnum (OFFSET:0x00054d56, SIZE:0x00004f29):
+; - Public Definitions:
+;     js_ValueToInt32
+;     js_NumberToObject
+;     js_FinalizeDouble
+;     js_InitNumberClass
+;     js_NumberToString
+;     js_NewDoubleValue
+;     js_NewDouble
+;     js_ValueToNumber
+;
+;
+;00010:jsmath (OFFSET:0x00059c7f, SIZE:0x000054b6):
+; - Public Definitions:
+;     js_InitMathClass
+;
+;
+;00011:jsjava (OFFSET:0x0005f135, SIZE:0x00022aad):
+; - Public Definitions:
+;     js_Hooks
+;     MojaSrcLog
+;     finalizeTask
+      JSJ_FindCurrentJSContext
+;     JSJ_GetPrincipals
+      JSJ_IsSafeMethod
+      JSJ_InitContext
+      JSJ_Init
+      js_JSErrorToJException
+      js_JavaErrorReporter
+      js_RemoveReflection
+      js_ReflectJObjectToJSObject
+      js_convertJObjectToJSValue
+      js_convertJSValueToJObject
+      js_ReflectJSObjectToJObject
+;     js_ReflectJClassToJSObject
+      JSJ_ExitJS
+      JSJ_EnterJS
+      JSJ_CurrentContext
+      JSJ_IsEnabled
+;added in GA code - DSR70297
+      JSJ_Finish
+      JSJ_IsCalledFromJava
+      js_GetJSPrincipalsFromJavaCaller
+
+;
+;
+;00012:jsinterp (OFFSET:0x00081be2, SIZE:0x00012274):
+; - Public Definitions:
+;     js_Call
+;     js_Interpret
+;     js_SetLocalVariable
+;     js_GetLocalVariable
+;     js_SetArgument
+;     js_GetArgument
+;     js_FlushPropertyCacheByProp
+;     js_FlushPropertyCache
+;
+;
+;00013:jsgc (OFFSET:0x00093e56, SIZE:0x00004f8d):
+; - Public Definitions:
+;     js_ForceGC
+;     js_UnlockGCThing
+;     js_LockGCThing
+;     js_GC
+;     js_AllocGCThing
+;     js_RemoveRoot
+;     js_AddRoot
+;     js_FinishGC
+;     js_InitGC
+;
+;
+;00014:jsfun (OFFSET:0x00098de3, SIZE:0x0000977c):
+; - Public Definitions:
+;     js_FunctionClass
+;     js_ClosureClass
+;     js_CallClass
+;     js_DefineFunction
+;     js_NewFunction
+;     js_InitCallAndClosureClasses
+;     js_InitFunctionClass
+;     js_ValueToFunction
+;     js_SetCallVariable
+;     js_GetCallVariable
+;     js_PutCallObject
+;     js_GetCallObject
+;
+;
+;00015:jsemit (OFFSET:0x000a255f, SIZE:0x000077be):
+; - Public Definitions:
+;     js_SrcNoteName
+;     js_SrcNoteArity
+      js_FinishTakingSrcNotes
+;     js_MoveSrcNotes
+;     js_GetSrcNoteOffset
+;     js_BumpSrcNoteDelta
+;     js_NewSrcNote3
+;     js_NewSrcNote2
+;     js_PopStatement
+;     js_EmitContinue
+;     js_EmitBreak
+;     js_SetSrcNoteOffset
+;     js_NewSrcNote
+;     js_PushStatement
+;     js_MoveCode
+;     js_SetJumpOffset
+;     js_Emit3
+;     js_Emit2
+;     js_Emit1
+;     js_UpdateDepth
+;     js_SrcNoteLength
+;     js_CancelLastOpcode
+      js_InitCodeGenerator
+;
+;
+;00016:jsdbgapi (OFFSET:0x000a9d1d, SIZE:0x000057db):
+; - Public Definitions:
+;     js_watchpoint_list
+;     js_trap_list
+;     JS_SetAnnotationInFrame
+;     JS_GetAnnotationFromFrame
+;     JS_GetJSPrincipalArrayFromFrame
+;     JS_NextJSFrame
+;     JS_InitJSFrameIterator
+      JS_LineNumberToPC
+      JS_PCToLineNumber
+      JS_ClearAllWatchPoints
+      JS_ClearWatchPoint
+      JS_SetWatchPoint
+      JS_HandleTrap
+      JS_ClearAllTraps
+      JS_ClearScriptTraps
+      JS_ClearTrap
+      JS_GetTrapOpcode
+      JS_SetTrap
+;DSR070297 - added in GA code
+      JS_FrameIterator
+      JS_GetFrameAnnotation
+      JS_GetFramePrincipalArray
+      JS_GetFrameScript
+      JS_GetScriptFilename
+      JS_SetFrameAnnotation
+      JS_GetFramePC
+      JS_GetFunctionScript
+
+;
+;
+;00017:jsdate (OFFSET:0x000af4f8, SIZE:0x00009a8e):
+; - Public Definitions:
+      js_DateGetSeconds
+      js_DateGetMinutes
+      js_DateGetHours
+      js_DateGetDate
+      js_DateGetMonth
+      js_DateGetYear
+      js_NewDateObject
+;     js_InitDateClass
+;
+;
+;00018:jscntxt (OFFSET:0x000b8f86, SIZE:0x00003732):
+; - Public Definitions:
+;     js_InterpreterHooks
+;     js_ReportIsNotDefined
+;     js_ReportErrorAgain
+;     js_ReportErrorVA
+;     js_ContextIterator
+;     js_DestroyContext
+;     js_NewContext
+;     js_SetInterpreterHooks
+;
+;
+;00019:jsbool (OFFSET:0x000bc6b8, SIZE:0x00003375):
+; - Public Definitions:
+;     js_BooleanToString
+;     js_BooleanToObject
+;     js_InitBooleanClass
+;     js_ValueToBoolean
+;
+;
+;00020:jsatom (OFFSET:0x000bfa2d, SIZE:0x000058d0):
+; - Public Definitions:
+;     js_valueOf_str
+;     js_toString_str
+;     js_length_str
+;     js_eval_str
+;     js_constructor_str
+;     js_class_prototype_str
+;     js_assign_str
+;     js_anonymous_str
+;     js_Object_str
+;     js_Array_str
+;     js_type_str
+;     js_DropUnmappedAtoms
+      js_FreeAtomMap
+      js_InitAtomMap
+;     js_GetAtom
+;     js_DropAtom
+;     js_IndexAtom
+;     js_ValueToStringAtom
+;     js_AtomizeString
+;     js_AtomizeDouble
+;     js_AtomizeInt
+;     js_AtomizeBoolean
+;     js_AtomizeObject
+;     js_HoldAtom
+;     js_MarkAtomState
+;     js_FreeAtomState
+;     js_Atomize
+;     js_InitAtomState
+;
+;
+;00021:jsarray (OFFSET:0x000c52fd, SIZE:0x00007c86):
+; - Public Definitions:
+;     js_ArrayClass
+;     js_SetArrayLength
+;     js_GetArrayLength
+;     js_InitArrayClass
+;     js_NewArrayObject
+;     PR_qsort
+;
+;
+;00022:jsapi (OFFSET:0x000ccf83, SIZE:0x0000de8c):
+; - Public Definitions:
+      JS_ClearRegExpStatics
+      JS_SetRegExpInput
+      JS_NewRegExpObject
+      JS_SetErrorReporter
+      JS_CompareStrings
+      JS_GetStringLength
+      JS_GetStringBytes
+      JS_InternString
+      JS_NewStringCopyZ
+      JS_NewStringCopyN
+      JS_NewString
+      JS_IsRunning
+      JS_SetBranchCallback
+      JS_CallFunctionValue
+      JS_CallFunctionName
+      JS_CallFunction
+      JS_EvaluateScriptForPrincipals
+      JS_EvaluateScript
+      JS_ExecuteScript
+      JS_DecompileFunctionBody
+      JS_DecompileFunction
+      JS_DecompileScript
+      JS_CompileFunctionForPrincipals
+      JS_CompileFunction
+      JS_DestroyScript
+      JS_CompileScriptForPrincipals
+      JS_CompileScript
+      JS_DefineFunction
+      JS_GetFunctionName
+      JS_GetFunctionObject
+      JS_NewFunction
+      JS_ClearScope
+      JS_DeleteElement
+      JS_SetElement
+      JS_GetElement
+      JS_LookupElement
+      JS_AliasElement
+      JS_DefineElement
+      JS_SetArrayLength
+      JS_GetArrayLength
+      JS_NewArrayObject
+      JS_DeleteProperty
+      JS_SetProperty
+      JS_GetProperty
+      JS_LookupProperty
+      JS_AliasProperty
+      JS_DefinePropertyWithTinyId
+      JS_DefineProperty
+      JS_DefineConstDoubles
+      JS_DefineObject
+      JS_NewObject
+      JS_GetConstructor
+      JS_SetParent
+      JS_GetParent
+      JS_SetPrototype
+      JS_GetPrototype
+      JS_GetInstancePrivate
+      JS_SetPrivate
+      JS_GetPrivate
+      JS_InstanceOf
+      JS_GetClass
+      JS_DefineFunctions
+      JS_DefineProperties
+      JS_InitClass
+      JS_FinalizeStub
+      JS_ConvertStub
+      JS_ResolveStub
+      JS_EnumerateStub
+      JS_PropertyStub
+      JS_GC
+      JS_UnlockGCThing
+      JS_LockGCThing
+      JS_RemoveRoot
+      JS_AddRoot
+      JS_NewDoubleValue
+      JS_NewDouble
+      JS_strdup
+      JS_free
+      JS_realloc
+      JS_ReportOutOfMemory
+      JS_malloc
+      JS_GetScopeChain
+      JS_InitStandardClasses
+      JS_SetGlobalObject
+      JS_GetGlobalObject
+      JS_SetVersion
+      JS_GetVersion
+      JS_ContextIterator
+      JS_GetTaskState
+      JS_DestroyContext
+      JS_NewContext
+      JS_Unlock
+      JS_Lock
+      JS_Finish
+      JS_Init
+      JS_GetTypeName
+      JS_TypeOfValue
+      JS_ValueToBoolean
+      JS_ValueToInt32
+      JS_ValueToNumber
+      JS_ValueToString
+      JS_ValueToFunction
+      JS_ValueToObject
+      JS_ReportError
+      JS_ConvertValue
+      JS_GetEmptyStringValue
+      JS_GetPositiveInfinityValue
+      JS_GetNegativeInfinityValue
+      JS_GetNaNValue
+;DSR062897 - added for GA code
+      JS_MaybeGC
+      JS_GetScriptPrincipals
+      JS_IsAssigning
+      JS_SetCharSetInfo
+;
+;
+;00023:prmjtime (OFFSET:0x000dae0f, SIZE:0x00008986):
+; - Public Definitions:
+      PRMJ_FormatTimeUSEnglish
+      PRMJ_gmtime
+      PRMJ_FormatTime
+      PRMJ_mktime
+      PRMJ_ComputeTime
+      PRMJ_localtime
+      PRMJ_ExplodeTime
+      PRMJ_ToLocal
+      PRMJ_ToGMT
+      PRMJ_NowLocal
+      PRMJ_DSTOffset
+      PRMJ_NowS
+      PRMJ_NowMS
+      PRMJ_Now
+      PRMJ_ToExtendedTime
+      PRMJ_ToBaseTime
+      PRMJ_setDST
+      PRMJ_LocalGMTDifference
+
+

mozilla/js/src/jsaddr.c

@@ -0,0 +1,42 @@
+/* -*- Mode: C; tab-width: 8 -*-
+ * Copyright © 1996 Netscape Communications Corporation, All Rights Reserved.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "jsapi.h"
+#include "jsinterp.h"
+
+/* These functions are needed to get the addresses of certain functions
+ * in the JS module. On WIN32 especially, these symbols have a different
+ * address from the actual address of these functions in the JS module.
+ * This is because on WIN32, import function address fixups are done only
+ * at load time and function calls are made by indirection - that is by
+ * using a couple extra instructions to lookup the actual function address
+ * in the importing module's import address table.
+ */
+
+PR_IMPLEMENT(JSPropertyOp)
+js_GetArgumentAddress()
+{
+	return ((void *)js_GetArgument);
+}
+
+PR_IMPLEMENT(JSPropertyOp)
+js_SetArgumentAddress()
+{
+	return ((void *)js_SetArgument);
+}
+
+PR_IMPLEMENT(JSPropertyOp)
+js_GetLocalVariableAddress()
+{
+	return ((void *)js_GetLocalVariable);
+}
+
+PR_IMPLEMENT(JSPropertyOp)
+js_SetLocalVariableAddress()
+{
+	return ((void *)js_SetLocalVariable);
+}

mozilla/js/src/jsaddr.h

@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 8 -*-
+ * Copyright © 1996 Netscape Communications Corporation, All Rights Reserved.
+ */
+
+#ifndef jsaddr_h___
+#define jsaddr_h___
+
+PR_EXTERN(JSPropertyOp)
+js_GetArgumentAddress();
+
+PR_EXTERN(JSPropertyOp)
+js_SetArgumentAddress();
+
+PR_EXTERN(JSPropertyOp)
+js_GetLocalVariableAddress();
+
+PR_EXTERN(JSPropertyOp)
+js_SetLocalVariableAddress();
+
+#endif /* jsaddr_h___ */

mozilla/js/src/jsapi.h

@@ -0,0 +1,998 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsapi_h___
+#define jsapi_h___
+/*
+ * JavaScript API.
+ */
+#include <stddef.h>
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+/*
+ * Type tags stored in the low bits of a jsval.
+ */
+#define JSVAL_OBJECT            0x0     /* untagged reference to object */
+#define JSVAL_INT               0x1     /* tagged 31-bit integer value */
+#define JSVAL_DOUBLE            0x2     /* tagged reference to double */
+#define JSVAL_STRING            0x4     /* tagged reference to string */
+#define JSVAL_BOOLEAN           0x6     /* tagged boolean value */
+
+/* Type tag bitfield length and derived macros. */
+#define JSVAL_TAGBITS           3
+#define JSVAL_TAGMASK           PR_BITMASK(JSVAL_TAGBITS)
+#define JSVAL_TAG(v)            ((v) & JSVAL_TAGMASK)
+#define JSVAL_SETTAG(v,t)       ((v) | (t))
+#define JSVAL_CLRTAG(v)         ((v) & ~(jsval)JSVAL_TAGMASK)
+#define JSVAL_ALIGN             PR_BIT(JSVAL_TAGBITS)
+
+/* Predicates for type testing. */
+#define JSVAL_IS_OBJECT(v)      (JSVAL_TAG(v) == JSVAL_OBJECT)
+#define JSVAL_IS_NUMBER(v)      (JSVAL_IS_INT(v) || JSVAL_IS_DOUBLE(v))
+#define JSVAL_IS_INT(v)         (((v) & JSVAL_INT) && (v) != JSVAL_VOID)
+#define JSVAL_IS_DOUBLE(v)      (JSVAL_TAG(v) == JSVAL_DOUBLE)
+#define JSVAL_IS_STRING(v)      (JSVAL_TAG(v) == JSVAL_STRING)
+#define JSVAL_IS_BOOLEAN(v)     (JSVAL_TAG(v) == JSVAL_BOOLEAN)
+#define JSVAL_IS_NULL(v)        ((v) == JSVAL_NULL)
+#define JSVAL_IS_VOID(v)        ((v) == JSVAL_VOID)
+#define JSVAL_IS_PRIMITIVE(v)   (!JSVAL_IS_OBJECT(v) || JSVAL_IS_NULL(v))
+
+/* Objects, strings, and doubles are GC'ed. */
+#define JSVAL_IS_GCTHING(v)     (!((v) & JSVAL_INT) && !JSVAL_IS_BOOLEAN(v))
+#define JSVAL_TO_GCTHING(v)     ((void *)JSVAL_CLRTAG(v))
+#define JSVAL_TO_OBJECT(v)      ((JSObject *)JSVAL_TO_GCTHING(v))
+#define JSVAL_TO_DOUBLE(v)      ((jsdouble *)JSVAL_TO_GCTHING(v))
+#define JSVAL_TO_STRING(v)      ((JSString *)JSVAL_TO_GCTHING(v))
+#define OBJECT_TO_JSVAL(obj)    ((jsval)(obj))
+#define DOUBLE_TO_JSVAL(dp)     JSVAL_SETTAG((jsval)(dp), JSVAL_DOUBLE)
+#define STRING_TO_JSVAL(str)    JSVAL_SETTAG((jsval)(str), JSVAL_STRING)
+
+/* Lock and unlock the GC thing held by a jsval. */
+#define JSVAL_LOCK(cx,v)        (JSVAL_IS_GCTHING(v)                          \
+				 ? JS_LockGCThing(cx, JSVAL_TO_GCTHING(v))    \
+				 : JS_TRUE)
+#define JSVAL_UNLOCK(cx,v)      (JSVAL_IS_GCTHING(v)                          \
+				 ? JS_UnlockGCThing(cx, JSVAL_TO_GCTHING(v))  \
+				 : JS_TRUE)
+
+/* Domain limits for the jsval int type. */
+#define JSVAL_INT_POW2(n)       ((jsval)1 << (n))
+#define JSVAL_INT_MIN           ((jsval)1 - JSVAL_INT_POW2(30))
+#define JSVAL_INT_MAX           (JSVAL_INT_POW2(30) - 1)
+#define INT_FITS_IN_JSVAL(i)    ((jsuint)((i)+JSVAL_INT_MAX) <= 2*JSVAL_INT_MAX)
+#define JSVAL_TO_INT(v)         ((jsint)(v) >> 1)
+#define INT_TO_JSVAL(i)         (((jsval)(i) << 1) | JSVAL_INT)
+
+/* Convert between boolean and jsval. */
+#define JSVAL_TO_BOOLEAN(v)     ((JSBool)((v) >> JSVAL_TAGBITS))
+#define BOOLEAN_TO_JSVAL(b)     JSVAL_SETTAG((jsval)(b) << JSVAL_TAGBITS,     \
+					     JSVAL_BOOLEAN)
+
+/* A private data pointer (2-byte-aligned) can be stored as an int jsval. */
+#define JSVAL_TO_PRIVATE(v)     ((void *)((v) & ~JSVAL_INT))
+#define PRIVATE_TO_JSVAL(p)     ((jsval)(p) | JSVAL_INT)
+
+/* Property attributes, set in JSPropertySpec and passed to API functions. */
+#define JSPROP_ENUMERATE        0x01    /* property is visible to for/in loop */
+#define JSPROP_READONLY         0x02    /* not settable: assignment is no-op */
+#define JSPROP_PERMANENT        0x04    /* property cannot be deleted */
+#define JSPROP_EXPORTED         0x08    /* property is exported from object */
+#define JSPROP_INDEX            0x20    /* name is actually (jsint) index */
+#define JSPROP_ASSIGNHACK       0x40    /* property set by its assign method */
+#define JSPROP_TINYIDHACK       0x80    /* prop->id is tinyid, not index */
+
+/* Function flags, set in JSFunctionSpec and passed to JS_NewFunction etc. */
+#define JSFUN_BOUND_METHOD      0x40    /* bind this to fun->object's parent */
+#define JSFUN_GLOBAL_PARENT     0x80    /* reparent calls to cx->globalObject */
+#define JSFUN_FLAGS_MASK        0xc0    /* overlay JSPROP_*HACK attributes */
+
+/*
+ * Well-known JS values.  The extern'd variables are initialized when the
+ * first JSContext is created by JS_NewContext (see below).
+ */
+#define JSVAL_VOID              INT_TO_JSVAL(0 - JSVAL_INT_POW2(30))
+#define JSVAL_NULL              OBJECT_TO_JSVAL(0)
+#define JSVAL_ZERO              INT_TO_JSVAL(0)
+#define JSVAL_ONE               INT_TO_JSVAL(1)
+#define JSVAL_FALSE             BOOLEAN_TO_JSVAL(JS_FALSE)
+#define JSVAL_TRUE              BOOLEAN_TO_JSVAL(JS_TRUE)
+
+/* Don't want to export data, so provide accessors for non-inline jsvals. */
+extern JS_PUBLIC_API(jsval)
+JS_GetNaNValue(JSContext *cx);
+
+extern JS_PUBLIC_API(jsval)
+JS_GetNegativeInfinityValue(JSContext *cx);
+
+extern JS_PUBLIC_API(jsval)
+JS_GetPositiveInfinityValue(JSContext *cx);
+
+extern JS_PUBLIC_API(jsval)
+JS_GetEmptyStringValue(JSContext *cx);
+
+/*
+ * Format is a string of the following characters (spaces are insignificant),
+ * specifying the tabulated type conversions:
+ *
+ *   b      JSBool          Boolean
+ *   c      uint16/jschar   ECMA uint16, Unicode char
+ *   i      int32           ECMA int32
+ *   u      uint32          ECMA uint32
+ *   j      int32           Rounded int32 (coordinate)
+ *   d      jsdouble        IEEE double
+ *   I      jsdouble        Integral IEEE double
+ *   s      char *          C string
+ *   S      JSString *      Unicode string
+ *   o      JSObject *      Object reference
+ *   f      JSFunction *    Function private
+ *   v      jsval           Argument value (no conversion)
+ *   *      N/A             Skip this argument (no vararg)
+ *   /      N/A             End of required arguments
+ *
+ * The variable argument list after format must consist of &b, &c, &s, e.g.,
+ * where those variables have the types given above.  For the pointer types
+ * char *, JSString *, and JSObject *, the pointed-at memory returned belongs
+ * to the JS runtime, not to the calling native code.  The runtime promises
+ * to keep this memory valid so long as argv refers to allocated stack space
+ * (so long as the native function is active).
+ *
+ * Fewer arguments than format specifies may be passed only if there is a /
+ * in format after the last required argument specifier and argc is at least
+ * the number of required arguments.  More arguments than format specifies
+ * may be passed without error; it is up to the caller to deal with trailing
+ * unconverted arguments.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ConvertArguments(JSContext *cx, uintN argc, jsval *argv, const char *format,
+		    ...);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ConvertValue(JSContext *cx, jsval v, JSType type, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToObject(JSContext *cx, jsval v, JSObject **objp);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_ValueToFunction(JSContext *cx, jsval v);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_ValueToConstructor(JSContext *cx, jsval v);
+
+extern JS_PUBLIC_API(JSString *)
+JS_ValueToString(JSContext *cx, jsval v);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp);
+
+/*
+ * Convert a value to a number, then to an int32, according to the ECMA rules
+ * for ToInt32.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip);
+
+/*
+ * Convert a value to a number, then to a uint32, according to the ECMA rules
+ * for ToUint32.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip);
+
+/*
+ * Convert a value to a number, then to an int32 if it fits by rounding to
+ * nearest; but failing with an error report if the double is out of range
+ * or unordered.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToInt32(JSContext *cx, jsval v, int32 *ip);
+
+/*
+ * ECMA ToUint16, for mapping a jsval to a Unicode point.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToUint16(JSContext *cx, jsval v, uint16 *ip);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp);
+
+extern JS_PUBLIC_API(JSType)
+JS_TypeOfValue(JSContext *cx, jsval v);
+
+extern JS_PUBLIC_API(const char *)
+JS_GetTypeName(JSContext *cx, JSType type);
+
+/************************************************************************/
+
+/*
+ * Initialization, locking, contexts, and memory allocation.
+ */
+#define JS_NewRuntime       JS_Init
+#define JS_DestroyRuntime   JS_Finish
+#define JS_LockRuntime      JS_Lock
+#define JS_UnlockRuntime    JS_Unlock
+
+extern JS_PUBLIC_API(JSRuntime *)
+JS_NewRuntime(uint32 maxbytes);
+
+extern JS_PUBLIC_API(void)
+JS_DestroyRuntime(JSRuntime *rt);
+
+extern JS_PUBLIC_API(void)
+JS_ShutDown(void);
+
+#ifdef JS_THREADSAFE
+
+extern JS_PUBLIC_API(void)
+JS_BeginRequest(JSContext *cx);
+
+extern JS_PUBLIC_API(void)
+JS_EndRequest(JSContext *cx);
+
+/* Yield to pending GC operations, regardless of request depth */
+extern JS_PUBLIC_API(void)
+JS_YieldRequest(JSContext *cx);
+
+extern JS_PUBLIC_API(void)
+JS_SuspendRequest(JSContext *cx);
+
+extern JS_PUBLIC_API(void)
+JS_ResumeRequest(JSContext *cx);
+
+#endif /* JS_THREADSAFE */
+
+extern JS_PUBLIC_API(void)
+JS_Lock(JSRuntime *rt);
+
+extern JS_PUBLIC_API(void)
+JS_Unlock(JSRuntime *rt);
+
+extern JS_PUBLIC_API(JSContext *)
+JS_NewContext(JSRuntime *rt, size_t stacksize);
+
+extern JS_PUBLIC_API(void)
+JS_DestroyContext(JSContext *cx);
+
+PR_EXTERN(void*)
+JS_GetContextPrivate(JSContext *cx);
+
+PR_EXTERN(void)
+JS_SetContextPrivate(JSContext *cx, void *data);
+
+extern JS_PUBLIC_API(JSRuntime *)
+JS_GetRuntime(JSContext *cx);
+
+extern JS_PUBLIC_API(JSContext *)
+JS_ContextIterator(JSRuntime *rt, JSContext **iterp);
+
+extern JS_PUBLIC_API(JSVersion)
+JS_GetVersion(JSContext *cx);
+
+extern JS_PUBLIC_API(JSVersion)
+JS_SetVersion(JSContext *cx, JSVersion version);
+
+extern JS_PUBLIC_API(const char *)
+JS_GetImplementationVersion(void);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetGlobalObject(JSContext *cx);
+
+extern JS_PUBLIC_API(void)
+JS_SetGlobalObject(JSContext *cx, JSObject *obj);
+
+/* NB: This sets cx's global object to obj if it was null. */
+extern JS_PUBLIC_API(JSBool)
+JS_InitStandardClasses(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetScopeChain(JSContext *cx);
+
+extern JS_PUBLIC_API(void *)
+JS_malloc(JSContext *cx, size_t nbytes);
+
+extern JS_PUBLIC_API(void *)
+JS_realloc(JSContext *cx, void *p, size_t nbytes);
+
+extern JS_PUBLIC_API(void)
+JS_free(JSContext *cx, void *p);
+
+extern JS_PUBLIC_API(char *)
+JS_strdup(JSContext *cx, const char *s);
+
+extern JS_PUBLIC_API(jsdouble *)
+JS_NewDouble(JSContext *cx, jsdouble d);
+
+extern JS_PUBLIC_API(JSBool)
+JS_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_AddRoot(JSContext *cx, void *rp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_RemoveRoot(JSContext *cx, void *rp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_AddNamedRoot(JSContext *cx, void *rp, const char *name);
+
+#ifdef DEBUG
+extern JS_PUBLIC_API(void)
+JS_DumpNamedRoots(JSRuntime *rt,
+		  void (*dump)(const char *name, void *rp, void *data),
+		  void *data);
+#endif
+
+extern JS_PUBLIC_API(JSBool)
+JS_LockGCThing(JSContext *cx, void *thing);
+
+extern JS_PUBLIC_API(JSBool)
+JS_UnlockGCThing(JSContext *cx, void *thing);
+
+extern JS_PUBLIC_API(void)
+JS_GC(JSContext *cx);
+
+extern JS_PUBLIC_API(void)
+JS_MaybeGC(JSContext *cx);
+
+extern JS_PUBLIC_API(JSGCCallback)
+JS_SetGCCallback(JSContext *cx, JSGCCallback cb);
+
+/************************************************************************/
+
+/*
+ * Classes, objects, and properties.
+ */
+struct JSClass {
+    char                *name;
+    uint32              flags;
+
+    /* Mandatory non-null function pointer members. */
+    JSPropertyOp        addProperty;
+    JSPropertyOp        delProperty;
+    JSPropertyOp        getProperty;
+    JSPropertyOp        setProperty;
+    JSEnumerateOp       enumerate;
+    JSResolveOp         resolve;
+    JSConvertOp         convert;
+    JSFinalizeOp        finalize;
+
+    /* Optionally non-null members start here. */
+    JSGetObjectOps      getObjectOps;
+    JSCheckAccessOp     checkAccess;
+    JSNative            call;
+    JSNative            construct;
+    JSXDRObjectOp       xdrObject;
+    JSHasInstanceOp     hasInstance;
+    prword              spare[2];
+};
+
+#define JSCLASS_HAS_PRIVATE     0x01    /* class instances have private slot */
+#define JSCLASS_NEW_ENUMERATE   0x02    /* class has JSNewEnumerateOp method */
+#define JSCLASS_NEW_RESOLVE     0x04    /* class has JSNewResolveOp method */
+
+struct JSObjectOps {
+    /* Mandatory non-null function pointer members. */
+    JSNewObjectMapOp    newObjectMap;
+    JSObjectMapOp       destroyObjectMap;
+    JSLookupPropOp      lookupProperty;
+    JSDefinePropOp      defineProperty;
+    JSPropertyIdOp      getProperty;
+    JSPropertyIdOp      setProperty;
+    JSAttributesOp      getAttributes;
+    JSAttributesOp      setAttributes;
+    JSPropertyIdOp      deleteProperty;
+    JSConvertOp         defaultValue;
+    JSNewEnumerateOp    enumerate;
+    JSCheckAccessIdOp   checkAccess;
+
+    /* Optionally non-null members start here. */
+    JSObjectOp          thisObject;
+    JSPropertyRefOp     dropProperty;
+    JSNative            call;
+    JSNative            construct;
+    JSXDRObjectOp       xdrObject;
+    JSHasInstanceOp     hasInstance;
+    prword              spare[2];
+};
+
+/*
+ * Classes that expose JSObjectOps via a non-null getObjectOps class hook may
+ * derive a property structure from this struct, return a pointer to it from
+ * lookupProperty and defineProperty, and use the pointer to avoid rehashing
+ * in getAttributes and setAttributes.
+ *
+ * The jsid type contains either an int jsval (see JSVAL_IS_INT above), or an
+ * internal pointer that is opaque to users of this API, but which users may
+ * convert from and to a jsval using JS_ValueToId and JS_IdToValue.
+ */
+struct JSProperty {
+    jsid id;
+};
+
+struct JSIdArray {
+    jsint length;
+    jsid  vector[1];    /* actually, length jsid words */
+};
+
+extern JS_PUBLIC_API(JSIdArray *)
+JS_NewIdArray(JSContext *cx, jsint length);
+
+extern JS_PUBLIC_API(void)
+JS_DestroyIdArray(JSContext *cx, JSIdArray *ida);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ValueToId(JSContext *cx, jsval v, jsid *idp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_IdToValue(JSContext *cx, jsid id, jsval *vp);
+
+#define JSRESOLVE_QUALIFIED     0x01    /* resolve a qualified property id */
+#define JSRESOLVE_ASSIGNING     0x02    /* resolve on the left of assignment */
+
+extern JS_PUBLIC_API(JSBool)
+JS_PropertyStub(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_EnumerateStub(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ResolveStub(JSContext *cx, JSObject *obj, jsval id);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ConvertStub(JSContext *cx, JSObject *obj, JSType type, jsval *vp);
+
+extern JS_PUBLIC_API(void)
+JS_FinalizeStub(JSContext *cx, JSObject *obj);
+
+struct JSConstDoubleSpec {
+    jsdouble        dval;
+    const char      *name;
+    uint8           flags;
+    uint8           spare[3];
+};
+
+/*
+ * To define an array element rather than a named property member, cast the
+ * element's index to (const char *) and initialize name with it, and set the
+ * JSPROP_INDEX bit in flags.
+ */
+struct JSPropertySpec {
+    const char      *name;
+    int8            tinyid;
+    uint8           flags;
+    JSPropertyOp    getter;
+    JSPropertyOp    setter;
+};
+
+struct JSFunctionSpec {
+    const char      *name;
+    JSNative        call;
+    uint8           nargs;
+    uint8           flags;
+    uint16          extra;
+};
+
+extern JS_PUBLIC_API(JSObject *)
+JS_InitClass(JSContext *cx, JSObject *obj, JSObject *parent_proto,
+	     JSClass *clasp, JSNative constructor, uintN nargs,
+             JSPropertySpec *ps, JSFunctionSpec *fs,
+             JSPropertySpec *static_ps, JSFunctionSpec *static_fs);
+
+#ifdef JS_THREADSAFE
+extern JS_PUBLIC_API(JSClass *)
+JS_GetClass(JSContext *cx, JSObject *obj);
+#else
+JS_PUBLIC_API(JSClass *)
+JS_GetClass(JSObject *obj);
+#endif
+
+extern JS_PUBLIC_API(JSBool)
+JS_InstanceOf(JSContext *cx, JSObject *obj, JSClass *clasp, jsval *argv);
+
+extern JS_PUBLIC_API(void *)
+JS_GetPrivate(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetPrivate(JSContext *cx, JSObject *obj, void *data);
+
+extern JS_PUBLIC_API(void *)
+JS_GetInstancePrivate(JSContext *cx, JSObject *obj, JSClass *clasp,
+                      jsval *argv);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetPrototype(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetParent(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetConstructor(JSContext *cx, JSObject *proto);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
+		   JSObject *parent);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_DefineObject(JSContext *cx, JSObject *obj, const char *name, JSClass *clasp,
+		JSObject *proto, uintN attrs);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineConstDoubles(JSContext *cx, JSObject *obj, JSConstDoubleSpec *cds);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineProperties(JSContext *cx, JSObject *obj, JSPropertySpec *ps);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,
+		  JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
+
+/*
+ * Determine the attributes (JSPROP_* flags) of a property on a given object.
+ *
+ * If the object does not have a property by that name, *foundp will be
+ * JS_FALSE and the value of *attrsp is undefined.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_GetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
+			 uintN *attrsp, JSBool *foundp);
+
+/*
+ * Set the attributes of a property on a given object.
+ *
+ * If the object does not have a property by that name, *foundp will be
+ * JS_FALSE and nothing will be altered.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_SetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
+			 uintN attrs, JSBool *foundp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name,
+			    int8 tinyid, jsval value,
+			    JSPropertyOp getter, JSPropertyOp setter,
+			    uintN attrs);
+
+extern JS_PUBLIC_API(JSBool)
+JS_AliasProperty(JSContext *cx, JSObject *obj, const char *name,
+		 const char *alias);
+
+extern JS_PUBLIC_API(JSBool)
+JS_LookupProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DeleteProperty(JSContext *cx, JSObject *obj, const char *name);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DeleteProperty2(JSContext *cx, JSObject *obj, const char *name,
+		   jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineUCProperty(JSContext *cx, JSObject *obj,
+		    const jschar *name, size_t namelen, jsval value,
+		    JSPropertyOp getter, JSPropertyOp setter,
+		    uintN attrs);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj,
+			      const jschar *name, size_t namelen,
+			      int8 tinyid, jsval value,
+			      JSPropertyOp getter, JSPropertyOp setter,
+			      uintN attrs);
+
+extern JS_PUBLIC_API(JSBool)
+JS_LookupUCProperty(JSContext *cx, JSObject *obj,
+		    const jschar *name, size_t namelen,
+		    jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetUCProperty(JSContext *cx, JSObject *obj,
+		 const jschar *name, size_t namelen,
+		 jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetUCProperty(JSContext *cx, JSObject *obj,
+		 const jschar *name, size_t namelen,
+		 jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DeleteUCProperty2(JSContext *cx, JSObject *obj,
+		     const jschar *name, size_t namelen,
+		     jsval *rval);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_NewArrayObject(JSContext *cx, jsint length, jsval *vector);
+
+extern JS_PUBLIC_API(JSBool)
+JS_IsArrayObject(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetArrayLength(JSContext *cx, JSObject *obj, jsuint length);
+
+extern JS_PUBLIC_API(JSBool)
+JS_HasArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,
+		 JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
+
+extern JS_PUBLIC_API(JSBool)
+JS_AliasElement(JSContext *cx, JSObject *obj, const char *name, jsint alias);
+
+extern JS_PUBLIC_API(JSBool)
+JS_LookupElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DeleteElement(JSContext *cx, JSObject *obj, jsint index);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DeleteElement2(JSContext *cx, JSObject *obj, jsint index, jsval *rval);
+
+extern JS_PUBLIC_API(void)
+JS_ClearScope(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSIdArray *)
+JS_Enumerate(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(JSBool)
+JS_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
+	       jsval *vp, uintN *attrsp);
+
+/************************************************************************/
+
+/*
+ * Security protocol.
+ */
+typedef struct JSPrincipals {
+    char *codebase;
+    void *(*getPrincipalArray)(JSContext *cx, struct JSPrincipals *);
+    JSBool (*globalPrivilegesEnabled)(JSContext *cx, struct JSPrincipals *);
+
+    /* Don't call "destroy"; use reference counting macros below. */
+    uintN refcount;
+    void (*destroy)(JSContext *cx, struct JSPrincipals *);
+} JSPrincipals;
+
+#define JSPRINCIPALS_HOLD(cx, principals)               \
+    ((principals)->refcount++)
+#define JSPRINCIPALS_DROP(cx, principals)               \
+    ((--((principals)->refcount) == 0)                  \
+        ? (*(principals)->destroy)((cx), (principals))  \
+        : (void) 0)
+
+/************************************************************************/
+
+/*
+ * Functions and scripts.
+ */
+extern JS_PUBLIC_API(JSFunction *)
+JS_NewFunction(JSContext *cx, JSNative call, uintN nargs, uintN flags,
+	       JSObject *parent, const char *name);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetFunctionObject(JSFunction *fun);
+
+extern JS_PUBLIC_API(const char *)
+JS_GetFunctionName(JSFunction *fun);
+
+extern JS_PUBLIC_API(JSBool)
+JS_DefineFunctions(JSContext *cx, JSObject *obj, JSFunctionSpec *fs);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_DefineFunction(JSContext *cx, JSObject *obj, const char *name, JSNative call,
+		  uintN nargs, uintN attrs);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent);
+
+extern JS_PUBLIC_API(JSScript *)
+JS_CompileScript(JSContext *cx, JSObject *obj,
+		 const char *bytes, size_t length,
+		 const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSScript *)
+JS_CompileScriptForPrincipals(JSContext *cx, JSObject *obj,
+			      JSPrincipals *principals,
+			      const char *bytes, size_t length,
+			      const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSScript *)
+JS_CompileUCScript(JSContext *cx, JSObject *obj,
+		   const jschar *chars, size_t length,
+		   const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSScript *)
+JS_CompileUCScriptForPrincipals(JSContext *cx, JSObject *obj,
+				JSPrincipals *principals,
+				const jschar *chars, size_t length,
+				const char *filename, uintN lineno);
+
+#ifdef JSFILE
+extern JS_PUBLIC_API(JSScript *)
+JS_CompileFile(JSContext *cx, JSObject *obj, const char *filename);
+#endif
+
+extern JS_PUBLIC_API(JSObject *)
+JS_NewScriptObject(JSContext *cx, JSScript *script);
+
+extern JS_PUBLIC_API(void)
+JS_DestroyScript(JSContext *cx, JSScript *script);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_CompileFunction(JSContext *cx, JSObject *obj, const char *name,
+		   uintN nargs, const char **argnames,
+		   const char *bytes, size_t length,
+		   const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_CompileFunctionForPrincipals(JSContext *cx, JSObject *obj,
+                                JSPrincipals *principals, const char *name,
+                                uintN nargs, const char **argnames,
+                                const char *bytes, size_t length,
+                                const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_CompileUCFunction(JSContext *cx, JSObject *obj, const char *name,
+		     uintN nargs, const char **argnames,
+		     const jschar *chars, size_t length,
+		     const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_CompileUCFunctionForPrincipals(JSContext *cx, JSObject *obj,
+				  JSPrincipals *principals, const char *name,
+				  uintN nargs, const char **argnames,
+				  const jschar *chars, size_t length,
+				  const char *filename, uintN lineno);
+
+extern JS_PUBLIC_API(JSString *)
+JS_DecompileScript(JSContext *cx, JSScript *script, const char *name,
+		   uintN indent);
+
+extern JS_PUBLIC_API(JSString *)
+JS_DecompileFunction(JSContext *cx, JSFunction *fun, uintN indent);
+
+extern JS_PUBLIC_API(JSString *)
+JS_DecompileFunctionBody(JSContext *cx, JSFunction *fun, uintN indent);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ExecuteScript(JSContext *cx, JSObject *obj, JSScript *script, jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_EvaluateScript(JSContext *cx, JSObject *obj,
+		  const char *bytes, uintN length,
+		  const char *filename, uintN lineno,
+		  jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj,
+			       JSPrincipals *principals,
+			       const char *bytes, uintN length,
+			       const char *filename, uintN lineno,
+			       jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_EvaluateUCScript(JSContext *cx, JSObject *obj,
+		    const jschar *chars, uintN length,
+		    const char *filename, uintN lineno,
+		    jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_EvaluateUCScriptForPrincipals(JSContext *cx, JSObject *obj,
+				 JSPrincipals *principals,
+				 const jschar *chars, uintN length,
+				 const char *filename, uintN lineno,
+				 jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_CallFunction(JSContext *cx, JSObject *obj, JSFunction *fun, uintN argc,
+		jsval *argv, jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_CallFunctionName(JSContext *cx, JSObject *obj, const char *name, uintN argc,
+		    jsval *argv, jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval, uintN argc,
+		     jsval *argv, jsval *rval);
+
+extern JS_PUBLIC_API(JSBranchCallback)
+JS_SetBranchCallback(JSContext *cx, JSBranchCallback cb);
+
+extern JS_PUBLIC_API(JSBool)
+JS_IsRunning(JSContext *cx);
+
+extern JS_PUBLIC_API(JSBool)
+JS_IsConstructing(JSContext *cx);
+
+/************************************************************************/
+
+/*
+ * Strings.
+ */
+extern JS_PUBLIC_API(JSString *)
+JS_NewString(JSContext *cx, char *bytes, size_t length);
+
+extern JS_PUBLIC_API(JSString *)
+JS_NewStringCopyN(JSContext *cx, const char *s, size_t n);
+
+extern JS_PUBLIC_API(JSString *)
+JS_NewStringCopyZ(JSContext *cx, const char *s);
+
+extern JS_PUBLIC_API(JSString *)
+JS_InternString(JSContext *cx, const char *s);
+
+extern JS_PUBLIC_API(JSString *)
+JS_NewUCString(JSContext *cx, jschar *chars, size_t length);
+
+extern JS_PUBLIC_API(JSString *)
+JS_NewUCStringCopyN(JSContext *cx, const jschar *s, size_t n);
+
+extern JS_PUBLIC_API(JSString *)
+JS_NewUCStringCopyZ(JSContext *cx, const jschar *s);
+
+extern JS_PUBLIC_API(JSString *)
+JS_InternUCStringN(JSContext *cx, const jschar *s, size_t length);
+
+extern JS_PUBLIC_API(JSString *)
+JS_InternUCString(JSContext *cx, const jschar *s);
+
+extern JS_PUBLIC_API(char *)
+JS_GetStringBytes(JSString *str);
+
+extern JS_PUBLIC_API(jschar *)
+JS_GetStringChars(JSString *str);
+
+extern JS_PUBLIC_API(size_t)
+JS_GetStringLength(JSString *str);
+
+extern JS_PUBLIC_API(intN)
+JS_CompareStrings(JSString *str1, JSString *str2);
+
+/************************************************************************/
+
+/*
+ * Error reporting.
+ */
+
+/*
+ * Report an exception represented by the sprintf-like conversion of format
+ * and its arguments.  This exception message string is passed to a pre-set
+ * JSErrorReporter function (set by JS_SetErrorReporter; see jspubtd.h for
+ * the JSErrorReporter typedef).
+ */
+extern JS_PUBLIC_API(void)
+JS_ReportError(JSContext *cx, const char *format, ...);
+
+/*
+ * Complain when out of memory.
+ */
+extern JS_PUBLIC_API(void)
+JS_ReportOutOfMemory(JSContext *cx);
+
+struct JSErrorReport {
+    const char      *filename;  /* source file name, URL, etc., or null */
+    uintN           lineno;     /* source line number */
+    const char      *linebuf;   /* offending source line without final '\n' */
+    const char      *tokenptr;  /* pointer to error token in linebuf */
+    const jschar    *uclinebuf; /* unicode (original) line buffer */
+    const jschar    *uctokenptr;/* unicode (original) token pointer */
+};
+
+extern JS_PUBLIC_API(JSErrorReporter)
+JS_SetErrorReporter(JSContext *cx, JSErrorReporter er);
+
+/************************************************************************/
+
+/*
+ * Regular Expressions.
+ */
+#define JSREG_FOLD      0x01    /* fold uppercase to lowercase */
+#define JSREG_GLOB      0x02    /* global exec, creates array of matches */
+
+extern JS_PUBLIC_API(JSObject *)
+JS_NewRegExpObject(JSContext *cx, char *bytes, size_t length, uintN flags);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_NewUCRegExpObject(JSContext *cx, jschar *chars, size_t length, uintN flags);
+
+extern JS_PUBLIC_API(void)
+JS_SetRegExpInput(JSContext *cx, JSString *input, JSBool multiline);
+
+extern JS_PUBLIC_API(void)
+JS_ClearRegExpStatics(JSContext *cx);
+
+extern JS_PUBLIC_API(void)
+JS_ClearRegExpRoots(JSContext *cx);
+
+/* TODO: compile, exec, get/set other statics... */
+
+/************************************************************************/
+
+extern JS_PUBLIC_API(JSBool)
+JS_IsExceptionPending(JSContext *cx);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetPendingException(JSContext *cx, jsval *vp);
+
+extern JS_PUBLIC_API(void)
+JS_SetPendingException(JSContext *cx, jsval v);
+
+extern JS_PUBLIC_API(void)
+JS_ClearPendingException(JSContext *cx);
+
+#ifdef JS_THREADSAFE
+/*
+ * Associate the current thread with the given context.  This is done
+ * implicitly by JS_NewContext.
+ *
+ * Returns the old thread id for this context, which should be treated as
+ * an opaque value.  This value is provided for comparison to 0, which
+ * indicates that ClearContextThread has been called on this context
+ * since the last SetContextThread, or non-0, which indicates the opposite.
+ */
+
+extern JS_PUBLIC_API(intN)
+JS_GetContextThread(JSContext *cx);
+
+extern JS_PUBLIC_API(intN)
+JS_SetContextThread(JSContext *cx);
+
+extern JS_PUBLIC_API(intN)
+JS_ClearContextThread(JSContext *cx);
+#endif
+
+/************************************************************************/
+
+#ifdef NETSCAPE_INTERNAL
+/*
+ * Returns true if a script is executing and its current bytecode is a set
+ * (assignment) operation.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_IsAssigning(JSContext *cx);
+#endif
+
+PR_END_EXTERN_C
+
+#endif /* jsapi_h___ */

mozilla/js/src/jsarray.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsarray_h___
+#define jsarray_h___
+/*
+ * JS Array interface.
+ */
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+extern JSClass js_ArrayClass;
+
+extern JSObject *
+js_InitArrayClass(JSContext *cx, JSObject *obj);
+
+extern JSObject *
+js_NewArrayObject(JSContext *cx, jsuint length, jsval *vector);
+
+extern JSBool
+js_GetLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp);
+
+extern JSBool
+js_SetLengthProperty(JSContext *cx, JSObject *obj, jsuint length);
+
+extern JSBool
+js_HasLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp);
+
+/*
+ * JS-specific qsort function.
+ */
+typedef int (*JSComparator)(const void *a, const void *b, void *arg);
+
+extern PRBool
+js_qsort(void *vec, size_t nel, size_t elsize, JSComparator cmp, void *arg);
+
+PR_END_EXTERN_C
+
+#endif /* jsarray_h___ */

mozilla/js/src/jsatom.c

@@ -0,0 +1,664 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS atom table.
+ */
+#include "jsstddef.h"
+#include <stdlib.h>
+#include <string.h>
+#include "prtypes.h"
+#include "prlog.h"
+#ifndef NSPR20
+#include "prhash.h"
+#else
+#include "plhash.h"
+#endif
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsgc.h"
+#include "jslock.h"
+#include "jsnum.h"
+#include "jsopcode.h"
+#include "jsstr.h"
+
+/*
+ * Keep this in sync with jspubtd.h -- an assertion below will insist that
+ * its length match the JSType enum's JSTYPE_LIMIT limit value.
+ */
+char *js_type_str[] = {
+    "undefined",
+    "object",
+    "function",
+    "string",
+    "number",
+    "boolean",
+};
+
+char *js_boolean_str[] = {
+    js_false_str,
+    js_true_str
+};
+
+char   js_Array_str[]             = "Array";
+char   js_Math_str[]              = "Math";
+char   js_Object_str[]            = "Object";
+char   js_anonymous_str[]         = "anonymous";
+char   js_arguments_str[]         = "arguments";
+char   js_arity_str[]             = "arity";
+char   js_assign_str[]            = "assign";
+char   js_callee_str[]            = "callee";
+char   js_caller_str[]            = "caller";
+char   js_class_prototype_str[]   = "prototype";
+char   js_constructor_str[]       = "constructor";
+char   js_count_str[]             = "__count__";
+char   js_eval_str[]              = "eval";
+char   js_index_str[]             = "index";
+char   js_input_str[]             = "input";
+char   js_length_str[]            = "length";
+char   js_name_str[]              = "name";
+char   js_parent_str[]            = "__parent__";
+char   js_proto_str[]             = "__proto__";
+char   js_toSource_str[]          = "toSource";
+char   js_toString_str[]          = "toString";
+char   js_valueOf_str[]           = "valueOf";
+
+#define HASH_OBJECT(o)  ((PRHashNumber)(o) >> JSVAL_TAGBITS)
+#define HASH_INT(i)     ((PRHashNumber)(i))
+#define HASH_DOUBLE(dp) ((PRHashNumber)(((uint32*)(dp))[0] ^ ((uint32*)(dp))[1]))
+#define HASH_BOOLEAN(b) ((PRHashNumber)(b))
+
+PR_STATIC_CALLBACK(PRHashNumber)
+js_hash_atom_key(const void *key)
+{
+    jsval v;
+    jsdouble *dp;
+
+    /* Order JSVAL_IS_* tests by likelihood of success. */
+    v = (jsval)key;
+    if (JSVAL_IS_STRING(v))
+	return js_HashString(JSVAL_TO_STRING(v));
+    if (JSVAL_IS_INT(v))
+	return HASH_INT(JSVAL_TO_INT(v));
+    if (JSVAL_IS_DOUBLE(v)) {
+	dp = JSVAL_TO_DOUBLE(v);
+	return HASH_DOUBLE(dp);
+    }
+    if (JSVAL_IS_OBJECT(v))
+	return HASH_OBJECT(JSVAL_TO_OBJECT(v));
+    if (JSVAL_IS_BOOLEAN(v))
+	return HASH_BOOLEAN(JSVAL_TO_BOOLEAN(v));
+    return (PRHashNumber)v;
+}
+
+PR_STATIC_CALLBACK(intN)
+js_compare_atom_keys(const void *k1, const void *k2)
+{
+    jsval v1, v2;
+
+    v1 = (jsval)k1, v2 = (jsval)k2;
+    if (JSVAL_IS_STRING(v1) && JSVAL_IS_STRING(v2))
+	return !js_CompareStrings(JSVAL_TO_STRING(v1), JSVAL_TO_STRING(v2));
+    if (JSVAL_IS_DOUBLE(v1) && JSVAL_IS_DOUBLE(v2)) {
+        double d1 = *JSVAL_TO_DOUBLE(v1);
+        double d2 = *JSVAL_TO_DOUBLE(v2);
+	if (JSDOUBLE_IS_NaN(d1))
+	    return JSDOUBLE_IS_NaN(d2);
+#ifdef XP_PC
+	/* XXX MSVC miscompiles such that (NaN == 0) */
+	if (JSDOUBLE_IS_NaN(d2))
+            return JS_FALSE;
+#endif
+	return d1 == d2;
+    }
+    return v1 == v2;
+}
+
+PR_STATIC_CALLBACK(int)
+js_compare_stub(const void *v1, const void *v2)
+{
+    return 1;
+}
+
+PR_STATIC_CALLBACK(void *)
+js_alloc_atom_space(void *priv, size_t size)
+{
+    return malloc(size);
+}
+
+PR_STATIC_CALLBACK(void)
+js_free_atom_space(void *priv, void *item)
+{
+    free(item);
+}
+
+PR_STATIC_CALLBACK(PRHashEntry *)
+js_alloc_atom(void *priv, const void *key)
+{
+    JSAtomState *state = priv;
+    JSAtom *atom;
+
+    atom = malloc(sizeof(JSAtom));
+    if (!atom)
+	return NULL;
+#ifdef JS_THREADSAFE
+    state->tablegen++;
+#endif
+    atom->entry.key = key;
+    atom->entry.value = NULL;
+    atom->flags = 0;
+    atom->kwindex = -1;
+    atom->number = state->number++;
+    return &atom->entry;
+}
+
+PR_STATIC_CALLBACK(void)
+js_free_atom(void *priv, PRHashEntry *he, uintN flag)
+{
+    if (flag != HT_FREE_ENTRY)
+	return;
+#ifdef JS_THREADSAFE
+    ((JSAtomState *)priv)->tablegen++;
+#endif
+    free(he);
+}
+
+static PRHashAllocOps atom_alloc_ops = {
+    js_alloc_atom_space,    js_free_atom_space,
+    js_alloc_atom,          js_free_atom
+};
+
+#define JS_ATOM_HASH_SIZE   1024
+
+JSBool
+js_InitAtomState(JSContext *cx, JSAtomState *state)
+{
+    uintN i;
+
+    state->runtime = cx->runtime;
+    state->number = 0;
+    state->table = PR_NewHashTable(JS_ATOM_HASH_SIZE, js_hash_atom_key,
+				   js_compare_atom_keys, js_compare_stub,
+				   &atom_alloc_ops, state);
+    if (!state->table) {
+	JS_ReportOutOfMemory(cx);
+	return JS_FALSE;
+    }
+#ifdef JS_THREADSAFE
+    js_NewLock(&state->lock);
+    state->tablegen = 0;
+#endif
+
+#define FROB(lval,str) {                                                      \
+    if (!(state->lval = js_Atomize(cx, str, strlen(str), ATOM_PINNED))) {     \
+	js_FreeAtomState(cx, state);                                          \
+	return JS_FALSE;                                                      \
+    }                                                                         \
+}
+
+    PR_ASSERT(sizeof js_type_str / sizeof js_type_str[0] == JSTYPE_LIMIT);
+    for (i = 0; i < JSTYPE_LIMIT; i++)
+	FROB(typeAtoms[i],        js_type_str[i]);
+
+    FROB(booleanAtoms[0],         js_false_str);
+    FROB(booleanAtoms[1],         js_true_str);
+    FROB(nullAtom,                js_null_str);
+
+    FROB(ArrayAtom,               js_Array_str);
+    FROB(MathAtom,                js_Math_str);
+    FROB(ObjectAtom,              js_Object_str);
+    FROB(anonymousAtom,           js_anonymous_str);
+    FROB(argumentsAtom,           js_arguments_str);
+    FROB(arityAtom,               js_arity_str);
+    FROB(assignAtom,              js_assign_str);
+    FROB(calleeAtom,              js_callee_str);
+    FROB(callerAtom,              js_caller_str);
+    FROB(classPrototypeAtom,      js_class_prototype_str);
+    FROB(constructorAtom,         js_constructor_str);
+    FROB(countAtom,               js_count_str);
+    FROB(indexAtom,               js_index_str);
+    FROB(inputAtom,               js_input_str);
+    FROB(lengthAtom,              js_length_str);
+    FROB(nameAtom,                js_name_str);
+    FROB(parentAtom,              js_parent_str);
+    FROB(protoAtom,               js_proto_str);
+    FROB(toSourceAtom,            js_toSource_str);
+    FROB(toStringAtom,            js_toString_str);
+    FROB(valueOfAtom,             js_valueOf_str);
+
+#undef FROB
+
+    return JS_TRUE;
+}
+
+void
+js_FreeAtomState(JSContext *cx, JSAtomState *state)
+{
+    state->runtime = NULL;
+    PR_HashTableDestroy(state->table);
+    state->table = NULL;
+    state->number = 0;
+#ifdef JS_THREADSAFE
+    js_DestroyLock(&state->lock);
+#endif
+}
+
+typedef struct MarkArgs {
+    JSRuntime       *runtime;
+    JSGCThingMarker mark;
+} MarkArgs;
+
+PR_STATIC_CALLBACK(intN)
+js_atom_marker(PRHashEntry *he, intN i, void *arg)
+{
+    JSAtom *atom;
+    jsval key;
+    MarkArgs *args;
+
+    atom = (JSAtom *)he;
+    if (atom->flags & ATOM_PINNED) {
+	atom->flags |= ATOM_MARK;
+	key = ATOM_KEY(atom);
+	if (JSVAL_IS_GCTHING(key)) {
+	    args = arg;
+	    args->mark(args->runtime, JSVAL_TO_GCTHING(key));
+	}
+    }
+    return HT_ENUMERATE_NEXT;
+}
+
+void
+js_MarkAtomState(JSAtomState *state, JSGCThingMarker mark)
+{
+    MarkArgs args;
+
+    args.runtime = state->runtime;
+    args.mark = mark;
+    PR_HashTableEnumerateEntries(state->table, js_atom_marker, &args);
+}
+
+PR_STATIC_CALLBACK(intN)
+js_atom_sweeper(PRHashEntry *he, intN i, void *arg)
+{
+    JSAtom *atom;
+
+    atom = (JSAtom *)he;
+    if (atom->flags & ATOM_MARK) {
+	atom->flags &= ~ATOM_MARK;
+	return HT_ENUMERATE_NEXT;
+    }
+    PR_ASSERT((atom->flags & ATOM_PINNED) == 0);
+    atom->entry.key = NULL;
+    atom->flags = 0;
+    return HT_ENUMERATE_REMOVE;
+}
+
+void
+js_SweepAtomState(JSAtomState *state)
+{
+    PR_HashTableEnumerateEntries(state->table, js_atom_sweeper, NULL);
+}
+
+PR_STATIC_CALLBACK(intN)
+js_atom_unpinner(PRHashEntry *he, intN i, void *arg)
+{
+    JSAtom *atom;
+
+    atom = (JSAtom *)he;
+    atom->flags &= ~ATOM_PINNED;
+    return HT_ENUMERATE_NEXT;
+}
+
+void
+js_UnpinPinnedAtoms(JSAtomState *state)
+{
+    PR_HashTableEnumerateEntries(state->table, js_atom_unpinner, NULL);
+}
+
+static JSAtom *
+js_AtomizeHashedKey(JSContext *cx, jsval key, PRHashNumber keyHash, uintN flags)
+{
+    JSAtomState *state;
+    PRHashTable *table;
+    PRHashEntry *he, **hep;
+    JSAtom *atom;
+
+    state = &cx->runtime->atomState;
+    JS_LOCK(&state->lock,cx);
+    table = state->table;
+    hep = PR_HashTableRawLookup(table, keyHash, (void *)key);
+    if ((he = *hep) == NULL) {
+	he = PR_HashTableRawAdd(table, hep, keyHash, (void *)key, NULL);
+	if (!he) {
+	    JS_ReportOutOfMemory(cx);
+	    atom = NULL;
+	    goto out;
+	}
+    }
+
+    atom = (JSAtom *)he;
+    atom->flags |= flags;
+out:
+    JS_UNLOCK(&state->lock,cx);
+    return atom;
+}
+
+JSAtom *
+js_AtomizeObject(JSContext *cx, JSObject *obj, uintN flags)
+{
+    jsval key;
+    PRHashNumber keyHash;
+
+    /* XXX must be set in the following order or MSVC1.52 will crash */
+    keyHash = HASH_OBJECT(obj);
+    key = OBJECT_TO_JSVAL(obj);
+    return js_AtomizeHashedKey(cx, key, keyHash, flags);
+}
+
+JSAtom *
+js_AtomizeBoolean(JSContext *cx, JSBool b, uintN flags)
+{
+    jsval key;
+    PRHashNumber keyHash;
+
+    key = BOOLEAN_TO_JSVAL(b);
+    keyHash = HASH_BOOLEAN(b);
+    return js_AtomizeHashedKey(cx, key, keyHash, flags);
+}
+
+JSAtom *
+js_AtomizeInt(JSContext *cx, jsint i, uintN flags)
+{
+    jsval key;
+    PRHashNumber keyHash;
+
+    key = INT_TO_JSVAL(i);
+    keyHash = HASH_INT(i);
+    return js_AtomizeHashedKey(cx, key, keyHash, flags);
+}
+
+JSAtom *
+js_AtomizeDouble(JSContext *cx, jsdouble d, uintN flags)
+{
+    jsdouble *dp;
+    PRHashNumber keyHash;
+    jsval key;
+    JSAtomState *state;
+    PRHashTable *table;
+    PRHashEntry *he, **hep;
+    JSAtom *atom;
+
+#if PR_ALIGN_OF_DOUBLE == 8
+    dp = &d;
+#else
+    char alignbuf[16];
+
+    dp = (jsdouble *)&alignbuf[8 - ((pruword)&alignbuf & 7)];
+    *dp = d;
+#endif
+
+    keyHash = HASH_DOUBLE(dp);
+    key = DOUBLE_TO_JSVAL(dp);
+    state = &cx->runtime->atomState;
+    JS_LOCK(&state->lock,cx);
+    table = state->table;
+    hep = PR_HashTableRawLookup(table, keyHash, (void *)key);
+    if ((he = *hep) == NULL) {
+#ifdef JS_THREADSAFE
+	uint32 gen = state->tablegen;
+#endif
+	JS_UNLOCK(&state->lock,cx);
+	if (!js_NewDoubleValue(cx, d, &key))
+	    return NULL;
+	JS_LOCK(&state->lock,cx);
+#ifdef JS_THREADSAFE
+	if (state->tablegen != gen) {
+	    hep = PR_HashTableRawLookup(table, keyHash, (void *)key);
+	    if ((he = *hep) != NULL) {
+	    	atom = (JSAtom *)he;
+	    	goto out;
+	    }
+	}
+#endif
+	he = PR_HashTableRawAdd(table, hep, keyHash, (void *)key, NULL);
+	if (!he) {
+	    JS_ReportOutOfMemory(cx);
+	    atom = NULL;
+	    goto out;
+	}
+    }
+
+    atom = (JSAtom *)he;
+    atom->flags |= flags;
+out:
+    JS_UNLOCK(&state->lock,cx);
+    return atom;
+}
+
+JSAtom *
+js_AtomizeString(JSContext *cx, JSString *str, uintN flags)
+{
+    PRHashNumber keyHash;
+    jsval key;
+    JSAtomState *state;
+    PRHashTable *table;
+    PRHashEntry *he, **hep;
+    JSAtom *atom;
+
+    keyHash = js_HashString(str);
+    key = STRING_TO_JSVAL(str);
+    state = &cx->runtime->atomState;
+    JS_LOCK(&state->lock,cx);
+    table = state->table;
+    hep = PR_HashTableRawLookup(table, keyHash, (void *)key);
+    if ((he = *hep) == NULL) {
+	if (flags & ATOM_TMPSTR) {
+#ifdef JS_THREADSAFE
+	    uint32 gen = state->tablegen;
+#endif
+	    JS_UNLOCK(&state->lock,cx);
+	    flags &= ~ATOM_TMPSTR;
+	    if (flags & ATOM_NOCOPY) {
+		flags &= ~ATOM_NOCOPY;
+		str = js_NewString(cx, str->chars, str->length, 0);
+	    } else {
+		str = js_NewStringCopyN(cx, str->chars, str->length, 0);
+	    }
+	    if (!str)
+		return NULL;
+	    key = STRING_TO_JSVAL(str);
+	    JS_LOCK(&state->lock,cx);
+#ifdef JS_THREADSAFE
+	    if (state->tablegen != gen) {
+		hep = PR_HashTableRawLookup(table, keyHash, (void *)key);
+		if ((he = *hep) != NULL) {
+		    atom = (JSAtom *)he;
+		    goto out;
+		}
+	    }
+#endif
+	}
+	he = PR_HashTableRawAdd(table, hep, keyHash, (void *)key, NULL);
+	if (!he) {
+	    JS_ReportOutOfMemory(cx);
+	    atom = NULL;
+	    goto out;
+	}
+    }
+
+    atom = (JSAtom *)he;
+    atom->flags |= flags;
+out:
+    JS_UNLOCK(&state->lock,cx);
+    return atom;
+}
+
+JS_FRIEND_API(JSAtom *)
+js_Atomize(JSContext *cx, const char *bytes, size_t length, uintN flags)
+{
+    jschar *chars;
+    JSString *str;
+    JSAtom *atom;
+#if PR_ALIGN_OF_DOUBLE == 8
+    union { jsdouble d; JSString s; } u;
+
+    str = &u.s;
+#else
+    char alignbuf[16];
+
+    str = (JSString *)&alignbuf[8 - ((pruword)&alignbuf & 7)];
+#endif
+
+    chars = js_InflateString(cx, bytes, length);
+    if (!chars)
+	return NULL;
+    str->chars = chars;
+    str->length = length;
+    atom = js_AtomizeString(cx, str, ATOM_TMPSTR | ATOM_NOCOPY | flags);
+    if (!atom || ATOM_TO_STRING(atom)->chars != chars)
+	JS_free(cx, chars);
+    return atom;
+}
+
+JS_FRIEND_API(JSAtom *)
+js_AtomizeChars(JSContext *cx, const jschar *chars, size_t length, uintN flags)
+{
+    JSString *str;
+#if PR_ALIGN_OF_DOUBLE == 8
+    union { jsdouble d; JSString s; } u;
+
+    str = &u.s;
+#else
+    char alignbuf[16];
+
+    str = (JSString *)&alignbuf[8 - ((pruword)&alignbuf & 7)];
+#endif
+
+    str->chars = (jschar *)chars;
+    str->length = length;
+    return js_AtomizeString(cx, str, ATOM_TMPSTR | flags);
+}
+
+JSAtom *
+js_AtomizeValue(JSContext *cx, jsval value, uintN flags)
+{
+    if (JSVAL_IS_STRING(value))
+	return js_AtomizeString(cx, JSVAL_TO_STRING(value), flags);
+    if (JSVAL_IS_INT(value))
+	return js_AtomizeInt(cx, JSVAL_TO_INT(value), flags);
+    if (JSVAL_IS_DOUBLE(value))
+	return js_AtomizeDouble(cx, *JSVAL_TO_DOUBLE(value), flags);
+    if (JSVAL_IS_OBJECT(value))
+	return js_AtomizeObject(cx, JSVAL_TO_OBJECT(value), flags);
+    if (JSVAL_IS_BOOLEAN(value))
+	return js_AtomizeBoolean(cx, JSVAL_TO_BOOLEAN(value), flags);
+    return js_AtomizeHashedKey(cx, value, (PRHashNumber)value, flags);
+}
+
+JSAtom *
+js_ValueToStringAtom(JSContext *cx, jsval v)
+{
+    JSString *str;
+
+    str = js_ValueToString(cx, v);
+    if (!str)
+	return NULL;
+    return js_AtomizeString(cx, str, 0);
+}
+
+JSAtomListElement *
+js_IndexAtom(JSContext *cx, JSAtom *atom, JSAtomList *al)
+{
+    JSAtomListElement *ale;
+
+    ATOM_LIST_SEARCH(ale, al, atom);
+    if (!ale) {
+	PR_ARENA_ALLOCATE(ale, &cx->tempPool, sizeof(JSAtomListElement));
+	if (!ale) {
+	    JS_ReportOutOfMemory(cx);
+	    return NULL;
+	}
+	ale->atom = atom;
+	ale->index = (jsatomid) al->count++;
+	ale->next = al->list;
+	al->list = ale;
+    }
+    return ale;
+}
+
+JS_FRIEND_API(JSAtom *)
+js_GetAtom(JSContext *cx, JSAtomMap *map, jsatomid i)
+{
+    JSAtom *atom;
+
+    PR_ASSERT(map->vector && i < map->length);
+    if (!map->vector || i >= map->length) {
+	JS_ReportError(cx, "internal error: no index for atom %ld", (long)i);
+	return NULL;
+    }
+    atom = map->vector[i];
+    PR_ASSERT(atom);
+    return atom;
+}
+
+JS_FRIEND_API(JSBool)
+js_InitAtomMap(JSContext *cx, JSAtomMap *map, JSAtomList *al)
+{
+    JSAtom **vector;
+    JSAtomListElement *ale, *next;
+    uint32 count;
+
+    ale = al->list;
+    if (!ale) {
+	map->vector = NULL;
+	map->length = 0;
+	return JS_TRUE;
+    }
+
+    count = al->count;
+    if (count >= ATOM_INDEX_LIMIT) {
+	JS_ReportError(cx, "too many literals");
+	return JS_FALSE;
+    }
+    vector = JS_malloc(cx, (size_t) count * sizeof *vector);
+    if (!vector)
+	return JS_FALSE;
+
+    do {
+        vector[ale->index] = ale->atom;
+	next = ale->next;
+	ale->next = NULL;
+    } while ((ale = next) != NULL);
+    al->list = NULL;
+    al->count = 0;
+
+    map->vector = vector;
+    map->length = (jsatomid)count;
+    return JS_TRUE;
+}
+
+JS_FRIEND_API(void)
+js_FreeAtomMap(JSContext *cx, JSAtomMap *map)
+{
+    if (map->vector) {
+	free(map->vector);
+	map->vector = NULL;
+    }
+    map->length = 0;
+}

mozilla/js/src/jsatom.h

@@ -0,0 +1,276 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsatom_h___
+#define jsatom_h___
+/*
+ * JS atom table.
+ */
+#include <stddef.h>
+#include "prtypes.h"
+#ifndef NSPR20
+#include "prhash.h"
+#else
+#include "plhash.h"
+#endif
+#include "jsapi.h"
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+#ifdef JS_THREADSAFE
+#include "jslock.h"
+#endif
+
+PR_BEGIN_EXTERN_C
+
+#define ATOM_NOCOPY     0x01            /* don't copy atom string bytes */
+#define ATOM_TMPSTR     0x02            /* internal, to avoid extra string */
+#define ATOM_MARK       0x04            /* atom is reachable via GC */
+#define ATOM_PINNED     0x08            /* atom is pinned against GC */
+
+struct JSAtom {
+    PRHashEntry         entry;          /* key is jsval, value keyword info */
+    uint8               flags;          /* flags, PINNED and/or MARK for now */
+    int8                kwindex;        /* keyword index, -1 if not keyword */
+    jsatomid            number;         /* atom serial number and hash code */
+};
+
+#define ATOM_KEY(atom)           ((jsval)(atom)->entry.key)
+#define ATOM_IS_OBJECT(atom)     JSVAL_IS_OBJECT(ATOM_KEY(atom))
+#define ATOM_TO_OBJECT(atom)     JSVAL_TO_OBJECT(ATOM_KEY(atom))
+#define ATOM_IS_INT(atom)        JSVAL_IS_INT(ATOM_KEY(atom))
+#define ATOM_TO_INT(atom)        JSVAL_TO_INT(ATOM_KEY(atom))
+#define ATOM_IS_DOUBLE(atom)     JSVAL_IS_DOUBLE(ATOM_KEY(atom))
+#define ATOM_TO_DOUBLE(atom)     JSVAL_TO_DOUBLE(ATOM_KEY(atom))
+#define ATOM_IS_STRING(atom)     JSVAL_IS_STRING(ATOM_KEY(atom))
+#define ATOM_TO_STRING(atom)     JSVAL_TO_STRING(ATOM_KEY(atom))
+#define ATOM_IS_BOOLEAN(atom)    JSVAL_IS_BOOLEAN(ATOM_KEY(atom))
+#define ATOM_TO_BOOLEAN(atom)    JSVAL_TO_BOOLEAN(ATOM_KEY(atom))
+#define ATOM_BYTES(atom)         JS_GetStringBytes(ATOM_TO_STRING(atom))
+
+struct JSAtomListElement {
+    JSAtomListElement   *next;
+    jsatomid            index;          /* index in script-specific atom map */
+    JSAtom		*atom;
+};
+
+struct JSAtomList {
+    JSAtomListElement   *list;          /* literals indexed for mapping */
+    jsuint              count;          /* count of indexed literals */
+};
+
+#define ATOM_LIST_INIT(al)  ((al)->list = NULL, (al)->count = 0)
+
+#define ATOM_LIST_SEARCH(_ale,_al,_atom)                                      \
+    PR_BEGIN_MACRO                                                            \
+        JSAtomListElement **_alep = &(_al)->list;                             \
+        while ((_ale = *_alep) != NULL) {                                     \
+            if (_ale->atom == (_atom)) {                                      \
+                /* Hit, move atom's element to the front of the list. */      \
+                *_alep = _ale->next;                                          \
+                _ale->next = (_al)->list;                                     \
+                (_al)->list = _ale;                                           \
+                break;                                                        \
+            }                                                                 \
+            _alep = &_ale->next;                                              \
+        }                                                                     \
+    PR_END_MACRO
+
+struct JSAtomMap {
+    JSAtom              **vector;       /* array of ptrs to indexed atoms */
+    jsatomid            length;         /* count of (to-be-)indexed atoms */
+};
+
+struct JSAtomState {
+    JSRuntime           *runtime;       /* runtime that owns us */
+    PRHashTable         *table;         /* hash table containing all atoms */
+    jsatomid            number;         /* one beyond greatest atom number */
+
+    /* Type names and value literals. */
+    JSAtom              *typeAtoms[JSTYPE_LIMIT];
+    JSAtom              *booleanAtoms[2];
+    JSAtom              *nullAtom;
+
+    /* Various built-in or commonly-used atoms. */
+    JSAtom              *ArrayAtom;
+    JSAtom              *MathAtom;
+    JSAtom              *ObjectAtom;
+    JSAtom              *anonymousAtom;
+    JSAtom              *argumentsAtom;
+    JSAtom              *arityAtom;
+    JSAtom              *assignAtom;
+    JSAtom              *calleeAtom;
+    JSAtom              *callerAtom;
+    JSAtom              *classPrototypeAtom;
+    JSAtom              *constructorAtom;
+    JSAtom              *countAtom;
+    JSAtom              *indexAtom;
+    JSAtom              *inputAtom;
+    JSAtom              *lengthAtom;
+    JSAtom              *nameAtom;
+    JSAtom              *parentAtom;
+    JSAtom              *protoAtom;
+    JSAtom              *toSourceAtom;
+    JSAtom              *toStringAtom;
+    JSAtom              *valueOfAtom;
+
+#ifdef JS_THREADSAFE
+    JSThinLock          lock;
+    volatile uint32     tablegen;
+#endif
+};
+
+/* Well-known predefined strings and their atoms. */
+extern char   *js_type_str[];
+extern char   *js_boolean_str[];
+
+extern char   js_Array_str[];
+extern char   js_Math_str[];
+extern char   js_Object_str[];
+extern char   js_anonymous_str[];
+extern char   js_arguments_str[];
+extern char   js_arity_str[];
+extern char   js_assign_str[];
+extern char   js_callee_str[];
+extern char   js_caller_str[];
+extern char   js_class_prototype_str[];
+extern char   js_constructor_str[];
+extern char   js_count_str[];
+extern char   js_eval_str[];
+extern char   js_index_str[];
+extern char   js_input_str[];
+extern char   js_length_str[];
+extern char   js_name_str[];
+extern char   js_parent_str[];
+extern char   js_proto_str[];
+extern char   js_toSource_str[];
+extern char   js_toString_str[];
+extern char   js_valueOf_str[];
+
+/*
+ * Initialize atom state.  Return true on success, false with an out of
+ * memory error report on failure.
+ */
+extern JSBool
+js_InitAtomState(JSContext *cx, JSAtomState *state);
+
+/*
+ * Free and clear atom state.
+ */
+extern void
+js_FreeAtomState(JSContext *cx, JSAtomState *state);
+
+/*
+ * Atom garbage collection hooks.
+ */
+typedef void
+(*JSGCThingMarker)(JSRuntime *rt, void *thing);
+
+extern void
+js_MarkAtomState(JSAtomState *state, JSGCThingMarker mark);
+
+extern void
+js_SweepAtomState(JSAtomState *state);
+
+extern void
+js_UnpinPinnedAtoms(JSAtomState *state);
+
+/*
+ * Find or create the atom for an object.  If we create a new atom, give it the
+ * type indicated in flags.  Return 0 on failure to allocate memory.
+ */
+extern JSAtom *
+js_AtomizeObject(JSContext *cx, JSObject *obj, uintN flags);
+
+/*
+ * Find or create the atom for a Boolean value.  If we create a new atom, give
+ * it the type indicated in flags.  Return 0 on failure to allocate memory.
+ */
+extern JSAtom *
+js_AtomizeBoolean(JSContext *cx, JSBool b, uintN flags);
+
+/*
+ * Find or create the atom for an integer value.  If we create a new atom, give
+ * it the type indicated in flags.  Return 0 on failure to allocate memory.
+ */
+extern JSAtom *
+js_AtomizeInt(JSContext *cx, jsint i, uintN flags);
+
+/*
+ * Find or create the atom for a double value.  If we create a new atom, give
+ * it the type indicated in flags.  Return 0 on failure to allocate memory.
+ */
+extern JSAtom *
+js_AtomizeDouble(JSContext *cx, jsdouble d, uintN flags);
+
+/*
+ * Find or create the atom for a string.  If we create a new atom, give it the
+ * type indicated in flags.  Return 0 on failure to allocate memory.
+ */
+extern JSAtom *
+js_AtomizeString(JSContext *cx, JSString *str, uintN flags);
+
+extern JS_FRIEND_API(JSAtom *)
+js_Atomize(JSContext *cx, const char *bytes, size_t length, uintN flags);
+
+extern JS_FRIEND_API(JSAtom *)
+js_AtomizeChars(JSContext *cx, const jschar *chars, size_t length, uintN flags);
+
+/*
+ * This variant handles all value tag types.
+ */
+extern JSAtom *
+js_AtomizeValue(JSContext *cx, jsval value, uintN flags);
+
+/*
+ * Convert v to an atomized string.
+ */
+extern JSAtom *
+js_ValueToStringAtom(JSContext *cx, jsval v);
+
+/*
+ * Assign atom an index and insert it on al.
+ */
+extern JSAtomListElement *
+js_IndexAtom(JSContext *cx, JSAtom *atom, JSAtomList *al);
+
+/*
+ * Get the atom with index i from map.
+ */
+extern JS_FRIEND_API(JSAtom *)
+js_GetAtom(JSContext *cx, JSAtomMap *map, jsatomid i);
+
+/*
+ * For all unmapped atoms recorded in al, add a mapping from the atom's index
+ * to its address.  The GC must not run until all indexed atoms in atomLists
+ * have been mapped by scripts connected to live objects (Function and Script
+ * class objects have scripts as/in their private data -- the GC knows about
+ * these two classes).
+ */
+extern JS_FRIEND_API(JSBool)
+js_InitAtomMap(JSContext *cx, JSAtomMap *map, JSAtomList *al);
+
+/*
+ * Free map->vector and clear map.
+ */
+extern JS_FRIEND_API(void)
+js_FreeAtomMap(JSContext *cx, JSAtomMap *map);
+
+PR_END_EXTERN_C
+
+#endif /* jsatom_h___ */

mozilla/js/src/jsbool.c

@@ -0,0 +1,210 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS boolean implementation.
+ */
+#include "jsstddef.h"
+#include "prtypes.h"
+#include "prlog.h"
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jsbool.h"
+#include "jscntxt.h"
+#include "jsconfig.h"
+#include "jsinterp.h"
+#include "jslock.h"
+#include "jsnum.h"
+#include "jsobj.h"
+#include "jsstr.h"
+
+static JSClass boolean_class = {
+    "Boolean",
+    JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
+};
+
+#if JS_HAS_TOSOURCE
+#include "prprf.h"
+
+static JSBool
+bool_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	      jsval *rval)
+{
+    jsval v;
+    char buf[32];
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &boolean_class, argv))
+	return JS_FALSE;
+    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
+    if (!JSVAL_IS_BOOLEAN(v))
+	return js_obj_toSource(cx, obj, argc, argv, rval);
+    PR_snprintf(buf, sizeof buf, "(new %s(%s))",
+		boolean_class.name,
+		js_boolean_str[JSVAL_TO_BOOLEAN(v) ? 1 : 0]);
+    str = JS_NewStringCopyZ(cx, buf);
+    if (!str)
+	return JS_FALSE;
+    *rval = STRING_TO_JSVAL(str);
+    return JS_TRUE;
+}
+#endif
+
+static JSBool
+bool_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	      jsval *rval)
+{
+    jsval v;
+    JSAtom *atom;
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &boolean_class, argv))
+	return JS_FALSE;
+    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
+    if (!JSVAL_IS_BOOLEAN(v))
+	return js_obj_toString(cx, obj, argc, argv, rval);
+    atom = cx->runtime->atomState.booleanAtoms[JSVAL_TO_BOOLEAN(v) ? 1 : 0];
+    str = ATOM_TO_STRING(atom);
+    if (!str)
+	return JS_FALSE;
+    *rval = STRING_TO_JSVAL(str);
+    return JS_TRUE;
+}
+
+static JSBool
+bool_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    if (!JS_InstanceOf(cx, obj, &boolean_class, argv))
+	return JS_FALSE;
+    *rval = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
+    return JS_TRUE;
+}
+
+static JSFunctionSpec boolean_methods[] = {
+#if JS_HAS_TOSOURCE
+    {js_toSource_str,   bool_toSource,          0},
+#endif
+    {js_toString_str,	bool_toString,		0},
+    {js_valueOf_str,	bool_valueOf,		0},
+    {0}
+};
+
+#ifdef XP_MAC
+#undef Boolean
+#define Boolean js_Boolean
+#endif
+
+static JSBool
+Boolean(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSBool b;
+    jsval bval;
+
+    if (argc != 0) {
+	if (!js_ValueToBoolean(cx, argv[0], &b))
+	    return JS_FALSE;
+	bval = BOOLEAN_TO_JSVAL(b);
+    } else {
+	bval = JSVAL_FALSE;
+    }
+    if (!cx->fp->constructing) {
+	*rval = bval;
+	return JS_TRUE;
+    }
+    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, bval);
+    return JS_TRUE;
+}
+
+JSObject *
+js_InitBooleanClass(JSContext *cx, JSObject *obj)
+{
+    JSObject *proto;
+
+    proto = JS_InitClass(cx, obj, NULL, &boolean_class, Boolean, 1,
+			NULL, boolean_methods, NULL, NULL);
+    if (!proto)
+	return NULL;
+    OBJ_SET_SLOT(cx, proto, JSSLOT_PRIVATE, JSVAL_FALSE);
+    return proto;
+}
+
+JSObject *
+js_BooleanToObject(JSContext *cx, JSBool b)
+{
+    JSObject *obj;
+
+    obj = js_NewObject(cx, &boolean_class, NULL, NULL);
+    if (!obj)
+	return NULL;
+    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, BOOLEAN_TO_JSVAL(b));
+    return obj;
+}
+
+JSString *
+js_BooleanToString(JSContext *cx, JSBool b)
+{
+    return ATOM_TO_STRING(cx->runtime->atomState.booleanAtoms[b ? 1 : 0]);
+}
+
+JSBool
+js_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp)
+{
+    JSBool b;
+    jsdouble d;
+
+#if defined XP_PC && defined _MSC_VER &&_MSC_VER <= 800
+    /* MSVC1.5 coredumps */
+    if (!bp)
+	return JS_TRUE;
+#endif
+
+    /* XXX this should be an if-else chain, but MSVC1.5 crashes if it is. */
+    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v)) {
+	/* Must return early to avoid falling thru to JSVAL_IS_OBJECT case. */
+	*bp = JS_FALSE;
+	return JS_TRUE;
+    }
+    if (JSVAL_IS_OBJECT(v)) {
+	if (cx->version == JSVERSION_1_2) {
+	    if (!OBJ_DEFAULT_VALUE(cx, JSVAL_TO_OBJECT(v), JSTYPE_BOOLEAN, &v))
+		return JS_FALSE;
+	    if (!JSVAL_IS_BOOLEAN(v))
+		v = JSVAL_TRUE;		/* non-null object is true */
+	    b = JSVAL_TO_BOOLEAN(v);
+	} else {
+	    b = JS_TRUE;
+	}
+    }
+    if (JSVAL_IS_STRING(v)) {
+	b = JSVAL_TO_STRING(v)->length ? JS_TRUE : JS_FALSE;
+    }
+    if (JSVAL_IS_INT(v)) {
+	b = JSVAL_TO_INT(v) ? JS_TRUE : JS_FALSE;
+    }
+    if (JSVAL_IS_DOUBLE(v)) {
+	d = *JSVAL_TO_DOUBLE(v);
+	b = (!JSDOUBLE_IS_NaN(d) && d != 0) ? JS_TRUE : JS_FALSE;
+    }
+    if (JSVAL_IS_BOOLEAN(v)) {
+	b = JSVAL_TO_BOOLEAN(v);
+    }
+    *bp = b;
+    return JS_TRUE;
+}

mozilla/js/src/jsbool.h

@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsbool_h___
+#define jsbool_h___
+/*
+ * JS boolean interface.
+ */
+
+PR_BEGIN_EXTERN_C
+
+extern JSObject *
+js_InitBooleanClass(JSContext *cx, JSObject *obj);
+
+extern JSObject *
+js_BooleanToObject(JSContext *cx, JSBool b);
+
+extern JSString *
+js_BooleanToString(JSContext *cx, JSBool b);
+
+extern JSBool
+js_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp);
+
+PR_END_EXTERN_C
+
+#endif /* jsbool_h___ */

mozilla/js/src/jscntxt.c

@@ -0,0 +1,227 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS execution context.
+ */
+#include "jsstddef.h"
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include "prtypes.h"
+#ifndef NSPR20
+#include "prarena.h"
+#else
+#include "plarena.h"
+#endif
+#include "prlog.h"
+#include "prclist.h"
+#include "prprf.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsconfig.h"
+#include "jsdbgapi.h"
+#include "jsgc.h"
+#include "jslock.h"
+#include "jsobj.h"
+#include "jsopcode.h"
+#include "jsscan.h"
+#include "jsscript.h"
+
+JSInterpreterHooks *js_InterpreterHooks = NULL;
+
+JS_FRIEND_API(void)
+js_SetInterpreterHooks(JSInterpreterHooks *hooks)
+{
+    js_InterpreterHooks = hooks;
+}
+
+JSContext *
+js_NewContext(JSRuntime *rt, size_t stacksize)
+{
+    JSContext *cx;
+
+    cx = malloc(sizeof *cx);
+    if (!cx)
+	return NULL;
+    memset(cx, 0, sizeof *cx);
+
+    cx->runtime = rt;
+#ifdef JS_THREADSAFE
+    js_InitContextForLocking(cx);
+#endif
+    if (rt->contextList.next == (PRCList *)&rt->contextList) {
+	/* First context on this runtime: initialize atoms and keywords. */
+	if (!js_InitAtomState(cx, &rt->atomState) ||
+	    !js_InitScanner(cx)) {
+	    free(cx);
+	    return NULL;
+	}
+    }
+    /* Atomicly append cx to rt's context list. */
+    JS_LOCK_RUNTIME_VOID(rt, PR_APPEND_LINK(&cx->links, &rt->contextList));
+
+    cx->version = JSVERSION_DEFAULT;
+    cx->jsop_eq = JSOP_EQ;
+    cx->jsop_ne = JSOP_NE;
+    PR_InitArenaPool(&cx->stackPool, "stack", stacksize, sizeof(jsval));
+    PR_InitArenaPool(&cx->codePool, "code", 1024, sizeof(jsbytecode));
+    PR_InitArenaPool(&cx->tempPool, "temp", 1024, sizeof(jsdouble));
+
+#if JS_HAS_REGEXPS
+    if (!js_InitRegExpStatics(cx, &cx->regExpStatics)) {
+	js_DestroyContext(cx);
+	return NULL;
+    }
+#endif
+    return cx;
+}
+
+void
+js_DestroyContext(JSContext *cx)
+{
+    JSRuntime *rt;
+    JSBool rtempty;
+
+    rt = cx->runtime;
+
+    /* Remove cx from context list first. */
+    JS_LOCK_RUNTIME(rt);
+    PR_REMOVE_LINK(&cx->links);
+    rtempty = (rt->contextList.next == (PRCList *)&rt->contextList);
+    JS_UNLOCK_RUNTIME(rt);
+
+    if (js_InterpreterHooks && js_InterpreterHooks->destroyContext) {
+	/* This is a stub, but in case it removes roots, call it now. */
+        js_InterpreterHooks->destroyContext(cx);
+    }
+
+    if (rtempty) {
+	/* Unpin all pinned atoms before final GC. */
+	js_UnpinPinnedAtoms(&rt->atomState);
+
+	/* Unlock GC things held by runtime pointers. */
+	js_UnlockGCThing(cx, rt->jsNaN);
+	js_UnlockGCThing(cx, rt->jsNegativeInfinity);
+	js_UnlockGCThing(cx, rt->jsPositiveInfinity);
+	js_UnlockGCThing(cx, rt->emptyString);
+
+	/*
+	 * Clear these so they get recreated if the standard classes are
+	 * initialized again.
+	 */
+	rt->jsNaN = NULL;
+	rt->jsNegativeInfinity = NULL;
+	rt->jsPositiveInfinity = NULL;
+	rt->emptyString = NULL;
+
+	/* Clear debugging state to remove GC roots. */
+	JS_ClearAllTraps(cx);
+	JS_ClearAllWatchPoints(cx);
+    }
+
+    /* Remove more GC roots in regExpStatics, then collect garbage. */
+#if JS_HAS_REGEXPS
+    js_FreeRegExpStatics(cx, &cx->regExpStatics);
+#endif
+    js_ForceGC(cx);
+
+    if (rtempty) {
+	/* Free atom state now that we've run the GC. */
+	js_FreeAtomState(cx, &rt->atomState);
+    }
+
+    /* Free the stuff hanging off of cx. */
+    PR_FinishArenaPool(&cx->stackPool);
+    PR_FinishArenaPool(&cx->codePool);
+    PR_FinishArenaPool(&cx->tempPool);
+    if (cx->lastMessage)
+	free(cx->lastMessage);
+    free(cx);
+}
+
+JSContext *
+js_ContextIterator(JSRuntime *rt, JSContext **iterp)
+{
+    JSContext *cx = *iterp;
+
+    JS_LOCK_RUNTIME(rt);
+    if (!cx)
+	cx = (JSContext *)rt->contextList.next;
+    if ((void *)cx == &rt->contextList)
+	cx = NULL;
+    else
+	*iterp = (JSContext *)cx->links.next;
+    JS_UNLOCK_RUNTIME(rt);
+    return cx;
+}
+
+void
+js_ReportErrorVA(JSContext *cx, const char *format, va_list ap)
+{
+    JSStackFrame *fp;
+    JSErrorReport report, *reportp;
+    char *last;
+
+    fp = cx->fp;
+    if (fp && fp->script && fp->pc) {
+	report.filename = fp->script->filename;
+	report.lineno = js_PCToLineNumber(fp->script, fp->pc);
+	/* XXX should fetch line somehow */
+	report.linebuf = NULL;
+	report.tokenptr = NULL;
+	reportp = &report;
+    } else {
+	reportp = NULL;
+    }
+    last = PR_vsmprintf(format, ap);
+    if (!last)
+	return;
+
+    js_ReportErrorAgain(cx, last, reportp);
+    free(last);
+}
+
+JS_FRIEND_API(void)
+js_ReportErrorAgain(JSContext *cx, const char *message, JSErrorReport *reportp)
+{
+    JSErrorReporter onError;
+
+    if (!message)
+	return;
+    if (cx->lastMessage)
+	free(cx->lastMessage);
+    cx->lastMessage = JS_strdup(cx, message);
+    if (!cx->lastMessage)
+	return;
+    onError = cx->errorReporter;
+    if (onError)
+	(*onError)(cx, cx->lastMessage, reportp);
+}
+
+void
+js_ReportIsNotDefined(JSContext *cx, const char *name)
+{
+    JS_ReportError(cx, "%s is not defined", name);
+}
+
+#if defined DEBUG && defined XP_UNIX
+/* For gdb usage. */
+void js_traceon(JSContext *cx)  { cx->tracefp = stderr; }
+void js_traceoff(JSContext *cx) { cx->tracefp = NULL; }
+#endif

mozilla/js/src/jscntxt.h

@@ -0,0 +1,209 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jscntxt_h___
+#define jscntxt_h___
+/*
+ * JS execution context.
+ */
+#ifndef NSPR20
+#include "prarena.h"
+#else
+#include "plarena.h"
+#endif
+#include "prclist.h"
+#include "prlong.h"
+#include "jsatom.h"
+#include "jsgc.h"
+#include "jsinterp.h"
+#include "jsobj.h"
+#include "jsprvtd.h"
+#include "jspubtd.h"
+#include "jsregexp.h"
+
+PR_BEGIN_EXTERN_C
+
+struct JSRuntime {
+    /* Garbage collector state, used by jsgc.c. */
+    PRArenaPool         gcArenaPool;
+    PRArenaPool         gcFlagsPool;
+    PRHashTable         *gcRootsHash;
+    JSGCThing           *gcFreeList;
+    uint32              gcBytes;
+    uint32              gcLastBytes;
+    uint32              gcMaxBytes;
+    uint32              gcLevel;
+    uint32              gcNumber;
+    JSBool              gcPoke;
+    JSGCCallback        gcCallback;
+#ifdef JS_GCMETER
+    JSGCStats           gcStats;
+#endif
+
+    /* Literal table maintained by jsatom.c functions. */
+    JSAtomState         atomState;
+
+    /* Random number generator state, used by jsmath.c. */
+    JSBool              rngInitialized;
+    int64               rngMultiplier;
+    int64               rngAddend;
+    int64               rngMask;
+    int64               rngSeed;
+    jsdouble            rngDscale;
+
+    /* Well-known numbers held for use by this runtime's contexts. */
+    jsdouble            *jsNaN;
+    jsdouble            *jsNegativeInfinity;
+    jsdouble            *jsPositiveInfinity;
+
+    /* Empty string held for use by this runtime's contexts. */
+    JSString            *emptyString;
+
+    /* List of active contexts sharing this runtime. */
+    PRCList             contextList;
+
+    /* These are used for debugging -- see jsprvtd.h and jsdbgapi.h. */
+    JSTrapHandler       interruptHandler;
+    void                *interruptHandlerData;
+    JSNewScriptHook     newScriptHook;
+    void                *newScriptHookData;
+    JSDestroyScriptHook destroyScriptHook;
+    void                *destroyScriptHookData;
+    JSTrapHandler       debuggerHandler;
+    void                *debuggerHandlerData;
+
+    /* More debugging state, see jsdbgapi.c. */
+    PRCList             trapList;
+    PRCList             watchPointList;
+
+    /* Weak links to properties, indexed by quickened get/set opcodes. */
+    /* XXX must come after PRCLists or MSVC alignment bug bites empty lists */
+    JSPropertyCache     propertyCache;
+
+#ifdef JS_THREADSAFE
+    /* These combine to interlock the GC and new requests. */
+    PRLock              *gcLock;
+    PRCondVar           *gcDone;
+    PRCondVar           *requestDone;
+    uint32              requestCount;
+
+    /* Lock and owning thread pointer for JS_LOCK_RUNTIME. */
+    JSThinLock          rtLock;
+#endif
+};
+
+struct JSContext {
+    PRCList             links;
+
+    /* Interpreter activation count. */
+    uintN               interpLevel;
+
+    /* Runtime version control identifier and equality operators. */
+    JSVersion           version;
+    jsbytecode          jsop_eq;
+    jsbytecode          jsop_ne;
+
+    /* Data shared by threads in an address space. */
+    JSRuntime           *runtime;
+
+    /* Stack arena pool and frame pointer register. */
+    PRArenaPool         stackPool;
+    JSStackFrame        *fp;
+
+    /* Temporary arena pools used while compiling and decompiling. */
+    PRArenaPool         codePool;
+    PRArenaPool         tempPool;
+
+    /* Top-level object and pointer to top stack frame's scope chain. */
+    JSObject            *globalObject;
+
+    /* Most recently created things by type, members of the GC's root set. */
+    JSGCThing           *newborn[GCX_NTYPES];
+
+    /* Regular expression class statics (XXX not shared globally). */
+    JSRegExpStatics     regExpStatics;
+
+    /* State for object and array toSource conversion. */
+    JSSharpObjectMap    sharpObjectMap;
+
+    /* Last message string and trace file for debugging. */
+    char                *lastMessage;
+#ifdef DEBUG
+    void                *tracefp;
+#endif
+
+    /* Per-context optional user callbacks. */
+    JSBranchCallback    branchCallback;
+    JSErrorReporter     errorReporter;
+
+    /* Client opaque pointer */
+    void                *data;
+
+    /* Java environment and JS errors to throw as exceptions. */
+    void                *javaEnv;
+    void                *savedErrors;
+
+#ifdef JS_THREADSAFE
+    prword              thread;
+    JSPackedBool        gcActive;
+    jsrefcount          requestDepth;
+#endif
+    JSStackFrame        *dormantFrameChain;   /* dormant frame chains */
+};
+
+typedef struct JSInterpreterHooks {
+    void (*destroyContext)(JSContext *cx);
+    void (*destroyScript)(JSContext *cx, JSScript *script);
+    void (*destroyFrame)(JSContext *cx, JSStackFrame *frame);
+} JSInterpreterHooks;
+
+extern JSInterpreterHooks *js_InterpreterHooks;
+
+extern JS_FRIEND_API(void)
+js_SetInterpreterHooks(JSInterpreterHooks *hooks);
+
+extern JSContext *
+js_NewContext(JSRuntime *rt, size_t stacksize);
+
+extern void
+js_DestroyContext(JSContext *cx);
+
+extern JSContext *
+js_ContextIterator(JSRuntime *rt, JSContext **iterp);
+
+/*
+ * Report an exception, which is currently realized as a printf-style format
+ * string and its arguments.
+ */
+#ifdef va_start
+extern void
+js_ReportErrorVA(JSContext *cx, const char *format, va_list ap);
+#endif
+
+/*
+ * Report an exception using a previously composed JSErrorReport.
+ */
+extern JS_FRIEND_API(void)
+js_ReportErrorAgain(JSContext *cx, const char *message, JSErrorReport *report);
+
+extern void
+js_ReportIsNotDefined(JSContext *cx, const char *name);
+
+PR_END_EXTERN_C
+
+#endif /* jscntxt_h___ */

mozilla/js/src/jscompat.h

@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8 -*-
+ * Copyright © 1996 Netscape Communications Corporation, All Rights Reserved.
+ */
+#ifndef jscompat_h___
+#define jscompat_h___
+/*
+ * Compatibility glue for various NSPR versions.  We must always define int8,
+ * int16, prword, and so on to minimize differences with js/ref, no matter what
+ * the NSPR typedef names may be.
+ */
+#include "prtypes.h"
+#include "prlong.h"
+#ifdef NSPR20
+typedef PRIntn intN;
+typedef PRUintn uintN;
+/* Following are already available in compatibility mode of NSPR 2.0 */
+#if 0
+typedef PRInt64 int64;
+typedef PRInt32 int32;
+typedef PRInt16 int16;
+typedef PRInt8 int8;
+typedef uint64 uint64;
+typedef uint32 uint32;
+typedef uint16 uint16;
+typedef uint8 uint8;
+#endif
+typedef PRUword pruword;
+typedef PRWord prword;
+#else  /* NSPR 1.0 */
+typedef int intN;
+typedef uint uintN;
+typedef uprword_t pruword;
+typedef prword_t prword;
+typedef int  PRIntn;
+typedef unsigned int PRUintn;
+typedef int64 PRInt64;
+typedef int32 PRInt32;
+typedef int16 PRInt16;
+typedef int8  PRInt8;
+typedef uint64 PRUint64;
+typedef uint32 PRUint32;
+typedef uint16 PRUint16;
+typedef uint8  PRUint8;
+typedef double PRFloat64;
+typedef uprword_t PRUword;
+typedef prword_t PRWord;
+#define PR_EXTERN extern PR_PUBLIC_API
+#define PR_IMPLEMENT PR_PUBLIC_API
+#define PR_BEGIN_EXTERN_C NSPR_BEGIN_EXTERN_C
+#define PR_END_EXTERN_C NSPR_END_EXTERN_C
+#define PR_BEGIN_MACRO NSPR_BEGIN_MACRO
+#define PR_END_MACRO NSPR_END_MACRO
+#endif /* NSPR 1.0 */
+#ifndef NSPR20
+typedef double float64;
+#endif
+typedef float float32;
+#define allocPriv allocPool
+#endif /* jscompat_h___ */

mozilla/js/src/jsconfig.h

@@ -0,0 +1,260 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS configuration macros.
+ */
+#ifndef JS_VERSION
+#define JS_VERSION 140
+#endif
+
+#if JS_VERSION == 100
+
+#define JS_BUG_AUTO_INDEX_PROPS 1       /* new object o: o.p = v sets o[0] */
+#define JS_BUG_NULL_INDEX_PROPS 1       /* o[0] defaults to null, not void */
+#define JS_BUG_EMPTY_INDEX_ZERO 1       /* o[""] is equivalent to o[0] */
+#define JS_BUG_SHORT_CIRCUIT    1       /* 1 && 1 => true, 1 && 0 => 0 bug */
+#define JS_BUG_EAGER_TOSTRING   1       /* o.toString() trumps o.valueOf() */
+#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
+#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
+#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
+#define JS_BUG_FALLIBLE_EQOPS   1       /* fallible/intransitive equality ops */
+#define JS_BUG_FALLIBLE_TONUM   1       /* fallible ValueToNumber primitive */
+#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
+#define JS_BUG_SET_ENUMERATE    1       /* o.p=q flags o.p JSPROP_ENUMERATE */
+
+#define JS_HAS_PROP_DELETE      0       /* delete o.p removes p from o */
+#define JS_HAS_CALL_OBJECT      0       /* fun.caller is stack frame obj */
+#define JS_HAS_LABEL_STATEMENT  0       /* has break/continue to label: */
+#define JS_HAS_DO_WHILE_LOOP    0       /* has do {...} while (b) */
+#define JS_HAS_SWITCH_STATEMENT 0       /* has switch (v) {case c: ...} */
+#define JS_HAS_SOME_PERL_FUN    0       /* has array.join/reverse/sort */
+#define JS_HAS_MORE_PERL_FUN    0       /* has array.push, str.substr, etc */
+#define JS_HAS_VALUEOF_HINT     0       /* valueOf(hint) where hint is typeof */
+#define JS_HAS_LEXICAL_CLOSURE  0       /* nested functions, lexically closed */
+#define JS_HAS_APPLY_FUNCTION   0       /* has fun.apply(obj, argArray) */
+#define JS_HAS_CALL_FUNCTION    0       /* has fun.call(obj, arg1, ... argN) */
+#define JS_HAS_OBJ_PROTO_PROP   0       /* has o.__proto__ etc. */
+#define JS_HAS_REGEXPS          0       /* has perl r.e.s via RegExp, /pat/ */
+#define JS_HAS_SEQUENCE_OPS     0       /* has array.slice, string.concat */
+#define JS_HAS_INITIALIZERS     0       /* has var o = {'foo': 42, 'bar':3} */
+#define JS_HAS_OBJ_WATCHPOINT   0       /* has o.watch and o.unwatch */
+#define JS_HAS_EXPORT_IMPORT    0       /* has export fun; import obj.fun */
+#define JS_HAS_EVAL_THIS_SCOPE  0       /* Math.eval is same as with (Math) */
+#define JS_HAS_TRIPLE_EQOPS     0       /* has === and !== identity eqops */
+#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
+#define JS_HAS_REPLACE_LAMBDA   0       /* has string.replace(re, lambda) */
+#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
+#define JS_HAS_XDR		0	/* has XDR API and object methods */
+#define JS_HAS_EXCEPTIONS	0	/* has exception handling */
+#define JS_HAS_UNDEFINED        0       /* has global "undefined" property */
+#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
+#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
+#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
+#define JS_HAS_ARGS_OBJECT      0       /* has minimal ECMA arguments object */
+#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
+
+#elif JS_VERSION == 110
+
+#define JS_BUG_AUTO_INDEX_PROPS 0       /* new object o: o.p = v sets o[0] */
+#define JS_BUG_NULL_INDEX_PROPS 1       /* o[0] defaults to null, not void */
+#define JS_BUG_EMPTY_INDEX_ZERO 1       /* o[""] is equivalent to o[0] */
+#define JS_BUG_SHORT_CIRCUIT    1       /* 1 && 1 => true, 1 && 0 => 0 bug */
+#define JS_BUG_EAGER_TOSTRING   1       /* o.toString() trumps o.valueOf() */
+#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
+#define JS_BUG_EVAL_THIS_FUN    1       /* eval('this') in function f is f */
+#define JS_BUG_EVAL_THIS_SCOPE  1       /* Math.eval('sin(x)') vs. local x */
+#define JS_BUG_FALLIBLE_EQOPS   1       /* fallible/intransitive equality ops */
+#define JS_BUG_FALLIBLE_TONUM   1       /* fallible ValueToNumber primitive */
+#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
+#define JS_BUG_SET_ENUMERATE    1       /* o.p=q flags o.p JSPROP_ENUMERATE */
+
+#define JS_HAS_PROP_DELETE      0       /* delete o.p removes p from o */
+#define JS_HAS_CALL_OBJECT      0       /* fun.caller is stack frame obj */
+#define JS_HAS_LABEL_STATEMENT  0       /* has break/continue to label: */
+#define JS_HAS_DO_WHILE_LOOP    0       /* has do {...} while (b) */
+#define JS_HAS_SWITCH_STATEMENT 0       /* has switch (v) {case c: ...} */
+#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
+#define JS_HAS_MORE_PERL_FUN    0       /* has array.push, str.substr, etc */
+#define JS_HAS_VALUEOF_HINT     0       /* valueOf(hint) where hint is typeof */
+#define JS_HAS_LEXICAL_CLOSURE  0       /* nested functions, lexically closed */
+#define JS_HAS_APPLY_FUNCTION   0       /* has apply(fun, arg1, ... argN) */
+#define JS_HAS_CALL_FUNCTION    0       /* has fun.call(obj, arg1, ... argN) */
+#define JS_HAS_OBJ_PROTO_PROP   0       /* has o.__proto__ etc. */
+#define JS_HAS_REGEXPS          0       /* has perl r.e.s via RegExp, /pat/ */
+#define JS_HAS_SEQUENCE_OPS     0       /* has array.slice, string.concat */
+#define JS_HAS_INITIALIZERS     0       /* has var o = {'foo': 42, 'bar':3} */
+#define JS_HAS_OBJ_WATCHPOINT   0       /* has o.watch and o.unwatch */
+#define JS_HAS_EXPORT_IMPORT    0       /* has export fun; import obj.fun */
+#define JS_HAS_EVAL_THIS_SCOPE  0       /* Math.eval is same as with (Math) */
+#define JS_HAS_TRIPLE_EQOPS     0       /* has === and !== identity eqops */
+#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
+#define JS_HAS_REPLACE_LAMBDA   0       /* has string.replace(re, lambda) */
+#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
+#define JS_HAS_XDR		0	/* has XDR API and object methods */
+#define JS_HAS_EXCEPTIONS	0	/* has exception handling */
+#define JS_HAS_UNDEFINED        0       /* has global "undefined" property */
+#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
+#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
+#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
+#define JS_HAS_ARGS_OBJECT      0       /* has minimal ECMA arguments object */
+#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
+
+#elif JS_VERSION == 120
+
+#define JS_BUG_AUTO_INDEX_PROPS 0       /* new object o: o.p = v sets o[0] */
+#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
+#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
+#define JS_BUG_SHORT_CIRCUIT    0       /* 1 && 1 => true, 1 && 0 => 0 bug */
+#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
+#define JS_BUG_VOID_TOSTRING    1       /* void 0 + 0 == "undefined0" */
+#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
+#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
+#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
+#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
+#define JS_BUG_WITH_CLOSURE     1       /* with(o)function f(){} sets o.f */
+#define JS_BUG_SET_ENUMERATE    1       /* o.p=q flags o.p JSPROP_ENUMERATE */
+
+#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
+#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
+#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
+#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
+#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
+#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
+#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
+#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
+#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
+#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
+#define JS_HAS_CALL_FUNCTION    0       /* has fun.call(obj, arg1, ... argN) */
+#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
+#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
+#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
+#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
+#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
+#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
+#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
+#define JS_HAS_TRIPLE_EQOPS     0       /* has === and !== identity eqops */
+#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
+#define JS_HAS_REPLACE_LAMBDA   0       /* has string.replace(re, lambda) */
+#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
+#define JS_HAS_XDR		0	/* has XDR API and object methods */
+#define JS_HAS_EXCEPTIONS	0	/* has exception handling */
+#define JS_HAS_UNDEFINED        0       /* has global "undefined" property */
+#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
+#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
+#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
+#define JS_HAS_ARGS_OBJECT      0       /* has minimal ECMA arguments object */
+#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
+
+#elif JS_VERSION == 130
+
+#define JS_BUG_AUTO_INDEX_PROPS 0       /* new object o: o.p = v sets o[0] */
+#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
+#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
+#define JS_BUG_SHORT_CIRCUIT    0       /* 1 && 1 => true, 1 && 0 => 0 bug */
+#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
+#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
+#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
+#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
+#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
+#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
+#define JS_BUG_WITH_CLOSURE     1       /* with(o)function f(){} sets o.f */
+#define JS_BUG_SET_ENUMERATE    0       /* o.p=q flags o.p JSPROP_ENUMERATE */
+
+#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
+#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
+#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
+#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
+#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
+#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
+#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
+#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
+#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
+#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
+#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
+#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
+#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
+#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
+#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
+#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
+#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
+#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
+#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
+#define JS_HAS_SHARP_VARS       1       /* has #n=, #n# for object literals */
+#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
+#define JS_HAS_SCRIPT_OBJECT    1       /* has (new Script("x++")).exec() */
+#define JS_HAS_XDR		1	/* has XDR API and object methods */
+#define JS_HAS_EXCEPTIONS	0	/* has exception handling */
+#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
+#define JS_HAS_TOSOURCE         1       /* has Object/Array toSource method */
+#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
+#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
+#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
+#define JS_HAS_DEBUGGER_KEYWORD 1       /* has hook for debugger keyword */
+
+#elif JS_VERSION == 140
+
+#define JS_BUG_AUTO_INDEX_PROPS 0       /* new object o: o.p = v sets o[0] */
+#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
+#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
+#define JS_BUG_SHORT_CIRCUIT    0       /* 1 && 1 => true, 1 && 0 => 0 bug */
+#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
+#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
+#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
+#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
+#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
+#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
+#define JS_BUG_WITH_CLOSURE     1       /* with(o)function f(){} sets o.f */
+#define JS_BUG_SET_ENUMERATE    0       /* o.p=q flags o.p JSPROP_ENUMERATE */
+
+#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
+#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
+#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
+#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
+#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
+#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
+#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
+#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
+#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
+#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
+#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
+#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
+#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
+#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
+#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
+#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
+#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
+#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
+#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
+#define JS_HAS_SHARP_VARS       1       /* has #n=, #n# for object literals */
+#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
+#define JS_HAS_SCRIPT_OBJECT    1       /* has (new Script("x++")).exec() */
+#define JS_HAS_XDR		1	/* has XDR API and object methods */
+#define JS_HAS_EXCEPTIONS	1	/* has exception handling */
+#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
+#define JS_HAS_TOSOURCE         1       /* has Object/Array toSource method */
+#define JS_HAS_IN_OPERATOR      1       /* has in operator ('p' in {p:1}) */
+#define JS_HAS_INSTANCEOF       1       /* has {p:1} instanceof Object */
+#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
+#define JS_HAS_DEBUGGER_KEYWORD 1       /* has hook for debugger keyword */
+
+#else
+
+#error "unknown JS_VERSION"
+
+#endif

mozilla/js/src/jsdate.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsdate_h___
+#define jsdate_h___
+/*
+ * JS Date class interface.
+ */
+
+PR_BEGIN_EXTERN_C
+
+extern JSObject *
+js_InitDateClass(JSContext *cx, JSObject *obj);
+
+/*
+ *  These functions provide a C interface to the date/time object
+ */
+extern JS_FRIEND_API(JSObject*)
+js_NewDateObject(JSContext* cx, int year, int mon, int mday,
+                                int hour, int min, int sec);
+
+extern JS_FRIEND_API(int)
+js_DateGetYear(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(int)
+js_DateGetMonth(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(int)
+js_DateGetDate(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(int)
+js_DateGetHours(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(int)
+js_DateGetMinutes(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(int)
+js_DateGetSeconds(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(void)
+js_DateSetYear(JSContext *cx, JSObject *obj, int year);
+
+extern JS_FRIEND_API(void)
+js_DateSetMonth(JSContext *cx, JSObject *obj, int year);
+
+extern JS_FRIEND_API(void)
+js_DateSetDate(JSContext *cx, JSObject *obj, int date);
+
+extern JS_FRIEND_API(void)
+js_DateSetHours(JSContext *cx, JSObject *obj, int hours);
+
+extern JS_FRIEND_API(void)
+js_DateSetMinutes(JSContext *cx, JSObject *obj, int minutes);
+
+extern JS_FRIEND_API(void)
+js_DateSetSeconds(JSContext *cx, JSObject *obj, int seconds);
+
+
+PR_END_EXTERN_C
+
+#endif /* jsdate_h___ */

mozilla/js/src/jsdbgapi.c

@@ -0,0 +1,769 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS debugging API.
+ */
+#include "jsstddef.h"
+#include <string.h>
+#include "prtypes.h"
+#include "prlog.h"
+#include "prclist.h"
+#include "jsapi.h"
+#include "jscntxt.h"
+#include "jsconfig.h"
+#include "jsdbgapi.h"
+#include "jsfun.h"
+#include "jsgc.h"
+#include "jsinterp.h"
+#include "jslock.h"
+#include "jsobj.h"
+#include "jsopcode.h"
+#include "jsscope.h"
+#include "jsscript.h"
+#include "jsstr.h"
+
+typedef struct JSTrap {
+    PRCList         links;
+    JSScript        *script;
+    jsbytecode      *pc;
+    JSOp            op;
+    JSTrapHandler   handler;
+    void            *closure;
+} JSTrap;
+
+static JSTrap *
+FindTrap(JSRuntime *rt, JSScript *script, jsbytecode *pc)
+{
+    JSTrap *trap;
+
+    for (trap = (JSTrap *)rt->trapList.next;
+	 trap != (JSTrap *)&rt->trapList;
+	 trap = (JSTrap *)trap->links.next) {
+	if (trap->script == script && trap->pc == pc)
+	    return trap;
+    }
+    return NULL;
+}
+
+void
+js_PatchOpcode(JSContext *cx, JSScript *script, jsbytecode *pc, JSOp op)
+{
+    JSTrap *trap;
+
+    trap = FindTrap(cx->runtime, script, pc);
+    if (trap)
+	trap->op = op;
+    else
+	*pc = (jsbytecode)op;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
+	   JSTrapHandler handler, void *closure)
+{
+    JSRuntime *rt;
+    JSTrap *trap;
+
+    rt = cx->runtime;
+    trap = FindTrap(rt, script, pc);
+    if (trap) {
+	/* Restore opcode at pc so it can be saved again. */
+	*pc = (jsbytecode)trap->op;
+    } else {
+	trap = JS_malloc(cx, sizeof *trap);
+	if (!trap || !js_AddRoot(cx, &trap->closure, "trap->closure")) {
+	    if (trap)
+		JS_free(cx, trap);
+	    return JS_FALSE;
+	}
+    }
+    PR_APPEND_LINK(&trap->links, &rt->trapList);
+    trap->script = script;
+    trap->pc = pc;
+    trap->op = (JSOp)*pc;
+    trap->handler = handler;
+    trap->closure = closure;
+    *pc = JSOP_TRAP;
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSOp)
+JS_GetTrapOpcode(JSContext *cx, JSScript *script, jsbytecode *pc)
+{
+    JSTrap *trap;
+
+    trap = FindTrap(cx->runtime, script, pc);
+    if (!trap) {
+	PR_ASSERT(0);	/* XXX can't happen */
+	return JSOP_LIMIT;
+    }
+    return trap->op;
+}
+
+static void
+DestroyTrap(JSContext *cx, JSTrap *trap)
+{
+    PR_REMOVE_LINK(&trap->links);
+    *trap->pc = (jsbytecode)trap->op;
+    js_RemoveRoot(cx, &trap->closure);
+    JS_free(cx, trap);
+}
+
+JS_PUBLIC_API(void)
+JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
+	     JSTrapHandler *handlerp, void **closurep)
+{
+    JSTrap *trap;
+
+    trap = FindTrap(cx->runtime, script, pc);
+    if (handlerp)
+	*handlerp = trap ? trap->handler : NULL;
+    if (closurep)
+	*closurep = trap ? trap->closure : NULL;
+    if (trap)
+	DestroyTrap(cx, trap);
+}
+
+JS_PUBLIC_API(void)
+JS_ClearScriptTraps(JSContext *cx, JSScript *script)
+{
+    JSRuntime *rt;
+    JSTrap *trap, *next;
+
+    rt = cx->runtime;
+    for (trap = (JSTrap *)rt->trapList.next;
+	 trap != (JSTrap *)&rt->trapList;
+	 trap = next) {
+	next = (JSTrap *)trap->links.next;
+	if (trap->script == script)
+	    DestroyTrap(cx, trap);
+    }
+}
+
+JS_PUBLIC_API(void)
+JS_ClearAllTraps(JSContext *cx)
+{
+    JSRuntime *rt;
+    JSTrap *trap, *next;
+
+    rt = cx->runtime;
+    for (trap = (JSTrap *)rt->trapList.next;
+	 trap != (JSTrap *)&rt->trapList;
+	 trap = next) {
+	next = (JSTrap *)trap->links.next;
+	DestroyTrap(cx, trap);
+    }
+}
+
+JS_PUBLIC_API(JSTrapStatus)
+JS_HandleTrap(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval)
+{
+    JSTrap *trap;
+    JSTrapStatus status;
+    jsint op;
+
+    trap = FindTrap(cx->runtime, script, pc);
+    if (!trap) {
+	PR_ASSERT(0);	/* XXX can't happen */
+	return JSTRAP_ERROR;
+    }
+    /*
+     * It's important that we not use 'trap->' after calling the callback --
+     * the callback might remove the trap!
+     */
+    op = (jsint)trap->op;
+    status = trap->handler(cx, script, pc, rval, trap->closure);
+    if (status == JSTRAP_CONTINUE) {
+	/* By convention, return the true op to the interpreter in rval. */
+	*rval = INT_TO_JSVAL(op);
+    }
+    return status;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_SetInterrupt(JSRuntime *rt, JSTrapHandler handler, void *closure)
+{
+    rt->interruptHandler = handler;
+    rt->interruptHandlerData = closure;
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_ClearInterrupt(JSRuntime *rt, JSTrapHandler *handlerp, void **closurep)
+{
+    if (handlerp)
+	*handlerp = (JSTrapHandler)rt->interruptHandler;
+    if (closurep)
+	*closurep = rt->interruptHandlerData;
+    rt->interruptHandler = 0;
+    rt->interruptHandlerData = 0;
+    return JS_TRUE;
+}
+
+
+typedef struct JSWatchPoint {
+    PRCList             links;
+    JSObject            *object;	/* weak link, see js_FinalizeObject */
+    jsval               userid;
+    JSScopeProperty     *sprop;
+    JSPropertyOp        setter;
+    JSWatchPointHandler handler;
+    void                *closure;
+    jsrefcount          nrefs;
+} JSWatchPoint;
+
+#define HoldWatchPoint(wp) ((wp)->nrefs++)
+
+static void
+DropWatchPoint(JSContext *cx, JSWatchPoint *wp)
+{
+    if (--wp->nrefs != 0)
+	return;
+    wp->sprop->setter = wp->setter;
+    JS_LOCK_OBJ_VOID(cx, wp->object,
+		     js_DropScopeProperty(cx, (JSScope *)wp->object->map,
+					  wp->sprop));
+    PR_REMOVE_LINK(&wp->links);
+    js_RemoveRoot(cx, &wp->closure);
+    JS_free(cx, wp);
+}
+
+static JSWatchPoint *
+FindWatchPoint(JSRuntime *rt, JSObject *obj, jsval userid)
+{
+    JSWatchPoint *wp;
+
+    for (wp = (JSWatchPoint *)rt->watchPointList.next;
+	 wp != (JSWatchPoint *)&rt->watchPointList;
+	 wp = (JSWatchPoint *)wp->links.next) {
+	if (wp->object == obj && wp->userid == userid)
+	    return wp;
+    }
+    return NULL;
+}
+
+JSScopeProperty *
+js_FindWatchPoint(JSRuntime *rt, JSObject *obj, jsval userid)
+{
+    JSWatchPoint *wp;
+
+    wp = FindWatchPoint(rt, obj, userid);
+    if (!wp)
+	return NULL;
+    return wp->sprop;
+}
+
+JSBool PR_CALLBACK
+js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSRuntime *rt;
+    JSWatchPoint *wp;
+    JSScopeProperty *sprop;
+    JSSymbol *sym;
+    jsval userid, value;
+    jsid symid;
+    JSScope *scope;
+    JSAtom *atom;
+    JSBool ok;
+
+    rt = cx->runtime;
+    for (wp = (JSWatchPoint *)rt->watchPointList.next;
+	 wp != (JSWatchPoint *)&rt->watchPointList;
+	 wp = (JSWatchPoint *)wp->links.next) {
+	sprop = wp->sprop;
+	if (wp->object == obj && sprop->id == id) {
+	    JS_LOCK_OBJ(cx, obj);
+	    sym = sprop->symbols;
+	    if (!sym) {
+		userid = wp->userid;
+		atom = NULL;
+		if (JSVAL_IS_INT(userid)) {
+		    symid = (jsid)userid;
+		} else {
+		    atom = js_ValueToStringAtom(cx, userid);
+		    if (!atom) {
+			JS_UNLOCK_OBJ(cx, obj);
+			return JS_FALSE;
+		    }
+		    symid = (jsid)atom;
+		}
+		scope = (JSScope *) obj->map;
+		PR_ASSERT(scope->props);
+		ok = LOCKED_OBJ_GET_CLASS(obj)->addProperty(cx, obj, sprop->id,
+							    &value);
+		if (!ok) {
+		    JS_UNLOCK_OBJ(cx, obj);
+		    return JS_FALSE;
+		}
+		ok = (scope->ops->add(cx, scope, symid, sprop) != NULL);
+		if (!ok) {
+		    JS_UNLOCK_OBJ(cx, obj);
+		    return JS_FALSE;
+		}
+		sym = sprop->symbols;
+	    }
+	    JS_UNLOCK_OBJ(cx, obj);
+	    HoldWatchPoint(wp);
+	    ok = wp->handler(cx, obj, js_IdToValue(sym_id(sym)),
+			     OBJ_GET_SLOT(cx, obj, wp->sprop->slot), vp,
+			     wp->closure);
+	    if (ok)
+		ok = wp->setter(cx, obj, id, vp);
+	    DropWatchPoint(cx, wp);
+	    return ok;
+	}
+    }
+    PR_ASSERT(0);	/* XXX can't happen */
+    return JS_FALSE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval id,
+		 JSWatchPointHandler handler, void *closure)
+{
+    JSAtom *atom;
+    jsid symid;
+    JSObject *pobj;
+    JSScopeProperty *sprop;
+    JSRuntime *rt;
+    JSWatchPoint *wp;
+
+    if (!OBJ_IS_NATIVE(obj)) {
+	JS_ReportError(cx, "can't watch non-native objects of class %s",
+		       OBJ_GET_CLASS(cx, obj)->name);
+	return JS_FALSE;
+    }
+
+    if (JSVAL_IS_INT(id)) {
+	symid = (jsid)id;
+	atom = NULL;
+    } else {
+	atom = js_ValueToStringAtom(cx, id);
+	if (!atom)
+	    return JS_FALSE;
+	symid = (jsid)atom;
+    }
+
+    if (!js_LookupProperty(cx, obj, symid, &pobj, (JSProperty **)&sprop))
+	return JS_FALSE;
+    rt = cx->runtime;
+    if (!sprop) {
+	/* Check for a deleted symbol watchpoint, which holds its property. */
+	sprop = js_FindWatchPoint(rt, obj, id);
+	if (sprop) {
+#ifdef JS_THREADSAFE
+	    /* Emulate js_LookupProperty if thread-safe. */
+	    JS_LOCK_OBJ(cx, obj);
+	    sprop->nrefs++;
+#endif
+	} else {
+	    /* Make a new property in obj so we can watch for the first set. */
+	    if (!js_DefineProperty(cx, obj, symid, JSVAL_VOID, NULL, NULL, 0,
+				   (JSProperty **)&sprop)) {
+		sprop = NULL;
+	    }
+	}
+    } else if (pobj != obj) {
+	/* Clone the prototype property so we can watch the right object. */
+	jsval value;
+	JSPropertyOp getter, setter;
+	uintN attrs;
+
+	if (OBJ_IS_NATIVE(pobj)) {
+	    value = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
+	} else {
+	    if (!OBJ_GET_PROPERTY(cx, pobj, id, &value)) {
+		OBJ_DROP_PROPERTY(cx, pobj, (JSProperty *)sprop);
+		return JS_FALSE;
+	    }
+	}
+	getter = sprop->getter;
+	setter = sprop->setter;
+	attrs = sprop->attrs;
+	OBJ_DROP_PROPERTY(cx, pobj, (JSProperty *)sprop);
+
+	if (!js_DefineProperty(cx, obj, symid, value, getter, setter, attrs,
+			       (JSProperty **)&sprop)) {
+	    sprop = NULL;
+	}
+    }
+    if (!sprop)
+	return JS_FALSE;
+
+    wp = FindWatchPoint(rt, obj, id);
+    if (!wp) {
+	wp = JS_malloc(cx, sizeof *wp);
+	if (!wp)
+	    return JS_FALSE;
+	if (!js_AddRoot(cx, &wp->closure, "wp->closure")) {
+	    JS_free(cx, wp);
+	    return JS_FALSE;
+	}
+	PR_APPEND_LINK(&wp->links, &rt->watchPointList);
+	wp->object = obj;
+	wp->userid = id;
+	wp->sprop = js_HoldScopeProperty(cx, (JSScope *)obj->map, sprop);
+	wp->setter = sprop->setter;
+	sprop->setter = js_watch_set;
+	wp->nrefs = 1;
+    }
+    wp->handler = handler;
+    wp->closure = closure;
+    OBJ_DROP_PROPERTY(cx, obj, (JSProperty *)sprop);
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(void)
+JS_ClearWatchPoint(JSContext *cx, JSObject *obj, jsval id,
+		   JSWatchPointHandler *handlerp, void **closurep)
+{
+    JSRuntime *rt;
+    JSWatchPoint *wp;
+
+    rt = cx->runtime;
+    for (wp = (JSWatchPoint *)rt->watchPointList.next;
+	 wp != (JSWatchPoint *)&rt->watchPointList;
+	 wp = (JSWatchPoint *)wp->links.next) {
+	if (wp->object == obj && wp->userid == id) {
+	    if (handlerp)
+		*handlerp = wp->handler;
+	    if (closurep)
+		*closurep = wp->closure;
+	    DropWatchPoint(cx, wp);
+	    return;
+	}
+    }
+    if (handlerp)
+	*handlerp = NULL;
+    if (closurep)
+	*closurep = NULL;
+}
+
+JS_PUBLIC_API(void)
+JS_ClearWatchPointsForObject(JSContext *cx, JSObject *obj)
+{
+    JSRuntime *rt;
+    JSWatchPoint *wp, *next;
+
+    rt = cx->runtime;
+    for (wp = (JSWatchPoint *)rt->watchPointList.next;
+	 wp != (JSWatchPoint *)&rt->watchPointList;
+	 wp = next) {
+	next = (JSWatchPoint *)wp->links.next;
+	if (wp->object == obj)
+	    DropWatchPoint(cx, wp);
+    }
+}
+
+JS_PUBLIC_API(void)
+JS_ClearAllWatchPoints(JSContext *cx)
+{
+    JSRuntime *rt;
+    JSWatchPoint *wp, *next;
+
+    rt = cx->runtime;
+    for (wp = (JSWatchPoint *)rt->watchPointList.next;
+	 wp != (JSWatchPoint *)&rt->watchPointList;
+	 wp = next) {
+	next = (JSWatchPoint *)wp->links.next;
+	DropWatchPoint(cx, wp);
+    }
+}
+
+JS_PUBLIC_API(uintN)
+JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc)
+{
+    return js_PCToLineNumber(script, pc);
+}
+
+JS_PUBLIC_API(jsbytecode *)
+JS_LineNumberToPC(JSContext *cx, JSScript *script, uintN lineno)
+{
+    return js_LineNumberToPC(script, lineno);
+}
+
+JS_PUBLIC_API(JSScript *)
+JS_GetFunctionScript(JSContext *cx, JSFunction *fun)
+{
+    return fun->script;
+}
+
+JS_PUBLIC_API(JSPrincipals *)
+JS_GetScriptPrincipals(JSContext *cx, JSScript *script)
+{
+    return script->principals;
+}
+
+
+/*
+ *  Stack Frame Iterator
+ */
+JS_PUBLIC_API(JSStackFrame *)
+JS_FrameIterator(JSContext *cx, JSStackFrame **iteratorp)
+{
+    *iteratorp = (*iteratorp == NULL) ? cx->fp : (*iteratorp)->down;
+    return *iteratorp;
+}
+
+JS_PUBLIC_API(JSScript *)
+JS_GetFrameScript(JSContext *cx, JSStackFrame *fp)
+{
+    return fp->script;
+}
+
+JS_PUBLIC_API(jsbytecode *)
+JS_GetFramePC(JSContext *cx, JSStackFrame *fp)
+{
+    return fp->pc;
+}
+
+JS_PUBLIC_API(void *)
+JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp)
+{
+    if (fp->annotation) {
+	JSPrincipals *principals = fp->script
+	    ? fp->script->principals
+	    : NULL;
+
+	if (principals == NULL)
+	    return NULL;
+
+	if (principals->globalPrivilegesEnabled(cx, principals)) {
+	    /*
+	     * Only give out an annotation if privileges have not
+	     * been revoked globally.
+	     */
+	    return fp->annotation;
+	}
+    }
+
+    return NULL;
+}
+
+JS_PUBLIC_API(void)
+JS_SetFrameAnnotation(JSContext *cx, JSStackFrame *fp, void *annotation)
+{
+    fp->annotation = annotation;
+}
+
+JS_PUBLIC_API(void *)
+JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp)
+{
+    JSPrincipals *principals = fp->script
+	? fp->script->principals
+	: NULL;
+
+    return principals
+	? principals->getPrincipalArray(cx, principals)
+	: NULL;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_IsNativeFrame(JSContext *cx, JSStackFrame *fp)
+{
+    return fp->fun && fp->fun->call;
+}
+
+JS_PUBLIC_API(JSObject *)
+JS_GetFrameObject(JSContext *cx, JSStackFrame *fp)
+{
+    return fp->scopeChain;
+}
+
+JS_PUBLIC_API(JSObject *)
+JS_GetFrameThis(JSContext *cx, JSStackFrame *fp)
+{
+    return fp->thisp;
+}
+
+JS_PUBLIC_API(JSFunction *)
+JS_GetFrameFunction(JSContext *cx, JSStackFrame *fp)
+{
+    return fp->fun;
+}
+
+/************************************************************************/
+
+JS_PUBLIC_API(const char *)
+JS_GetScriptFilename(JSContext *cx, JSScript *script)
+{
+    return script->filename;
+}
+
+JS_PUBLIC_API(uintN)
+JS_GetScriptBaseLineNumber(JSContext *cx, JSScript *script)
+{
+    return script->lineno;
+}
+
+JS_PUBLIC_API(uintN)
+JS_GetScriptLineExtent(JSContext *cx, JSScript *script)
+{
+    return js_GetScriptLineExtent(script);
+}
+
+/***************************************************************************/
+
+JS_PUBLIC_API(void)
+JS_SetNewScriptHook(JSRuntime *rt, JSNewScriptHook hook, void *callerdata)
+{
+    rt->newScriptHook = hook;
+    rt->newScriptHookData = callerdata;
+}
+
+JS_PUBLIC_API(void)
+JS_SetDestroyScriptHook(JSRuntime *rt, JSDestroyScriptHook hook,
+			void *callerdata)
+{
+    rt->destroyScriptHook = hook;
+    rt->destroyScriptHookData = callerdata;
+}
+
+/***************************************************************************/
+
+JS_PUBLIC_API(JSBool)
+JS_EvaluateInStackFrame(JSContext *cx, JSStackFrame *fp,
+			const char *bytes, uintN length,
+			const char *filename, uintN lineno,
+			jsval *rval)
+{
+    JSScript *script;
+    JSBool ok;
+
+    script = JS_CompileScriptForPrincipals(cx, fp->scopeChain,
+					   fp->script ? fp->script->principals
+						      : NULL,
+					   bytes, length, filename, lineno);
+    if (!script)
+	return JS_FALSE;
+    ok = js_Execute(cx, fp->scopeChain, script, fp->fun, fp, JS_TRUE, rval);
+    js_DestroyScript(cx, script);
+    return ok;
+}
+
+/************************************************************************/
+
+JS_PUBLIC_API(JSScopeProperty *)
+JS_PropertyIterator(JSObject *obj, JSScopeProperty **iteratorp)
+{
+    JSScopeProperty *sprop;
+    JSScope *scope;
+
+    sprop = *iteratorp;
+    scope = (JSScope *) obj->map;
+    sprop = (sprop == NULL) ? scope->props : sprop->next;
+    *iteratorp = sprop;
+    return sprop;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_GetPropertyDesc(JSContext *cx, JSObject *obj, JSScopeProperty *sprop,
+		   JSPropertyDesc *pd)
+{
+    JSSymbol *sym;
+
+    sym = sprop->symbols;
+    pd->id = sym ? js_IdToValue(sym_id(sym)) : JSVAL_VOID;
+    pd->value = OBJ_GET_SLOT(cx, obj, sprop->slot);
+    pd->flags = ((sprop->attrs & JSPROP_ENUMERATE)      ? JSPD_ENUMERATE : 0)
+	      | ((sprop->attrs & JSPROP_READONLY)       ? JSPD_READONLY  : 0)
+	      | ((sprop->attrs & JSPROP_PERMANENT)      ? JSPD_PERMANENT : 0)
+	      | ((sprop->getter == js_GetArgument)      ? JSPD_ARGUMENT  : 0)
+	      | ((sprop->getter == js_GetLocalVariable) ? JSPD_VARIABLE  : 0);
+    pd->spare = 0;
+    pd->slot = (pd->flags & (JSPD_ARGUMENT | JSPD_VARIABLE))
+	       ? JSVAL_TO_INT(sprop->id)
+	       : 0;
+    if (!sym || !sym->next || (pd->flags & (JSPD_ARGUMENT | JSPD_VARIABLE))) {
+	pd->alias = JSVAL_VOID;
+    } else {
+	pd->alias = js_IdToValue(sym_id(sym->next));
+	pd->flags |= JSPD_ALIAS;
+    }
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_GetPropertyDescArray(JSContext *cx, JSObject *obj, JSPropertyDescArray *pda)
+{
+    JSScope *scope;
+    uint32 i, n;
+    JSPropertyDesc *pd;
+    JSScopeProperty *sprop;
+
+    if (!OBJ_GET_CLASS(cx, obj)->enumerate(cx, obj))
+	return JS_FALSE;
+    scope = (JSScope *)obj->map;
+    if (!scope->props) {
+	pda->length = 0;
+	pda->array = NULL;
+	return JS_TRUE;
+    }
+    n = scope->map.freeslot;
+    pd = JS_malloc(cx, (size_t)n * sizeof(JSPropertyDesc));
+    if (!pd)
+	return JS_FALSE;
+    i = 0;
+    for (sprop = scope->props; sprop; sprop = sprop->next) {
+	if (!js_AddRoot(cx, &pd[i].id, NULL))
+	    goto bad;
+	if (!js_AddRoot(cx, &pd[i].value, NULL))
+	    goto bad;
+	JS_GetPropertyDesc(cx, obj, sprop, &pd[i]);
+	if ((pd[i].flags & JSPD_ALIAS) && !js_AddRoot(cx, &pd[i].alias, NULL))
+	    goto bad;
+	if (++i == n)
+	    break;
+    }
+    pda->length = i;
+    pda->array = pd;
+    return JS_TRUE;
+
+bad:
+    pda->length = i + 1;
+    pda->array = pd;
+    JS_PutPropertyDescArray(cx, pda);
+    return JS_FALSE;
+}
+
+JS_PUBLIC_API(void)
+JS_PutPropertyDescArray(JSContext *cx, JSPropertyDescArray *pda)
+{
+    JSPropertyDesc *pd;
+    uint32 i;
+
+    pd = pda->array;
+    for (i = 0; i < pda->length; i++) {
+	js_RemoveRoot(cx, &pd[i].id);
+	js_RemoveRoot(cx, &pd[i].value);
+	if (pd[i].flags & JSPD_ALIAS)
+	    js_RemoveRoot(cx, &pd[i].alias);
+    }
+    JS_free(cx, pd);
+}
+
+/************************************************************************/
+
+JS_PUBLIC_API(JSBool)
+JS_SetDebuggerHandler(JSRuntime *rt, JSTrapHandler handler, void *closure)
+{
+    rt->debuggerHandler = handler;
+    rt->debuggerHandlerData = closure;
+    return JS_TRUE;
+}

mozilla/js/src/jsdbgapi.h

@@ -0,0 +1,221 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsdbgapi_h___
+#define jsdbgapi_h___
+/*
+ * JS debugger API.
+ */
+#include "jsapi.h"
+#include "jsopcode.h"
+#include "jsprvtd.h"
+
+PR_BEGIN_EXTERN_C
+
+extern void
+js_PatchOpcode(JSContext *cx, JSScript *script, jsbytecode *pc, JSOp op);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
+	   JSTrapHandler handler, void *closure);
+
+extern JS_PUBLIC_API(JSOp)
+JS_GetTrapOpcode(JSContext *cx, JSScript *script, jsbytecode *pc);
+
+extern JS_PUBLIC_API(void)
+JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
+	     JSTrapHandler *handlerp, void **closurep);
+
+extern JS_PUBLIC_API(void)
+JS_ClearScriptTraps(JSContext *cx, JSScript *script);
+
+extern JS_PUBLIC_API(void)
+JS_ClearAllTraps(JSContext *cx);
+
+extern JS_PUBLIC_API(JSTrapStatus)
+JS_HandleTrap(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetInterrupt(JSRuntime *rt, JSTrapHandler handler, void *closure);
+
+extern JS_PUBLIC_API(JSBool)
+JS_ClearInterrupt(JSRuntime *rt, JSTrapHandler *handlerp, void **closurep);
+
+/************************************************************************/
+
+typedef JSBool
+(*JSWatchPointHandler)(JSContext *cx, JSObject *obj, jsval id,
+		       jsval old, jsval *newp, void *closure);
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval id,
+		 JSWatchPointHandler handler, void *closure);
+
+extern JS_PUBLIC_API(void)
+JS_ClearWatchPoint(JSContext *cx, JSObject *obj, jsval id,
+		   JSWatchPointHandler *handlerp, void **closurep);
+
+extern JS_PUBLIC_API(void)
+JS_ClearWatchPointsForObject(JSContext *cx, JSObject *obj);
+
+extern JS_PUBLIC_API(void)
+JS_ClearAllWatchPoints(JSContext *cx);
+
+#ifdef JS_HAS_OBJ_WATCHPOINT
+/*
+ * Hide these non-API function prototypes by testing whether the internal
+ * header file "jsconfig.h" has been included.
+ */
+extern JSScopeProperty *
+js_FindWatchPoint(JSRuntime *rt, JSObject *obj, jsval userid);
+
+extern JSBool PR_CALLBACK
+js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+#endif
+
+/************************************************************************/
+
+extern JS_PUBLIC_API(uintN)
+JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc);
+
+extern JS_PUBLIC_API(jsbytecode *)
+JS_LineNumberToPC(JSContext *cx, JSScript *script, uintN lineno);
+
+extern JS_PUBLIC_API(JSScript *)
+JS_GetFunctionScript(JSContext *cx, JSFunction *fun);
+
+extern JS_PUBLIC_API(JSPrincipals *)
+JS_GetScriptPrincipals(JSContext *cx, JSScript *script);
+
+/*
+ * Stack Frame Iterator
+ *
+ * Used to iterate through the JS stack frames to extract
+ * information from the frames.
+ */
+
+extern JS_PUBLIC_API(JSStackFrame *)
+JS_FrameIterator(JSContext *cx, JSStackFrame **iteratorp);
+
+extern JS_PUBLIC_API(JSScript *)
+JS_GetFrameScript(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(jsbytecode *)
+JS_GetFramePC(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_IsNativeFrame(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(void *)
+JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(void)
+JS_SetFrameAnnotation(JSContext *cx, JSStackFrame *fp, void *annotation);
+
+extern JS_PUBLIC_API(void *)
+JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetFrameObject(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(JSObject *)
+JS_GetFrameThis(JSContext *cx, JSStackFrame *fp);
+
+extern JS_PUBLIC_API(JSFunction *)
+JS_GetFrameFunction(JSContext *cx, JSStackFrame *fp);
+
+/************************************************************************/
+
+extern JS_PUBLIC_API(const char *)
+JS_GetScriptFilename(JSContext *cx, JSScript *script);
+
+extern JS_PUBLIC_API(uintN)
+JS_GetScriptBaseLineNumber(JSContext *cx, JSScript *script);
+
+extern JS_PUBLIC_API(uintN)
+JS_GetScriptLineExtent(JSContext *cx, JSScript *script);
+
+/************************************************************************/
+
+/*
+ * Hook setters for script creation and destruction, see jsprvtd.h for the
+ * typedefs.  These macros provide binary compatibility and newer, shorter
+ * synonyms.
+ */
+#define JS_SetNewScriptHook     JS_SetNewScriptHookProc
+#define JS_SetDestroyScriptHook JS_SetDestroyScriptHookProc
+
+extern JS_PUBLIC_API(void)
+JS_SetNewScriptHook(JSRuntime *rt, JSNewScriptHook hook, void *callerdata);
+
+extern JS_PUBLIC_API(void)
+JS_SetDestroyScriptHook(JSRuntime *rt, JSDestroyScriptHook hook,
+			void *callerdata);
+
+/************************************************************************/
+
+extern JS_PUBLIC_API(JSBool)
+JS_EvaluateInStackFrame(JSContext *cx, JSStackFrame *fp,
+			const char *bytes, uintN length,
+			const char *filename, uintN lineno,
+			jsval *rval);
+
+/************************************************************************/
+
+typedef struct JSPropertyDesc {
+    jsval           id;         /* primary id, a string or int */
+    jsval           value;      /* property value */
+    uint8           flags;      /* flags, see below */
+    uint8           spare;      /* unused */
+    uint16          slot;       /* argument/variable slot */
+    jsval           alias;      /* alias id if JSPD_ALIAS flag */
+} JSPropertyDesc;
+
+#define JSPD_ENUMERATE  0x01    /* visible to for/in loop */
+#define JSPD_READONLY   0x02    /* assignment is error */
+#define JSPD_PERMANENT  0x04    /* property cannot be deleted */
+#define JSPD_ALIAS      0x08    /* property has an alias id */
+#define JSPD_ARGUMENT   0x10    /* argument to function */
+#define JSPD_VARIABLE   0x20    /* local variable in function */
+
+typedef struct JSPropertyDescArray {
+    uint32          length;     /* number of elements in array */
+    JSPropertyDesc  *array;     /* alloc'd by Get, freed by Put */
+} JSPropertyDescArray;
+
+extern JS_PUBLIC_API(JSScopeProperty *)
+JS_PropertyIterator(JSObject *obj, JSScopeProperty **iteratorp);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetPropertyDesc(JSContext *cx, JSObject *obj, JSScopeProperty *sprop,
+		   JSPropertyDesc *pd);
+
+extern JS_PUBLIC_API(JSBool)
+JS_GetPropertyDescArray(JSContext *cx, JSObject *obj, JSPropertyDescArray *pda);
+
+extern JS_PUBLIC_API(void)
+JS_PutPropertyDescArray(JSContext *cx, JSPropertyDescArray *pda);
+
+/************************************************************************/
+
+extern JS_PUBLIC_API(JSBool)
+JS_SetDebuggerHandler(JSRuntime *rt, JSTrapHandler handler, void *closure);
+
+PR_END_EXTERN_C
+
+#endif /* jsdbgapi_h___ */

mozilla/js/src/jsemit.h

@@ -0,0 +1,376 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsemit_h___
+#define jsemit_h___
+/*
+ * JS bytecode generation.
+ */
+
+#include "jsstddef.h"
+#include "prtypes.h"
+#include "jsatom.h"
+#include "jsopcode.h"
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+typedef enum JSStmtType {
+    STMT_BLOCK        = 0,      /* compound statement: { s1[;... sN] } */
+    STMT_LABEL        = 1,      /* labeled statement:  l: s */
+    STMT_IF           = 2,      /* if (then) statement */
+    STMT_ELSE         = 3,      /* else statement */
+    STMT_SWITCH       = 4,      /* switch statement */
+    STMT_WITH         = 5,      /* with statement */
+    STMT_TRY	      = 6,	/* try statement */
+    STMT_CATCH	      = 7,	/* catch block */
+    STMT_FINALLY      = 8,	/* finally statement */
+    STMT_DO_LOOP      = 9,      /* do/while loop statement */
+    STMT_FOR_LOOP     = 10,     /* for loop statement */
+    STMT_FOR_IN_LOOP  = 11,     /* for/in loop statement */
+    STMT_WHILE_LOOP   = 12      /* while loop statement */
+} JSStmtType;
+
+#define STMT_IS_LOOP(stmt)      ((stmt)->type >= STMT_DO_LOOP)
+
+typedef struct JSStmtInfo JSStmtInfo;
+
+struct JSStmtInfo {
+    JSStmtType      type;           /* statement type */
+    ptrdiff_t       top;            /* offset of loop top from cg base */
+    ptrdiff_t       update;         /* loop update offset (top if none) */
+    ptrdiff_t       breaks;         /* offset of last break in loop */
+    ptrdiff_t       continues;      /* offset of last continue in loop */
+    JSAtom          *label;         /* label name if type is STMT_LABEL */
+    JSStmtInfo      *down;          /* info for enclosing statement */
+};
+
+#define SET_STATEMENT_TOP(stmt, top) \
+    ((stmt)->top = (stmt)->update = (stmt)->breaks = (stmt)->continues = (top))
+
+struct JSTreeContext {              /* tree context for semantic checks */
+    uint32          flags;          /* statement state flags, see below */
+    uint32          tryCount;       /* total count of try statements parsed */
+    JSStmtInfo      *topStmt;       /* top of statement info stack */
+};
+
+#define TCF_IN_FUNCTION 0x01        /* parsing inside function body */
+#define TCF_RETURN_EXPR 0x02        /* function has 'return expr;' */
+#define TCF_RETURN_VOID 0x04        /* function has 'return;' */
+#define TCF_IN_FOR_INIT 0x08        /* parsing init expr of for; exclude 'in' */
+
+#define INIT_TREE_CONTEXT(tc) \
+    ((tc)->flags = 0, (tc)->tryCount = 0, (tc)->topStmt = NULL)
+
+struct JSCodeGenerator {
+    void            *codeMark;      /* low watermark in cx->codePool */
+    void            *tempMark;      /* low watermark in cx->tempPool */
+    jsbytecode      *base;          /* base of JS bytecode vector */
+    jsbytecode      *limit;         /* one byte beyond end of bytecode */
+    jsbytecode      *next;          /* pointer to next free bytecode */
+    JSAtomList      atomList;       /* literals indexed for mapping */
+    ptrdiff_t       lastCodeOffset; /* offset of last non-nop opcode */
+    intN            stackDepth;     /* current stack depth in basic block */
+    uintN           maxStackDepth;  /* maximum stack depth so far */
+    jssrcnote       *notes;         /* source notes, see below */
+    uintN           noteCount;      /* number of source notes so far */
+    ptrdiff_t       lastNoteOffset; /* code offset for last source note */
+    const char      *filename;      /* null or weak link to source filename */
+    uintN           firstLine;      /* first line, for js_NewScriptFromCG */
+    uintN           currentLine;    /* line number for tree-based srcnote gen */
+    JSPrincipals    *principals;    /* principals for constant folding eval */
+    JSTreeContext   treeContext;    /* for break/continue code generation */
+    JSTryNote       *tryBase;       /* first exception handling block */
+    JSTryNote       *tryNext;       /* next avail block */
+    JSTryNote       *tryLimit;      /* pointer to one-past-end block */
+};
+
+#define CG_CODE(cg,offset)      ((cg)->base + (offset))
+#define CG_OFFSET(cg)           PTRDIFF((cg)->next, (cg)->base, jsbytecode)
+#define CG_RESET(cg)            ((cg)->next = (cg)->base,                     \
+				 ATOM_LIST_INIT(&(cg)->atomList),             \
+                                 (cg)->lastCodeOffset = 0,                    \
+                                 (cg)->stackDepth = (cg)->maxStackDepth = 0,  \
+				 (cg)->currentLine = (cg)->firstLine,         \
+				 INIT_TREE_CONTEXT(&(cg)->treeContext),       \
+				 (cg)->tryNext = (cg)->tryBase,               \
+                                 CG_RESET_NOTES(cg))
+#define CG_RESET_NOTES(cg)      ((cg)->notes = NULL, (cg)->noteCount = 0,     \
+                                 (cg)->lastNoteOffset = 0)
+#define CG_PUSH(cg, newcg)      ((newcg)->atomList = (cg)->atomList)
+#define CG_POP(cg, newcg)       ((cg)->atomList = (newcg)->atomList)
+
+/*
+ * Initialize cg to allocate bytecode space from cx->codePool, and srcnote
+ * space from cx->tempPool.  Return true on success.  Report an error and
+ * return false if the initial code segment can't be allocated.
+ */
+extern JS_FRIEND_API(JSBool)
+js_InitCodeGenerator(JSContext *cx, JSCodeGenerator *cg,
+		     const char *filename, uintN lineno,
+		     JSPrincipals *principals);
+
+/*
+ * Release cx->codePool and cx->tempPool to marks set by js_InitCodeGenerator.
+ */
+extern JS_FRIEND_API(void)
+js_ResetCodeGenerator(JSContext *cx, JSCodeGenerator *cg);
+
+/*
+ * Emit one bytecode.
+ */
+extern ptrdiff_t
+js_Emit1(JSContext *cx, JSCodeGenerator *cg, JSOp op);
+
+/*
+ * Emit two bytecodes, an opcode (op) with a byte of immediate operand (op1).
+ */
+extern ptrdiff_t
+js_Emit2(JSContext *cx, JSCodeGenerator *cg, JSOp op, jsbytecode op1);
+
+/*
+ * Emit three bytecodes, an opcode with two bytes of immediate operands.
+ */
+extern ptrdiff_t
+js_Emit3(JSContext *cx, JSCodeGenerator *cg, JSOp op, jsbytecode op1,
+	 jsbytecode op2);
+
+/*
+ * Emit (1 + extra) bytecodes, for N bytes of op and its immediate operand.
+ */
+extern ptrdiff_t
+js_EmitN(JSContext *cx, JSCodeGenerator *cg, JSOp op, size_t extra);
+
+/*
+ * Unsafe macro to call js_SetJumpOffset and return false if it does.
+ */
+#define CHECK_AND_SET_JUMP_OFFSET(cx,cg,pc,off)                               \
+    PR_BEGIN_MACRO                                                            \
+	if (!js_SetJumpOffset(cx, cg, pc, off))                               \
+	    return JS_FALSE;                                                  \
+    PR_END_MACRO
+
+#define CHECK_AND_SET_JUMP_OFFSET_AT(cx,cg,off)                               \
+    CHECK_AND_SET_JUMP_OFFSET(cx, cg, CG_CODE(cg,off), CG_OFFSET(cg) - (off))
+
+extern JSBool
+js_SetJumpOffset(JSContext *cx, JSCodeGenerator *cg, jsbytecode *pc,
+		 ptrdiff_t off);
+
+/*
+ * Push the C-stack-allocated struct at stmt onto the stmtInfo stack.
+ */
+extern void
+js_PushStatement(JSTreeContext *tc, JSStmtInfo *stmt, JSStmtType type,
+		 ptrdiff_t top);
+
+/*
+ * Emit a break instruction, recording it for backpatching.
+ */
+extern ptrdiff_t
+js_EmitBreak(JSContext *cx, JSCodeGenerator *cg, JSStmtInfo *stmt,
+	     JSAtomListElement *label);
+
+/*
+ * Emit a continue instruction, recording it for backpatching.
+ */
+extern ptrdiff_t
+js_EmitContinue(JSContext *cx, JSCodeGenerator *cg, JSStmtInfo *stmt,
+		JSAtomListElement *label);
+
+/*
+ * Pop tc->topStmt.  If the top JSStmtInfo struct is not stack-allocated, it
+ * is up to the caller to free it.
+ */
+extern void
+js_PopStatement(JSTreeContext *tc);
+
+/*
+ * Like js_PopStatement(&cg->treeContext), also patch breaks and continues.
+ * May fail if a jump offset overflows.
+ */
+extern JSBool
+js_PopStatementCG(JSContext *cx, JSCodeGenerator *cg);
+
+/*
+ * Emit code into cg for the tree rooted at pn.
+ */
+extern JSBool
+js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn);
+
+/*
+ * Emit code into cg for the tree rooted at body, then create a persistent
+ * script for fun from cg.
+ */
+extern JSBool
+js_EmitFunctionBody(JSContext *cx, JSCodeGenerator *cg, JSParseNode *body,
+		    JSFunction *fun);
+
+/*
+ * Source notes generated along with bytecode for decompiling and debugging.
+ * A source note is a uint8 with 5 bits of type and 3 of offset from the pc of
+ * the previous note.  If 3 bits of offset aren't enough, extended delta notes
+ * (SRC_XDELTA) consisting of 2 set high order bits followed by 6 offset bits
+ * are emitted before the next note.  Some notes have operand offsets encoded
+ * in note bytes or byte-pairs.
+ *
+ * At most one "gettable" note (i.e., a note of type other than SRC_NEWLINE,
+ * SRC_SETLINE, and SRC_XDELTA) applies to a given bytecode.
+ *
+ * NB: the js_SrcNoteName and js_SrcNoteArity arrays in jsemit.c are indexed
+ * by this enum, so their initializers need to match the order here.
+ */
+typedef enum JSSrcNoteType {
+    SRC_NULL        = 0,        /* terminates a note vector */
+    SRC_IF          = 1,        /* JSOP_IFEQ bytecode is from an if-then */
+    SRC_IF_ELSE     = 2,        /* JSOP_IFEQ bytecode is from an if-then-else */
+    SRC_WHILE       = 3,        /* JSOP_IFEQ is from a while loop */
+    SRC_FOR         = 4,        /* JSOP_NOP or JSOP_POP in for loop head */
+    SRC_CONTINUE    = 5,        /* JSOP_GOTO is a continue, not a break */
+    SRC_VAR         = 6,        /* JSOP_NAME/FORNAME with a var declaration */
+    SRC_COMMA       = 7,        /* JSOP_POP representing a comma operator */
+    SRC_ASSIGNOP    = 8,        /* += or another assign-op follows */
+    SRC_COND        = 9,        /* JSOP_IFEQ is from conditional ?: operator */
+    SRC_PAREN       = 10,       /* JSOP_NOP generated to mark user parens */
+    SRC_HIDDEN      = 11,       /* opcode shouldn't be decompiled */
+    SRC_PCBASE      = 12,       /* offset of first obj.prop.subprop bytecode */
+    SRC_LABEL       = 13,       /* JSOP_NOP for label: with atomid immediate */
+    SRC_LABELBRACE  = 14,       /* JSOP_NOP for label: {...} begin brace */
+    SRC_ENDBRACE    = 15,       /* JSOP_NOP for label: {...} end brace */
+    SRC_BREAK2LABEL = 16,       /* JSOP_GOTO for 'break label' with atomid */
+    SRC_CONT2LABEL  = 17,       /* JSOP_GOTO for 'continue label' with atomid */
+    SRC_SWITCH      = 18,       /* JSOP_*SWITCH with offset to end of switch */
+    SRC_FUNCDEF     = 19,       /* JSOP_NOP for function f() with atomid */
+    SRC_TRYFIN	    = 20,       /* JSOP_NOP for try{} or finally{} section */
+    SRC_CATCH       = 21,       /* catch block has guard */
+    SRC_NEWLINE     = 22,       /* bytecode follows a source newline */
+    SRC_SETLINE     = 23,       /* a file-absolute source line number note */
+    SRC_XDELTA      = 24        /* 24-31 are for extended delta notes */
+} JSSrcNoteType;
+
+#define SN_TYPE_BITS            5
+#define SN_DELTA_BITS           3
+#define SN_XDELTA_BITS          6
+#define SN_TYPE_MASK            (PR_BITMASK(SN_TYPE_BITS) << SN_DELTA_BITS)
+#define SN_DELTA_MASK           ((ptrdiff_t)PR_BITMASK(SN_DELTA_BITS))
+#define SN_XDELTA_MASK          ((ptrdiff_t)PR_BITMASK(SN_XDELTA_BITS))
+
+#define SN_MAKE_NOTE(sn,t,d)    (*(sn) = (jssrcnote)                          \
+					  (((t) << SN_DELTA_BITS)             \
+					   | ((d) & SN_DELTA_MASK)))
+#define SN_MAKE_XDELTA(sn,d)    (*(sn) = (jssrcnote)                          \
+					  ((SRC_XDELTA << SN_DELTA_BITS)      \
+					   | ((d) & SN_XDELTA_MASK)))
+
+#define SN_IS_XDELTA(sn)        ((*(sn) >> SN_DELTA_BITS) >= SRC_XDELTA)
+#define SN_TYPE(sn)             (SN_IS_XDELTA(sn) ? SRC_XDELTA                \
+						  : *(sn) >> SN_DELTA_BITS)
+#define SN_SET_TYPE(sn,type)    SN_MAKE_NOTE(sn, type, SN_DELTA(sn))
+#define SN_IS_GETTABLE(sn)      (SN_TYPE(sn) < SRC_NEWLINE)
+
+#define SN_DELTA(sn)            ((ptrdiff_t)(SN_IS_XDELTA(sn)                 \
+					     ? *(sn) & SN_XDELTA_MASK         \
+					     : *(sn) & SN_DELTA_MASK))
+#define SN_SET_DELTA(sn,delta)  (SN_IS_XDELTA(sn)                             \
+				 ? SN_MAKE_XDELTA(sn, delta)                  \
+				 : SN_MAKE_NOTE(sn, SN_TYPE(sn), delta))
+
+#define SN_DELTA_LIMIT          ((ptrdiff_t)PR_BIT(SN_DELTA_BITS))
+#define SN_XDELTA_LIMIT         ((ptrdiff_t)PR_BIT(SN_XDELTA_BITS))
+
+/*
+ * Offset fields follow certain notes and are frequency-encoded: an offset in
+ * [0,0x7f] consumes one byte, an offset in [0x80,0x7fffff] takes three, and
+ * the high bit of the first byte is set.
+ */
+#define SN_3BYTE_OFFSET_FLAG    0x80
+#define SN_3BYTE_OFFSET_MASK    0x7f
+
+extern JS_FRIEND_DATA(const char *) js_SrcNoteName[];
+extern JS_FRIEND_DATA(uint8) js_SrcNoteArity[];
+extern JS_FRIEND_DATA(uintN) js_SrcNoteLength(jssrcnote *sn);
+
+#define SN_LENGTH(sn)           ((js_SrcNoteArity[SN_TYPE(sn)] == 0) ? 1      \
+				 : js_SrcNoteLength(sn))
+#define SN_NEXT(sn)             ((sn) + SN_LENGTH(sn))
+
+/* A source note array is terminated by an all-zero element. */
+#define SN_MAKE_TERMINATOR(sn)  (*(sn) = SRC_NULL)
+#define SN_IS_TERMINATOR(sn)    (*(sn) == SRC_NULL)
+
+/*
+ * Append a new source note of the given type (and therefore size) to cg's
+ * notes dynamic array, updating cg->noteCount.  Return the new note's index
+ * within the array pointed at by cg->notes.  Return -1 if out of memory.
+ */
+extern intN
+js_NewSrcNote(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type);
+
+extern intN
+js_NewSrcNote2(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type,
+	       ptrdiff_t offset);
+
+extern intN
+js_NewSrcNote3(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type,
+	       ptrdiff_t offset1, ptrdiff_t offset2);
+
+/*
+ * Get and set the offset operand identified by which (0 for the first, etc.).
+ */
+extern JS_FRIEND_API(ptrdiff_t)
+js_GetSrcNoteOffset(jssrcnote *sn, uintN which);
+
+extern JSBool
+js_SetSrcNoteOffset(JSContext *cx, JSCodeGenerator *cg, uintN index,
+		    uintN which, ptrdiff_t offset);
+
+/*
+ * Finish taking source notes in cx's tempPool by copying them to new
+ * stable store allocated via JS_malloc.  Return null on malloc failure,
+ * which means this function reported an error.
+ */
+extern JS_FRIEND_API(jssrcnote *)
+js_FinishTakingSrcNotes(JSContext *cx, JSCodeGenerator *cg);
+
+/*
+ * Allocate cg->treeContext.tryCount notes (plus one for the end sentinel)
+ * from cx->tempPool and set cg->tryBase/tryNext/tryLimit for exactly tryCount
+ * js_NewTryNote calls.  The storage is freed in one fell swoop by JS_Compile*
+ * API entry points at the end of compilation.
+ */
+extern JSBool
+js_AllocTryNotes(JSContext *cx, JSCodeGenerator *cg);
+
+/*
+ * Grab the next trynote slot in cg, filling it in appropriately.
+ */
+extern JS_FRIEND_API(JSTryNote *)
+js_NewTryNote(JSContext *cx, JSCodeGenerator *cg, ptrdiff_t start,
+	      ptrdiff_t end, ptrdiff_t catchStart);
+
+/*
+ * Finish generating exception information, and copy it to JS_malloc
+ * storage.
+ */
+extern JS_FRIEND_API(JSBool)
+js_FinishTakingTryNotes(JSContext *cx, JSCodeGenerator *cg, JSTryNote **tryp);
+
+PR_END_EXTERN_C
+
+#endif /* jsemit_h___ */

mozilla/js/src/jsfun.h

@@ -0,0 +1,105 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsfun_h___
+#define jsfun_h___
+/*
+ * JS function definitions.
+ */
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+struct JSFunction {
+    jsrefcount	 nrefs;		/* number of referencing objects */
+    JSObject     *object;       /* back-pointer to GC'ed object header */
+    JSNative     call;          /* native method pointer or null */
+    uint16       nargs;         /* minimum number of actual arguments */
+    uint16       extra;         /* number of arg slots for local GC roots */
+    uint16       nvars;         /* number of local variables */
+    uint8        flags;         /* bound method and other flags, see jsapi.h */
+    uint8        spare;         /* reserved for future use */
+    JSAtom       *atom;         /* name for diagnostics and decompiling */
+    JSScript     *script;       /* interpreted bytecode descriptor or null */
+};
+
+extern JSClass js_ArgumentsClass;
+extern JSClass js_CallClass;
+extern JSClass js_ClosureClass;
+extern JSClass js_FunctionClass;
+
+/*
+ * NB: jsapi.h and jsobj.h must be included before any call to this macro.
+ */
+#define JSVAL_IS_FUNCTION(cx, v)                                              \
+    (JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) &&                              \
+     OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_FunctionClass)
+
+extern JSBool
+js_IsIdentifier(JSString *str);
+
+extern JSObject *
+js_InitFunctionClass(JSContext *cx, JSObject *obj);
+
+extern JSBool
+js_InitArgsCallClosureClasses(JSContext *cx, JSObject *obj,
+			      JSObject *arrayProto);
+
+extern JSFunction *
+js_NewFunction(JSContext *cx, JSObject *funobj, JSNative call, uintN nargs,
+	       uintN flags, JSObject *parent, JSAtom *atom);
+
+extern JSBool
+js_LinkFunctionObject(JSContext *cx, JSFunction *fun, JSObject *object);
+
+extern JSFunction *
+js_DefineFunction(JSContext *cx, JSObject *obj, JSAtom *atom, JSNative call,
+		  uintN nargs, uintN flags);
+
+extern JSFunction *
+js_ValueToFunction(JSContext *cx, jsval *vp, JSBool constructing);
+
+extern void
+js_ReportIsNotFunction(JSContext *cx, jsval *vp, JSBool constructing);
+
+extern JSObject *
+js_GetCallObject(JSContext *cx, JSStackFrame *fp, JSObject *parent,
+		 JSObject *withobj);
+
+extern JSBool
+js_PutCallObject(JSContext *cx, JSStackFrame *fp);
+
+extern JSBool
+js_GetCallVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSBool
+js_SetCallVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSObject *
+js_GetArgsObject(JSContext *cx, JSStackFrame *fp);
+
+extern JSBool
+js_PutArgsObject(JSContext *cx, JSStackFrame *fp);
+
+extern JSBool
+js_XDRFunction(JSXDRState *xdr, JSObject **objp);
+
+PR_END_EXTERN_C
+
+#endif /* jsfun_h___ */

mozilla/js/src/jsgc.c

@@ -0,0 +1,899 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS Mark-and-Sweep Garbage Collector.
+ *
+ * This GC allocates only fixed-sized things big enough to contain two words
+ * (pointers) on any host architecture.  It allocates from an arena pool (see
+ * prarena.h).  It uses a parallel arena-pool array of flag bytes to hold the
+ * mark bit, finalizer type index, etc.
+ *
+ * XXX swizzle page to freelist for better locality of reference
+ */
+#include "jsstddef.h"
+#include <stdlib.h>     /* for free, called by PR_ARENA_DESTROY */
+#include <string.h>	/* for memset, called by prarena.h macros if DEBUG */
+#include "prtypes.h"
+#ifndef NSPR20
+#include "prarena.h"
+#else
+#include "plarena.h"
+#endif
+#include "prlog.h"
+#ifndef NSPR20
+#include "prhash.h"
+#else
+#include "plhash.h"
+#endif
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsfun.h"
+#include "jsgc.h"
+#include "jsinterp.h"
+#include "jslock.h"
+#include "jsnum.h"
+#include "jsobj.h"
+#include "jsscope.h"
+#include "jsscript.h"
+#include "jsstr.h"
+
+/*
+ * Arena sizes, the first must be a multiple of the second so the two arena
+ * pools can be maintained (in particular, arenas may be destroyed from the
+ * middle of each pool) in parallel.
+ */
+#define GC_ARENA_SIZE	8192		/* 1024 (512 on Alpha) objects */
+#define GC_FLAGS_SIZE	(GC_ARENA_SIZE / sizeof(JSGCThing))
+#define GC_ROOTS_SIZE	256		/* SWAG, small enough to amortize */
+
+static PRHashNumber   gc_hash_root(const void *key);
+
+struct JSGCThing {
+    JSGCThing       *next;
+    uint8           *flagp;
+};
+
+typedef void (*GCFinalizeOp)(JSContext *cx, JSGCThing *thing);
+
+static GCFinalizeOp gc_finalizers[GCX_NTYPES];
+
+#ifdef JS_GCMETER
+#define METER(x) x
+#else
+#define METER(x) /* nothing */
+#endif
+
+JSBool
+js_InitGC(JSRuntime *rt, uint32 maxbytes)
+{
+    if (!gc_finalizers[GCX_OBJECT]) {
+	gc_finalizers[GCX_OBJECT] = (GCFinalizeOp)js_FinalizeObject;
+	gc_finalizers[GCX_STRING] = (GCFinalizeOp)js_FinalizeString;
+	gc_finalizers[GCX_DOUBLE] = (GCFinalizeOp)js_FinalizeDouble;
+    }
+
+    PR_InitArenaPool(&rt->gcArenaPool, "gc-arena", GC_ARENA_SIZE,
+		     sizeof(JSGCThing));
+    PR_InitArenaPool(&rt->gcFlagsPool, "gc-flags", GC_FLAGS_SIZE,
+		     sizeof(uint8));
+    rt->gcRootsHash = PR_NewHashTable(GC_ROOTS_SIZE, gc_hash_root,
+				      PR_CompareValues, PR_CompareValues,
+				      NULL, NULL);
+    if (!rt->gcRootsHash)
+	return JS_FALSE;
+    rt->gcMaxBytes = maxbytes;
+    return JS_TRUE;
+}
+
+#ifdef JS_GCMETER
+void
+js_DumpGCStats(JSRuntime *rt, FILE *fp)
+{
+    fprintf(fp, "\nGC allocation statistics:\n");
+    fprintf(fp, "     bytes currently allocated: %lu\n", rt->gcBytes);
+    fprintf(fp, "                alloc attempts: %lu\n", rt->gcStats.alloc);
+    fprintf(fp, "            GC freelist length: %lu\n", rt->gcStats.freelen);
+    fprintf(fp, "  recycles through GC freelist: %lu\n", rt->gcStats.recycle);
+    fprintf(fp, "alloc retries after running GC: %lu\n", rt->gcStats.retry);
+    fprintf(fp, "           allocation failures: %lu\n", rt->gcStats.fail);
+    fprintf(fp, "              valid lock calls: %lu\n", rt->gcStats.lock);
+    fprintf(fp, "            valid unlock calls: %lu\n", rt->gcStats.unlock);
+    fprintf(fp, "   locks that hit stuck counts: %lu\n", rt->gcStats.stuck);
+    fprintf(fp, " unlocks that saw stuck counts: %lu\n", rt->gcStats.unstuck);
+    fprintf(fp, "          mark recursion depth: %lu\n", rt->gcStats.depth);
+    fprintf(fp, "  maximum mark recursion depth: %lu\n", rt->gcStats.maxdepth);
+    fprintf(fp, "      maximum GC nesting level: %lu\n", rt->gcStats.maxlevel);
+    fprintf(fp, "   potentially useful GC calls: %lu\n", rt->gcStats.poke);
+    fprintf(fp, "              useless GC calls: %lu\n", rt->gcStats.nopoke);
+    fprintf(fp, "        thing arena corruption: %lu\n", rt->gcStats.badarena);
+    fprintf(fp, "        flags arena corruption: %lu\n", rt->gcStats.badflag);
+    fprintf(fp, "     thing arenas freed so far: %lu\n", rt->gcStats.afree);
+    fprintf(fp, "     flags arenas freed so far: %lu\n", rt->gcStats.fafree);
+#ifdef PR_ARENAMETER
+    PR_DumpArenaStats(fp);
+#endif
+}
+#endif
+
+void
+js_FinishGC(JSRuntime *rt)
+{
+#ifdef PR_ARENAMETER
+    PR_DumpArenaStats(stdout);
+#endif
+#ifdef JS_GCMETER
+    js_DumpGCStats(rt, stdout);
+#endif
+    PR_FinishArenaPool(&rt->gcArenaPool);
+    PR_FinishArenaPool(&rt->gcFlagsPool);
+    PR_ArenaFinish();
+    PR_HashTableDestroy(rt->gcRootsHash);
+    rt->gcRootsHash = NULL;
+    rt->gcFreeList = NULL;
+}
+
+JSBool
+js_AddRoot(JSContext *cx, void *rp, const char *name)
+{
+    JSRuntime *rt;
+    JSBool ok;
+
+    rt = cx->runtime;
+    JS_LOCK_GC_VOID(rt,
+	ok = (PR_HashTableAdd(rt->gcRootsHash, rp, (void *)name) != NULL));
+    if (!ok)
+	JS_ReportOutOfMemory(cx);
+    return ok;
+}
+
+JSBool
+js_RemoveRoot(JSContext *cx, void *rp)
+{
+    JSRuntime *rt;
+
+    rt = cx->runtime;
+    JS_LOCK_GC_VOID(rt, PR_HashTableRemove(rt->gcRootsHash, rp));
+    return JS_TRUE;
+}
+
+void *
+js_AllocGCThing(JSContext *cx, uintN flags)
+{
+    JSRuntime *rt;
+    JSGCThing *thing;
+    uint8 *flagp;
+#ifdef TOO_MUCH_GC
+    JSBool tried_gc = JS_TRUE;
+    js_GC(cx);
+#else
+    JSBool tried_gc = JS_FALSE;
+#endif
+
+    rt = cx->runtime;
+    JS_LOCK_GC(rt);
+    METER(rt->gcStats.alloc++);
+retry:
+    thing = rt->gcFreeList;
+    if (thing) {
+	rt->gcFreeList = thing->next;
+	flagp = thing->flagp;
+	METER(rt->gcStats.freelen--);
+	METER(rt->gcStats.recycle++);
+    } else {
+	if (rt->gcBytes < rt->gcMaxBytes) {
+	    PR_ARENA_ALLOCATE(thing, &rt->gcArenaPool, sizeof(JSGCThing));
+	    PR_ARENA_ALLOCATE(flagp, &rt->gcFlagsPool, sizeof(uint8));
+	}
+	if (!thing || !flagp) {
+	    if (thing)
+		PR_ARENA_RELEASE(&rt->gcArenaPool, thing);
+	    if (!tried_gc) {
+		JS_UNLOCK_GC(rt);
+		js_GC(cx);
+		tried_gc = JS_TRUE;
+		JS_LOCK_GC(rt);
+		METER(rt->gcStats.retry++);
+		goto retry;
+	    }
+	    METER(rt->gcStats.fail++);
+	    JS_UNLOCK_GC(rt);
+	    JS_ReportOutOfMemory(cx);
+	    return NULL;
+	}
+    }
+    *flagp = (uint8)flags;
+    rt->gcBytes += sizeof(JSGCThing) + sizeof(uint8);
+    cx->newborn[flags & GCF_TYPEMASK] = thing;
+
+    /*
+     * Clear thing before unlocking in case a GC run is about to scan it,
+     * finding it via cx->newborn[].
+     */
+    thing->next = NULL;
+    thing->flagp = NULL;
+    JS_UNLOCK_GC(rt);
+    return thing;
+}
+
+static uint8 *
+gc_find_flags(JSRuntime *rt, void *thing)
+{
+    pruword index, offset, length;
+    PRArena *a, *fa;
+
+    index = 0;
+    for (a = rt->gcArenaPool.first.next; a; a = a->next) {
+	offset = PR_UPTRDIFF(thing, a->base);
+	length = a->avail - a->base;
+	if (offset < length) {
+	    index += offset / sizeof(JSGCThing);
+	    for (fa = rt->gcFlagsPool.first.next; fa; fa = fa->next) {
+		offset = fa->avail - fa->base;
+		if (index < offset)
+		    return (uint8 *)fa->base + index;
+		index -= offset;
+	    }
+	    return NULL;
+	}
+	index += length / sizeof(JSGCThing);
+    }
+    return NULL;
+}
+
+JSBool
+js_LockGCThing(JSContext *cx, void *thing)
+{
+    uint8 *flagp, flags;
+
+    if (!thing)
+	return JS_TRUE;
+    flagp = gc_find_flags(cx->runtime, thing);
+    if (!flagp)
+	return JS_FALSE;
+    flags = *flagp;
+    if ((flags & GCF_LOCKMASK) != GCF_LOCKMASK) {
+	*flagp = (uint8)(flags + GCF_LOCK);
+    } else {
+	METER(cx->runtime->gcStats.stuck++);
+    }
+    METER(cx->runtime->gcStats.lock++);
+    return JS_TRUE;
+}
+
+JSBool
+js_UnlockGCThing(JSContext *cx, void *thing)
+{
+    uint8 *flagp, flags;
+
+    if (!thing)
+	return JS_TRUE;
+    flagp = gc_find_flags(cx->runtime, thing);
+    if (!flagp)
+	return JS_FALSE;
+    flags = *flagp;
+    if ((flags & GCF_LOCKMASK) != GCF_LOCKMASK) {
+	*flagp = (uint8)(flags - GCF_LOCK);
+    } else {
+	METER(cx->runtime->gcStats.unstuck++);
+    }
+    METER(cx->runtime->gcStats.unlock++);
+    return JS_TRUE;
+}
+
+#ifdef GC_MARK_DEBUG
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "prprf.h"
+
+JS_FRIEND_DATA(FILE *) js_DumpGCHeap;
+JS_FRIEND_DATA(void *) js_LiveThingToFind;
+
+typedef struct GCMarkNode GCMarkNode;
+
+struct GCMarkNode {
+    void        *thing;
+    char        *name;
+    GCMarkNode  *next;
+    GCMarkNode  *prev;
+};
+
+static void
+gc_dump_thing(JSGCThing *thing, uint8 flags, GCMarkNode *prev, FILE *fp)
+{
+    GCMarkNode *next = NULL;
+    char *path = NULL;
+    JSObject *obj;
+    JSClass *clasp;
+
+    while (prev) {
+	next = prev;
+	prev = prev->prev;
+    }
+    while (next) {
+	path = PR_sprintf_append(path, "%s.", next->name);
+	next = next->next;
+    }
+    if (!path)
+	return;
+
+    fprintf(fp, "%08lx ", (long)thing);
+    switch (flags & GCF_TYPEMASK) {
+      case GCX_OBJECT:
+	obj = (JSObject *)thing;
+	clasp = JSVAL_TO_PRIVATE(obj->slots[JSSLOT_CLASS]);
+	fprintf(fp, "object %s", clasp->name);
+	break;
+      case GCX_STRING:
+	fprintf(fp, "string %s", JS_GetStringBytes((JSString *)thing));
+	break;
+      case GCX_DOUBLE:
+	fprintf(fp, "double %g", *(jsdouble *)thing);
+	break;
+      case GCX_DECIMAL:
+	break;
+    }
+    fprintf(fp, " via %s\n", path);
+    free(path);
+}
+
+static void
+gc_mark_node(JSRuntime *rt, void *thing, GCMarkNode *prev);
+
+#define GC_MARK(_rt, _thing, _name, _prev)                                    \
+    PR_BEGIN_MACRO                                                            \
+	GCMarkNode _node;                                                     \
+	_node.thing = _thing;                                                 \
+	_node.name  = _name;                                                  \
+	_node.next  = NULL;                                                   \
+	_node.prev  = _prev;                                                  \
+	if (_prev) ((GCMarkNode *)(_prev))->next = &_node;                    \
+	gc_mark_node(_rt, _thing, &_node);                                    \
+    PR_END_MACRO
+
+static void
+gc_mark(JSRuntime *rt, void *thing)
+{
+    GC_MARK(rt, thing, "atom", NULL);
+}
+
+#define GC_MARK_ATOM(rt, atom, prev)     gc_mark_atom(rt, atom, prev)
+#define GC_MARK_SCRIPT(rt, script, prev) gc_mark_script(rt, script, prev)
+
+#else  /* !GC_MARK_DEBUG */
+
+#define GC_MARK(rt, thing, name, prev)   gc_mark(rt, thing)
+#define GC_MARK_ATOM(rt, atom, prev)     gc_mark_atom(rt, atom)
+#define GC_MARK_SCRIPT(rt, script, prev) gc_mark_script(rt, script)
+
+static void
+gc_mark(JSRuntime *rt, void *thing);
+
+#endif /* !GC_MARK_DEBUG */
+
+static void
+gc_mark_atom(JSRuntime *rt, JSAtom *atom
+#ifdef GC_MARK_DEBUG
+  , GCMarkNode *prev
+#endif
+)
+{
+    jsval key;
+
+    if (!atom || atom->flags & ATOM_MARK)
+	return;
+    atom->flags |= ATOM_MARK;
+    key = ATOM_KEY(atom);
+    if (JSVAL_IS_GCTHING(key)) {
+#ifdef GC_MARK_DEBUG
+	char name[32];
+
+	if (JSVAL_IS_STRING(key)) {
+	    PR_snprintf(name, sizeof name, "'%s'",
+			JS_GetStringBytes(JSVAL_TO_STRING(key)));
+	} else {
+	    PR_snprintf(name, sizeof name, "<%x>", key);
+	}
+#endif
+	GC_MARK(rt, JSVAL_TO_GCTHING(key), name, prev);
+    }
+}
+
+static void
+gc_mark_script(JSRuntime *rt, JSScript *script
+#ifdef GC_MARK_DEBUG
+  , GCMarkNode *prev
+#endif
+)
+{
+    JSAtomMap *map;
+    uintN i, length;
+    JSAtom **vector;
+
+    map = &script->atomMap;
+    length = map->length;
+    vector = map->vector;
+    for (i = 0; i < length; i++)
+	GC_MARK_ATOM(rt, vector[i], prev);
+}
+
+static void
+#ifdef GC_MARK_DEBUG
+gc_mark_node(JSRuntime *rt, void *thing, GCMarkNode *prev)
+#else
+gc_mark(JSRuntime *rt, void *thing)
+#endif
+{
+    uint8 flags, *flagp;
+    JSObject *obj;
+    jsval v, *vp, *end;
+    JSScope *scope;
+    JSClass *clasp;
+    JSScript *script;
+    JSFunction *fun;
+    JSScopeProperty *sprop;
+    JSSymbol *sym;
+
+    if (!thing)
+	return;
+    flagp = gc_find_flags(rt, thing);
+    if (!flagp)
+	return;
+
+    /* Check for something on the GC freelist to handle recycled stack. */
+    flags = *flagp;
+    if (flags == GCF_FINAL)
+	return;
+
+#ifdef GC_MARK_DEBUG
+    if (js_LiveThingToFind == thing)
+	gc_dump_thing(thing, flags, prev, stderr);
+#endif
+
+    if (flags & GCF_MARK)
+	return;
+    *flagp |= GCF_MARK;
+    METER(if (++rt->gcStats.depth > rt->gcStats.maxdepth)
+	      rt->gcStats.maxdepth = rt->gcStats.depth);
+
+#ifdef GC_MARK_DEBUG
+    if (js_DumpGCHeap)
+	gc_dump_thing(thing, flags, prev, js_DumpGCHeap);
+#endif
+
+    if ((flags & GCF_TYPEMASK) == GCX_OBJECT) {
+	obj = thing;
+	vp = obj->slots;
+	if (vp) {
+	    scope = OBJ_IS_NATIVE(obj) ? (JSScope *) obj->map : NULL;
+	    if (scope) {
+		clasp = JSVAL_TO_PRIVATE(obj->slots[JSSLOT_CLASS]);
+
+		if (clasp == &js_ScriptClass) {
+		    v = vp[JSSLOT_PRIVATE];
+		    if (!JSVAL_IS_VOID(v)) {
+			script = JSVAL_TO_PRIVATE(v);
+			if (script)
+			    GC_MARK_SCRIPT(rt, script, prev);
+		    }
+		}
+
+		if (clasp == &js_FunctionClass) {
+		    v = vp[JSSLOT_PRIVATE];
+		    if (!JSVAL_IS_VOID(v)) {
+			fun = JSVAL_TO_PRIVATE(v);
+			if (fun) {
+			    if (fun->atom)
+			    	GC_MARK_ATOM(rt, fun->atom, prev);
+			    if (fun->script)
+				GC_MARK_SCRIPT(rt, fun->script, prev);
+			}
+		    }
+		}
+
+		for (sprop = scope->props; sprop; sprop = sprop->next) {
+		    for (sym = sprop->symbols; sym; sym = sym->next) {
+			if (JSVAL_IS_INT(sym_id(sym)))
+			    continue;
+			GC_MARK_ATOM(rt, sym_atom(sym), prev);
+		    }
+		}
+	    }
+	    if (!scope || scope->object == obj)
+		end = vp + obj->map->freeslot;
+	    else
+		end = vp + JS_INITIAL_NSLOTS;
+	    for (; vp < end; vp++) {
+		v = *vp;
+		if (JSVAL_IS_GCTHING(v)) {
+#ifdef GC_MARK_DEBUG
+		    char name[32];
+
+		    if (scope) {
+			uint32 slot;
+			jsval nval;
+
+			slot = vp - obj->slots;
+			for (sprop = scope->props; ; sprop = sprop->next) {
+			    if (!sprop) {
+				switch (slot) {
+				  case JSSLOT_PROTO:
+				    strcpy(name, "__proto__");
+				    break;
+				  case JSSLOT_PARENT:
+				    strcpy(name, "__parent__");
+				    break;
+				  case JSSLOT_PRIVATE:
+				    strcpy(name, "__private__");
+				    break;
+				  default:
+				    PR_snprintf(name, sizeof name,
+						"**UNKNOWN SLOT %ld**",
+						(long)slot);
+				    break;
+				}
+				break;
+			    }
+			    if (sprop->slot == slot) {
+				nval = sprop->symbols
+				       ? js_IdToValue(sym_id(sprop->symbols))
+				       : sprop->id;
+				if (JSVAL_IS_INT(nval)) {
+				    PR_snprintf(name, sizeof name, "%ld",
+						(long)JSVAL_TO_INT(nval));
+				} else if (JSVAL_IS_STRING(nval)) {
+				    PR_snprintf(name, sizeof name, "%s",
+				      JS_GetStringBytes(JSVAL_TO_STRING(nval)));
+				} else {
+				    strcpy(name, "**FINALIZED ATOM KEY**");
+				}
+				break;
+			    }
+			}
+		    }
+#endif
+		    GC_MARK(rt, JSVAL_TO_GCTHING(v), name, prev);
+		}
+	    }
+	}
+    }
+
+    METER(rt->gcStats.depth--);
+}
+
+static PRHashNumber
+gc_hash_root(const void *key)
+{
+    PRHashNumber num = (PRHashNumber) key;	/* help lame MSVC1.5 on Win16 */
+
+    return num >> 2;
+}
+
+PR_STATIC_CALLBACK(intN)
+gc_root_marker(PRHashEntry *he, intN i, void *arg)
+{
+    void **rp = (void **)he->key;
+
+    if (*rp)
+	GC_MARK(arg, *rp, he->value ? he->value : "root", NULL);
+    return HT_ENUMERATE_NEXT;
+}
+
+JS_FRIEND_API(void)
+js_ForceGC(JSContext *cx)
+{
+    cx->newborn[GCX_OBJECT] = NULL;
+    cx->newborn[GCX_STRING] = NULL;
+    cx->newborn[GCX_DOUBLE] = NULL;
+    cx->runtime->gcPoke = JS_TRUE;
+    js_GC(cx);
+    PR_ArenaFinish();
+}
+
+void
+js_GC(JSContext *cx)
+{
+    JSRuntime *rt;
+    JSContext *iter, *acx;
+    PRArena *a, *ma, *fa, **ap, **fap;
+    jsval v, *vp, *sp;
+    pruword begin, end;
+    JSStackFrame *fp, *chain;
+    void *mark;
+    uint8 flags, *flagp;
+    JSGCThing *thing, *final, **flp, **oflp;
+    GCFinalizeOp finalizer;
+    JSBool a_all_clear, f_all_clear;
+
+    rt = cx->runtime;
+#ifdef JS_THREADSAFE
+    /* Avoid deadlock. */
+    PR_ASSERT(!JS_IS_RUNTIME_LOCKED(rt));
+#endif
+
+    /* Let the API user decide to defer a GC if it wants to. */
+    if (rt->gcCallback && !rt->gcCallback(cx, JSGC_BEGIN))
+	return;
+
+    /* Lock out other GC allocator and collector invocations. */
+    JS_LOCK_GC(rt);
+
+    /* Do nothing if no assignment has executed since the last GC. */
+    if (!rt->gcPoke) {
+	METER(rt->gcStats.nopoke++);
+	JS_UNLOCK_GC(rt);
+	return;
+    }
+    rt->gcPoke = JS_FALSE;
+    METER(rt->gcStats.poke++);
+
+#ifdef JS_THREADSAFE
+    /* Bump gcLevel and return rather than nest on this context. */
+    if (cx->gcActive) {
+	rt->gcLevel++;
+	METER(if (rt->gcLevel > rt->gcStats.maxlevel)
+		  rt->gcStats.maxlevel = rt->gcLevel);
+	if (rt->gcLevel > 1) {
+	    JS_UNLOCK_GC(rt);
+	    return;
+	}
+    }
+
+    /* If we're in a request, indicate, temporarily, that we're inactive. */
+    if (cx->requestDepth) {
+	rt->requestCount--;
+	JS_NOTIFY_REQUEST_DONE(rt);
+    }
+
+    /* If another thread is already in GC, don't attempt GC; wait instead. */
+    if (rt->gcLevel > 0) {
+	while (rt->gcLevel > 0)
+	    JS_AWAIT_GC_DONE(rt);
+	if (cx->requestDepth)
+	    rt->requestCount++;
+	JS_UNLOCK_GC(rt);
+	return;
+    }
+
+    /* No other thread is in GC, so indicate that we're now in GC. */
+    rt->gcLevel = 1;
+
+    /* Also indicate that GC is active on this context. */
+    cx->gcActive = JS_TRUE;
+
+    /* Wait for all other requests to finish. */
+    while (rt->requestCount > 0)
+	JS_AWAIT_REQUEST_DONE(rt);
+
+#else  /* !JS_THREADSAFE */
+
+    /* Bump gcLevel and return rather than nest; the outer gc will restart. */
+    rt->gcLevel++;
+    METER(if (rt->gcLevel > rt->gcStats.maxlevel)
+	      rt->gcStats.maxlevel = rt->gcLevel);
+    if (rt->gcLevel > 1)
+	return;
+
+#endif /* !JS_THREADSAFE */
+
+    /* Drop atoms held by the property cache, and clear property weak links. */
+    js_FlushPropertyCache(cx);
+restart:
+    rt->gcNumber++;
+
+    /* Mark phase. */
+    PR_HashTableEnumerateEntries(rt->gcRootsHash, gc_root_marker, rt);
+    js_MarkAtomState(&rt->atomState, gc_mark);
+    iter = NULL;
+    while ((acx = js_ContextIterator(rt, &iter)) != NULL) {
+	/*
+	 * Iterate frame chain and dormant chains. Temporarily tack current
+         * frame onto the head of the dormant list to ease iteration.
+         *
+         * (NOTE: see comment on this whole 'dormant' thing in js_Execute)
+         */
+	chain = acx->fp;
+        if (chain) {
+            PR_ASSERT(!chain->dormantNext);
+            chain->dormantNext = acx->dormantFrameChain;
+        } else {
+            chain = acx->dormantFrameChain;
+        }
+        for (fp=chain; fp; fp = chain = chain->dormantNext) {
+	    sp = fp->sp;
+	    if (sp) {
+		for (a = acx->stackPool.first.next; a; a = a->next) {
+		    begin = a->base;
+		    end = a->avail;
+		    if (PR_UPTRDIFF(sp, begin) < PR_UPTRDIFF(end, begin))
+			end = (pruword)sp;
+		    for (vp = (jsval *)begin; vp < (jsval *)end; vp++) {
+			v = *vp;
+			if (JSVAL_IS_GCTHING(v))
+			    GC_MARK(rt, JSVAL_TO_GCTHING(v), "stack", NULL);
+		    }
+		    if (end == (pruword)sp)
+		    	break;
+		}
+	    }
+	    do {
+		GC_MARK(rt, fp->scopeChain, "scope chain", NULL);
+		GC_MARK(rt, fp->thisp, "this", NULL);
+		if (JSVAL_IS_GCTHING(fp->rval))
+		    GC_MARK(rt, JSVAL_TO_GCTHING(fp->rval), "rval", NULL);
+		if (fp->callobj)
+		    GC_MARK(rt, fp->callobj, "call object", NULL);
+		if (fp->argsobj)
+		    GC_MARK(rt, fp->argsobj, "arguments object", NULL);
+		if (fp->script)
+		    GC_MARK_SCRIPT(rt, fp->script, NULL);
+		if (fp->sharpArray)
+		    GC_MARK(rt, fp->sharpArray, "sharp array", NULL);
+	    } while ((fp = fp->down) != NULL);
+	}
+        /* cleanup temporary link */
+        if (acx->fp)
+            acx->fp->dormantNext = NULL;
+	GC_MARK(rt, acx->globalObject, "global object", NULL);
+	GC_MARK(rt, acx->newborn[GCX_OBJECT], "newborn object", NULL);
+	GC_MARK(rt, acx->newborn[GCX_STRING], "newborn string", NULL);
+	GC_MARK(rt, acx->newborn[GCX_DOUBLE], "newborn double", NULL);
+    }
+
+    /* Sweep phase.  Mark in tempPool for release at label out:. */
+    ma = cx->tempPool.current;
+    mark = PR_ARENA_MARK(&cx->tempPool);
+    js_SweepAtomState(&rt->atomState);
+    fa = rt->gcFlagsPool.first.next;
+    flagp = (uint8 *)fa->base;
+    for (a = rt->gcArenaPool.first.next; a; a = a->next) {
+	for (thing = (JSGCThing *)a->base; thing < (JSGCThing *)a->avail;
+	     thing++) {
+	    if (flagp >= (uint8 *)fa->avail) {
+		fa = fa->next;
+		PR_ASSERT(fa);
+		if (!fa) {
+		    METER(rt->gcStats.badflag++);
+		    goto out;
+		}
+		flagp = (uint8 *)fa->base;
+	    }
+	    flags = *flagp;
+	    if (flags & GCF_MARK) {
+		*flagp &= ~GCF_MARK;
+	    } else if (!(flags & (GCF_LOCKMASK | GCF_FINAL))) {
+		PR_ARENA_ALLOCATE(final, &cx->tempPool, sizeof(JSGCThing));
+		if (!final)
+		    goto out;
+		final->next = thing;
+		final->flagp = flagp;
+		PR_ASSERT(rt->gcBytes >= sizeof(JSGCThing) + sizeof(uint8));
+		rt->gcBytes -= sizeof(JSGCThing) + sizeof(uint8);
+	    }
+	    flagp++;
+	}
+    }
+
+    /* Finalize phase.  Don't hold the GC lock while running finalizers! */
+    JS_UNLOCK_GC(rt);
+    for (final = mark; ; final++) {
+	if ((pruword)final >= ma->avail) {
+	    ma = ma->next;
+	    if (!ma)
+		break;
+	    final = (JSGCThing *)ma->base;
+	}
+	thing = final->next;
+	flagp = final->flagp;
+	flags = *flagp;
+	finalizer = gc_finalizers[flags & GCF_TYPEMASK];
+	if (finalizer) {
+	    *flagp |= GCF_FINAL;
+	    finalizer(cx, thing);
+	}
+
+	/*
+	 * Set flags to GCF_FINAL, signifying that thing is free, but don't
+	 * thread thing onto rt->gcFreeList.  We need the GC lock to rebuild
+	 * the freelist below while also looking for free-able arenas.
+	 */
+	*flagp = GCF_FINAL;
+    }
+    JS_LOCK_GC(rt);
+
+    /* Free unused arenas and rebuild the freelist. */
+    ap = &rt->gcArenaPool.first.next;
+    a = *ap;
+    if (!a)
+	goto out;
+    thing = (JSGCThing *)a->base;
+    a_all_clear = f_all_clear = JS_TRUE;
+    flp = oflp = &rt->gcFreeList;
+    *flp = NULL;
+    METER(rt->gcStats.freelen = 0);
+
+    fap = &rt->gcFlagsPool.first.next;
+    while ((fa = *fap) != NULL) {
+	/* XXX optimize by unrolling to use word loads */
+	for (flagp = (uint8 *)fa->base; ; flagp++) {
+	    PR_ASSERT(a);
+	    if (!a) {
+		METER(rt->gcStats.badarena++);
+		goto out;
+	    }
+	    if (thing >= (JSGCThing *)a->avail) {
+		if (a_all_clear) {
+		    PR_ARENA_DESTROY(&rt->gcArenaPool, a, ap);
+		    flp = oflp;
+		    METER(rt->gcStats.afree++);
+		} else {
+		    ap = &a->next;
+		    a_all_clear = JS_TRUE;
+		    oflp = flp;
+		}
+		a = *ap;
+		if (!a)
+		    break;
+		thing = (JSGCThing *)a->base;
+	    }
+	    if (flagp >= (uint8 *)fa->avail)
+		break;
+	    if (*flagp != GCF_FINAL) {
+		a_all_clear = f_all_clear = JS_FALSE;
+	    } else {
+		thing->flagp = flagp;
+		*flp = thing;
+		flp = &thing->next;
+		METER(rt->gcStats.freelen++);
+	    }
+	    thing++;
+	}
+	if (f_all_clear) {
+	    PR_ARENA_DESTROY(&rt->gcFlagsPool, fa, fap);
+	    METER(rt->gcStats.fafree++);
+	} else {
+	    fap = &fa->next;
+	    f_all_clear = JS_TRUE;
+	}
+    }
+
+    /* Terminate the new freelist. */
+    *flp = NULL;
+
+out:
+    PR_ARENA_RELEASE(&cx->tempPool, mark);
+    if (rt->gcLevel > 1) {
+	rt->gcLevel = 1;
+	goto restart;
+    }
+    rt->gcLevel = 0;
+    rt->gcLastBytes = rt->gcBytes;
+
+#ifdef JS_THREADSAFE
+    /* If we were invoked during a request, undo the temporary decrement. */
+    if (cx->requestDepth)
+	rt->requestCount++;
+    cx->gcActive = JS_FALSE;
+    JS_NOTIFY_GC_DONE(rt);
+    JS_UNLOCK_GC(rt);
+#endif
+    if (rt->gcCallback)
+	(void) rt->gcCallback(cx, JSGC_END);
+}

mozilla/js/src/jsgc.h

@@ -0,0 +1,110 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsgc_h___
+#define jsgc_h___
+/*
+ * JS Garbage Collector.
+ */
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+/* GC thing type indexes. */
+#define GCX_OBJECT	0			/* JSObject */
+#define GCX_STRING	1			/* JSString */
+#define GCX_DOUBLE	2			/* jsdouble */
+#define GCX_DECIMAL     3                       /* JSDecimal */
+#define GCX_NTYPES      4
+
+/* GC flag definitions (type index goes in low bits). */
+#define GCF_TYPEMASK	PR_BITMASK(2)		/* use low bits for type */
+#define GCF_MARK	PR_BIT(2)		/* mark bit */
+#define GCF_FINAL	PR_BIT(3)		/* in finalization bit */
+#define GCF_LOCKBIT	4			/* lock bit shift and mask */
+#define GCF_LOCKMASK	(PR_BITMASK(4) << GCF_LOCKBIT)
+#define GCF_LOCK	PR_BIT(GCF_LOCKBIT)	/* lock request bit in API */
+
+#if 1
+/*
+ * Since we're forcing a GC from JS_GC anyway, don't bother wasting cycles
+ * loading oldval.  XXX remove implied force, poke in addroot/removeroot, &c
+ */
+#define GC_POKE(cx, oldval) ((cx)->runtime->gcPoke = JS_TRUE)
+#else
+#define GC_POKE(cx, oldval) ((cx)->runtime->gcPoke = JSVAL_IS_GCTHING(oldval))
+#endif
+
+extern JSBool
+js_InitGC(JSRuntime *rt, uint32 maxbytes);
+
+extern void
+js_FinishGC(JSRuntime *rt);
+
+extern JSBool
+js_AddRoot(JSContext *cx, void *rp, const char *name);
+
+extern JSBool
+js_RemoveRoot(JSContext *cx, void *rp);
+
+extern void *
+js_AllocGCThing(JSContext *cx, uintN flags);
+
+extern JSBool
+js_LockGCThing(JSContext *cx, void *thing);
+
+extern JSBool
+js_UnlockGCThing(JSContext *cx, void *thing);
+
+extern JS_FRIEND_API(void)
+js_ForceGC(JSContext *cx);
+
+extern void
+js_GC(JSContext *cx);
+
+#ifdef JS_GCMETER
+
+typedef struct JSGCStats {
+    uint32  alloc;      /* number of allocation attempts */
+    uint32  freelen;    /* gcFreeList length */
+    uint32  recycle;    /* number of things recycled through gcFreeList */
+    uint32  retry;      /* allocation attempt retries after running the GC */
+    uint32  fail;       /* allocation failures */
+    uint32  lock;       /* valid lock calls */
+    uint32  unlock;     /* valid unlock calls */
+    uint32  stuck;      /* stuck reference counts seen by lock calls */
+    uint32  unstuck;    /* unlock calls that saw a stuck lock count */
+    uint32  depth;      /* mark recursion depth */
+    uint32  maxdepth;   /* maximum mark recursion depth */
+    uint32  maxlevel;   /* maximum GC nesting (indirect recursion) level */
+    uint32  poke;       /* number of potentially useful GC calls */
+    uint32  nopoke;     /* useless GC calls where js_PokeGC was not set */
+    uint32  badarena;   /* thing arena corruption */
+    uint32  badflag;    /* flags arena corruption */
+    uint32  afree;      /* thing arenas freed so far */
+    uint32  fafree;     /* flags arenas freed so far */
+} JSGCStats;
+
+extern void
+js_DumpGCStats(JSRuntime *rt, FILE *fp);
+
+#endif /* JS_GCMETER */
+
+PR_END_EXTERN_C
+
+#endif /* jsgc_h___ */

mozilla/js/src/jsinterp.h

@@ -0,0 +1,211 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsinterp_h___
+#define jsinterp_h___
+/*
+ * JS interpreter interface.
+ */
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+/*
+ * JS stack frame, allocated on the C stack.
+ */
+struct JSStackFrame {
+    JSObject        *callobj;       /* lazily created Call object */
+    JSObject        *argsobj;       /* lazily created arguments object */
+    JSScript        *script;        /* script being interpreted */
+    JSFunction      *fun;           /* function being called or null */
+    JSObject        *thisp;         /* "this" pointer if in method */
+    uintN           argc;           /* actual argument count */
+    jsval           *argv;          /* base of argument stack slots */
+    jsval           rval;           /* function return value */
+    uintN           nvars;          /* local variable count */
+    jsval           *vars;          /* base of variable stack slots */
+    JSStackFrame    *down;          /* previous frame */
+    void            *annotation;    /* used by Java security */
+    JSObject        *scopeChain;    /* scope chain */
+    jsbytecode      *pc;            /* program counter */
+    jsval           *sp;            /* stack pointer */
+    uintN           sharpDepth;     /* array/object initializer depth */
+    JSObject        *sharpArray;    /* scope for #n= initializer vars */
+    JSPackedBool    constructing;   /* true if called via new operator */
+    uint8           overrides;      /* bit-set of overridden Call properties */
+    JSPackedBool    debugging;      /* true if for JS_EvaluateInStackFrame */
+    JSPackedBool    throwing;       /* is there a pending exception? */
+    jsval	    exception;      /* most-recently-thrown exceptin */
+    JSStackFrame    *dormantNext;   /* next dormant frame chain */
+};
+
+/*
+ * Property cache for quickened get/set property opcodes.
+ */
+#define PROPERTY_CACHE_LOG2     10
+#define PROPERTY_CACHE_SIZE     PR_BIT(PROPERTY_CACHE_LOG2)
+#define PROPERTY_CACHE_MASK     PR_BITMASK(PROPERTY_CACHE_LOG2)
+
+#define PROPERTY_CACHE_HASH(obj, id) \
+    ((((pruword)(obj) >> JSVAL_TAGBITS) ^ (pruword)(id)) & PROPERTY_CACHE_MASK)
+
+#ifdef JS_THREADSAFE
+
+#if HAVE_ATOMIC_DWORD_ACCESS
+
+#define PCE_LOAD(cache, pce, entry)     PR_ATOMIC_DWORD_LOAD(pce, entry)
+#define PCE_STORE(cache, pce, entry)    PR_ATOMIC_DWORD_STORE(pce, entry)
+
+#else  /* !HAVE_ATOMIC_DWORD_ACCESS */
+
+#define PCE_LOAD(cache, pce, entry)                                           \
+    PR_BEGIN_MACRO                                                            \
+	uint32 _prefills;                                                     \
+	uint32 _fills = (cache)->fills;                                       \
+	do {                                                                  \
+	    /* Load until cache->fills is stable (see FILL macro below). */   \
+	    _prefills = _fills;                                               \
+	    (entry) = *(pce);                                                 \
+	} while ((_fills = (cache)->fills) != _prefills);                     \
+    PR_END_MACRO
+
+#define PCE_STORE(cache, pce, entry)                                          \
+    PR_BEGIN_MACRO                                                            \
+	do {                                                                  \
+	    /* Store until no racing collider stores half or all of pce. */   \
+	    *(pce) = (entry);                                                 \
+	} while (PCE_OBJECT(*pce) != PCE_OBJECT(entry) ||                     \
+		 PCE_PROPERTY(*pce) != PCE_PROPERTY(entry));                  \
+    PR_END_MACRO
+
+#endif /* !HAVE_ATOMIC_DWORD_ACCESS */
+
+#else  /* !JS_THREADSAFE */
+
+#define PCE_LOAD(cache, pce, entry)     ((entry) = *(pce))
+#define PCE_STORE(cache, pce, entry)    (*(pce) = (entry))
+
+#endif /* !JS_THREADSAFE */
+
+typedef union JSPropertyCacheEntry {
+    struct {
+	JSObject    *object;    /* weak link to object */
+	JSProperty  *property;  /* weak link to property, or not-found id */
+    } s;
+#ifdef HAVE_ATOMIC_DWORD_ACCESS
+    prdword align;
+#endif
+} JSPropertyCacheEntry;
+
+/* These may be called in lvalue or rvalue position. */
+#define PCE_OBJECT(entry)       ((entry).s.object)
+#define PCE_PROPERTY(entry)     ((entry).s.property)
+
+typedef struct JSPropertyCache {
+    JSPropertyCacheEntry table[PROPERTY_CACHE_SIZE];
+    JSBool               empty;
+    uint32               fills;
+    uint32               recycles;
+    uint32               tests;
+    uint32               misses;
+    uint32               flushes;
+} JSPropertyCache;
+
+/* Property-not-found lookup results are cached using this invalid pointer. */
+#define PROP_NOT_FOUND(obj,id)  ((JSProperty *) ((prword)(id) | 1))
+#define PROP_NOT_FOUND_ID(prop) ((jsid) ((prword)(prop) & ~1))
+#define PROP_FOUND(prop)        ((prop) && ((prword)(prop) & 1) == 0)
+
+#define PROPERTY_CACHE_FILL(cx, cache, obj, id, prop)                         \
+    PR_BEGIN_MACRO                                                            \
+	uintN _hashIndex = (uintN)PROPERTY_CACHE_HASH(obj, id);               \
+	JSPropertyCache *_cache = (cache);                                    \
+	JSPropertyCacheEntry *_pce = &_cache->table[_hashIndex];              \
+	JSPropertyCacheEntry _entry;                                          \
+	JSProperty *_pce_prop;                                                \
+	PCE_LOAD(_cache, _pce, _entry);                                       \
+	_pce_prop = PCE_PROPERTY(_entry);                                     \
+	if (_pce_prop && _pce_prop != prop)                                   \
+	    _cache->recycles++;                                               \
+	PCE_OBJECT(_entry) = obj;                                             \
+	PCE_PROPERTY(_entry) = prop;                                          \
+	_cache->empty = JS_FALSE;                                             \
+	_cache->fills++;                                                      \
+	PCE_STORE(_cache, _pce, _entry);                                      \
+    PR_END_MACRO
+
+#define PROPERTY_CACHE_TEST(cache, obj, id, prop)                             \
+    PR_BEGIN_MACRO                                                            \
+	uintN _hashIndex = (uintN)PROPERTY_CACHE_HASH(obj, id);               \
+	JSPropertyCache *_cache = (cache);                                    \
+	JSPropertyCacheEntry *_pce = &_cache->table[_hashIndex];              \
+	JSPropertyCacheEntry _entry;                                          \
+	JSProperty *_pce_prop;                                                \
+	PCE_LOAD(_cache, _pce, _entry);                                       \
+	_pce_prop = PCE_PROPERTY(_entry);                                     \
+	_cache->tests++;                                                      \
+	if (_pce_prop &&                                                      \
+	    (((prword)_pce_prop & 1)                                          \
+	     ? PROP_NOT_FOUND_ID(_pce_prop)                                   \
+	     : sym_id(((JSScopeProperty *)_pce_prop)->symbols)) == id &&      \
+	    PCE_OBJECT(_entry) == obj) {                                      \
+	    prop = _pce_prop;                                                 \
+	} else {                                                              \
+	    _cache->misses++;                                                 \
+	    prop = NULL;                                                      \
+	}                                                                     \
+    PR_END_MACRO
+
+extern void
+js_FlushPropertyCache(JSContext *cx);
+
+extern void
+js_FlushPropertyCacheByProp(JSContext *cx, JSProperty *prop);
+
+extern jsval *
+js_AllocStack(JSContext *cx, uintN nslots, void **markp);
+
+extern void
+js_FreeStack(JSContext *cx, void *mark);
+
+extern JSBool
+js_GetArgument(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSBool
+js_SetArgument(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSBool
+js_GetLocalVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSBool
+js_SetLocalVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+extern JSBool
+js_Invoke(JSContext *cx, uintN argc, JSBool constructing);
+
+extern JSBool
+js_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval,
+		     uintN argc, jsval *argv, jsval *rval);
+
+extern JSBool
+js_Execute(JSContext *cx, JSObject *chain, JSScript *script, JSFunction *fun,
+	   JSStackFrame *down, JSBool debugging, jsval *result);
+
+extern JSBool
+js_Interpret(JSContext *cx, jsval *result);
+
+#endif /* jsinterp_h___ */

mozilla/js/src/jslock.c

@@ -0,0 +1,766 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifdef JS_THREADSAFE
+
+/*
+ * JS locking stubs.
+ */
+#include "jsstddef.h"
+#include <stdlib.h>
+#include "jspubtd.h"
+#include "prthread.h"
+#include "prlog.h"
+#include "jscntxt.h"
+#include "jsscope.h"
+#include "jspubtd.h"
+#include "jslock.h"
+
+static PRLock *_global_lock;
+
+static void
+js_LockGlobal()
+{
+  PR_Lock(_global_lock);
+}
+
+static void
+js_UnlockGlobal()
+{
+  PR_Unlock(_global_lock);
+}
+
+#define AtomicRead(W) (W)
+#define AtomicAddBody(P,I)\
+    prword n;\
+    do {\
+	n = AtomicRead(*(P));\
+    } while (!js_CompareAndSwap(P, n, n + I));
+
+#if defined(_WIN32) && !defined(NSPR_LOCK)
+#pragma warning( disable : 4035 )
+
+PR_INLINE int
+js_CompareAndSwap(prword *w, prword ov, prword nv)
+{
+    __asm {
+		mov eax,ov
+		mov ecx, nv
+		mov ebx, w
+		lock cmpxchg [ebx], ecx
+		sete al
+		and eax,1h
+	}
+}
+
+#elif defined(SOLARIS) && !defined(NSPR_LOCK)
+
+#ifndef ULTRA_SPARC
+PR_INLINE prword
+js_AtomicRead(prword *p)
+{
+    prword n;
+    while ((n = *p) == -1)
+	;
+    return n;
+}
+
+#undef AtomicRead
+#define AtomicRead(W) js_AtomicRead(&(W))
+
+static PRLock *_counter_lock;
+#define UsingCounterLock 1
+
+#undef AtomicAddBody
+#define AtomicAddBody(P,I) \
+    PR_Lock(_counter_lock);\
+    *(P) += I;\
+    PR_Unlock(_counter_lock);
+
+#endif /* !ULTRA_SPARC */
+
+PR_INLINE int
+js_CompareAndSwap(prword *w, prword ov, prword nv)
+{
+#if defined(__GNUC__)
+    unsigned int res;
+#ifndef ULTRA_SPARC
+    PR_ASSERT(nv >= 0);
+    asm volatile ("
+swap [%1],%4
+1:  tst %4
+bneg,a 1b
+swap [%1],%4
+cmp %2,%4
+be,a 2f
+swap [%1],%3
+swap [%1],%4
+ba 3f
+mov 0,%0
+2:  mov 1,%0
+3:"
+		  : "=r" (res)
+		  : "r" (w), "r" (ov), "r" (nv), "r" (-1));
+#else /* ULTRA_SPARC */
+    PR_ASSERT(ov != nv);
+    asm volatile ("
+cas [%1],%2,%3
+cmp %2,%3
+be,a 1f
+mov 1,%0
+mov 0,%0
+1:"
+		  : "=r" (res)
+		  : "r" (w), "r" (ov), "r" (nv));
+#endif /* ULTRA_SPARC */
+    return (int)res;
+#else /* !__GNUC__ */
+    extern int compare_and_swap(prword*,prword,prword);
+#ifndef ULTRA_SPARC
+    PR_ASSERT(nv >= 0);
+#else
+    PR_ASSERT(ov != nv);
+#endif
+    return compare_and_swap(w,ov,nv);
+#endif
+}
+
+#elif defined(AIX) && !defined(NSPR_LOCK)
+
+PR_INLINE int
+js_CompareAndSwap(prword *w, prword ov, prword nv)
+{
+/*
+  int i = -1;
+
+  lwarx reg,0,w
+  cmpw reg,ov
+  bne no
+  stwcx. nv,0,w
+  beq yes
+  no:
+  li res,0
+  yes:
+  */
+    extern int compare_and_swap(int*,int*,int);
+
+    return compare_and_swap(w,&ov,nv);
+}
+
+#else
+
+static PRLock *_counter_lock;
+#define UsingCounterLock 1
+
+#undef AtomicAddBody
+#define AtomicAddBody(P,I) \
+    PR_Lock(_counter_lock);\
+    *(P) += I;\
+    PR_Unlock(_counter_lock);
+
+static PRLock *_compare_and_swap_lock;
+#define UsingCompareAndSwapLock 1
+
+PR_INLINE int
+js_CompareAndSwap(prword *w, prword ov, prword nv)
+{
+    int res = 0;
+
+    PR_Lock(_compare_and_swap_lock);
+    if (*w == ov) {
+      *w = nv;
+      res = 1;
+    }
+    PR_Unlock(_compare_and_swap_lock);
+    return res;
+}
+
+#endif /* arch-tests */
+
+PR_INLINE void
+js_AtomicAdd(prword *p, prword i)
+{
+    AtomicAddBody(p,i);
+}
+
+prword
+js_CurrentThreadId()
+{
+    return CurrentThreadId();
+}
+
+void
+js_NewLock(JSThinLock *p)
+{
+#ifdef NSPR_LOCK
+    p->owner = 0;
+    p->fat = (JSFatLock*)JS_NEW_LOCK();
+#else
+    memset(p, 0, sizeof(JSThinLock));
+#endif
+}
+
+void
+js_DestroyLock(JSThinLock *p)
+{
+#ifdef NSPR_LOCK
+    p->owner = 0xdeadbeef;
+    JS_DESTROY_LOCK(((JSLock*)p->fat));
+#else
+    PR_ASSERT(p->owner == 0);
+    PR_ASSERT(p->fat == NULL);
+#endif
+}
+
+static void js_Dequeue(JSThinLock *);
+
+PR_INLINE jsval
+js_GetSlotWhileLocked(JSContext *cx, JSObject *obj, uint32 slot)
+{
+    jsval v;
+#ifndef NSPR_LOCK
+    JSScope *scp = (JSScope *)obj->map;
+    JSThinLock *p = &scp->lock;
+    prword me = cx->thread;
+#endif
+
+    PR_ASSERT(obj->slots && slot < obj->map->freeslot);
+#ifndef NSPR_LOCK
+    PR_ASSERT(me == CurrentThreadId());
+    if (js_CompareAndSwap(&p->owner, 0, me)) {
+	if (scp == (JSScope *)obj->map) {
+	    v = obj->slots[slot];
+	    if (!js_CompareAndSwap(&p->owner, me, 0)) {
+		scp->count = 1;
+		js_UnlockObj(cx,obj);
+	    }
+	    return v;
+	}
+	if (!js_CompareAndSwap(&p->owner, me, 0))
+	    js_Dequeue(p);
+    }
+    else if (Thin_RemoveWait(AtomicRead(p->owner)) == me) {
+	return obj->slots[slot];
+    }
+#endif
+    js_LockObj(cx,obj);
+    v = obj->slots[slot];
+    js_UnlockObj(cx,obj);
+    return v;
+}
+
+PR_INLINE void
+js_SetSlotWhileLocked(JSContext *cx, JSObject *obj, uint32 slot, jsval v)
+{
+#ifndef NSPR_LOCK
+    JSScope *scp = (JSScope *)obj->map;
+    JSThinLock *p = &scp->lock;
+    prword me = cx->thread;
+#endif
+
+    PR_ASSERT(obj->slots && slot < obj->map->freeslot);
+#ifndef NSPR_LOCK
+    PR_ASSERT(me == CurrentThreadId());
+    if (js_CompareAndSwap(&p->owner, 0, me)) {
+	if (scp == (JSScope *)obj->map) {
+	    obj->slots[slot] = v;
+	    if (!js_CompareAndSwap(&p->owner, me, 0)) {
+		scp->count = 1;
+		js_UnlockObj(cx,obj);
+	    }
+	    return;
+	}
+	if (!js_CompareAndSwap(&p->owner, me, 0))
+	    js_Dequeue(p);
+    }
+    else if (Thin_RemoveWait(AtomicRead(p->owner)) == me) {
+	obj->slots[slot] = v;
+	return;
+    }
+#endif
+    js_LockObj(cx,obj);
+    obj->slots[slot] = v;
+    js_UnlockObj(cx,obj);
+}
+
+static JSFatLock *
+mallocFatlock()
+{
+    JSFatLock *fl = (JSFatLock *)malloc(sizeof(JSFatLock)); /* for now */
+    PR_ASSERT(fl);
+    fl->susp = 0;
+    fl->next = NULL;
+    fl->prev = NULL;
+    fl->slock = PR_NewLock();
+    fl->svar = PR_NewCondVar(fl->slock);
+    return fl;
+}
+
+static void
+freeFatlock(JSFatLock *fl)
+{
+    PR_DestroyLock(fl->slock);
+    PR_DestroyCondVar(fl->svar);
+    free(fl);
+}
+
+static int
+js_SuspendThread(JSThinLock *p)
+{
+    JSFatLock *fl = p->fat;
+    PRStatus stat;
+    if (fl == NULL)
+	return 1;
+    PR_Lock(fl->slock);
+    fl->susp++;
+    if (p->fat == NULL || fl->susp<1) {
+		PR_Unlock(fl->slock);
+		return 1;
+    }
+    stat = PR_WaitCondVar(fl->svar,PR_INTERVAL_NO_TIMEOUT);
+    if (stat == PR_FAILURE) {
+		fl->susp--;
+		return 0;
+    }
+    PR_Unlock(fl->slock);
+    return 1;
+}
+
+static void
+js_ResumeThread(JSThinLock *p)
+{
+    JSFatLock *fl = p->fat;
+    PRStatus stat;
+    PR_Lock(fl->slock);
+    fl->susp--;
+    stat = PR_NotifyCondVar(fl->svar);
+    PR_ASSERT(stat != PR_FAILURE);
+    PR_Unlock(fl->slock);
+}
+
+static JSFatLock *
+listOfFatlocks(int l)
+{
+    JSFatLock *m;
+    JSFatLock *m0;
+	int i;
+
+    PR_ASSERT(l>0);
+    m0 = m = mallocFatlock();
+    for (i=1; i<l; i++) {
+		m->next = mallocFatlock();
+		m = m->next;
+    }
+    return m0;
+}
+
+static void
+deleteListOfFatlocks(JSFatLock *m)
+{
+    JSFatLock *m0;
+    for (; m; m=m0) {
+		m0 = m->next;
+		freeFatlock(m);
+    }
+}
+
+static JSFatLockTable _fl_table;
+
+JSFatLock *
+allocateFatlock()
+{
+  JSFatLock *m;
+
+  if (_fl_table.free == NULL) {
+#ifdef DEBUG
+      printf("Ran out of fat locks!\n");
+#endif
+      _fl_table.free = listOfFatlocks(10);
+  }
+  m = _fl_table.free;
+  _fl_table.free = m->next;
+  _fl_table.free->prev = NULL;
+  m->susp = 0;
+  m->next = _fl_table.taken;
+  m->prev = NULL;
+  if (_fl_table.taken != NULL)
+	_fl_table.taken->prev = m;
+  _fl_table.taken = m;
+  return m;
+}
+
+void
+deallocateFatlock(JSFatLock *m)
+{
+  if (m == NULL)
+	return;
+  if (m->prev != NULL)
+	m->prev->next = m->next;
+  if (m->next != NULL)
+	m->next->prev = m->prev;
+  if (m == _fl_table.taken)
+	_fl_table.taken = m->next;
+  m->next = _fl_table.free;
+  _fl_table.free = m;
+}
+
+JS_PUBLIC_API(int)
+js_SetupLocks(int l)
+{
+  if (l > 10000)       /* l equals number of initially allocated fat locks */
+#ifdef DEBUG
+    printf("Number %d very large in js_SetupLocks()!\n",l);
+#endif
+  if (_global_lock)
+    return 1;
+  _global_lock = PR_NewLock();
+  PR_ASSERT(_global_lock);
+#ifdef UsingCounterLock
+  _counter_lock = PR_NewLock();
+  PR_ASSERT(_counter_lock);
+#endif
+#ifdef UsingCompareAndSwapLock
+  _compare_and_swap_lock = PR_NewLock();
+  PR_ASSERT(_compare_and_swap_lock);
+#endif
+  _fl_table.free = listOfFatlocks(l);
+  _fl_table.taken = NULL;
+  return 1;
+}
+
+JS_PUBLIC_API(void)
+js_CleanupLocks()
+{
+  if (_global_lock != NULL) {
+    deleteListOfFatlocks(_fl_table.free);
+    _fl_table.free = NULL;
+    deleteListOfFatlocks(_fl_table.taken);
+    _fl_table.taken = NULL;
+    PR_DestroyLock(_global_lock);
+    _global_lock = NULL;
+#ifdef UsingCounterLock
+    PR_DestroyLock(_counter_lock);
+    _counter_lock = NULL;
+#endif
+#ifdef UsingCompareAndSwapLock
+    PR_DestroyLock(_compare_and_swap_lock);
+    _compare_and_swap_lock = NULL;
+#endif
+  }
+}
+
+JS_PUBLIC_API(void)
+js_InitContextForLocking(JSContext *cx)
+{
+	cx->thread = CurrentThreadId();
+	PR_ASSERT(Thin_GetWait(cx->thread) == 0);
+}
+
+/*
+
+  It is important that emptyFatlock() clears p->fat in the empty case
+  while holding p->slock. This serializes the access of p->fat wrt
+  js_SuspendThread(), which also requires p->slock.  There would
+  otherwise be a race condition as follows.  Thread A is about to
+  clear p->fat, having woken up after being suspended in a situation
+  where no other thread has yet suspended on p. However, suppose
+  thread B is about to suspend on p, having just released the global
+  lock, and is currently calling js_SuspendThread(). In the unfortunate
+  case where A precedes B ever so slightly, A will think that it
+  should clear p->fat (being currently empty but not for long), at the
+  same time as B is about to suspend on p->fat.  Now, A deallocates
+  p->fat while B is about to suspend on it. Thus, the suspension of B
+  is lost and B will not be properly activated.
+
+  Using p->slock as below (and correspondingly in js_SuspendThread()),
+  js_SuspendThread() will notice that p->fat is empty, and hence return
+  immediately.
+
+  */
+
+int
+emptyFatlock(JSThinLock *p)
+{
+  JSFatLock *fl = p->fat;
+  int i;
+
+  if (fl == NULL)
+	return 1;
+  PR_Lock(fl->slock);
+  i = fl->susp;
+  if (i < 1) {
+	fl->susp = -1;
+	deallocateFatlock(fl);
+	p->fat = NULL;
+  }
+  PR_Unlock(fl->slock);
+  return i < 1;
+}
+
+/*
+  Fast locking and unlocking is implemented by delaying the
+  allocation of a system lock (fat lock) until contention. As long as
+  a locking thread A runs uncontended, the lock is represented solely
+  by storing A's identity in the object being locked.
+
+  If another thread B tries to lock the object currently locked by A,
+  B is enqueued into a fat lock structure (which might have to be
+  allocated and pointed to by the object), and suspended using NSPR
+  conditional variables (wait).  A wait bit (Bacon bit) is set in the
+  lock word of the object, signalling to A that when releasing the
+  lock, B must be dequeued and notified.
+
+  The basic operation of the locking primitives (js_Lock(),
+  js_Unlock(), js_Enqueue(), and js_Dequeue()) is
+  compare-and-swap. Hence, when locking into p, if
+  compare-and-swap(p,NULL,me) succeeds this implies that p is
+  unlocked.  Similarly, when unlocking p, if
+  compare-and-swap(p,me,NULL) succeeds this implies that p is
+  uncontended (no one is waiting because the wait bit is not set).
+
+  Furthermore, when enqueueing (after the compare-and-swap has failed
+  to lock the object), a global spin lock is grabbed which serializes
+  changes to an object, and prevents the race condition when a lock is
+  released simultaneously with a thread suspending on it (these two
+  operations are serialized using the spin lock). Thus, a thread is
+  enqueued if the lock is still held by another thread, and otherwise
+  the lock is grabbed using compare-and-swap. When dequeueing, the
+  lock is released, and one of the threads suspended on the lock is
+  notified.  If other threads still are waiting, the wait bit is kept, and if
+  not, the fat lock is deallocated (in emptyFatlock()).
+
+*/
+
+static void
+js_Enqueue(JSThinLock *p, prword me)
+{
+  prword o, n;
+
+  js_LockGlobal();
+  while (1) {
+	o = AtomicRead(p->owner);
+	n = Thin_SetWait(o);
+	if (o != 0 && js_CompareAndSwap(&p->owner,o,n)) {
+	  if (p->fat == NULL)
+		p->fat = allocateFatlock();
+#ifdef DEBUG_
+	  printf("Going to suspend (%x) on {%x,%x}\n",me,p,p->fat);
+#endif
+	  js_UnlockGlobal();
+	  js_SuspendThread(p);
+	  js_LockGlobal();
+#ifdef DEBUG_
+	  printf("Waking up (%x) on {%x,%x,%d}\n",me,p,p->fat,(p->fat ? p->fat->susp : 42));
+#endif
+	  if (emptyFatlock(p))
+		me = Thin_RemoveWait(me);
+	  else
+		me = Thin_SetWait(me);
+	}
+	else if (js_CompareAndSwap(&p->owner,0,me)) {
+	  js_UnlockGlobal();
+	  return;
+	}
+  }
+}
+
+static void
+js_Dequeue(JSThinLock *p)
+{
+  js_LockGlobal();
+  PR_ASSERT(Thin_GetWait(AtomicRead(p->owner)));
+  p->owner = 0;			/* release it */
+  PR_ASSERT(p->fat);
+  js_ResumeThread(p);
+  js_UnlockGlobal();
+}
+
+PR_INLINE void
+js_Lock(JSThinLock *p, prword me)
+{
+#ifdef DEBUG_
+    printf("\nT%x about to lock %x\n",me,p);
+#endif
+    PR_ASSERT(me == CurrentThreadId());
+    if (js_CompareAndSwap(&p->owner, 0, me))
+		return;
+    if (Thin_RemoveWait(AtomicRead(p->owner)) != me)
+		js_Enqueue(p, me);
+#ifdef DEBUG
+    else
+	PR_ASSERT(0);
+#endif
+}
+
+PR_INLINE void
+js_Unlock(JSThinLock *p, prword me)
+{
+#ifdef DEBUG_
+    printf("\nT%x about to unlock %p\n",me,p);
+#endif
+    PR_ASSERT(me == CurrentThreadId());
+    if (js_CompareAndSwap(&p->owner, me, 0))
+	return;
+    if (Thin_RemoveWait(AtomicRead(p->owner)) == me)
+	js_Dequeue(p);
+#ifdef DEBUG
+    else
+	PR_ASSERT(0);
+#endif
+}
+
+void
+js_LockRuntime(JSRuntime *rt)
+{
+    prword me = CurrentThreadId();
+    JSThinLock *p;
+
+    PR_ASSERT(Thin_RemoveWait(AtomicRead(rt->rtLock.owner)) != me);
+    p = &rt->rtLock;
+    JS_LOCK0(p,me);
+}
+
+void
+js_UnlockRuntime(JSRuntime *rt)
+{
+    prword me = CurrentThreadId();
+    JSThinLock *p;
+
+    PR_ASSERT(Thin_RemoveWait(AtomicRead(rt->rtLock.owner)) == me);
+    p = &rt->rtLock;
+    JS_UNLOCK0(p,me);
+}
+
+PR_INLINE void
+js_LockScope1(JSContext *cx, JSScope *scope, prword me)
+{
+    JSThinLock *p;
+
+    if (Thin_RemoveWait(AtomicRead(scope->lock.owner)) == me) {
+	PR_ASSERT(scope->count > 0);
+	scope->count++;
+    } else {
+	p = &scope->lock;
+	JS_LOCK0(p,me);
+	PR_ASSERT(scope->count == 0);
+	scope->count = 1;
+    }
+}
+
+void
+js_LockScope(JSContext *cx, JSScope *scope)
+{
+    PR_ASSERT(cx->thread == CurrentThreadId());
+    js_LockScope1(cx,scope,cx->thread);
+}
+
+void
+js_UnlockScope(JSContext *cx, JSScope *scope)
+{
+    prword me = cx->thread;
+    JSThinLock *p;
+
+    PR_ASSERT(scope->count > 0);
+    if (Thin_RemoveWait(AtomicRead(scope->lock.owner)) != me) {
+	PR_ASSERT(0);
+	return;
+    }
+    if (--scope->count == 0) {
+	p = &scope->lock;
+	JS_UNLOCK0(p,me);
+    }
+}
+
+void
+js_TransferScopeLock(JSContext *cx, JSScope *oldscope, JSScope *newscope)
+{
+    prword me;
+    JSThinLock *p;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(newscope));
+    /*
+     * If the last reference to oldscope went away, newscope needs no lock
+     * state update.
+     */
+    if (!oldscope) {
+	return;
+    }
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(oldscope));
+    /*
+     * Transfer oldscope's entry count to newscope, as it will be unlocked
+     * now via JS_UNLOCK_OBJ(cx,obj) calls made while we unwind the C stack
+     * from the current point (under js_GetMutableScope).
+     */
+    newscope->count = oldscope->count;
+    /*
+     * Reset oldscope's lock state so that it is completely unlocked.
+     */
+    oldscope->count = 0;
+    p = &oldscope->lock;
+    me = cx->thread;
+    JS_UNLOCK0(p,me);
+}
+
+void
+js_LockObj(JSContext *cx, JSObject *obj)
+{
+    JSScope *scope;
+    prword me = cx->thread;
+    PR_ASSERT(me == CurrentThreadId());
+    for (;;) {
+		scope = (JSScope *) obj->map;
+		js_LockScope1(cx, scope, me);
+
+		/* If obj still has this scope, we're done. */
+		if (scope == (JSScope *) obj->map)
+			return;
+
+		/* Lost a race with a mutator; retry with obj's new scope. */
+		js_UnlockScope(cx, scope);
+    }
+}
+
+void
+js_UnlockObj(JSContext *cx, JSObject *obj)
+{
+    js_UnlockScope(cx, (JSScope *) obj->map);
+}
+
+#ifdef DEBUG
+JSBool
+js_IsRuntimeLocked(JSRuntime *rt)
+{
+    return CurrentThreadId() == Thin_RemoveWait(AtomicRead(rt->rtLock.owner));
+}
+
+JSBool
+js_IsObjLocked(JSObject *obj)
+{
+    JSObjectMap *map = obj->map;
+
+    return MAP_IS_NATIVE(map) && CurrentThreadId() == Thin_RemoveWait(AtomicRead(((JSScope *)map)->lock.owner));
+}
+
+JSBool
+js_IsScopeLocked(JSScope *scope)
+{
+    return CurrentThreadId() == Thin_RemoveWait(AtomicRead(scope->lock.owner));
+}
+#endif
+
+#endif /* JS_THREADSAFE */

mozilla/js/src/jslock.h

@@ -0,0 +1,217 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef jslock_h__
+#define jslock_h__
+
+#ifdef JS_THREADSAFE
+
+#include "prtypes.h"
+#include "prlock.h"
+#include "prcvar.h"
+#ifndef NSPR20
+#include "prhash.h"
+#else
+#include "plhash.h"
+#endif
+
+#define Thin_GetWait(W) ((prword)(W) & 0x1)
+#define Thin_SetWait(W) ((prword)(W) | 0x1)
+#define Thin_RemoveWait(W) ((prword)(W) & ~0x1)
+
+typedef struct JSFatLock {
+    int susp;
+    PRLock* slock;
+    PRCondVar* svar;
+    struct JSFatLock *next;
+    struct JSFatLock *prev;
+} JSFatLock;
+
+typedef struct JSThinLock {
+  prword owner;
+  JSFatLock *fat;
+} JSThinLock;
+
+typedef PRLock JSLock;
+
+typedef struct JSFatLockTable {
+    JSFatLock *free;
+    JSFatLock *taken;
+} JSFatLockTable;
+
+#define JS_ATOMIC_ADDREF(p, i) js_AtomicAdd(p,i)
+
+#define CurrentThreadId() (prword)PR_GetCurrentThread()
+#define JS_CurrentThreadId() js_CurrentThreadId()
+#define JS_NEW_LOCK()               PR_NewLock()
+#define JS_DESTROY_LOCK(l)          PR_DestroyLock(l)
+#define JS_ACQUIRE_LOCK(l)          PR_Lock(l)
+#define JS_RELEASE_LOCK(l)          PR_Unlock(l)
+#define JS_LOCK0(P,M) js_Lock(P,M)
+#define JS_UNLOCK0(P,M) js_Unlock(P,M)
+
+#define JS_NEW_CONDVAR(l)           PR_NewCondVar(l)
+#define JS_DESTROY_CONDVAR(cv)      PR_DestroyCondVar(cv)
+#define JS_WAIT_CONDVAR(cv,to)      PR_WaitCondVar(cv,to)
+#define JS_NO_TIMEOUT               PR_INTERVAL_NO_TIMEOUT
+#define JS_NOTIFY_CONDVAR(cv)       PR_NotifyCondVar(cv)
+#define JS_NOTIFY_ALL_CONDVAR(cv)   PR_NotifyAllCondVar(cv)
+
+#ifdef DEBUG
+#include "jsscope.h"
+
+#define _SET_OBJ_INFO(obj,f,l)                                                \
+    _SET_SCOPE_INFO(((JSScope*)obj->map),f,l)
+
+#define _SET_SCOPE_INFO(scope,f,l)                                            \
+    (PR_ASSERT(scope->count > 0 && scope->count <= 4),                        \
+     scope->file[scope->count-1] = f,                                         \
+     scope->line[scope->count-1] = l)
+#endif /* DEBUG */
+
+#define JS_LOCK_RUNTIME(rt)         js_LockRuntime(rt)
+#define JS_UNLOCK_RUNTIME(rt)       js_UnlockRuntime(rt)
+#define JS_LOCK_OBJ(cx,obj)         (js_LockObj(cx, obj),                    \
+				      _SET_OBJ_INFO(obj,__FILE__,__LINE__))
+#define JS_UNLOCK_OBJ(cx,obj)       js_UnlockObj(cx, obj)
+#define JS_LOCK_SCOPE(cx,scope)     (js_LockScope(cx, scope),                \
+				      _SET_SCOPE_INFO(scope,__FILE__,__LINE__))
+#define JS_UNLOCK_SCOPE(cx,scope)   js_UnlockScope(cx, scope)
+#define JS_TRANSFER_SCOPE_LOCK(cx, scope, newscope) js_TransferScopeLock(cx, scope, newscope)
+
+extern prword js_CurrentThreadId();
+extern PR_INLINE void js_Lock(JSThinLock *, prword);
+extern PR_INLINE void js_Unlock(JSThinLock *, prword);
+extern int js_CompareAndSwap(prword *, prword, prword);
+extern void js_AtomicAdd(prword*, prword);
+extern void js_LockRuntime(JSRuntime *rt);
+extern void js_UnlockRuntime(JSRuntime *rt);
+extern void js_LockObj(JSContext *cx, JSObject *obj);
+extern void js_UnlockObj(JSContext *cx, JSObject *obj);
+extern void js_LockScope(JSContext *cx, JSScope *scope);
+extern void js_UnlockScope(JSContext *cx, JSScope *scope);
+extern JS_PUBLIC_API(int) js_SetupLocks(int);
+extern JS_PUBLIC_API(void) js_CleanupLocks();
+extern JS_PUBLIC_API(void) js_InitContextForLocking(JSContext *);
+extern void js_TransferScopeLock(JSContext *, JSScope *, JSScope *);
+extern JS_PUBLIC_API(jsval) js_GetSlotWhileLocked(JSContext *, JSObject *, uint32);
+extern JS_PUBLIC_API(void) js_SetSlotWhileLocked(JSContext *, JSObject *, uint32, jsval);
+extern void js_NewLock(JSThinLock *);
+extern void js_DestroyLock(JSThinLock *);
+
+#ifdef DEBUG
+
+#define JS_IS_RUNTIME_LOCKED(rt)    js_IsRuntimeLocked(rt)
+#define JS_IS_OBJ_LOCKED(obj)       js_IsObjLocked(obj)
+#define JS_IS_SCOPE_LOCKED(scope)   js_IsScopeLocked(scope)
+
+extern JSBool js_IsRuntimeLocked(JSRuntime *rt);
+extern JSBool js_IsObjLocked(JSObject *obj);
+extern JSBool js_IsScopeLocked(JSScope *scope);
+
+#else
+
+#define JS_IS_RUNTIME_LOCKED(rt)    0
+#define JS_IS_OBJ_LOCKED(obj)       1
+#define JS_IS_SCOPE_LOCKED(scope)   1
+
+#endif /* DEBUG */
+
+#define JS_LOCK_OBJ_VOID(cx, obj, e)                                          \
+    PR_BEGIN_MACRO                                                            \
+	js_LockObj(cx, obj);                                                 \
+	e;                                                                    \
+	js_UnlockObj(cx, obj);                                               \
+    PR_END_MACRO
+
+#define JS_LOCK_VOID(cx, e)                                                   \
+    PR_BEGIN_MACRO                                                            \
+	JSRuntime *_rt = (cx)->runtime;                                       \
+	JS_LOCK_RUNTIME_VOID(_rt, e);                                         \
+    PR_END_MACRO
+
+#if defined(JS_ONLY_NSPR_LOCKS) || !(defined(_WIN32) || defined(SOLARIS) || defined(AIX))
+
+#undef JS_LOCK0
+#undef JS_UNLOCK0
+#define JS_LOCK0(P,M) JS_ACQUIRE_LOCK(((JSLock*)(P)->fat)); (P)->owner = (M)
+#define JS_UNLOCK0(P,M) (P)->owner = 0; JS_RELEASE_LOCK(((JSLock*)(P)->fat))
+#define NSPR_LOCK 1
+
+#endif /* arch-tests */
+
+#else  /* !JS_THREADSAFE */
+
+#define JS_ATOMIC_ADDREF(p,i)       (*(p) += i)
+
+#define JS_CurrentThreadId() 0
+#define JS_NEW_LOCK()               NULL
+#define JS_DESTROY_LOCK(l)          ((void)0)
+#define JS_ACQUIRE_LOCK(l)          ((void)0)
+#define JS_RELEASE_LOCK(l)          ((void)0)
+#define JS_LOCK0(P,M)                ((void)0)
+#define JS_UNLOCK0(P,M)              ((void)0)
+
+#define JS_NEW_CONDVAR(l)           NULL
+#define JS_DESTROY_CONDVAR(cv)      ((void)0)
+#define JS_WAIT_CONDVAR(cv,to)      ((void)0)
+#define JS_NOTIFY_CONDVAR(cv)       ((void)0)
+#define JS_NOTIFY_ALL_CONDVAR(cv)   ((void)0)
+
+#define JS_LOCK_RUNTIME(rt)         ((void)0)
+#define JS_UNLOCK_RUNTIME(rt)       ((void)0)
+#define JS_LOCK_OBJ(cx,obj)         ((void)0)
+#define JS_UNLOCK_OBJ(cx,obj)       ((void)0)
+#define JS_LOCK_OBJ_VOID(cx,obj,e)  (e)
+#define JS_LOCK_SCOPE(cx,scope)     ((void)0)
+#define JS_UNLOCK_SCOPE(cx,scope)   ((void)0)
+#define JS_TRANSFER_SCOPE_LOCK(c,o,n) ((void)0)
+
+#define JS_IS_RUNTIME_LOCKED(rt)    1
+#define JS_IS_OBJ_LOCKED(obj)       1
+#define JS_IS_SCOPE_LOCKED(scope)   1
+#define JS_LOCK_VOID(cx, e)         JS_LOCK_RUNTIME_VOID((cx)->runtime, e)
+
+#endif /* !JS_THREADSAFE */
+
+#define JS_LOCK_RUNTIME_VOID(rt,e)                                            \
+    PR_BEGIN_MACRO                                                            \
+	JS_LOCK_RUNTIME(rt);                                                  \
+	e;                                                                    \
+	JS_UNLOCK_RUNTIME(rt);                                                \
+    PR_END_MACRO
+
+#define JS_LOCK_GC(rt)              JS_ACQUIRE_LOCK((rt)->gcLock)
+#define JS_UNLOCK_GC(rt)            JS_RELEASE_LOCK((rt)->gcLock)
+#define JS_LOCK_GC_VOID(rt,e)       (JS_LOCK_GC(rt), (e), JS_UNLOCK_GC(rt))
+#define JS_AWAIT_GC_DONE(rt)        JS_WAIT_CONDVAR((rt)->gcDone, JS_NO_TIMEOUT)
+#define JS_NOTIFY_GC_DONE(rt)       JS_NOTIFY_ALL_CONDVAR((rt)->gcDone)
+#define JS_AWAIT_REQUEST_DONE(rt)   JS_WAIT_CONDVAR((rt)->requestDone,        \
+						    JS_NO_TIMEOUT)
+#define JS_NOTIFY_REQUEST_DONE(rt)  JS_NOTIFY_CONDVAR((rt)->requestDone)
+
+#define JS_LOCK(P,CX) JS_LOCK0(P,(CX)->thread)
+#define JS_UNLOCK(P,CX) JS_UNLOCK0(P,(CX)->thread)
+
+#ifndef _SET_OBJ_INFO
+#define _SET_OBJ_INFO(obj,f,l)      ((void)0)
+#endif
+#ifndef _SET_SCOPE_INFO
+#define _SET_SCOPE_INFO(scope,f,l)  ((void)0)
+#endif
+
+#endif /* jslock_h___ */

mozilla/js/src/jsmath.c

@@ -0,0 +1,414 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS math package.
+ */
+#include "jsstddef.h"
+#include <math.h>
+#include <stdlib.h>
+#include "prtypes.h"
+#include "prlong.h"
+#include "prmjtime.h"
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsconfig.h"
+#include "jslock.h"
+#include "jsmath.h"
+#include "jsnum.h"
+#include "jsobj.h"
+
+#ifndef M_E
+#define M_E		2.7182818284590452354
+#endif
+#ifndef M_LOG2E
+#define M_LOG2E		1.4426950408889634074
+#endif
+#ifndef M_LOG10E
+#define M_LOG10E	0.43429448190325182765
+#endif
+#ifndef M_LN2
+#define M_LN2		0.69314718055994530942
+#endif
+#ifndef M_LN10
+#define M_LN10		2.30258509299404568402
+#endif
+#ifndef M_PI
+#define M_PI		3.14159265358979323846
+#endif
+#ifndef M_SQRT2
+#define M_SQRT2		1.41421356237309504880
+#endif
+#ifndef M_SQRT1_2
+#define M_SQRT1_2	0.70710678118654752440
+#endif
+
+static JSConstDoubleSpec math_constants[] = {
+    {M_E,       "E"},
+    {M_LOG2E,   "LOG2E"},
+    {M_LOG10E,  "LOG10E"},
+    {M_LN2,     "LN2"},
+    {M_LN10,    "LN10"},
+    {M_PI,      "PI"},
+    {M_SQRT2,   "SQRT2"},
+    {M_SQRT1_2, "SQRT1_2"},
+    {0}
+};
+
+static JSClass math_class = {
+    "Math",
+    0,
+    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
+};
+
+static JSBool
+math_abs(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = (x < 0) ? -x : x;
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_acos(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = acos(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_asin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = asin(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_atan(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = atan(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_atan2(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, y, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    if (!js_ValueToNumber(cx, argv[1], &y))
+	return JS_FALSE;
+    z = atan2(x, y);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_ceil(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = ceil(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_cos(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = cos(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_exp(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = exp(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_floor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = floor(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_log(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = log(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_max(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, y, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    if (!js_ValueToNumber(cx, argv[1], &y))
+	return JS_FALSE;
+    z = (x > y) ? x : y;
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_min(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, y, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    if (!js_ValueToNumber(cx, argv[1], &y))
+	return JS_FALSE;
+    z = (x < y) ? x : y;
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_pow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, y, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    if (!js_ValueToNumber(cx, argv[1], &y))
+	return JS_FALSE;
+    z = pow(x, y);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+/*
+ * Math.random() support, lifted from java.util.Random.java.
+ */
+static void
+random_setSeed(JSRuntime *rt, int64 seed)
+{
+    int64 tmp;
+
+    LL_I2L(tmp, 1000);
+    LL_DIV(seed, seed, tmp);
+    LL_XOR(tmp, seed, rt->rngMultiplier);
+    LL_AND(rt->rngSeed, tmp, rt->rngMask);
+}
+
+static void
+random_init(JSRuntime *rt)
+{
+    int64 tmp, tmp2;
+
+    /* Do at most once. */
+    if (rt->rngInitialized)
+	return;
+    rt->rngInitialized = JS_TRUE;
+
+    /* rt->rngMultiplier = 0x5DEECE66DL */
+    LL_ISHL(tmp, 0x5D, 32);
+    LL_UI2L(tmp2, 0xEECE66DL);
+    LL_OR(rt->rngMultiplier, tmp, tmp2);
+
+    /* rt->rngAddend = 0xBL */
+    LL_I2L(rt->rngAddend, 0xBL);
+
+    /* rt->rngMask = (1L << 48) - 1 */
+    LL_I2L(tmp, 1);
+    LL_SHL(tmp2, tmp, 48);
+    LL_SUB(rt->rngMask, tmp2, tmp);
+
+    /* rt->rngDscale = (jsdouble)(1L << 54) */
+    LL_SHL(tmp2, tmp, 54);
+    LL_L2D(rt->rngDscale, tmp2);
+
+    /* Finally, set the seed from current time. */
+    random_setSeed(rt, PRMJ_Now());
+}
+
+static uint32
+random_next(JSRuntime *rt, int bits)
+{
+    int64 nextseed, tmp;
+    uint32 retval;
+
+    LL_MUL(nextseed, rt->rngSeed, rt->rngMultiplier);
+    LL_ADD(nextseed, nextseed, rt->rngAddend);
+    LL_AND(nextseed, nextseed, rt->rngMask);
+    rt->rngSeed = nextseed;
+    LL_USHR(tmp, nextseed, 48 - bits);
+    LL_L2I(retval, tmp);
+    return retval;
+}
+
+static jsdouble
+random_nextDouble(JSRuntime *rt)
+{
+    int64 tmp, tmp2;
+    jsdouble d;
+
+    LL_ISHL(tmp, random_next(rt, 27), 27);
+    LL_UI2L(tmp2, random_next(rt, 27));
+    LL_ADD(tmp, tmp, tmp2);
+    LL_L2D(d, tmp);
+    return d / rt->rngDscale;
+}
+
+static JSBool
+math_random(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSRuntime *rt;
+    jsdouble z;
+
+    rt = cx->runtime;
+    JS_LOCK_RUNTIME(rt);
+    random_init(rt);
+    z = random_nextDouble(rt);
+    JS_UNLOCK_RUNTIME(rt);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_round(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = floor(x + 0.5);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_sin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = sin(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_sqrt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = sqrt(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSBool
+math_tan(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x, z;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    z = tan(x);
+    return js_NewNumberValue(cx, z, rval);
+}
+
+static JSFunctionSpec math_static_methods[] = {
+    {"abs",		math_abs,		1},
+    {"acos",		math_acos,		1},
+    {"asin",		math_asin,		1},
+    {"atan",		math_atan,		1},
+    {"atan2",		math_atan2,		2},
+    {"ceil",		math_ceil,		1},
+    {"cos",		math_cos,		1},
+    {"exp",		math_exp,		1},
+    {"floor",		math_floor,		1},
+    {"log",		math_log,		1},
+    {"max",		math_max,		2},
+    {"min",		math_min,		2},
+    {"pow",		math_pow,		2},
+    {"random",		math_random,		0},
+    {"round",		math_round,		1},
+    {"sin",		math_sin,		1},
+    {"sqrt",		math_sqrt,		1},
+    {"tan",		math_tan,		1},
+    {0}
+};
+
+#if JS_HAS_TOSOURCE
+static JSBool
+math_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	      jsval *rval)
+{
+    *rval = ATOM_KEY(cx->runtime->atomState.MathAtom);
+    return JS_TRUE;
+}
+
+static JSFunctionSpec math_methods[] = {
+    {js_toSource_str,   math_toSource,  0},
+    {0}
+};
+#else
+#define math_methods    NULL
+#endif
+
+JSObject *
+js_InitMathClass(JSContext *cx, JSObject *obj)
+{
+    JSObject *proto;
+
+    proto = JS_InitClass(cx, obj, NULL, &math_class, NULL, 0,
+		         NULL, math_methods, NULL, math_static_methods);
+    if (!proto)
+	return NULL;
+    if (!JS_DefineConstDoubles(cx, proto, math_constants))
+	return NULL;
+    return proto;
+}

mozilla/js/src/jsmath.h

@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsmath_h___
+#define jsmath_h___
+/*
+ * JS math functions.
+ */
+
+PR_BEGIN_EXTERN_C
+
+extern JSObject *
+js_InitMathClass(JSContext *cx, JSObject *obj);
+
+PR_END_EXTERN_C
+
+#endif /* jsmath_h___ */

mozilla/js/src/jsnum.c

@@ -0,0 +1,825 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS number type and wrapper class.
+ */
+#include "jsstddef.h"
+#include <errno.h>
+#ifdef XP_PC
+#include <float.h>
+#endif
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "prtypes.h"
+#include "prlog.h"
+#include "prdtoa.h"
+#include "prprf.h"
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsconfig.h"
+#include "jsgc.h"
+#include "jsinterp.h"
+#include "jsnum.h"
+#include "jsobj.h"
+#include "jsopcode.h"
+#include "jsstr.h"
+
+union dpun {
+    struct {
+#ifdef IS_LITTLE_ENDIAN
+	uint32 lo, hi;
+#else
+	uint32 hi, lo;
+#endif
+    } s;
+    jsdouble d;
+};
+
+static JSBool
+num_isNaN(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    *rval = BOOLEAN_TO_JSVAL(JSDOUBLE_IS_NaN(x));
+    return JS_TRUE;
+}
+
+static JSBool
+num_isFinite(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble x;
+
+    if (!js_ValueToNumber(cx, argv[0], &x))
+	return JS_FALSE;
+    *rval = BOOLEAN_TO_JSVAL(JSDOUBLE_IS_FINITE(x));
+    return JS_TRUE;
+}
+
+static JSBool
+num_parseFloat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSString *str;
+    jsdouble d;
+    const jschar *ep;
+
+    str = js_ValueToString(cx, argv[0]);
+    if (!str)
+	return JS_FALSE;
+    if (!js_strtod(cx, str->chars, &ep, &d))
+        return JS_FALSE;
+    if (ep == str->chars) {
+	*rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
+        return JS_TRUE;
+    }
+    return js_NewNumberValue(cx, d, rval);
+}
+
+/* See ECMA 15.1.2.2. */
+static JSBool
+num_parseInt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSString *str;
+    jsint radix;
+    jsdouble d;
+    const jschar *ep;
+
+    str = js_ValueToString(cx, argv[0]);
+    if (!str)
+	return JS_FALSE;
+
+    if (argc > 1) {
+	if (!js_ValueToECMAInt32(cx, argv[1], &radix))
+	    return JS_FALSE;
+    } else
+        radix = 0;
+
+    if (radix != 0 && (radix < 2 || radix > 36)) {
+        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
+        return JS_TRUE;
+    }
+    if (!js_strtointeger(cx, str->chars, &ep, radix, &d))
+        return JS_FALSE;
+    if (ep == str->chars) {
+	*rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
+        return JS_TRUE;
+    }
+    return js_NewNumberValue(cx, d, rval);
+}
+
+
+static JSFunctionSpec number_functions[] = {
+    {"isNaN",           num_isNaN,              1},
+    {"isFinite",        num_isFinite,           1},
+    {"parseFloat",      num_parseFloat,         1},
+    {"parseInt",        num_parseInt,           2},
+    {0}
+};
+
+static JSClass number_class = {
+    "Number",
+    JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
+};
+
+static JSBool
+Number(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsdouble d;
+    jsval v;
+
+    if (argc != 0) {
+	if (!js_ValueToNumber(cx, argv[0], &d))
+	    return JS_FALSE;
+    } else {
+	d = 0.0;
+    }
+    if (!js_NewNumberValue(cx, d, &v))
+	return JS_FALSE;
+    if (!cx->fp->constructing) {
+	*rval = v;
+	return JS_TRUE;
+    }
+    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, v);
+    return JS_TRUE;
+}
+
+#if JS_HAS_TOSOURCE
+static JSBool
+num_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsval v;
+    jsdouble d;
+    size_t i;
+    char buf[64];
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &number_class, argv))
+	return JS_FALSE;
+    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
+    if (!JSVAL_IS_NUMBER(v))
+	return js_obj_toSource(cx, obj, argc, argv, rval);
+    d = JSVAL_IS_INT(v) ? (jsdouble)JSVAL_TO_INT(v) : *JSVAL_TO_DOUBLE(v);
+    i = PR_snprintf(buf, sizeof buf, "(new %s(", number_class.name);
+
+    PR_cnvtf(buf + i, sizeof buf - i, 20, d);
+    i = strlen(buf);
+    PR_snprintf(buf + i, sizeof buf - i, "))");
+    str = JS_NewStringCopyZ(cx, buf);
+    if (!str)
+	return JS_FALSE;
+    *rval = STRING_TO_JSVAL(str);
+    return JS_TRUE;
+}
+#endif
+
+static JSBool
+num_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    jsval v;
+    jsdouble d;
+    jsint base, ival, dval;
+    char *bp, buf[32];
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &number_class, argv))
+	return JS_FALSE;
+    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
+    if (!JSVAL_IS_NUMBER(v))
+	return js_obj_toString(cx, obj, argc, argv, rval);
+    d = JSVAL_IS_INT(v) ? (jsdouble)JSVAL_TO_INT(v) : *JSVAL_TO_DOUBLE(v);
+    if (argc != 0) {
+	if (!js_ValueToECMAInt32(cx, argv[0], &base))
+	    return JS_FALSE;
+	if (base < 2 || base > 36) {
+	    JS_ReportError(cx, "illegal radix %d", base);
+	    return JS_FALSE;
+	}
+	if (base != 10 && JSDOUBLE_IS_FINITE(d)) {
+	    ival = (jsint) js_DoubleToInteger(d);
+	    bp = buf + sizeof buf;
+	    for (*--bp = '\0'; ival != 0 && --bp >= buf; ival /= base) {
+		dval = ival % base;
+		*bp = (char)((dval >= 10) ? 'a' - 10 + dval : '0' + dval);
+	    }
+	    if (*bp == '\0')
+		*--bp = '0';
+	    str = JS_NewStringCopyZ(cx, bp);
+	} else {
+	    str = js_NumberToString(cx, d);
+	}
+    } else {
+	str = js_NumberToString(cx, d);
+    }
+    if (!str)
+	return JS_FALSE;
+    *rval = STRING_TO_JSVAL(str);
+    return JS_TRUE;
+}
+
+static JSBool
+num_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    if (!JS_InstanceOf(cx, obj, &number_class, argv))
+	return JS_FALSE;
+    *rval = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
+    return JS_TRUE;
+}
+
+static JSFunctionSpec number_methods[] = {
+#if JS_HAS_TOSOURCE
+    {js_toSource_str,   num_toSource,   0},
+#endif
+    {js_toString_str,	num_toString,	0},
+    {js_valueOf_str,	num_valueOf,	0},
+    {0}
+};
+
+/* NB: Keep this in synch with number_constants[]. */
+enum nc_slot {
+    NC_NaN,
+    NC_POSITIVE_INFINITY,
+    NC_NEGATIVE_INFINITY,
+    NC_MAX_VALUE,
+    NC_MIN_VALUE,
+    NC_LIMIT
+};
+
+/*
+ * Some to most C compilers forbid spelling these at compile time, or barf
+ * if you try, so all but MAX_VALUE are set at runtime by js_InitNumberClass
+ * using union dpun.
+ */
+static JSConstDoubleSpec number_constants[] = {
+    {0,                         "NaN"},
+    {0,                         "POSITIVE_INFINITY"},
+    {0,                         "NEGATIVE_INFINITY"},
+    {1.7976931348623157E+308,   "MAX_VALUE"},
+    {0,                         "MIN_VALUE"},
+    {0}
+};
+
+static jsdouble NaN;
+
+JSObject *
+js_InitNumberClass(JSContext *cx, JSObject *obj)
+{
+    JSRuntime *rt;
+    union dpun u;
+    JSObject *proto, *ctor;
+
+    rt = cx->runtime;
+    if (!rt->jsNaN) {
+#ifdef XP_PC
+#ifdef XP_OS2
+	/*DSR071597 - I have no idea what this really does other than mucking with the floating     */
+	/*point unit, but it does fix a "floating point underflow" exception I am getting, and there*/
+	/*is similar code in the Hursley java. Making sure we have the same code in Javascript      */
+	/*where Netscape was calling control87 on Windows...                                        */
+	_control87(MCW_EM+PC_53+RC_NEAR,MCW_EM+MCW_PC+MCW_RC);
+#else
+	_control87(MCW_EM, MCW_EM);
+#endif
+#endif
+
+	u.s.hi = JSDOUBLE_HI32_EXPMASK | JSDOUBLE_HI32_MANTMASK;
+	u.s.lo = 0xffffffff;
+	number_constants[NC_NaN].dval = NaN = u.d;
+	rt->jsNaN = js_NewDouble(cx, NaN);
+	if (!rt->jsNaN || !js_LockGCThing(cx, rt->jsNaN))
+	    return NULL;
+
+	u.s.hi = JSDOUBLE_HI32_EXPMASK;
+	u.s.lo = 0x00000000;
+	number_constants[NC_POSITIVE_INFINITY].dval = u.d;
+	rt->jsPositiveInfinity = js_NewDouble(cx, u.d);
+	if (!rt->jsPositiveInfinity ||
+	    !js_LockGCThing(cx, rt->jsPositiveInfinity)) {
+	    return NULL;
+	}
+
+	u.s.hi = JSDOUBLE_HI32_SIGNBIT | JSDOUBLE_HI32_EXPMASK;
+	u.s.lo = 0x00000000;
+	number_constants[NC_NEGATIVE_INFINITY].dval = u.d;
+	rt->jsNegativeInfinity = js_NewDouble(cx, u.d);
+	if (!rt->jsNegativeInfinity ||
+	    !js_LockGCThing(cx, rt->jsNegativeInfinity)) {
+	    return NULL;
+	}
+
+	u.s.hi = 0;
+	u.s.lo = 1;
+	number_constants[NC_MIN_VALUE].dval = u.d;
+    }
+
+    if (!JS_DefineFunctions(cx, obj, number_functions))
+	return NULL;
+
+    proto = JS_InitClass(cx, obj, NULL, &number_class, Number, 1,
+			 NULL, number_methods, NULL, NULL);
+    if (!proto || !(ctor = JS_GetConstructor(cx, proto)))
+	return NULL;
+    OBJ_SET_SLOT(cx, proto, JSSLOT_PRIVATE, JSVAL_ZERO);
+    if (!JS_DefineConstDoubles(cx, ctor, number_constants))
+	return NULL;
+
+    /* ECMA 15.1.1.1 */
+    if (!JS_DefineProperty(cx, obj, "NaN", DOUBLE_TO_JSVAL(rt->jsNaN),
+			   NULL, NULL, 0)) {
+	return NULL;
+    }
+
+    /* ECMA 15.1.1.2 */
+    if (!JS_DefineProperty(cx, obj, "Infinity",
+			   DOUBLE_TO_JSVAL(rt->jsPositiveInfinity),
+			   NULL, NULL, 0)) {
+	return NULL;
+    }
+    return proto;
+}
+
+jsdouble *
+js_NewDouble(JSContext *cx, jsdouble d)
+{
+    jsdouble *dp;
+
+    dp = js_AllocGCThing(cx, GCX_DOUBLE);
+    if (!dp)
+	return NULL;
+    *dp = d;
+    return dp;
+}
+
+void
+js_FinalizeDouble(JSContext *cx, jsdouble *dp)
+{
+    *dp = NaN;
+}
+
+JSBool
+js_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval)
+{
+    jsdouble *dp;
+
+    dp = js_NewDouble(cx, d);
+    if (!dp)
+	return JS_FALSE;
+    *rval = DOUBLE_TO_JSVAL(dp);
+    return JS_TRUE;
+}
+
+JSBool
+js_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval)
+{
+    jsint i;
+
+    if (JSDOUBLE_IS_INT(d, i) && INT_FITS_IN_JSVAL(i)) {
+	*rval = INT_TO_JSVAL(i);
+    } else {
+	if (!js_NewDoubleValue(cx, d, rval))
+	    return JS_FALSE;
+    }
+    return JS_TRUE;
+}
+
+JSObject *
+js_NumberToObject(JSContext *cx, jsdouble d)
+{
+    JSObject *obj;
+    jsval v;
+
+    obj = js_NewObject(cx, &number_class, NULL, NULL);
+    if (!obj)
+	return NULL;
+    if (!js_NewNumberValue(cx, d, &v)) {
+	cx->newborn[GCX_OBJECT] = NULL;
+	return NULL;
+    }
+    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, v);
+    return obj;
+}
+
+/* XXXbe rewrite me to be ECMA-based! */
+JSString *
+js_NumberToString(JSContext *cx, jsdouble d)
+{
+    jsint i;
+    char buf[32];
+
+    if (JSDOUBLE_IS_INT(d, i)) {
+	PR_snprintf(buf, sizeof buf, "%ld", (long)i);
+    } else {
+	PR_cnvtf(buf, sizeof buf, 20, d);
+    }
+    return JS_NewStringCopyZ(cx, buf);
+}
+
+JSBool
+js_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp)
+{
+    JSObject *obj;
+    JSString *str;
+    const jschar *ep;
+    jsdouble d;
+
+    if (JSVAL_IS_OBJECT(v)) {
+	obj = JSVAL_TO_OBJECT(v);
+	if (!obj) {
+	    *dp = 0;
+	    return JS_TRUE;
+	}
+	if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_NUMBER, &v))
+	    return JS_FALSE;
+    }
+    if (JSVAL_IS_INT(v)) {
+	*dp = (jsdouble)JSVAL_TO_INT(v);
+    } else if (JSVAL_IS_DOUBLE(v)) {
+	*dp = *JSVAL_TO_DOUBLE(v);
+    } else if (JSVAL_IS_STRING(v)) {
+	str = JSVAL_TO_STRING(v);
+	errno = 0;
+	/* Note that ECMAScript doesn't treat numbers beginning with a zero as octal numbers here.
+	 * This works because all such numbers will be interpreted as decimal by js_strtod and
+	 * will never get passed to js_strtointeger, which would interpret them as octal. */
+	if ((!js_strtod(cx, str->chars, &ep, &d) || js_SkipWhiteSpace(ep) != str->chars + str->length) &&
+	    (!js_strtointeger(cx, str->chars, &ep, 0, &d) || js_SkipWhiteSpace(ep) != str->chars + str->length)) {
+	    goto badstr;
+	}
+	*dp = d;
+    } else if (JSVAL_IS_BOOLEAN(v)) {
+	*dp = JSVAL_TO_BOOLEAN(v) ? 1 : 0;
+    } else {
+#if JS_BUG_FALLIBLE_TONUM
+	str = js_DecompileValueGenerator(cx, v, NULL);
+badstr:
+	if (str) {
+	    JS_ReportError(cx, "%s is not a number",
+			   JS_GetStringBytes(str));
+	}
+	return JS_FALSE;
+#else
+badstr:
+	*dp = *cx->runtime->jsNaN;
+#endif
+    }
+    return JS_TRUE;
+}
+
+JSBool
+js_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip)
+{
+    jsdouble d;
+
+    if (!js_ValueToNumber(cx, v, &d))
+        return JS_FALSE;
+    return js_DoubleToECMAInt32(cx, d, ip);
+}
+
+JSBool
+js_DoubleToECMAInt32(JSContext *cx, jsdouble d, int32 *ip)
+{
+    jsdouble two32 = 4294967296.0;
+    jsdouble two31 = 2147483648.0;
+
+    if (!JSDOUBLE_IS_FINITE(d) || d == 0) {
+        *ip = 0;
+        return JS_TRUE;
+    }
+    d = fmod(d, two32);
+    d = d >= 0 ? d : d + two32;
+    if (d >= two31)
+        *ip = (int32)(d - two32);
+    else
+        *ip = (int32)d;
+    return JS_TRUE;
+}
+
+JSBool
+js_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip)
+{
+    jsdouble d;
+
+    if (!js_ValueToNumber(cx, v, &d))
+        return JS_FALSE;
+    return js_DoubleToECMAUint32(cx, d, ip);
+}
+
+JSBool
+js_DoubleToECMAUint32(JSContext *cx, jsdouble d, uint32 *ip)
+{
+    JSBool neg;
+    jsdouble two32 = 4294967296.0;
+
+    if (!JSDOUBLE_IS_FINITE(d) || d == 0) {
+        *ip = 0;
+        return JS_TRUE;
+    }
+
+    neg = (d < 0);
+    d = floor(neg ? -d : d);
+    d = neg ? -d : d;
+
+    d = fmod(d, two32);
+
+    d = d >= 0 ? d : d + two32;
+    *ip = (uint32)d;
+    return JS_TRUE;
+}
+
+JSBool
+js_ValueToInt32(JSContext *cx, jsval v, int32 *ip)
+{
+    jsdouble d;
+    JSString *str;
+
+    if (!js_ValueToNumber(cx, v, &d))
+	return JS_FALSE;
+    if (JSDOUBLE_IS_NaN(d) || d <= -2147483649.0 || 2147483648.0 <= d) {
+	str = js_DecompileValueGenerator(cx, v, NULL);
+	if (str) {
+	    JS_ReportError(cx, "can't convert %s to an integer",
+			   JS_GetStringBytes(str));
+	}
+	return JS_FALSE;
+    }
+    *ip = (int32)floor(d + 0.5);     /* Round to nearest */
+    return JS_TRUE;
+}
+
+JSBool
+js_ValueToUint16(JSContext *cx, jsval v, uint16 *ip)
+{
+    jsdouble d;
+    jsuint i, m;
+    JSBool neg;
+
+    if (!js_ValueToNumber(cx, v, &d))
+	return JS_FALSE;
+    if (d == 0 || !JSDOUBLE_IS_FINITE(d)) {
+	*ip = 0;
+	return JS_TRUE;
+    }
+    i = (jsuint)d;
+    if ((jsdouble)i == d) {
+	*ip = (uint16)i;
+	return JS_TRUE;
+    }
+    neg = (d < 0);
+    d = floor(neg ? -d : d);
+    d = neg ? -d : d;
+    m = PR_BIT(16);
+    d = fmod(d, m);
+    if (d < 0)
+	d += m;
+    *ip = (uint16) d;
+    return JS_TRUE;
+}
+
+jsdouble
+js_DoubleToInteger(jsdouble d)
+{
+    JSBool neg;
+
+    if (d == 0)
+	return d;
+    if (!JSDOUBLE_IS_FINITE(d)) {
+	if (JSDOUBLE_IS_NaN(d))
+	    return 0;
+	return d;
+    }
+    neg = (d < 0);
+    d = floor(neg ? -d : d);
+    return neg ? -d : d;
+}
+
+
+JSBool
+js_strtod(JSContext *cx, const jschar *s, const jschar **ep, jsdouble *dp)
+{
+    size_t i;
+    char *cstr, *istr, *estr;
+    JSBool negative;
+    jsdouble d;
+    const jschar *s1 = js_SkipWhiteSpace(s);
+    size_t length = js_strlen(s1);
+
+    cstr = malloc(length + 1);
+    if (!cstr)
+	return JS_FALSE;
+    for (i = 0; i <= length; i++) {
+	if (s1[i] >> 8) {
+	    cstr[i] = 0;
+	    break;
+	}
+	cstr[i] = (char)s1[i];
+    }
+
+    istr = cstr;
+    if ((negative = (*istr == '-')) != 0 || *istr == '+')
+        istr++;
+    if (!strncmp(istr, "Infinity", 8)) {
+        d = *(negative ? cx->runtime->jsNegativeInfinity : cx->runtime->jsPositiveInfinity);
+        estr = istr + 8;
+    } else {
+	errno = 0;
+	d = PR_strtod(cstr, &estr);
+	if (errno == ERANGE)
+	    if (d == HUGE_VAL)
+		d = *cx->runtime->jsPositiveInfinity;
+	    else if (d == -HUGE_VAL)
+		d = *cx->runtime->jsNegativeInfinity;
+    }
+
+    free(cstr);
+    i = estr - cstr;
+    *ep = i ? s1 + i : s;
+    *dp = d;
+    return JS_TRUE;
+}
+
+struct BinaryDigitReader
+{
+    uintN base;			/* Base of number; must be a power of 2 */
+    uintN digit;		/* Current digit value in radix given by base */
+    uintN digitMask;		/* Mask to extract the next bit from digit */
+    const jschar *digits;	/* Pointer to the remaining digits */
+    const jschar *end;		/* Pointer to first non-digit */
+};
+
+/* Return the next binary digit from the number or -1 if done */
+static intN GetNextBinaryDigit(struct BinaryDigitReader *bdr)
+{
+    intN bit;
+
+    if (bdr->digitMask == 0) {
+        uintN c;
+
+        if (bdr->digits == bdr->end)
+            return -1;
+
+        c = *bdr->digits++;
+        if ('0' <= c && c <= '9')
+            bdr->digit = c - '0';
+        else if ('a' <= c && c <= 'z')
+            bdr->digit = c - 'a' + 10;
+        else bdr->digit = c - 'A' + 10;
+        bdr->digitMask = bdr->base >> 1;
+    }
+    bit = (bdr->digit & bdr->digitMask) != 0;
+    bdr->digitMask >>= 1;
+    return bit;
+}
+
+JSBool
+js_strtointeger(JSContext *cx, const jschar *s, const jschar **ep, jsint base, jsdouble *dp)
+{
+    JSBool negative;
+    jsdouble value;
+    const jschar *start;
+    const jschar *s1 = js_SkipWhiteSpace(s);
+
+    if ((negative = (*s1 == '-')) != 0 || *s1 == '+')
+        s1++;
+
+    if (base == 0)
+        /* No base supplied, or some base that evaluated to 0. */
+        if (*s1 == '0')
+            /* It's either hex or octal; only increment char if str isn't '0' */
+            if (s1[1] == 'X' || s1[1] == 'x') { /* Hex */
+                s1 += 2;
+                base = 16;
+            } else /* Octal */
+                base = 8;
+        else
+            base = 10; /* Default to decimal. */
+    else if (base == 16 && *s1 == '0' && (s1[1] == 'X' || s1[1] == 'x'))
+        /* If base is 16, ignore hex prefix. */
+        s1 += 2;
+
+    /* Done with the preliminaries; find some prefix of the string that's
+     * a number in the given base.
+     */
+    start = s1; /* Mark - if string is empty, we return NaN. */
+    value = 0.0;
+    while (1) {
+        uintN digit;
+        jschar c = *s1;
+        if ('0' <= c && c <= '9')
+            digit = c - '0';
+        else if ('a' <= c && c <= 'z')
+            digit = c - 'a' + 10;
+        else if ('A' <= c && c <= 'Z')
+            digit = c - 'A' + 10;
+        else
+            break;
+        if (digit >= (uintN)base)
+            break;
+        value = value*base + digit;
+        s1++;
+    }
+
+    if (value >= 9007199254740992.0)
+        if (base == 10) {
+	    /* If we're accumulating a decimal number and the number is >= 2^53, then
+	     * the result from the repeated multiply-add above may be inaccurate.  Call
+	     * PR_strtod to get the correct answer.
+	     */
+	    size_t i;
+	    size_t length = s1 - start;
+	    char *cstr = malloc(length + 1);
+	    char *estr;
+
+	    if (!cstr)
+	        return JS_FALSE;
+	    for (i = 0; i != length; i++)
+	        cstr[i] = (char)start[i];
+	    cstr[length] = 0;
+
+	    errno = 0;
+	    value = PR_strtod(cstr, &estr);
+	    if (errno == ERANGE && value == HUGE_VAL)
+	        value = *cx->runtime->jsPositiveInfinity;
+	    free(cstr);
+
+	} else if (base == 2 || base == 4 || base == 8 || base == 16 || base == 32) {
+	    /* The number may also be inaccurate for one of these bases.  This
+	     * happens if the addition in value*base + digit causes a round-down
+	     * to an even least significant mantissa bit when the first dropped bit
+	     * is a one.  If any of the following digits in the number (which haven't
+	     * been added in yet) are nonzero then the correct action would have
+	     * been to round up instead of down.  An example of this occurs when
+	     * reading the number 0x1000000000000081, which rounds to 0x1000000000000000
+	     * instead of 0x1000000000000100.
+	     */
+	    struct BinaryDigitReader bdr;
+	    intN bit, bit2;
+	    intN j;
+
+	    bdr.base = base;
+	    bdr.digitMask = 0;
+	    bdr.digits = start;
+	    bdr.end = s1;
+	    value = 0.0;
+
+	    /* Skip leading zeros. */
+	    do {
+	        bit = GetNextBinaryDigit(&bdr);
+	    } while (bit == 0);
+
+	    if (bit == 1) {
+	        /* Gather the 53 significant bits (including the leading 1) */
+	        value = 1.0;
+	        for (j = 52; j; j--) {
+	            bit = GetNextBinaryDigit(&bdr);
+	            if (bit < 0)
+	                goto done;
+	            value = value*2 + bit;
+	        }
+	        /* bit2 is the 54th bit (the first dropped from the mantissa) */
+	        bit2 = GetNextBinaryDigit(&bdr);
+	        if (bit2 >= 0) {
+	            jsdouble factor = 2.0;
+	            intN sticky = 0;  /* sticky is 1 if any bit beyond the 54th is 1 */
+	            intN bit3;
+
+	            while ((bit3 = GetNextBinaryDigit(&bdr)) >= 0) {
+	                sticky |= bit3;
+	                factor *= 2;
+	            }
+	            value += bit2 & (bit | sticky);
+	            value *= factor;
+	        }
+	      done:;
+	    }
+	}
+    /* We don't worry about inaccurate numbers for any other base. */
+
+    if (s1 == start) {
+        *dp = 0.0;
+        *ep = s;
+    } else {
+        *dp = negative ? -value : value;
+        *ep = s1;
+    }
+    return JS_TRUE;
+}

mozilla/js/src/jsnum.h

@@ -0,0 +1,167 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsnum_h___
+#define jsnum_h___
+/*
+ * JS number (IEEE double) interface.
+ *
+ * JS numbers are optimistically stored in the top 31 bits of 32-bit integers,
+ * but floating point literals, results that overflow 31 bits, and division and
+ * modulus operands and results require a 64-bit IEEE double.  These are GC'ed
+ * and pointed to by 32-bit jsvals on the stack and in object properties.
+ *
+ * When a JS number is treated as an object (followed by . or []), the runtime
+ * wraps it with a JSObject whose valueOf method returns the unwrapped number.
+ */
+
+PR_BEGIN_EXTERN_C
+
+#ifdef IS_LITTLE_ENDIAN
+#define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[1])
+#define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[0])
+#else
+#define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[0])
+#define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[1])
+#endif
+#define JSDOUBLE_HI32_SIGNBIT   0x80000000
+#define JSDOUBLE_HI32_EXPMASK   0x7ff00000
+#define JSDOUBLE_HI32_MANTMASK  0x000fffff
+
+#define JSDOUBLE_IS_NaN(x)                                                    \
+    ((JSDOUBLE_HI32(x) & JSDOUBLE_HI32_EXPMASK) == JSDOUBLE_HI32_EXPMASK &&   \
+     (JSDOUBLE_LO32(x) || (JSDOUBLE_HI32(x) & JSDOUBLE_HI32_MANTMASK)))
+
+#define JSDOUBLE_IS_INFINITE(x)                                               \
+    ((JSDOUBLE_HI32(x) & ~JSDOUBLE_HI32_SIGNBIT) == JSDOUBLE_HI32_EXPMASK &&   \
+     !JSDOUBLE_LO32(x))
+
+#define JSDOUBLE_IS_FINITE(x)                                                 \
+    ((JSDOUBLE_HI32(x) & JSDOUBLE_HI32_EXPMASK) != JSDOUBLE_HI32_EXPMASK)
+
+#define JSDOUBLE_IS_NEGZERO(d)  (JSDOUBLE_HI32(d) == JSDOUBLE_HI32_SIGNBIT && \
+				 JSDOUBLE_LO32(d) == 0)
+
+/*
+ * JSDOUBLE_IS_INT first checks that d is neither NaN nor infinite, to avoid
+ * raising SIGFPE on platforms such as Alpha Linux, then (only if the cast is
+ * safe) leaves i as (jsint)d.  This also avoid anomalous NaN floating point
+ * comparisons under MSVC.
+ */
+#define JSDOUBLE_IS_INT(d, i) (JSDOUBLE_IS_FINITE(d) && !JSDOUBLE_IS_NEGZERO(d) \
+                               && ((d) == (i = (jsint)(d))))
+
+/* Initialize the Number class, returning its prototype object. */
+extern JSObject *
+js_InitNumberClass(JSContext *cx, JSObject *obj);
+
+/* GC-allocate a new JS number. */
+extern jsdouble *
+js_NewDouble(JSContext *cx, jsdouble d);
+
+extern void
+js_FinalizeDouble(JSContext *cx, jsdouble *dp);
+
+extern JSBool
+js_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval);
+
+extern JSBool
+js_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval);
+
+/* Construct a Number instance that wraps around d. */
+extern JSObject *
+js_NumberToObject(JSContext *cx, jsdouble d);
+
+/* Convert a number to a GC'ed string. */
+extern JSString *
+js_NumberToString(JSContext *cx, jsdouble d);
+
+/*
+ * Convert a value to a number, returning false after reporting any error,
+ * otherwise returning true with *dp set.
+ */
+extern JSBool
+js_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp);
+
+/*
+ * Convert a value or a double to an int32, according to the ECMA rules
+ * for ToInt32.
+ */
+extern JSBool
+js_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip);
+
+extern JSBool
+js_DoubleToECMAInt32(JSContext *cx, jsdouble d, int32 *ip);
+
+/*
+ * Convert a value or a double to a uint32, according to the ECMA rules
+ * for ToUint32.
+ */
+extern JSBool
+js_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip);
+
+extern JSBool
+js_DoubleToECMAUint32(JSContext *cx, jsdouble d, uint32 *ip);
+
+/*
+ * Convert a value to a number, then to an int32 if it fits by rounding to
+ * nearest; but failing with an error report if the double is out of range
+ * or unordered.
+ */
+extern JSBool
+js_ValueToInt32(JSContext *cx, jsval v, int32 *ip);
+
+/*
+ * Convert a value to a number, then to a uint16 according to the ECMA rules
+ * for ToUint16.
+ */
+extern JSBool
+js_ValueToUint16(JSContext *cx, jsval v, uint16 *ip);
+
+/*
+ * Convert a jsdouble to an integral number, stored in a jsdouble.
+ * If d is NaN, return 0.  If d is an infinity, return it without conversion.
+ */
+extern jsdouble
+js_DoubleToInteger(jsdouble d);
+
+/*
+ * Similar to strtod except that replaces overflows with infinities of the correct
+ * sign and underflows with zeros of the correct sign.  Guaranteed to return the
+ * closest double number to the given input in dp.
+ * Also allows inputs of the form [+|-]Infinity, which produce an infinity of the
+ * appropriate sign.  The case of the "Infinity" string must match.
+ * If the string does not have a number in it, set *ep to s and return 0.0 in dp.
+ * Return false if out of memory.
+ */
+extern JSBool
+js_strtod(JSContext *cx, const jschar *s, const jschar **ep, jsdouble *dp);
+
+/*
+ * Similar to strtol except that handles integers of arbitrary size.  Guaranteed to
+ * return the closest double number to the given input when radix is 10 or a power of 2.
+ * May experience roundoff errors for very large numbers of a different radix.
+ * If the string does not have a number in it, set *ep to s and return 0.0 in dp.
+ * Return false if out of memory.
+ */
+extern JSBool
+js_strtointeger(JSContext *cx, const jschar *s, const jschar **ep, jsint radix, jsdouble *dp);
+
+PR_END_EXTERN_C
+
+#endif /* jsnum_h___ */

mozilla/js/src/jsobj.h

@@ -0,0 +1,331 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsobj_h___
+#define jsobj_h___
+/*
+ * JS object definitions.
+ *
+ * A JS object consists of a possibly-shared object descriptor containing
+ * ordered property names, called the map; and a dense vector of property
+ * values, called slots.  The map/slot pointer pair is GC'ed, while the map
+ * is reference counted and the slot vector is malloc'ed.
+ */
+#ifdef NETSCAPE_INTERNAL
+#ifndef NSPR20
+#include "prhash.h"
+#else
+#include "plhash.h"
+#endif
+#endif
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+struct JSObjectMap {
+    jsrefcount  nrefs;          /* count of all referencing objects */
+    JSObjectOps *ops;           /* high level object operation vtable */
+    uint32      nslots;         /* length of obj->slots vector */
+    uint32      freeslot;       /* index of next free obj->slots element */
+};
+
+/* Shorthand macros for frequently-made calls. */
+#if defined JS_THREADSAFE && defined DEBUG
+#define OBJ_LOOKUP_PROPERTY(cx,obj,id,objp,propp)                             \
+    (obj)->map->ops->lookupProperty(cx,obj,id,objp,propp,__FILE__,__LINE__)
+#else
+#define OBJ_LOOKUP_PROPERTY(cx,obj,id,objp,propp)                             \
+    (obj)->map->ops->lookupProperty(cx,obj,id,objp,propp)
+#endif
+#define OBJ_DEFINE_PROPERTY(cx,obj,id,value,getter,setter,attrs,propp)        \
+    (obj)->map->ops->defineProperty(cx,obj,id,value,getter,setter,attrs,propp)
+#define OBJ_GET_PROPERTY(cx,obj,id,vp)                                        \
+    (obj)->map->ops->getProperty(cx,obj,id,vp)
+#define OBJ_SET_PROPERTY(cx,obj,id,vp)                                        \
+    (obj)->map->ops->setProperty(cx,obj,id,vp)
+#define OBJ_GET_ATTRIBUTES(cx,obj,id,prop,attrsp)                             \
+    (obj)->map->ops->getAttributes(cx,obj,id,prop,attrsp)
+#define OBJ_SET_ATTRIBUTES(cx,obj,id,prop,attrsp)                             \
+    (obj)->map->ops->setAttributes(cx,obj,id,prop,attrsp)
+#define OBJ_DELETE_PROPERTY(cx,obj,id,rval)                                   \
+    (obj)->map->ops->deleteProperty(cx,obj,id,rval)
+#define OBJ_DEFAULT_VALUE(cx,obj,hint,vp)                                     \
+    (obj)->map->ops->defaultValue(cx,obj,hint,vp)
+#define OBJ_ENUMERATE(cx,obj,enum_op,statep,idp)                                                 \
+    (obj)->map->ops->enumerate(cx,obj,enum_op,statep,idp)
+#define OBJ_CHECK_ACCESS(cx,obj,id,mode,vp,attrsp)                            \
+    (obj)->map->ops->checkAccess(cx,obj,id,mode,vp,attrsp)
+
+/* These two are time-optimized to avoid stub calls. */
+#define OBJ_THIS_OBJECT(cx,obj)                                               \
+    ((obj)->map->ops->thisObject                                              \
+     ? (obj)->map->ops->thisObject(cx,obj)                                    \
+     : (obj))
+#define OBJ_DROP_PROPERTY(cx,obj,prop)                                        \
+    ((obj)->map->ops->dropProperty                                            \
+     ? (obj)->map->ops->dropProperty(cx,obj,prop)                             \
+     : (void)0)
+
+struct JSObject {
+    JSObjectMap *map;
+    jsval       *slots;
+};
+
+#define JSSLOT_PROTO        0
+#define JSSLOT_PARENT       1
+#define JSSLOT_CLASS        2
+#define JSSLOT_PRIVATE      3
+#define JSSLOT_START        3
+
+#define JSSLOT_FREE(clasp)  (((clasp)->flags & JSCLASS_HAS_PRIVATE)           \
+			     ? JSSLOT_PRIVATE + 1                             \
+			     : JSSLOT_START)
+
+#define JS_INITIAL_NSLOTS   5
+
+#ifdef DEBUG
+#define MAP_CHECK_SLOT(map,slot) \
+    PR_ASSERT((uint32)slot < PR_MAX((map)->nslots, (map)->freeslot))
+#define OBJ_CHECK_SLOT(obj,slot) \
+    MAP_CHECK_SLOT((obj)->map, slot)
+#else
+#define OBJ_CHECK_SLOT(obj,slot) ((void)0)
+#endif
+
+/* Fast macros for accessing obj->slots while obj is locked (if thread-safe). */
+#define LOCKED_OBJ_GET_SLOT(obj,slot) \
+    (OBJ_CHECK_SLOT(obj, slot), (obj)->slots[slot])
+#define LOCKED_OBJ_SET_SLOT(obj,slot,value) \
+    (OBJ_CHECK_SLOT(obj, slot), (obj)->slots[slot] = (value))
+#define LOCKED_OBJ_GET_PROTO(obj) \
+    JSVAL_TO_OBJECT(LOCKED_OBJ_GET_SLOT(obj, JSSLOT_PROTO))
+#define LOCKED_OBJ_GET_CLASS(obj) \
+    ((JSClass *)JSVAL_TO_PRIVATE(LOCKED_OBJ_GET_SLOT(obj, JSSLOT_CLASS)))
+
+#ifdef JS_THREADSAFE
+
+/* Thread-safe functions and wrapper macros for accessing obj->slots. */
+#define OBJ_GET_SLOT(cx,obj,slot) \
+    (OBJ_CHECK_SLOT(obj, slot), js_GetSlotWhileLocked(cx, obj, slot))
+#define OBJ_SET_SLOT(cx,obj,slot,value) \
+    (OBJ_CHECK_SLOT(obj, slot), js_SetSlotWhileLocked(cx, obj, slot, value))
+
+#else   /* !JS_THREADSAFE */
+
+#define OBJ_GET_SLOT(cx,obj,slot)       LOCKED_OBJ_GET_SLOT(obj,slot)
+#define OBJ_SET_SLOT(cx,obj,slot,value) LOCKED_OBJ_SET_SLOT(obj,slot,value)
+
+#endif /* !JS_THREADSAFE */
+
+/* Thread-safe proto, parent, and class access macros. */
+#define OBJ_GET_PROTO(cx,obj) \
+    JSVAL_TO_OBJECT(OBJ_GET_SLOT(cx, obj, JSSLOT_PROTO))
+#define OBJ_SET_PROTO(cx,obj,proto) \
+    OBJ_SET_SLOT(cx, obj, JSSLOT_PROTO, OBJECT_TO_JSVAL(proto))
+
+#define OBJ_GET_PARENT(cx,obj) \
+    JSVAL_TO_OBJECT(OBJ_GET_SLOT(cx, obj, JSSLOT_PARENT))
+#define OBJ_SET_PARENT(cx,obj,parent) \
+    OBJ_SET_SLOT(cx, obj, JSSLOT_PARENT, OBJECT_TO_JSVAL(parent))
+
+#define OBJ_GET_CLASS(cx,obj) \
+    ((JSClass *)JSVAL_TO_PRIVATE(OBJ_GET_SLOT(cx, obj, JSSLOT_CLASS)))
+
+/* Test whether a map or object is native. */
+#define MAP_IS_NATIVE(map)  ((map)->ops == &js_ObjectOps)
+#define OBJ_IS_NATIVE(obj)  MAP_IS_NATIVE((obj)->map)
+
+extern JS_FRIEND_DATA(JSObjectOps) js_ObjectOps;
+extern JSClass      js_ObjectClass;
+extern JSClass      js_WithClass;
+
+struct JSSharpObjectMap {
+    jsrefcount  depth;
+    jsatomid    sharpgen;
+    PRHashTable *table;
+};
+
+#define SHARP_BIT       1
+#define IS_SHARP(he)	((jsatomid)(he)->value & SHARP_BIT)
+#define MAKE_SHARP(he)  ((he)->value = (void*)((jsatomid)(he)->value|SHARP_BIT))
+
+extern PRHashEntry *
+js_EnterSharpObject(JSContext *cx, JSObject *obj, JSIdArray **idap,
+		    jschar **sp);
+
+extern void
+js_LeaveSharpObject(JSContext *cx, JSIdArray **idap);
+
+extern JSBool
+js_obj_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+		jsval *rval);
+
+extern JSBool
+js_obj_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	        jsval *rval);
+
+extern JSObject *
+js_InitObjectClass(JSContext *cx, JSObject *obj);
+
+extern void
+js_InitObjectMap(JSObjectMap *map, jsrefcount nrefs, JSObjectOps *ops,
+		 JSClass *clasp);
+
+extern JSObjectMap *
+js_NewObjectMap(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops,
+		JSClass *clasp, JSObject *obj);
+
+extern void
+js_DestroyObjectMap(JSContext *cx, JSObjectMap *map);
+
+extern JSObjectMap *
+js_HoldObjectMap(JSContext *cx, JSObjectMap *map);
+
+extern JSObjectMap *
+js_DropObjectMap(JSContext *cx, JSObjectMap *map, JSObject *obj);
+
+extern JSObject *
+js_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
+
+extern JSObject *
+js_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
+		   JSObject *parent);
+
+extern void
+js_FinalizeObject(JSContext *cx, JSObject *obj);
+
+extern JSBool
+js_AllocSlot(JSContext *cx, JSObject *obj, uint32 *slotp);
+
+extern void
+js_FreeSlot(JSContext *cx, JSObject *obj, uint32 slot);
+
+/*
+ * On error, return false.  On success, if propp is non-null, return true with
+ * obj locked and with a held property in *propp; if propp is null, return true
+ * but release obj's lock first.  Therefore all callers who pass non-null propp
+ * result parameters must later call OBJ_DROP_PROPERTY(cx, obj, *propp) both to
+ * drop the held property, and to release the lock on obj.
+ */
+extern JSBool
+js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+		  JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
+		  JSProperty **propp);
+
+/*
+ * Unlike js_DefineProperty, propp must be non-null.  On success, and if id was
+ * found, return true with *objp non-null and locked, and with a held property
+ * stored in *propp.  If successful but id was not found, return true with both
+ * *objp and *propp null.  Therefore all callers who receive a non-null *propp
+ * must later call OBJ_DROP_PROPERTY(cx, *objp, *propp).
+ */
+#if defined JS_THREADSAFE && defined DEBUG
+extern JS_FRIEND_API(JSBool)
+_js_LookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
+		   JSProperty **propp, const char *file, uintN line);
+
+#define js_LookupProperty(cx,obj,id,objp,propp) \
+    _js_LookupProperty(cx,obj,id,objp,propp,__FILE__,__LINE__)
+#else
+extern JS_FRIEND_API(JSBool)
+js_LookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
+		  JSProperty **propp);
+#endif
+
+extern JS_FRIEND_API(JSBool)
+js_FindProperty(JSContext *cx, jsid id, JSObject **objp, JSObject **pobjp,
+		JSProperty **propp);
+
+extern JSBool
+js_FindVariable(JSContext *cx, jsid id, JSObject **objp, JSObject **pobjp,
+		JSProperty **propp);
+
+extern JSObject *
+js_FindVariableScope(JSContext *cx, JSFunction **funp);
+
+extern JSBool
+js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+extern JSBool
+js_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+extern JSBool
+js_GetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
+		 uintN *attrsp);
+
+extern JSBool
+js_SetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
+		 uintN *attrsp);
+
+extern JSBool
+js_DeleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *rval);
+
+extern JSBool
+js_DefaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp);
+
+extern JSBool
+js_Enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+             jsval *statep, jsid *idp);
+
+extern JSBool
+js_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
+	       jsval *vp, uintN *attrsp);
+
+extern JSBool
+js_Call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+
+extern JSBool
+js_Construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	     jsval *rval);
+
+extern JSBool
+js_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
+
+extern JSBool
+js_IsDelegate(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
+
+extern JSBool
+js_GetClassPrototype(JSContext *cx, const char *name, JSObject **protop);
+
+extern JSBool
+js_SetClassPrototype(JSContext *cx, JSObject *ctor, JSObject *proto,
+		     uintN attrs);
+
+extern JSBool
+js_ValueToObject(JSContext *cx, jsval v, JSObject **objp);
+
+extern JSObject *
+js_ValueToNonNullObject(JSContext *cx, jsval v);
+
+extern void
+js_TryValueOf(JSContext *cx, JSObject *obj, JSType type, jsval *rval);
+
+extern void
+js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
+	     uintN argc, jsval *argv, jsval *rval);
+
+extern JSBool
+js_XDRObject(JSXDRState *xdr, JSObject **objp);
+
+extern JSIdArray *
+js_NewIdArray(JSContext *cx, jsint length);
+
+PR_END_EXTERN_C
+
+#endif /* jsobj_h___ */

mozilla/js/src/jsopcode.def

@@ -0,0 +1,202 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+ * JavaScript operation bytecodes.
+ *
+ * Includers must define an OPDEF macro of the following form:
+ *
+ * #define OPDEF(op,val,name,image,length,nuses,ndefs,prec,format) ...
+ *
+ * Selected arguments can be expanded in initializers.  The op argument is
+ * expanded followed by comma in the JSOp enum (jsopcode.h), e.g.  The value
+ * field must be dense for now, because jsopcode.c uses an OPDEF() expansion
+ * inside the js_CodeSpec[] initializer.
+ *
+ * Field        Description
+ * op           Bytecode name, which is the JSOp enumerator name
+ * value        Bytecode value, which is the JSOp enumerator value
+ * name         C string containing name for disassembler
+ * image        C string containing "image" for pretty-printer, null if ugly
+ * length       Number of bytes including any immediate operands
+ * nuses        Number of stack slots consumed by bytecode, -1 if variadic
+ * ndefs        Number of stack slots produced by bytecode
+ * prec         Operator precedence, zero if not an operator
+ * format       Bytecode plus immediate operand encoding format
+ *
+ * This file is best viewed with 116 columns:
+01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345
+ */
+
+/* legend: op         val name          image       len use def prec  format */
+
+/* Permanently-assigned bytecodes. */
+OPDEF(JSOP_NOP,       0,  "nop",        NULL,         1,  0,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_PUSH,      1,  "push",       NULL,         1,  0,  1,  0,  JOF_BYTE)
+OPDEF(JSOP_POPV,      2,  "popv",       NULL,         1,  1,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_ENTERWITH, 3,  "enterwith",  NULL,         1,  1,  1,  0,  JOF_BYTE)
+OPDEF(JSOP_LEAVEWITH, 4,  "leavewith",  NULL,         1,  1,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_RETURN,    5,  "return",     NULL,         1,  1,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_GOTO,      6,  "goto",       NULL,         3,  0,  0,  0,  JOF_JUMP)
+OPDEF(JSOP_IFEQ,      7,  "ifeq",       NULL,         3,  1,  0,  0,  JOF_JUMP)
+OPDEF(JSOP_IFNE,      8,  "ifne",       NULL,         3,  1,  0,  0,  JOF_JUMP)
+OPDEF(JSOP_FORNAME,   9,  "forname",    NULL,         3,  1,  1,  0,  JOF_CONST|JOF_NAME|JOF_SET)
+OPDEF(JSOP_FORPROP,   10, "forprop",    NULL,         3,  2,  1,  0,  JOF_CONST|JOF_PROP|JOF_SET)
+OPDEF(JSOP_FORELEM,   11, "forelem",    NULL,         1,  3,  1,  0,  JOF_BYTE |JOF_ELEM|JOF_SET)
+OPDEF(JSOP_DUP,       12, "dup",        NULL,         1,  1,  2,  0,  JOF_BYTE)
+OPDEF(JSOP_DUP2,      13, "dup2",       NULL,         1,  2,  4,  0,  JOF_BYTE)
+OPDEF(JSOP_SETNAME,   14, "setname",    NULL,         3,  1,  1,  1,  JOF_CONST|JOF_NAME|JOF_SET)
+OPDEF(JSOP_BITOR,     15, "bitor",      "|",          1,  2,  1,  2,  JOF_BYTE)
+OPDEF(JSOP_BITXOR,    16, "bitxor",     "^",          1,  2,  1,  3,  JOF_BYTE)
+OPDEF(JSOP_BITAND,    17, "bitand",     "&",          1,  2,  1,  4,  JOF_BYTE)
+OPDEF(JSOP_EQ,        18, "eq",         "==",         1,  2,  1,  5,  JOF_BYTE)
+OPDEF(JSOP_NE,        19, "ne",         "!=",         1,  2,  1,  5,  JOF_BYTE)
+OPDEF(JSOP_LT,        20, "lt",         "<",          1,  2,  1,  6,  JOF_BYTE)
+OPDEF(JSOP_LE,        21, "le",         "<=",         1,  2,  1,  6,  JOF_BYTE)
+OPDEF(JSOP_GT,        22, "gt",         ">",          1,  2,  1,  6,  JOF_BYTE)
+OPDEF(JSOP_GE,        23, "ge",         ">=",         1,  2,  1,  6,  JOF_BYTE)
+OPDEF(JSOP_LSH,       24, "lsh",        "<<",         1,  2,  1,  7,  JOF_BYTE)
+OPDEF(JSOP_RSH,       25, "rsh",        ">>",         1,  2,  1,  7,  JOF_BYTE)
+OPDEF(JSOP_URSH,      26, "ursh",       ">>>",        1,  2,  1,  7,  JOF_BYTE)
+OPDEF(JSOP_ADD,       27, "add",        "+",          1,  2,  1,  8,  JOF_BYTE)
+OPDEF(JSOP_SUB,       28, "sub",        "-",          1,  2,  1,  8,  JOF_BYTE)
+OPDEF(JSOP_MUL,       29, "mul",        "*",          1,  2,  1,  9,  JOF_BYTE)
+OPDEF(JSOP_DIV,       30, "div",        "/",          1,  2,  1,  9,  JOF_BYTE)
+OPDEF(JSOP_MOD,       31, "mod",        "%",          1,  2,  1,  9,  JOF_BYTE)
+OPDEF(JSOP_NOT,       32, "not",        "!",          1,  1,  1, 10,  JOF_BYTE)
+OPDEF(JSOP_BITNOT,    33, "bitnot",     "~",          1,  1,  1, 10,  JOF_BYTE)
+OPDEF(JSOP_NEG,       34, "neg",        "-",          1,  1,  1, 10,  JOF_BYTE)
+OPDEF(JSOP_NEW,       35, js_new_str,   NULL,         3, -1,  1, 10,  JOF_UINT16)
+OPDEF(JSOP_DELNAME,   36, "delname",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEL)
+OPDEF(JSOP_DELPROP,   37, "delprop",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_DEL)
+OPDEF(JSOP_DELELEM,   38, "delelem",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEL)
+OPDEF(JSOP_TYPEOF,    39, js_typeof_str,NULL,         1,  1,  1, 10,  JOF_BYTE)
+OPDEF(JSOP_VOID,      40, js_void_str,  NULL,         1,  1,  1, 10,  JOF_BYTE)
+OPDEF(JSOP_INCNAME,   41, "incname",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_INC)
+OPDEF(JSOP_INCPROP,   42, "incprop",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_INC)
+OPDEF(JSOP_INCELEM,   43, "incelem",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_INC)
+OPDEF(JSOP_DECNAME,   44, "decname",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEC)
+OPDEF(JSOP_DECPROP,   45, "decprop",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_DEC)
+OPDEF(JSOP_DECELEM,   46, "decelem",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEC)
+OPDEF(JSOP_NAMEINC,   47, "nameinc",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_INC|JOF_POST)
+OPDEF(JSOP_PROPINC,   48, "propinc",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_INC|JOF_POST)
+OPDEF(JSOP_ELEMINC,   49, "eleminc",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_INC|JOF_POST)
+OPDEF(JSOP_NAMEDEC,   50, "namedec",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEC|JOF_POST)
+OPDEF(JSOP_PROPDEC,   51, "propdec",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_DEC|JOF_POST)
+OPDEF(JSOP_ELEMDEC,   52, "elemdec",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEC|JOF_POST)
+OPDEF(JSOP_GETPROP,   53, "getprop",    NULL,         3,  1,  1, 11,  JOF_CONST|JOF_PROP)
+OPDEF(JSOP_SETPROP,   54, "setprop",    NULL,         3,  2,  1,  1,  JOF_CONST|JOF_PROP|JOF_SET)
+OPDEF(JSOP_GETELEM,   55, "getelem",    NULL,         1,  2,  1, 11,  JOF_BYTE |JOF_ELEM)
+OPDEF(JSOP_SETELEM,   56, "setelem",    NULL,         1,  3,  1,  1,  JOF_BYTE |JOF_ELEM|JOF_SET)
+OPDEF(JSOP_PUSHOBJ,   57, "pushobj",    NULL,         1,  0,  1,  0,  JOF_BYTE)
+OPDEF(JSOP_CALL,      58, "call",       NULL,         3, -1,  1, 11,  JOF_UINT16)
+OPDEF(JSOP_NAME,      59, "name",       NULL,         3,  0,  1, 12,  JOF_CONST|JOF_NAME)
+OPDEF(JSOP_NUMBER,    60, "number",     NULL,         3,  0,  1, 12,  JOF_CONST)
+OPDEF(JSOP_STRING,    61, "string",     NULL,         3,  0,  1, 12,  JOF_CONST)
+OPDEF(JSOP_ZERO,      62, "zero",       "0",          1,  0,  1, 12,  JOF_BYTE)
+OPDEF(JSOP_ONE,       63, "one",        "1",          1,  0,  1, 12,  JOF_BYTE)
+OPDEF(JSOP_NULL,      64, js_null_str,  js_null_str,  1,  0,  1, 12,  JOF_BYTE)
+OPDEF(JSOP_THIS,      65, js_this_str,  js_this_str,  1,  0,  1, 12,  JOF_BYTE)
+OPDEF(JSOP_FALSE,     66, js_false_str, js_false_str, 1,  0,  1, 12,  JOF_BYTE)
+OPDEF(JSOP_TRUE,      67, js_true_str,  js_true_str,  1,  0,  1, 12,  JOF_BYTE)
+OPDEF(JSOP_OR,        68, "or",         NULL,         3,  1,  0,  0,  JOF_JUMP)
+OPDEF(JSOP_AND,       69, "and",        NULL,         3,  1,  0,  0,  JOF_JUMP)
+
+/* The switch bytecodes have variable length. */
+OPDEF(JSOP_TABLESWITCH,  70, "tableswitch",  NULL,   -1,  1,  0,  0,  JOF_TABLESWITCH)
+OPDEF(JSOP_LOOKUPSWITCH, 71, "lookupswitch", NULL,   -1,  1,  0,  0,  JOF_LOOKUPSWITCH)
+
+/* New, infallible/transitive identity ops. */
+OPDEF(JSOP_NEW_EQ,    72, "eq",         NULL,         1,  2,  1,  5,  JOF_BYTE)
+OPDEF(JSOP_NEW_NE,    73, "ne",         NULL,         1,  2,  1,  5,  JOF_BYTE)
+
+/* Lexical closure constructor. */
+OPDEF(JSOP_CLOSURE,   74, "closure",    NULL,         3,  0,  1,  0,  JOF_CONST)
+
+/* Export and import ops. */
+OPDEF(JSOP_EXPORTALL, 75, "exportall",  NULL,         1,  0,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_EXPORTNAME,76, "exportname", NULL,         3,  0,  0,  0,  JOF_CONST|JOF_NAME)
+OPDEF(JSOP_IMPORTALL, 77, "importall",  NULL,         1,  1,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_IMPORTPROP,78, "importprop", NULL,         3,  1,  0,  0,  JOF_CONST|JOF_PROP|JOF_IMPORT)
+OPDEF(JSOP_IMPORTELEM,79, "importelem", NULL,         3,  2,  0,  0,  JOF_BYTE |JOF_ELEM|JOF_IMPORT)
+
+/* Push object literal. */
+OPDEF(JSOP_OBJECT,    80, "object",     NULL,         3,  0,  1, 12,  JOF_CONST)
+
+/* Pop value and discard it. */
+OPDEF(JSOP_POP,       81, "pop",        NULL,         1,  1,  0,  0,  JOF_BYTE)
+
+/* Convert value to number, for unary +. */
+OPDEF(JSOP_POS,       82, "pos",        "+",          1,  1,  1, 10,  JOF_BYTE)
+
+/* Trap into debugger for breakpoint, etc. */
+OPDEF(JSOP_TRAP,      83, "trap",       NULL,         1,  0,  0,  0,  JOF_BYTE)
+
+/* Fast get/set ops for function arguments and local variables. */
+OPDEF(JSOP_GETARG,    84, "getarg",     NULL,         3,  0,  1, 12,  JOF_QARG |JOF_NAME)
+OPDEF(JSOP_SETARG,    85, "setarg",     NULL,         3,  1,  1,  1,  JOF_QARG |JOF_NAME|JOF_SET)
+OPDEF(JSOP_GETVAR,    86, "getvar",     NULL,         3,  0,  1, 12,  JOF_QVAR |JOF_NAME)
+OPDEF(JSOP_SETVAR,    87, "setvar",     NULL,         3,  1,  1,  1,  JOF_QVAR |JOF_NAME|JOF_SET)
+
+/* Push unsigned 16-bit int constant. */
+OPDEF(JSOP_UINT16,    88, "uint16",     NULL,         3,  0,  1, 12,  JOF_UINT16)
+
+/* Object and array literal support. */
+OPDEF(JSOP_NEWINIT,   89, "newinit",    NULL,         1,  2,  1, 10,  JOF_BYTE)
+OPDEF(JSOP_ENDINIT,   90, "endinit",    NULL,         1,  0,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_INITPROP,  91, "initprop",   NULL,         3,  1,  0,  0,  JOF_CONST|JOF_PROP)
+OPDEF(JSOP_INITELEM,  92, "initelem",   NULL,         1,  2,  0,  0,  JOF_BYTE |JOF_ELEM)
+OPDEF(JSOP_DEFSHARP,  93, "defsharp",   NULL,         3,  0,  0,  0,  JOF_UINT16)
+OPDEF(JSOP_USESHARP,  94, "usesharp",   NULL,         3,  0,  1,  0,  JOF_UINT16)
+
+/* Fast inc/dec ops for args and local vars. */
+OPDEF(JSOP_INCARG,    95, "incarg",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_INC)
+OPDEF(JSOP_INCVAR,    96, "incvar",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_INC)
+OPDEF(JSOP_DECARG,    97, "decarg",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_DEC)
+OPDEF(JSOP_DECVAR,    98, "decvar",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_DEC)
+OPDEF(JSOP_ARGINC,    99, "arginc",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_INC|JOF_POST)
+OPDEF(JSOP_VARINC,    100,"varinc",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_INC|JOF_POST)
+OPDEF(JSOP_ARGDEC,    101,"argdec",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_DEC|JOF_POST)
+OPDEF(JSOP_VARDEC,    102,"vardec",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_DEC|JOF_POST)
+
+/* ECMA-compliant for/in ops. */
+OPDEF(JSOP_TOOBJECT,  103,"toobject",   NULL,         1,  1,  1,  0,  JOF_BYTE)
+OPDEF(JSOP_FORNAME2,  104,"forname2",   NULL,         3,  0,  1,  0,  JOF_CONST|JOF_NAME|JOF_SET|JOF_FOR2)
+OPDEF(JSOP_FORPROP2,  105,"forprop2",   NULL,         3,  1,  1,  0,  JOF_CONST|JOF_PROP|JOF_SET|JOF_FOR2)
+OPDEF(JSOP_FORELEM2,  106,"forelem2",   NULL,         1,  2,  1,  0,  JOF_BYTE |JOF_ELEM|JOF_SET|JOF_FOR2)
+OPDEF(JSOP_POP2,      107,"pop2",       NULL,         1,  2,  0,  0,  JOF_BYTE)
+
+/* ECMA-complaint assignment ops. */
+OPDEF(JSOP_BINDNAME,  108,"bindname",   NULL,         3,  0,  1,  0,  JOF_CONST|JOF_NAME)
+OPDEF(JSOP_SETNAME2,  109,"setname2",   NULL,         3,  2,  1,  1,  JOF_CONST|JOF_NAME|JOF_SET)
+
+/* Exception handling ops. */
+OPDEF(JSOP_THROW,     110,"throw",      NULL,         1,  1,  0,  0,  JOF_BYTE)
+
+/* 'in' and 'instanceof' ops. */
+OPDEF(JSOP_IN,        111,js_in_str,    js_in_str,    1,  2,  1,  6,  JOF_BYTE)
+OPDEF(JSOP_INSTANCEOF,112,js_instanceof_str,js_instanceof_str,1,2,1,6,JOF_BYTE)
+
+/* debugger op */
+OPDEF(JSOP_DEBUGGER,  113,"debugger",   NULL,         1,  0,  0,  0,  JOF_BYTE)
+
+/* jsr/return for finally handling */
+OPDEF(JSOP_JSR,       114,"jsr",	NULL,	      3,  0,  1,  0,  JOF_JUMP)
+OPDEF(JSOP_RETSUB,    115,"retsub",     NULL,         1,  1,  0,  0,  JOF_BYTE)
+
+/* more exception handling ops */
+OPDEF(JSOP_EXCEPTION, 116,"exception",  NULL,         1,  0,  1,  0,  JOF_BYTE)

mozilla/js/src/jsopcode.h

@@ -0,0 +1,188 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsopcode_h___
+#define jsopcode_h___
+/*
+ * JS bytecode definitions.
+ */
+#include <stddef.h>
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+PR_BEGIN_EXTERN_C
+
+/*
+ * JS operation bytecodes.
+ */
+typedef enum JSOp {
+#define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
+    op = val,
+#include "jsopcode.def"
+#undef OPDEF
+    JSOP_LIMIT
+} JSOp;
+
+/*
+ * JS bytecode formats.
+ */
+#define JOF_BYTE          0       /* single bytecode, no immediates */
+#define JOF_JUMP          1       /* signed 16-bit jump offset immediate */
+#define JOF_CONST         2       /* unsigned 16-bit constant pool index */
+#define JOF_UINT16        3       /* unsigned 16-bit immediate operand */
+#define JOF_TABLESWITCH   4       /* table switch */
+#define JOF_LOOKUPSWITCH  5       /* lookup switch */
+#define JOF_QARG          6       /* quickened get/set function argument ops */
+#define JOF_QVAR          7       /* quickened get/set local variable ops */
+#define JOF_TYPEMASK      0x000f  /* mask for above immediate types */
+#define JOF_NAME          0x0010  /* name operation */
+#define JOF_PROP          0x0020  /* obj.prop operation */
+#define JOF_ELEM          0x0030  /* obj[index] operation */
+#define JOF_MODEMASK      0x0030  /* mask for above addressing modes */
+#define JOF_SET           0x0040  /* set (i.e., assignment) operation */
+#define JOF_DEL           0x0080  /* delete operation */
+#define JOF_DEC           0x0100  /* decrement (--, not ++) opcode */
+#define JOF_INC           0x0200  /* increment (++, not --) opcode */
+#define JOF_INCDEC        0x0300  /* increment or decrement opcode */
+#define JOF_POST          0x0400  /* postorder increment or decrement */
+#define JOF_IMPORT        0x0800  /* import property op */
+#define JOF_FOR2          0x1000  /* new for/in loop bytecodes */
+
+/*
+ * Immediate operand getters, setters, and bounds.
+ */
+#define JUMP_OFFSET_LEN         2
+#define JUMP_OFFSET_HI(off)     ((jsbytecode)((off) >> 8))
+#define JUMP_OFFSET_LO(off)     ((jsbytecode)(off))
+#define GET_JUMP_OFFSET(pc)     ((int16)(((pc)[1] << 8) | (pc)[2]))
+#define SET_JUMP_OFFSET(pc,off) ((pc)[1] = JUMP_OFFSET_HI(off),               \
+				 (pc)[2] = JUMP_OFFSET_LO(off))
+#define JUMP_OFFSET_MIN         ((int16)0x8000)
+#define JUMP_OFFSET_MAX         ((int16)0x7fff)
+
+#define ATOM_INDEX_LEN          2
+#define ATOM_INDEX_HI(index)    ((jsbytecode)((index) >> 8))
+#define ATOM_INDEX_LO(index)    ((jsbytecode)(index))
+#define GET_ATOM_INDEX(pc)      (((pc)[1] << 8) | (pc)[2])
+#define SET_ATOM_INDEX(pc,index)((pc)[1] = ATOM_INDEX_HI(index),              \
+				 (pc)[2] = ATOM_INDEX_LO(index))
+#define GET_ATOM(cx,script,pc)  js_GetAtom((cx), &(script)->atomMap,          \
+					   GET_ATOM_INDEX(pc))
+#define ATOM_INDEX_LIMIT_LOG2   16
+#define ATOM_INDEX_LIMIT        ((uint32)1 << ATOM_INDEX_LIMIT_LOG2)
+
+#define ARGC_HI(argc)           ((jsbytecode)((argc) >> 8))
+#define ARGC_LO(argc)           ((jsbytecode)(argc))
+#define GET_ARGC(pc)            (((pc)[1] << 8) | (pc)[2])
+#define ARGC_LIMIT              ((uint32)1 << 16)
+
+/* Synonyms for quick JOF_QARG and JOF_QVAR bytecodes. */
+#define GET_ARGNO(pc)           GET_ARGC(pc)
+#define SET_ARGNO(pc,argno)     SET_JUMP_OFFSET(pc,argno)
+#define GET_VARNO(pc)           GET_ARGC(pc)
+#define SET_VARNO(pc,varno)     SET_JUMP_OFFSET(pc,varno)
+
+struct JSCodeSpec {
+    const char          *name;          /* JS bytecode name */
+    const char          *token;         /* JS source literal or null */
+    int8                length;         /* length including opcode byte */
+    int8                nuses;          /* arity, -1 if variadic */
+    int8                ndefs;          /* number of stack results */
+    uint8               prec;           /* operator precedence */
+    uint32              format;         /* immediate operand format */
+};
+
+extern char             js_in_str[];
+extern char             js_instanceof_str[];
+extern char             js_new_str[];
+extern char             js_delete_str[];
+extern char             js_typeof_str[];
+extern char             js_void_str[];
+extern char             js_null_str[];
+extern char             js_this_str[];
+extern char             js_false_str[];
+extern char             js_true_str[];
+extern JSCodeSpec       js_CodeSpec[];
+extern uintN            js_NumCodeSpecs;
+extern jschar           js_EscapeMap[];
+
+/*
+ * Return a GC'ed string containing the chars in str, with any non-printing
+ * chars or quotes (' or " as specified by the quote argument) escaped, and
+ * with the quote character at the beginning and end of the result string.
+ */
+extern JSString *
+js_QuoteString(JSContext *cx, JSString *str, jschar quote);
+
+/*
+ * JSPrinter operations, for printf style message formatting.  The return
+ * value from js_GetPrinterOutput() is the printer's cumulative output, in
+ * a GC'ed string.
+ */
+extern JSPrinter *
+js_NewPrinter(JSContext *cx, const char *name, uintN indent);
+
+extern void
+js_DestroyPrinter(JSPrinter *jp);
+
+extern JSString *
+js_GetPrinterOutput(JSPrinter *jp);
+
+extern int
+js_printf(JSPrinter *jp, char *format, ...);
+
+extern JSBool
+js_puts(JSPrinter *jp, char *s);
+
+#ifdef DEBUG
+/*
+ * Disassemblers, for debugging only.
+ */
+#include <stdio.h>
+
+extern JS_FRIEND_API(void)
+js_Disassemble(JSContext *cx, JSScript *script, JSBool lines, FILE *fp);
+
+extern JS_FRIEND_API(uintN)
+js_Disassemble1(JSContext *cx, JSScript *script, jsbytecode *pc, uintN loc,
+		JSBool lines, FILE *fp);
+#endif /* DEBUG */
+
+/*
+ * Decompilers, for script, function, and expression pretty-printing.
+ */
+extern JSBool
+js_DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, uintN len);
+
+extern JSBool
+js_DecompileScript(JSPrinter *jp, JSScript *script);
+
+extern JSBool
+js_DecompileFunction(JSPrinter *jp, JSFunction *fun, JSBool newlines);
+
+/*
+ * Find the source expression that resulted in v, and return a new string
+ * containing it.  Fall back on v's string conversion if we can't find the
+ * bytecode that generated and pushed v on the operand stack.
+ */
+extern JSString *
+js_DecompileValueGenerator(JSContext *cx, jsval v, JSString *fallback);
+
+PR_END_EXTERN_C
+
+#endif /* jsopcode_h___ */

mozilla/js/src/jsparse.h

@@ -0,0 +1,253 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsparse_h___
+#define jsparse_h___
+/*
+ * JS parser definitions.
+ */
+#include "jsprvtd.h"
+#include "jspubtd.h"
+#include "jsscan.h"
+
+PR_BEGIN_EXTERN_C
+
+/*
+ * Parsing builds a tree of nodes that directs code generation.  This tree is
+ * not a concrete syntax tree in all respects (for example, || and && are left
+ * associative, but (A && B && C) translates into the right-associated tree
+ * <A && <B && C>> so that code generation can emit a left-associative branch
+ * around <B && C> when A is false).  Nodes are labeled by token type, with a
+ * JSOp secondary label when needed:
+ *
+ * Label        Variant     Members
+ * -----        -------     -------
+ * <Definitions>
+ * TOK_FUNCTION func        pn_fun: function, contains arg and var properties
+ *                          pn_body: TOK_LC node for function body
+ *                            NB: We define or create the function object at
+ *                            parse (not emit) time, in order to specialize arg
+ *                            and var bytecodes early.
+ *                          pn_tryCount: of try statements in function
+ *
+ * <Statements>
+ * TOK_LC       list        pn_head: list of pn_count statements
+ * TOK_EXPORT   list        pn_head: list of pn_count TOK_NAMEs or one TOK_STAR
+ *                            (which is not a multiply node)
+ * TOK_IMPORT   list        pn_head: list of pn_count sub-trees of the form
+ *                            a.b.*, a[b].*, a.*, a.b, or a[b] -- but never a.
+ *                            Each member is expressed with TOK_DOT or TOK_LB.
+ *                            Each sub-tree's root node has a pn_op in the set
+ *                            JSOP_IMPORT{ALL,PROP,ELEM}
+ * TOK_IF       ternary     pn_kid1: cond, pn_kid2: then, pn_kid3: else or null
+ * TOK_SWITCH   ternary     pn_kid1: discriminant
+ *                          pn_kid2: list of TOK_CASE nodes
+ *                          pn_kid3: TOK_LC node for default statements or null
+ * TOK_CASE     binary      pn_left: case expr
+ *                          pn_right: TOK_LC node for case statements
+ * TOK_WHILE    binary      pn_left: cond, pn_right: body
+ * TOK_DO       binary      pn_left: body, pn_right: cond
+ * TOK_FOR      binary      pn_left: either
+ *                            for/in loop: a binary TOK_IN node with
+ *                              pn_left:  TOK_VAR or TOK_NAME to left of 'in'
+ *                              pn_right: object expr to right of 'in'
+ *                            for(;;) loop: a ternary TOK_RESERVED node with
+ *                              pn_kid1:  init expr before first ';'
+ *                              pn_kid2:  cond expr before second ';'
+ *                              pn_kid3:  update expr after second ';'
+ *                              any kid may be null
+ *                          pn_right: body
+ * TOK_THROW    unary       pn_op: JSOP_THROW, pn_kid: exception
+ * TOK_BREAK    name        pn_atom: label or null
+ * TOK_CONTINUE name        pn_atom: label or null
+ * TOK_WITH     binary      pn_left: head expr, pn_right: body
+ * TOK_VAR      list        pn_head: list of pn_count TOK_NAME nodes
+ *                          each name node has pn_atom: variable name and
+ *                          pn_expr: initializer or null
+ * TOK_RETURN   unary       pn_kid: return expr or null
+ * TOK_SEMI     unary       pn_kid: expr or null statement
+ * TOK_COLON    name        pn_atom: label, pn_expr: labeled statement
+ *
+ * <Expressions>
+ * TOK_COMMA    list        pn_head: list of pn_count comma-separated exprs
+ * TOK_ASSIGN   binary      pn_left: lvalue, pn_right: rvalue
+ * TOK_HOOK     ternary     pn_kid1: cond, pn_kid2: then, pn_kid3: else
+ * TOK_OR       binary      pn_left: first in || chain, pn_right: rest of chain
+ * TOK_AND      binary      pn_left: first in && chain, pn_right: rest of chain
+ * TOK_BITOR    binary      pn_left: left-assoc | expr, pn_right: ^ expr
+ * TOK_BITXOR   binary      pn_left: left-assoc ^ expr, pn_right: & expr
+ * TOK_BITAND   binary      pn_left: left-assoc & expr, pn_right: EQ expr
+ * TOK_EQOP     binary      pn_left: left-assoc EQ expr, pn_right: REL expr
+ *                          pn_op: JSOP_EQ, JSOP_NE, JSOP_NEW_EQ, JSOP_NEW_NE
+ * TOK_RELOP    binary      pn_left: left-assoc REL expr, pn_right: SH expr
+ *                          pn_op: JSOP_LT, JSOP_LE, JSOP_GT, JSOP_GE
+ * TOK_SHOP     binary      pn_left: left-assoc SH expr, pn_right: ADD expr
+ *                          pn_op: JSOP_LSH, JSOP_RSH, JSOP_URSH
+ * TOK_PLUS,    binary      pn_left: left-assoc ADD expr, pn_right: MUL expr
+ * TOK_MINUS                pn_op: JSOP_ADD, JSOP_SUB
+ * TOK_STAR,    binary      pn_left: left-assoc MUL expr, pn_right: UNARY expr
+ * TOK_DIVOP                pn_op: JSOP_MUL, JSOP_DIV, JSOP_MOD
+ * TOK_UNARYOP  unary       pn_kid: UNARY expr, pn_op: JSOP_NEG, JSOP_POS,
+ *                          JSOP_NOT, JSOP_BITNOT, JSOP_TYPEOF, JSOP_VOID
+ * TOK_INC,     unary       pn_kid: MEMBER expr
+ * TOK_DEC                  pn_num: arg or local var slot if non-negative
+ * TOK_NEW      list        pn_head: list of ctor, arg1, arg2, ... argN
+ *                          pn_count: 1 + N (where N is number of args)
+ *                          ctor is a MEMBER expr
+ * TOK_DELETE   unary       pn_kid: MEMBER expr
+ * TOK_DOT      name        pn_expr: MEMBER expr to left of .
+ *                          pn_atom: name to right of .
+ * TOK_LB       binary      pn_left: MEMBER expr to left of [
+ *                          pn_right: expr between [ and ]
+ * TOK_LP       list        pn_head: list of call, arg1, arg2, ... argN
+ *                          pn_count: 1 + N (where N is number of args)
+ *                          call is a MEMBER expr naming a callable object
+ * TOK_RB       list        pn_head: list of pn_count array element exprs
+ *                          [,,] holes are represented by TOK_COMMA nodes
+ *                          #n=[...] produces TOK_DEFSHARP at head of list
+ *                          pn_extra: true if extra comma at end
+ * TOK_RC       list        pn_head: list of pn_count TOK_COLON nodes where
+ *                          each has pn_left: property id, pn_right: value
+ *                          #n={...} produces TOK_DEFSHARP at head of list
+ * TOK_DEFSHARP unary       pn_num: jsint value of n in #n=
+ * TOK_USESHARP nullary     pn_num: jsint value of n in #n#
+ * TOK_RP       unary       pn_kid: parenthesized expression
+ * TOK_NAME,    name        pn_atom: name, string, or object atom
+ * TOK_STRING,              pn_op: JSOP_NAME, JSOP_STRING, or JSOP_OBJECT
+ * TOK_OBJECT               pn_op may be *ARG or *VAR with pn_slot >= 0
+ * TOK_NUMBER   dval        pn_dval: double value of numeric literal
+ * TOK_PRIMARY  nullary     pn_op: JSOp bytecode
+ */
+typedef enum JSParseNodeArity {
+    PN_FUNC     = -3,
+    PN_LIST     = -2,
+    PN_TERNARY  =  3,
+    PN_BINARY   =  2,
+    PN_UNARY    =  1,
+    PN_NAME     = -1,
+    PN_NULLARY  =  0
+} JSParseNodeArity;
+
+struct JSParseNode {
+    JSTokenType         pn_type;
+    JSTokenPos          pn_pos;
+    JSOp                pn_op;
+    ptrdiff_t           pn_offset;      /* first generated bytecode offset */
+    JSParseNodeArity    pn_arity;
+    union {
+	struct {                        /* TOK_FUNCTION node */
+            JSFunction  *fun;           /* function object private data */
+            JSParseNode *body;          /* TOK_LC list of statements */
+	    uint32      tryCount;       /* try statement count */
+	} func;
+        struct {                        /* list of next-linked nodes */
+	    JSParseNode *head;          /* first node in list */
+	    JSParseNode **tail;         /* ptr to ptr to last node in list */
+	    uint32      count;          /* number of nodes in list */
+	    JSBool      extra;          /* extra comma flag for [1,2,,] */
+        } list;
+        struct {                        /* ternary: if, switch, for(;;), ?: */
+            JSParseNode *kid1;          /* condition, discriminant, etc. */
+            JSParseNode *kid2;          /* then-part, case list, etc. */
+            JSParseNode *kid3;          /* else-part, default case, etc. */
+	} ternary;
+        struct {                        /* two kids if binary */
+            JSParseNode *left;
+            JSParseNode *right;
+	    jsval       val;            /* switch case value */
+        } binary;
+        struct {                        /* one kid if unary */
+            JSParseNode *kid;
+            jsint       num;            /* -1 or arg or local/sharp var num */
+        } unary;
+        struct {                        /* name, labeled statement, etc. */
+            JSAtom      *atom;          /* name or label atom, null if slot */
+            JSParseNode *expr;          /* object or initializer */
+            jsint       slot;           /* -1 or arg or local var slot */
+	} name;
+	jsdouble        dval;           /* aligned numeric literal value */
+    } pn_u;
+    JSParseNode         *pn_next;       /* here to align dval and pn_u on RISCs */
+};
+
+#define pn_fun          pn_u.func.fun
+#define pn_body         pn_u.func.body
+#define pn_tryCount     pn_u.func.tryCount
+#define pn_head         pn_u.list.head
+#define pn_tail         pn_u.list.tail
+#define pn_count        pn_u.list.count
+#define pn_extra        pn_u.list.extra
+#define pn_kid1         pn_u.ternary.kid1
+#define pn_kid2         pn_u.ternary.kid2
+#define pn_kid3         pn_u.ternary.kid3
+#define pn_left         pn_u.binary.left
+#define pn_right        pn_u.binary.right
+#define pn_val          pn_u.binary.val
+#define pn_kid          pn_u.unary.kid
+#define pn_num          pn_u.unary.num
+#define pn_atom         pn_u.name.atom
+#define pn_expr         pn_u.name.expr
+#define pn_slot         pn_u.name.slot
+#define pn_dval         pn_u.dval
+
+/*
+ * Compute a pointer to the last JSParseNode element in a singly-linked list.
+ * NB: list must be non-empty for correct PN_LAST usage!
+ */
+#define PN_LAST(list) \
+    ((JSParseNode *)((char *)(list)->pn_tail - offsetof(JSParseNode, pn_next)))
+
+#define PN_INIT_LIST(list)                                                    \
+    PR_BEGIN_MACRO                                                            \
+    	(list)->pn_head = NULL;                                               \
+    	(list)->pn_tail = &(list)->pn_head;                                   \
+    	(list)->pn_count = 0;                                                 \
+    PR_END_MACRO
+
+#define PN_INIT_LIST_1(list, pn)                                              \
+    PR_BEGIN_MACRO                                                            \
+    	(list)->pn_head = (pn);                                               \
+    	(list)->pn_tail = &(pn)->pn_next;                                     \
+    	(list)->pn_count = 1;                                                 \
+    PR_END_MACRO
+
+#define PN_APPEND(list, pn)                                                   \
+    PR_BEGIN_MACRO                                                            \
+	*(list)->pn_tail = (pn);                                              \
+	(list)->pn_tail = &(pn)->pn_next;                                     \
+	(list)->pn_count++;                                                   \
+    PR_END_MACRO
+
+/* New names to connote code generation in addition to parse tree gen. */
+#define js_CompileTokenStream   js_Parse
+#define js_CompileFunctionBody  js_ParseFunctionBody
+
+extern JS_FRIEND_API(JSBool)
+js_CompileTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts,
+		      JSCodeGenerator *cg);
+
+extern JSBool
+js_CompileFunctionBody(JSContext *cx, JSTokenStream *ts, JSFunction *fun);
+
+/* XXXbe expose js_Parse{TokenStream,FunctionBody} that return trees? */
+extern JSBool
+js_FoldConstants(JSContext *cx, JSParseNode *pn);
+
+PR_END_EXTERN_C
+
+#endif /* jsparse_h___ */

mozilla/js/src/jsprvtd.h

@@ -0,0 +1,99 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsprvtd_h___
+#define jsprvtd_h___
+/*
+ * JS private typename definitions.
+ *
+ * This header is included only in other .h files, for convenience and for
+ * simplicity of type naming.  The alternative for structures is to use tags,
+ * which are named the same as their typedef names (legal in C/C++, and less
+ * noisy than suffixing the typedef name with "Struct" or "Str").  Instead,
+ * all .h files that include this file may use the same typedef name, whether
+ * declaring a pointer to struct type, or defining a member of struct type.
+ *
+ * A few fundamental scalar types are defined here too.  Neither the scalar
+ * nor the struct typedefs should change much, therefore the nearly-global
+ * make dependency induced by this file should not prove painful.
+ */
+
+#include "jspubtd.h"
+
+/* Scalar typedefs. */
+typedef uint8  jsbytecode;
+typedef uint8  jssrcnote;
+typedef uint32 jsatomid;
+
+/* Struct typedefs. */
+typedef struct JSCodeGenerator  JSCodeGenerator;
+typedef struct JSGCThing        JSGCThing;
+typedef struct JSParseNode      JSParseNode;
+typedef struct JSSharpObjectMap JSSharpObjectMap;
+typedef struct JSToken          JSToken;
+typedef struct JSTokenPos       JSTokenPos;
+typedef struct JSTokenPtr       JSTokenPtr;
+typedef struct JSTokenStream    JSTokenStream;
+typedef struct JSTreeContext    JSTreeContext;
+typedef struct JSTryNote       JSTryNote;
+
+/* Friend "Advanced API" typedefs. */
+typedef struct JSAtom           JSAtom;
+typedef struct JSAtomList       JSAtomList;
+typedef struct JSAtomListElement JSAtomListElement;
+typedef struct JSAtomMap        JSAtomMap;
+typedef struct JSAtomState      JSAtomState;
+typedef struct JSCodeSpec       JSCodeSpec;
+typedef struct JSPrinter        JSPrinter;
+typedef struct JSRegExp         JSRegExp;
+typedef struct JSRegExpStatics  JSRegExpStatics;
+typedef struct JSScope          JSScope;
+typedef struct JSScopeOps       JSScopeOps;
+typedef struct JSScopeProperty  JSScopeProperty;
+typedef struct JSStackFrame     JSStackFrame;
+typedef struct JSSubString      JSSubString;
+typedef struct JSSymbol         JSSymbol;
+
+/* "Friend" types used by jscntxt.h and jsdbgapi.h. */
+typedef enum JSTrapStatus {
+    JSTRAP_ERROR,
+    JSTRAP_CONTINUE,
+    JSTRAP_RETURN,
+    JSTRAP_LIMIT
+} JSTrapStatus;
+
+typedef JSTrapStatus
+(*JSTrapHandler)(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval,
+		 void *closure);
+
+/* called just after script creation */
+typedef void
+(*JSNewScriptHook)( JSContext   *cx,
+		    const char  *filename,  /* URL this script loads from */
+		    uintN       lineno,     /* line where this script starts */
+		    JSScript    *script,
+		    JSFunction  *fun,
+		    void        *callerdata );
+
+/* called just before script destruction */
+typedef void
+(*JSDestroyScriptHook)( JSContext   *cx,
+			JSScript    *script,
+			void        *callerdata );
+
+#endif /* jsprvtd_h___ */

mozilla/js/src/jspubtd.h

@@ -0,0 +1,294 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jspubtd_h___
+#define jspubtd_h___
+/*
+ * JS public API typedefs.
+ */
+#include "prtypes.h"
+#define NETSCAPE_INTERNAL 1
+#include "jscompat.h"
+
+#ifndef PR_INLINE
+#  ifdef _WIN32
+#       define PR_INLINE __inline
+#  elif defined(__GNUC__)
+#       define PR_INLINE inline
+#  else
+#       define PR_INLINE
+#  endif
+#endif /* PR_INLINE */
+
+/*
+ * Downrev NSPR versions of prtypes.h do not define these linkage-related
+ * PR_* macros, so we define them if necessary.  Eventually, we should be
+ * able to remove these local definitions (move them to js/ref/prtypes.h,
+ * and get them from an uprev NSPR's prtypes.h for js/src).
+ */
+#ifndef PR_IMPORT_API
+#    ifdef _WIN32
+#        define PR_IMPORT_API(__x)      _declspec(dllimport) __x
+#    else
+#        define PR_IMPORT_API(__x)      PR_IMPLEMENT(__x)
+#    endif
+#endif /* PR_IMPORT_API */
+#ifndef PR_IMPORT_DATA
+#    ifdef _WIN32
+#        define PR_IMPORT_DATA(__x)      _declspec(dllimport) __x
+#    else
+#        define PR_IMPORT_DATA(__x)      __x
+#    endif
+#endif /* PR_IMPORT_DATA */
+#ifndef PR_PUBLIC_DATA
+#    ifdef _WIN32
+#        define PR_PUBLIC_DATA(__x)      _declspec(dllexport) __x
+#    else
+#        define PR_PUBLIC_DATA(__x)      __x
+#    endif
+#endif /* PR_PUBLIC_DATA */
+
+/*
+ * The linkage of JS API functions differs depending on whether the file is
+ * used within the JS library or not.  Any source file within the JS
+ * interpreter should define EXPORT_JS_API whereas any client of the library
+ * should not.
+ */
+#ifdef EXPORT_JS_API
+#define JS_PUBLIC_API(t)    PR_IMPLEMENT(t)
+#define JS_PUBLIC_DATA(t)   PR_PUBLIC_DATA(t)
+#else
+#define JS_PUBLIC_API(t)    PR_IMPORT_API(t)
+#define JS_PUBLIC_DATA(t)   PR_IMPORT_DATA(t)
+#endif
+
+#define JS_FRIEND_API(t)    JS_PUBLIC_API(t)
+#define JS_FRIEND_DATA(t)   JS_PUBLIC_DATA(t)
+
+/* Scalar typedefs. */
+typedef uint16    jschar;
+typedef int32     jsint;
+typedef uint32    jsuint;
+typedef float64   jsdouble;
+typedef prword    jsval;
+typedef prword    jsid;
+typedef prword    jsrefcount;
+
+/* Boolean enum and packed int types. */
+typedef PRBool       JSBool;
+typedef PRPackedBool JSPackedBool;
+
+#define JS_FALSE     PR_FALSE
+#define JS_TRUE      PR_TRUE
+
+typedef enum JSVersion {
+    JSVERSION_1_0     = 100,
+    JSVERSION_1_1     = 110,
+    JSVERSION_1_2     = 120,
+    JSVERSION_1_3     = 130,
+    JSVERSION_1_4     = 140,
+    JSVERSION_DEFAULT = 0,
+    JSVERSION_UNKNOWN = -1
+} JSVersion;
+
+#define JSVERSION_IS_ECMA(version) \
+    ((version) == JSVERSION_DEFAULT || (version) >= JSVERSION_1_3)
+#define JSVERSION_IS_ECMAv2(version) \
+    ((version) >= JSVERSION_1_3)
+
+/* Result of typeof operator enumeration. */
+typedef enum JSType {
+    JSTYPE_VOID,                /* undefined */
+    JSTYPE_OBJECT,              /* object */
+    JSTYPE_FUNCTION,            /* function */
+    JSTYPE_STRING,              /* string */
+    JSTYPE_NUMBER,              /* number */
+    JSTYPE_BOOLEAN,             /* boolean */
+    JSTYPE_LIMIT
+} JSType;
+
+/* JSObjectOps.checkAccess mode enumeration. */
+typedef enum JSAccessMode {
+    JSACC_PROTO,
+    JSACC_PARENT,
+    JSACC_IMPORT,
+    JSACC_WATCH,
+    JSACC_LIMIT
+} JSAccessMode;
+
+/*
+ * This enum type is used to control the behavior of a JSObject property
+ * iterator function that has type JSNewEnumerate.
+ */
+typedef enum JSIterateOp {
+    JSENUMERATE_INIT,       /* Create new iterator state */
+    JSENUMERATE_NEXT,       /* Iterate once */
+    JSENUMERATE_DESTROY     /* Destroy iterator state */
+} JSIterateOp;
+
+/* Struct typedefs. */
+typedef struct JSClass           JSClass;
+typedef struct JSConstDoubleSpec JSConstDoubleSpec;
+typedef struct JSContext         JSContext;
+typedef struct JSErrorReport     JSErrorReport;
+typedef struct JSFunction        JSFunction;
+typedef struct JSFunctionSpec    JSFunctionSpec;
+typedef struct JSIdArray         JSIdArray;
+typedef struct JSProperty        JSProperty;
+typedef struct JSPropertySpec    JSPropertySpec;
+typedef struct JSObject          JSObject;
+typedef struct JSObjectMap       JSObjectMap;
+typedef struct JSObjectOps       JSObjectOps;
+typedef struct JSRuntime         JSRuntime;
+typedef struct JSRuntime         JSTaskState;	/* XXX deprecated name */
+typedef struct JSScript          JSScript;
+typedef struct JSString          JSString;
+typedef struct JSXDRState	 JSXDRState;
+
+#ifndef CRT_CALL
+#ifdef XP_OS2
+#define CRT_CALL _Optlink
+#else
+#define CRT_CALL
+#endif
+#endif
+
+/* JSClass (and JSObjectOps where appropriate) function pointer typedefs. */
+
+typedef JSBool
+(* CRT_CALL JSPropertyOp)(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+
+/*
+ *  This function type is used for callbacks that enumerate the properties of a
+ *  JSObject.  The behavior depends on the value of enum_op:
+ *
+ *    JSENUMERATE_INIT - A new, opaque iterator state should be allocated and
+ *           stored in *statep.  (You can use PRIVATE_TO_JSVAL() to store
+ *           a pointer in *statep).  The number of properties that will be
+ *           enumerated should be returned as an integer jsval in *idp, if idp
+ *           is non-NULL.
+ *    JSENUMERATE_NEXT - A previously allocated opaque iterator state is passed
+ *           in via statep.  Return the next jsid in the iteration using *idp.
+ *           The opaque iterator state pointed at by statep is destroyed and
+ *           *statep is set to JSVAL_NULL if there are no properties left to
+ *           enumerate.
+ *    JSENUMERATE_DESTROY - Destroy the opaque iterator previous allocated by
+ *           a call to this function with enum_op set to JSENUMERATE_INIT.
+ *
+ *   The return value is always used to indicate success, with a value of JS_FALSE
+ *   for failure.
+ */
+typedef JSBool
+(* CRT_CALL JSNewEnumerateOp)(JSContext *cx, JSObject *obj,
+                              JSIterateOp enum_op,
+                              jsval *statep, jsid *idp);
+
+typedef JSBool
+(* CRT_CALL JSEnumerateOp)(JSContext *cx, JSObject *obj);
+
+typedef JSBool
+(* CRT_CALL JSResolveOp)(JSContext *cx, JSObject *obj, jsval id);
+
+typedef JSBool
+(* CRT_CALL JSNewResolveOp)(JSContext *cx, JSObject *obj, jsval id, uintN flags,
+			    JSObject **objp);
+
+typedef JSBool
+(* CRT_CALL JSConvertOp)(JSContext *cx, JSObject *obj, JSType type, jsval *vp);
+
+typedef void
+(* CRT_CALL JSFinalizeOp)(JSContext *cx, JSObject *obj);
+
+typedef JSObjectOps *
+(* CRT_CALL JSGetObjectOps)(JSContext *cx, JSClass *clasp);
+
+typedef JSBool
+(* CRT_CALL JSCheckAccessOp)(JSContext *cx, JSObject *obj, jsval id,
+			     JSAccessMode mode, jsval *vp);
+
+typedef JSBool
+(* CRT_CALL JSXDRObjectOp)(JSXDRState *xdr, JSObject **objp);
+
+typedef JSBool
+(* CRT_CALL JSHasInstanceOp)(JSContext *cx, JSObject *obj, jsval v,
+			     JSBool *bp);
+
+/* JSObjectOps function pointer typedefs. */
+
+typedef JSObjectMap *
+(* CRT_CALL JSNewObjectMapOp)(JSContext *cx, jsrefcount nrefs,
+			      JSObjectOps *ops, JSClass *clasp,
+			      JSObject *obj);
+
+typedef void
+(* CRT_CALL JSObjectMapOp)(JSContext *cx, JSObjectMap *map);
+
+typedef JSBool
+(* CRT_CALL JSLookupPropOp)(JSContext *cx, JSObject *obj, jsid id,
+			    JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+			    , const char *file, uintN line
+#endif
+			    );
+
+typedef JSBool
+(* CRT_CALL JSDefinePropOp)(JSContext *cx, JSObject *obj, jsid id, jsval value,
+			    JSPropertyOp getter, JSPropertyOp setter,
+			    uintN attrs, JSProperty **propp);
+
+typedef JSBool
+(* CRT_CALL JSPropertyIdOp)(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+typedef JSBool
+(* CRT_CALL JSAttributesOp)(JSContext *cx, JSObject *obj, jsid id,
+			    JSProperty *prop, uintN *attrsp);
+
+typedef JSBool
+(* CRT_CALL JSCheckAccessIdOp)(JSContext *cx, JSObject *obj, jsid id,
+			       JSAccessMode mode, jsval *vp, uintN *attrsp);
+
+typedef JSObject *
+(* CRT_CALL JSObjectOp)(JSContext *cx, JSObject *obj);
+
+typedef void
+(* CRT_CALL JSPropertyRefOp)(JSContext *cx, JSObject *obj, JSProperty *prop);
+
+/* Typedef for native functions called by the JS VM. */
+
+typedef JSBool
+(* CRT_CALL JSNative)(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+		      jsval *rval);
+
+/* Callbacks and their arguments. */
+
+typedef enum JSGCStatus {
+    JSGC_BEGIN,
+    JSGC_END
+} JSGCStatus;
+
+typedef JSBool
+(* CRT_CALL JSGCCallback)(JSContext *cx, JSGCStatus status);
+
+typedef JSBool
+(* CRT_CALL JSBranchCallback)(JSContext *cx, JSScript *script);
+
+typedef void
+(* CRT_CALL JSErrorReporter)(JSContext *cx, const char *message,
+			     JSErrorReport *report);
+
+#endif /* jspubtd_h___ */

mozilla/js/src/jsregexp.h

@@ -0,0 +1,107 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsregexp_h___
+#define jsregexp_h___
+/*
+ * JS regular expression interface.
+ */
+#include <stddef.h>
+#include "jspubtd.h"
+#include "jsstr.h"
+
+struct JSRegExpStatics {
+    JSString    *input;         /* input string to match (perl $_, GC root) */
+    JSBool      multiline;      /* whether input contains newlines (perl $*) */
+    uintN       parenCount;     /* number of valid elements in parens[] */
+    uintN       moreLength;     /* number of allocated elements in moreParens */
+    JSSubString parens[9];      /* last set of parens matched (perl $1, $2) */
+    JSSubString *moreParens;    /* null or realloc'd vector for $10, etc. */
+    JSSubString lastMatch;      /* last string matched (perl $&) */
+    JSSubString lastParen;      /* last paren matched (perl $+) */
+    JSSubString leftContext;    /* input to left of last match (perl $`) */
+    JSSubString rightContext;   /* input to right of last match (perl $') */
+};
+
+/*
+ * This macro is safe because moreParens is guaranteed to be allocated and big
+ * enough to hold parenCount, or else be null when parenCount is 0.
+ */
+#define REGEXP_PAREN_SUBSTRING(res, num)                                      \
+    (((jsuint)(num) < (jsuint)(res)->parenCount)                              \
+     ? ((jsuint)(num) < 9)                                                    \
+       ? &(res)->parens[num]                                                  \
+       : &(res)->moreParens[(num) - 9]                                        \
+     : &js_EmptySubString)
+
+struct JSRegExp {
+    JSString    *source;        /* locked source string, sans // */
+    size_t      length;         /* program length in bytes */
+    size_t      lastIndex;      /* index after last match, for //g iterator */
+    uintN       parenCount;     /* number of parenthesized submatches */
+    uint8       flags;          /* flags, see jsapi.h */
+    jsbytecode  program[1];     /* regular expression bytecode */
+};
+
+extern JSRegExp *
+js_NewRegExp(JSContext *cx, JSString *str, uintN flags);
+
+extern JSRegExp *
+js_NewRegExpOpt(JSContext *cx, JSString *str, JSString *opt);
+
+extern void
+js_DestroyRegExp(JSContext *cx, JSRegExp *re);
+
+/*
+ * Execute re on input str at *indexp, returning null in *rval on mismatch.
+ * On match, return true if test is true, otherwise return an array object.
+ * Update *indexp and cx->regExpStatics always on match.
+ */
+extern JSBool
+js_ExecuteRegExp(JSContext *cx, JSRegExp *re, JSString *str, size_t *indexp,
+		 JSBool test, jsval *rval);
+
+/*
+ * These two add and remove GC roots, respectively, so their calls must be
+ * well-ordered.
+ */
+extern JSBool
+js_InitRegExpStatics(JSContext *cx, JSRegExpStatics *res);
+
+extern void
+js_FreeRegExpStatics(JSContext *cx, JSRegExpStatics *res);
+
+#define JSVAL_IS_REGEXP(cx, v)                                                \
+    (JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) &&                              \
+     OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_RegExpClass)
+
+extern JSClass js_RegExpClass;
+
+extern JSObject *
+js_InitRegExpClass(JSContext *cx, JSObject *obj);
+
+/*
+ * Create a new RegExp object.
+ */
+extern JSObject *
+js_NewRegExpObject(JSContext *cx, jschar *chars, size_t length, uintN flags);
+
+extern JSBool
+js_XDRRegExp(JSXDRState *xdr, JSObject **objp);
+
+#endif /* jsregexp_h___ */

mozilla/js/src/jsscan.h

@@ -0,0 +1,261 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsscan_h___
+#define jsscan_h___
+/*
+ * JS lexical scanner interface.
+ */
+#include <stddef.h>
+#ifdef JSFILE
+#include <stdio.h>
+#endif
+#include "jsopcode.h"
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+#ifdef JSD_LOWLEVEL_SOURCE
+#include "jsdebug.h"
+#endif
+
+PR_BEGIN_EXTERN_C
+
+typedef enum JSTokenType {
+    TOK_ERROR = -1,                     /* well-known as the only code < EOF */
+    TOK_EOF = 0,                        /* end of file */
+    TOK_EOL = 1,                        /* end of line */
+    TOK_SEMI = 2,                       /* semicolon */
+    TOK_LB = 3, TOK_RB = 4,             /* left and right brackets */
+    TOK_LC = 5, TOK_RC = 6,             /* left and right curlies (braces) */
+    TOK_LP = 7, TOK_RP = 8,             /* left and right parentheses */
+    TOK_COMMA = 9,                      /* comma operator */
+    TOK_ASSIGN = 10,                    /* assignment ops (= += -= etc.) */
+    TOK_HOOK = 11, TOK_COLON = 12,      /* conditional (?:) */
+    TOK_OR = 13,                        /* logical or (||) */
+    TOK_AND = 14,                       /* logical and (&&) */
+    TOK_BITOR = 15,                     /* bitwise-or (|) */
+    TOK_BITXOR = 16,                    /* bitwise-xor (^) */
+    TOK_BITAND = 17,                    /* bitwise-and (&) */
+    TOK_EQOP = 18,                      /* equality ops (== !=) */
+    TOK_RELOP = 19,                     /* relational ops (< <= > >=) */
+    TOK_SHOP = 20,                      /* shift ops (<< >> >>>) */
+    TOK_PLUS = 21,                      /* plus */
+    TOK_MINUS = 22,                     /* minus */
+    TOK_STAR = 23, TOK_DIVOP = 24,      /* multiply/divide ops (* / %) */
+    TOK_UNARYOP = 25,                   /* unary prefix operator */
+    TOK_INC = 26, TOK_DEC = 27,         /* increment/decrement (++ --) */
+    TOK_DOT = 28,                       /* member operator (.) */
+    TOK_NAME = 29,                      /* identifier */
+    TOK_NUMBER = 30,                    /* numeric constant */
+    TOK_STRING = 31,                    /* string constant */
+    TOK_OBJECT = 32,                    /* RegExp or other object constant */
+    TOK_PRIMARY = 33,                   /* true, false, null, this, super */
+    TOK_FUNCTION = 34,                  /* function keyword */
+    TOK_EXPORT = 35,                    /* export keyword */
+    TOK_IMPORT = 36,                    /* import keyword */
+    TOK_IF = 37,                        /* if keyword */
+    TOK_ELSE = 38,                      /* else keyword */
+    TOK_SWITCH = 39,                    /* switch keyword */
+    TOK_CASE = 40,                      /* case keyword */
+    TOK_DEFAULT = 41,                   /* default keyword */
+    TOK_WHILE = 42,                     /* while keyword */
+    TOK_DO = 43,                        /* do keyword */
+    TOK_FOR = 44,                       /* for keyword */
+    TOK_BREAK = 45,                     /* break keyword */
+    TOK_CONTINUE = 46,                  /* continue keyword */
+    TOK_IN = 47,                        /* in keyword */
+    TOK_VAR = 48,                       /* var keyword */
+    TOK_WITH = 49,                      /* with keyword */
+    TOK_RETURN = 50,                    /* return keyword */
+    TOK_NEW = 51,                       /* new keyword */
+    TOK_DELETE = 52,                    /* delete keyword */
+    TOK_DEFSHARP = 53,                  /* #n= for object/array initializers */
+    TOK_USESHARP = 54,                  /* #n# for object/array initializers */
+    TOK_TRY = 55,                       /* try keyword */
+    TOK_CATCH = 56,                     /* catch keyword */
+    TOK_FINALLY = 57,                   /* finally keyword */
+    TOK_THROW = 58,                     /* throw keyword */
+    TOK_INSTANCEOF = 59,                /* instanceof keyword */
+    TOK_DEBUGGER = 60,                  /* debugger keyword */
+    TOK_RESERVED,                       /* reserved keywords */
+    TOK_LIMIT                           /* domain size */
+} JSTokenType;
+
+#define IS_PRIMARY_TOKEN(tt) \
+    ((uintN)((tt) - TOK_NAME) <= (uintN)(TOK_PRIMARY - TOK_NAME))
+
+struct JSTokenPtr {
+    uint16              index;          /* index of char in physical line */
+    uint16              lineno;         /* physical line number */
+};
+
+struct JSTokenPos {
+    JSTokenPtr          begin;          /* first character and line of token */
+    JSTokenPtr          end;            /* index 1 past last char, last line */
+};
+
+struct JSToken {
+    JSTokenType         type;           /* char value or above enumerator */
+    JSTokenPos          pos;            /* token position in file */
+    jschar              *ptr;           /* beginning of token in line buffer */
+    union {
+        struct {
+	    JSOp        op;             /* operator, for minimal parser */
+	    JSAtom      *atom;          /* atom table entry */
+        } s;
+        jsdouble        dval;           /* floating point number */
+    } u;
+};
+
+#define t_op            u.s.op
+#define t_atom          u.s.atom
+#define t_dval          u.dval
+
+typedef struct JSTokenBuf {
+    jschar              *base;          /* base of line or stream buffer */
+    jschar              *limit;         /* limit for quick bounds check */
+    jschar              *ptr;           /* next char to get, or slot to use */
+} JSTokenBuf;
+
+#define JS_LINE_LIMIT   256             /* logical line buffer size limit --
+                                           physical line length is unlimited */
+
+struct JSTokenStream {
+    JSToken             token;          /* last token scanned */
+    JSToken             pushback;       /* pushed-back already-scanned token */
+    uintN               lineno;         /* current line number */
+    uintN               ungetpos;       /* next free char slot in ungetbuf */
+    jschar              ungetbuf[4];    /* at most 4, for \uXXXX lookahead */
+    uintN               flags;          /* flags -- see below */
+    ptrdiff_t           linelen;        /* physical linebuf segment length */
+    ptrdiff_t           linepos;        /* linebuf offset in physical line */
+    JSTokenBuf          linebuf;        /* line buffer for diagnostics */
+    JSTokenBuf          userbuf;        /* user input buffer if !file */
+    JSTokenBuf          tokenbuf;       /* current token string buffer */
+    const char          *filename;      /* input filename or null */
+#ifdef JSFILE
+    FILE                *file;          /* stdio stream if reading from file */
+#endif
+    JSPrincipals        *principals;    /* principals associated with given input */
+#ifdef JSD_LOWLEVEL_SOURCE
+    JSDContext          *jsdc;          /* used to cram source into debugger */
+    JSDSourceText       *jsdsrc;        /* used to cram source into debugger */
+#endif
+};
+
+/* JSTokenStream flags */
+#define TSF_ERROR       0x01            /* fatal error while scanning */
+#define TSF_EOF         0x02            /* hit end of file */
+#define TSF_NEWLINES    0x04            /* tokenize newlines */
+#define TSF_REGEXP      0x08            /* looking for a regular expression */
+#define TSF_INTERACTIVE 0x10            /* interactive parsing mode */
+#define TSF_NLFLAG      0x20            /* last linebuf ended with \n */
+#define TSF_CRFLAG      0x40            /* linebuf would have ended with \r */
+
+/*
+ * At most one non-EOF token can be pushed back onto a TokenStream between
+ * Get or successful Match operations.  These macros manipulate the pushback
+ * token to clear it when changing scanning modes (upon initialzation, after
+ * errors, or between newline-sensitive and insensitive states).
+ */
+#define CLEAR_PUSHBACK(ts)  ((ts)->pushback.type = TOK_EOF)
+#define SCAN_NEWLINES(ts)   ((ts)->flags |= TSF_NEWLINES)
+#define HIDE_NEWLINES(ts)                                                     \
+    PR_BEGIN_MACRO                                                            \
+	(ts)->flags &= ~TSF_NEWLINES;                                         \
+	if ((ts)->pushback.type == TOK_EOL)                                   \
+	    (ts)->pushback.type = TOK_EOF;                                    \
+    PR_END_MACRO
+
+/* Clear ts member that might point above a released cx->tempPool mark. */
+#define RESET_TOKENBUF(ts)  ((ts)->tokenbuf.base = (ts)->tokenbuf.limit = NULL)
+
+/*
+ * Create a new token stream, either from an input buffer or from a file.
+ * Return null on file-open or memory-allocation failure.
+ *
+ * NB: All of js_New{,Buffer,File}TokenStream() return a pointer to transient
+ * memory in the current context's temp pool.  This memory is deallocated via
+ * PR_ARENA_RELEASE() after parsing is finished.
+ */
+extern JSTokenStream *
+js_NewTokenStream(JSContext *cx, const jschar *base, size_t length,
+		  const char *filename, uintN lineno, JSPrincipals *principals);
+
+extern JS_FRIEND_API(JSTokenStream *)
+js_NewBufferTokenStream(JSContext *cx, const jschar *base, size_t length);
+
+#ifdef JSFILE
+extern JS_FRIEND_API(JSTokenStream *)
+js_NewFileTokenStream(JSContext *cx, const char *filename, FILE *defaultfp);
+#endif
+
+extern JS_FRIEND_API(JSBool)
+js_CloseTokenStream(JSContext *cx, JSTokenStream *ts);
+
+/*
+ * Initialize the scanner, installing JS keywords into cx's global scope.
+ */
+extern JSBool
+js_InitScanner(JSContext *cx);
+
+/*
+ * Friend-exported API entry point to call a mapping function on each reserved
+ * identifier in the scanner's keyword table.
+ */
+extern JS_FRIEND_API(void)
+js_MapKeywords(void (*mapfun)(const char *));
+
+/*
+ * Report an error found while scanning ts to a window or other output device
+ * associated with cx.
+ */
+extern void
+js_ReportCompileError(JSContext *cx, JSTokenStream *ts, const char *format,
+		      ...);
+
+/*
+ * Look ahead one token and return its type.
+ */
+extern JSTokenType
+js_PeekToken(JSContext *cx, JSTokenStream *ts);
+
+extern JSTokenType
+js_PeekTokenSameLine(JSContext *cx, JSTokenStream *ts);
+
+/*
+ * Get the next token from ts.
+ */
+extern JSTokenType
+js_GetToken(JSContext *cx, JSTokenStream *ts);
+
+/*
+ * Push back the last scanned token onto ts.
+ */
+extern void
+js_UngetToken(JSTokenStream *ts);
+
+/*
+ * Get the next token from ts if its type is tt.
+ */
+extern JSBool
+js_MatchToken(JSContext *cx, JSTokenStream *ts, JSTokenType tt);
+
+PR_END_EXTERN_C
+
+#endif /* jsscan_h___ */

mozilla/js/src/jsscope.c

@@ -0,0 +1,518 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS symbol tables.
+ */
+#include "jsstddef.h"
+#include <string.h>
+#include "prtypes.h"
+#include "prlog.h"
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsinterp.h"
+#include "jslock.h"
+#include "jsnum.h"
+#include "jsscope.h"
+#include "jsstr.h"
+
+PR_STATIC_CALLBACK(PRHashNumber)
+js_hash_id(const void *key)
+{
+    jsval v;
+    const JSAtom *atom;
+
+    v = (jsval)key;
+    if (JSVAL_IS_INT(v))
+	return JSVAL_TO_INT(v);
+    atom = key;
+    return atom->number;
+}
+
+typedef struct JSScopePrivate {
+    JSContext *context;
+    JSScope *scope;
+} JSScopePrivate;
+
+PR_STATIC_CALLBACK(void *)
+js_alloc_scope_space(void *priv, size_t size)
+{
+    return JS_malloc(((JSScopePrivate *)priv)->context, size);
+}
+
+PR_STATIC_CALLBACK(void)
+js_free_scope_space(void *priv, void *item)
+{
+    JS_free(((JSScopePrivate *)priv)->context, item);
+}
+
+PR_STATIC_CALLBACK(PRHashEntry *)
+js_alloc_symbol(void *priv, const void *key)
+{
+    JSScopePrivate *spriv;
+    JSContext *cx;
+    JSSymbol *sym;
+
+    spriv = priv;
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(spriv->scope));
+    cx = spriv->context;
+    sym = JS_malloc(cx, sizeof(JSSymbol));
+    if (!sym)
+	return NULL;
+    sym->entry.key = key;
+    return &sym->entry;
+}
+
+PR_STATIC_CALLBACK(void)
+js_free_symbol(void *priv, PRHashEntry *he, uintN flag)
+{
+    JSScopePrivate *spriv;
+    JSContext *cx;
+    JSSymbol *sym, **sp;
+    JSScopeProperty *sprop;
+
+    spriv = priv;
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(spriv->scope));
+    cx = spriv->context;
+    sym = (JSSymbol *)he;
+    sprop = sym->entry.value;
+    if (sprop) {
+	sym->entry.value = NULL;
+	sprop = js_DropScopeProperty(cx, spriv->scope, sprop);
+	if (sprop) {
+	    for (sp = &sprop->symbols; *sp; sp = &(*sp)->next) {
+		if (*sp == sym) {
+		    *sp = sym->next;
+		    if (!*sp)
+			break;
+		}
+	    }
+	    sym->next = NULL;
+	}
+    }
+
+    if (flag == HT_FREE_ENTRY)
+	JS_free(cx, he);
+}
+
+static PRHashAllocOps hash_scope_alloc_ops = {
+    js_alloc_scope_space, js_free_scope_space,
+    js_alloc_symbol, js_free_symbol
+};
+
+/************************************************************************/
+
+PR_STATIC_CALLBACK(JSSymbol *)
+js_hash_scope_lookup(JSContext *cx, JSScope *scope, jsid id, PRHashNumber hash)
+{
+    PRHashTable *table = scope->data;
+    PRHashEntry **hep;
+    JSSymbol *sym;
+
+    hep = PR_HashTableRawLookup(table, hash, (const void *)id);
+    sym = (JSSymbol *) *hep;
+    return sym;
+}
+
+#define SCOPE_ADD(PRIV, CLASS_SPECIFIC_CODE)                                  \
+    PR_BEGIN_MACRO                                                            \
+	if (sym) {                                                            \
+	    if (sym->entry.value == sprop)                                    \
+		return sym;                                                   \
+	    if (sym->entry.value)                                             \
+		js_free_symbol(PRIV, &sym->entry, HT_FREE_VALUE);             \
+	} else {                                                              \
+	    CLASS_SPECIFIC_CODE                                               \
+	    sym->scope = scope;                                               \
+	    sym->next = NULL;                                                 \
+	}                                                                     \
+	if (sprop) {                                                          \
+	    sym->entry.value = js_HoldScopeProperty(cx, scope, sprop);        \
+	    for (sp = &sprop->symbols; *sp; sp = &(*sp)->next)                \
+		;                                                             \
+	    *sp = sym;                                                        \
+	} else {                                                              \
+	    sym->entry.value = NULL;                                          \
+	}                                                                     \
+    PR_END_MACRO
+
+PR_STATIC_CALLBACK(JSSymbol *)
+js_hash_scope_add(JSContext *cx, JSScope *scope, jsid id, JSScopeProperty *sprop)
+{
+    PRHashTable *table = scope->data;
+    const void *key;
+    PRHashNumber keyHash;
+    PRHashEntry **hep;
+    JSSymbol *sym, **sp;
+    JSScopePrivate *priv;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    priv = table->allocPriv;
+    priv->context = cx;
+    key = (const void *)id;
+    keyHash = js_hash_id(key);
+    hep = PR_HashTableRawLookup(table, keyHash, key);
+    sym = (JSSymbol *) *hep;
+    SCOPE_ADD(priv,
+	sym = (JSSymbol *) PR_HashTableRawAdd(table, hep, keyHash, key, NULL);
+	if (!sym)
+	    return NULL;
+    );
+    return sym;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+js_hash_scope_remove(JSContext *cx, JSScope *scope, jsid id)
+{
+    PRHashTable *table = scope->data;
+    JSScopePrivate *priv;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    priv = table->allocPriv;
+    priv->context = cx;
+    return PR_HashTableRemove(table, (const void *)id);
+}
+
+/* Forward declaration for use by js_hash_scope_clear(). */
+extern JS_FRIEND_DATA(JSScopeOps) js_list_scope_ops;
+
+PR_STATIC_CALLBACK(void)
+js_hash_scope_clear(JSContext *cx, JSScope *scope)
+{
+    PRHashTable *table = scope->data;
+    JSScopePrivate *priv;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    priv = table->allocPriv;
+    priv->context = cx;
+    PR_HashTableDestroy(table);
+    JS_free(cx, priv);
+    scope->ops = &js_list_scope_ops;
+    scope->data = NULL;
+}
+
+JSScopeOps js_hash_scope_ops = {
+    js_hash_scope_lookup,
+    js_hash_scope_add,
+    js_hash_scope_remove,
+    js_hash_scope_clear
+};
+
+/************************************************************************/
+
+PR_STATIC_CALLBACK(JSSymbol *)
+js_list_scope_lookup(JSContext *cx, JSScope *scope, jsid id, PRHashNumber hash)
+{
+    JSSymbol *sym, **sp;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    for (sp = (JSSymbol **)&scope->data; (sym = *sp) != 0;
+	 sp = (JSSymbol **)&sym->entry.next) {
+	if (sym_id(sym) == id) {
+	    /* Move sym to the front for shorter searches. */
+	    *sp = (JSSymbol *)sym->entry.next;
+	    sym->entry.next = scope->data;
+	    scope->data = sym;
+	    return sym;
+	}
+    }
+    return NULL;
+}
+
+#define HASH_THRESHOLD	5
+
+PR_STATIC_CALLBACK(JSSymbol *)
+js_list_scope_add(JSContext *cx, JSScope *scope, jsid id, JSScopeProperty *sprop)
+{
+    JSSymbol *list = scope->data;
+    uint32 nsyms;
+    JSSymbol *sym, *next, **sp;
+    PRHashTable *table;
+    PRHashEntry **hep;
+    JSScopePrivate priv;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    nsyms = 0;
+    for (sym = list; sym; sym = (JSSymbol *)sym->entry.next) {
+	if (sym_id(sym) == id)
+	    break;
+	nsyms++;
+    }
+
+    if (nsyms >= HASH_THRESHOLD) {
+	JSScopePrivate *priv = JS_malloc(cx, sizeof(JSScopePrivate));
+	if (!priv) return NULL;
+	priv->context = cx;
+	priv->scope = scope;
+	table = PR_NewHashTable(nsyms, js_hash_id,
+			        PR_CompareValues, PR_CompareValues,
+			        &hash_scope_alloc_ops, priv);
+	if (table) {
+	    for (sym = list; sym; sym = next) {
+		/* Save next for loop update, before it changes in lookup. */
+		next = (JSSymbol *)sym->entry.next;
+
+		/* Now compute missing keyHash fields. */
+		sym->entry.keyHash = js_hash_id(sym->entry.key);
+		sym->entry.next = NULL;
+		hep = PR_HashTableRawLookup(table,
+					    sym->entry.keyHash,
+					    sym->entry.key);
+		*hep = &sym->entry;
+	    }
+	    table->nentries = nsyms;
+	    scope->ops = &js_hash_scope_ops;
+	    scope->data = table;
+	    return scope->ops->add(cx, scope, id, sprop);
+	}
+    }
+
+    priv.context = cx;
+    priv.scope = scope;
+    SCOPE_ADD(&priv,
+	sym = (JSSymbol *)js_alloc_symbol(&priv, (const void *)id);
+	if (!sym)
+	    return NULL;
+	/* Don't set keyHash until we know we need it, above. */
+	sym->entry.next = scope->data;
+	scope->data = sym;
+    );
+    return sym;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+js_list_scope_remove(JSContext *cx, JSScope *scope, jsid id)
+{
+    JSSymbol *sym, **sp;
+    JSScopePrivate priv;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    for (sp = (JSSymbol **)&scope->data; (sym = *sp) != 0;
+	 sp = (JSSymbol **)&sym->entry.next) {
+	if (sym_id(sym) == id) {
+	    *sp = (JSSymbol *)sym->entry.next;
+	    priv.context = cx;
+	    priv.scope = scope;
+	    js_free_symbol(&priv, &sym->entry, HT_FREE_ENTRY);
+	    return JS_TRUE;
+	}
+    }
+    return JS_FALSE;
+}
+
+PR_STATIC_CALLBACK(void)
+js_list_scope_clear(JSContext *cx, JSScope *scope)
+{
+    JSSymbol *sym;
+    JSScopePrivate priv;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    while ((sym = scope->data) != NULL) {
+	scope->data = sym->entry.next;
+	priv.context = cx;
+	priv.scope = scope;
+	js_free_symbol(&priv, &sym->entry, HT_FREE_ENTRY);
+    }
+}
+
+JSScopeOps JS_FRIEND_DATA(js_list_scope_ops) = {
+    js_list_scope_lookup,
+    js_list_scope_add,
+    js_list_scope_remove,
+    js_list_scope_clear
+};
+
+/************************************************************************/
+
+JSScope *
+js_GetMutableScope(JSContext *cx, JSObject *obj)
+{
+    JSScope *scope, *newscope;
+
+    scope = (JSScope *) obj->map;
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    if (scope->object == obj)
+	return scope;
+    newscope = js_NewScope(cx, 0, scope->map.ops, LOCKED_OBJ_GET_CLASS(obj),
+			   obj);
+    if (!newscope)
+	return NULL;
+    JS_LOCK_SCOPE(cx, newscope);
+    obj->map = js_HoldObjectMap(cx, &newscope->map);
+    scope = (JSScope *) js_DropObjectMap(cx, &scope->map, obj);
+    JS_TRANSFER_SCOPE_LOCK(cx, scope, newscope);
+    return newscope;
+}
+
+JSScope *
+js_MutateScope(JSContext *cx, JSObject *obj, jsid id,
+	       JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
+	       JSScopeProperty **propp)
+{
+    /* XXX pessimal */
+    *propp = NULL;
+    return js_GetMutableScope(cx, obj);
+}
+
+JSScope *
+js_NewScope(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops, JSClass *clasp,
+	    JSObject *obj)
+{
+    JSScope *scope;
+
+    scope = JS_malloc(cx, sizeof(JSScope));
+    if (!scope)
+	return NULL;
+    js_InitObjectMap(&scope->map, nrefs, ops, clasp);
+    scope->object = obj;
+    scope->props = NULL;
+    scope->proptail = &scope->props;
+    scope->ops = &js_list_scope_ops;
+    scope->data = NULL;
+
+#ifdef JS_THREADSAFE
+    js_NewLock(&scope->lock);
+    scope->count = 0;
+#ifdef DEBUG
+    scope->file[0] = scope->file[1] = scope->file[2] = scope->file[3] = NULL;
+    scope->line[0] = scope->line[1] = scope->line[2] = scope->line[3] = 0;
+#endif
+#endif
+
+    return scope;
+}
+
+void
+js_DestroyScope(JSContext *cx, JSScope *scope)
+{
+    JS_LOCK_SCOPE(cx, scope);
+    scope->ops->clear(cx, scope);
+    JS_UNLOCK_SCOPE(cx, scope);
+#ifdef JS_THREADSAFE
+    PR_ASSERT(scope->count == 0);
+    js_DestroyLock(&scope->lock);
+#endif
+    JS_free(cx, scope);
+}
+
+PRHashNumber
+js_HashValue(jsval v)
+{
+    return js_hash_id((const void *)v);
+}
+
+jsval
+js_IdToValue(jsid id)
+{
+    JSAtom *atom;
+
+    if (JSVAL_IS_INT(id))
+	return id;
+    atom = (JSAtom *)id;
+    return ATOM_KEY(atom);
+}
+
+JSScopeProperty *
+js_NewScopeProperty(JSContext *cx, JSScope *scope, jsid id,
+		    JSPropertyOp getter, JSPropertyOp setter, uintN attrs)
+{
+    uint32 slot;
+    JSScopeProperty *sprop;
+
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    if (!js_AllocSlot(cx, scope->object, &slot))
+	return NULL;
+    sprop = JS_malloc(cx, sizeof(JSScopeProperty));
+    if (!sprop) {
+	js_FreeSlot(cx, scope->object, slot);
+	return NULL;
+    }
+    sprop->nrefs = 0;
+    sprop->id = js_IdToValue(id);
+    sprop->getter = getter;
+    sprop->setter = setter;
+    sprop->slot = slot;
+    sprop->attrs = attrs;
+    sprop->spare = 0;
+    sprop->symbols = NULL;
+    sprop->next = NULL;
+    sprop->prevp = scope->proptail;
+    *scope->proptail = sprop;
+    scope->proptail = &sprop->next;
+    return sprop;
+}
+
+void
+js_DestroyScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop)
+{
+    /*
+     * Test whether obj was finalized before prop's last dereference.
+     *
+     * This can happen when a deleted property is held by a property iterator
+     * object (which points to obj, keeping obj alive so long as the property
+     * iterator is reachable).  As soon as the GC finds the iterator to be
+     * unreachable, it will finalize the iterator, and may also finalize obj,
+     * in an unpredictable order.  If obj is finalized first, its map will be
+     * null below, and we need only free prop.
+     *
+     * In the more typical case of a property whose last reference (from a
+     * symbol in obj's scope) goes away before obj is finalized, we must be
+     * sure to free prop's slot and unlink it from obj's property list.
+     */
+    if (scope) {
+	PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+	if (scope->object) {
+	    js_FreeSlot(cx, scope->object, sprop->slot);
+	    *sprop->prevp = sprop->next;
+	    if (sprop->next)
+		sprop->next->prevp = sprop->prevp;
+	    else
+		scope->proptail = sprop->prevp;
+	}
+    }
+
+    /* Purge any cached weak links to prop, then free it. */
+    js_FlushPropertyCacheByProp(cx, (JSProperty *)sprop);
+    JS_free(cx, sprop);
+}
+
+JSScopeProperty *
+js_HoldScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop)
+{
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    if (sprop) {
+	PR_ASSERT(sprop->nrefs >= 0);
+	sprop->nrefs++;
+    }
+    return sprop;
+}
+
+JSScopeProperty *
+js_DropScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop)
+{
+    PR_ASSERT(JS_IS_SCOPE_LOCKED(scope));
+    if (sprop) {
+	PR_ASSERT(sprop->nrefs > 0);
+	if (--sprop->nrefs == 0) {
+	    js_DestroyScopeProperty(cx, scope, sprop);
+	    sprop = NULL;
+	}
+    }
+    return sprop;
+}

mozilla/js/src/jsscope.h

@@ -0,0 +1,126 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsscope_h___
+#define jsscope_h___
+/*
+ * JS symbol tables.
+ */
+#include "prtypes.h"
+#ifndef NSPR20
+#include "prhash.h"
+#else
+#include "plhash.h"
+#endif
+#include "jsobj.h"
+#include "jsprvtd.h"
+#include "jspubtd.h"
+
+struct JSScopeOps {
+    JSSymbol *      (*lookup)(JSContext *cx, JSScope *scope, jsid id,
+			      PRHashNumber hash);
+    JSSymbol *      (*add)(JSContext *cx, JSScope *scope, jsid id,
+			   JSScopeProperty *sprop);
+    JSBool          (*remove)(JSContext *cx, JSScope *scope, jsid id);
+    void            (*clear)(JSContext *cx, JSScope *scope);
+};
+
+struct JSScope {
+    JSObjectMap     map;                /* base class state */
+    JSObject        *object;            /* object that owns this scope */
+    JSScopeProperty *props;             /* property list in definition order */
+    JSScopeProperty **proptail;         /* pointer to pointer to last prop */
+    JSScopeOps      *ops;               /* virtual operations */
+    void            *data;              /* private data specific to ops */
+#ifdef JS_THREADSAFE
+    JSThinLock      lock;              /* binary semaphore protecting scope */
+    int32           count;              /* entry count for reentrancy */
+#ifdef DEBUG
+    const char      *file[4];           /* file where lock was (re-)taken */
+    unsigned int    line[4];            /* line where lock was (re-)taken */
+#endif
+#endif
+};
+
+struct JSSymbol {
+    PRHashEntry     entry;              /* base class state */
+    JSScope         *scope;             /* pointer to owning scope */
+    JSSymbol        *next;              /* next in type-specific list */
+};
+
+#define sym_id(sym)             ((jsid)(sym)->entry.key)
+#define sym_atom(sym)           ((JSAtom *)(sym)->entry.key)
+#define sym_property(sym)       ((JSScopeProperty *)(sym)->entry.value)
+
+struct JSScopeProperty {
+    jsrefcount      nrefs;              /* number of referencing symbols */
+    jsval           id;                 /* id passed to getter and setter */
+    JSPropertyOp    getter;             /* getter and setter methods */
+    JSPropertyOp    setter;
+    uint32          slot;               /* index in obj->slots vector */
+    uint8           attrs;              /* attributes, see jsapi.h JSPROP_ */
+    uint8           spare;              /* reserved for future use */
+    JSSymbol        *symbols;           /* list of aliasing symbols */
+    JSScopeProperty *next;              /* doubly-linked list linkage */
+    JSScopeProperty **prevp;
+};
+
+/*
+ * These macros are designed to decouple getter and setter from sprop, by
+ * passing obj2 (in whose scope sprop lives, and in whose scope getter and
+ * setter might be stored apart from sprop -- say in scope->opTable[i] for
+ * a compressed getter or setter index i that is stored in sprop).
+ */
+#define SPROP_GET(cx,sprop,obj,obj2,vp) ((sprop)->getter(cx,obj,sprop->id,vp))
+#define SPROP_SET(cx,sprop,obj,obj2,vp) ((sprop)->setter(cx,obj,sprop->id,vp))
+
+extern JSScope *
+js_GetMutableScope(JSContext *cx, JSObject *obj);
+
+extern JSScope *
+js_MutateScope(JSContext *cx, JSObject *obj, jsid id,
+	       JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
+	       JSScopeProperty **propp);
+
+extern JSScope *
+js_NewScope(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops, JSClass *clasp,
+	    JSObject *obj);
+
+extern void
+js_DestroyScope(JSContext *cx, JSScope *scope);
+
+extern PRHashNumber
+js_HashValue(jsval v);
+
+extern jsval
+js_IdToValue(jsid id);
+
+extern JSScopeProperty *
+js_NewScopeProperty(JSContext *cx, JSScope *scope, jsid id,
+		    JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
+
+extern void
+js_DestroyScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop);
+
+extern JSScopeProperty *
+js_HoldScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop);
+
+extern JSScopeProperty *
+js_DropScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop);
+
+#endif /* jsscope_h___ */

mozilla/js/src/jsscript.c

@@ -0,0 +1,785 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * JS script operations.
+ */
+#include "jsstddef.h"
+#include <string.h>
+#include "prtypes.h"
+#include "prlog.h"
+#include "prprf.h"
+#include "jsapi.h"
+#include "jsatom.h"
+#include "jscntxt.h"
+#include "jsconfig.h"
+#include "jsdbgapi.h"
+#include "jsemit.h"
+#include "jsfun.h"
+#include "jsinterp.h"
+#include "jsnum.h"
+#include "jsopcode.h"
+#include "jsscript.h"
+#if JS_HAS_XDR
+#include "jsxdrapi.h"
+#endif
+
+#if JS_HAS_SCRIPT_OBJECT
+
+#if JS_HAS_TOSOURCE
+static JSBool
+script_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+		jsval *rval)
+{
+    JSScript *script;
+    size_t i, j, k, n;
+    char buf[16];
+    jschar *s, *t;
+    uint32 indent;
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
+	return JS_FALSE;
+    script = JS_GetPrivate(cx, obj);
+
+    /* Let n count the source string length, j the "front porch" length. */
+    j = PR_snprintf(buf, sizeof buf, "(new %s(", js_ScriptClass.name);
+    n = j + 2;
+    if (!script) {
+	/* Let k count the constructor argument string length. */
+	k = 0;
+    } else {
+	indent = 0;
+	if (argc && !js_ValueToECMAUint32(cx, argv[0], &indent))
+	    return JS_FALSE;
+	str = JS_DecompileScript(cx, script, "Script.prototype.toSource",
+				 (uintN)indent);
+	if (!str)
+	    return JS_FALSE;
+    	str = js_QuoteString(cx, str, '\'');
+	if (!str)
+	    return JS_FALSE;
+        s = str->chars;
+	k = str->length;
+    	n += k;
+    }
+
+    /* Allocate the source string and copy into it. */
+    t = JS_malloc(cx, (n + 1) * sizeof(jschar));
+    if (!t)
+	return JS_FALSE;
+    for (i = 0; i < j; i++)
+	t[i] = buf[i];
+    for (j = 0; j < k; i++, j++)
+	t[i] = s[j];
+    t[i++] = ')';
+    t[i++] = ')';
+    t[i] = 0;
+
+    /* Create and return a JS string for t. */
+    str = JS_NewUCString(cx, t, n);
+    if (!str) {
+	JS_free(cx, t);
+	return JS_FALSE;
+    }
+    *rval = STRING_TO_JSVAL(str);
+    return JS_TRUE;
+}
+#endif /* JS_HAS_TOSOURCE */
+
+static JSBool
+script_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+		jsval *rval)
+{
+    JSScript *script;
+    uint32 indent;
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
+    	return JS_FALSE;
+    script = JS_GetPrivate(cx, obj);
+    if (!script) {
+    	*rval = STRING_TO_JSVAL(cx->runtime->emptyString);
+    	return JS_TRUE;
+    }
+
+    indent = 0;
+    if (argc && !js_ValueToECMAUint32(cx, argv[0], &indent))
+	return JS_FALSE;
+    str = JS_DecompileScript(cx, script, "Script.prototype.toString",
+			     (uintN)indent);
+    if (!str)
+    	return JS_FALSE;
+    *rval = STRING_TO_JSVAL(str);
+    return JS_TRUE;
+}
+
+static JSBool
+script_compile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	       jsval *rval)
+{
+    JSScript *oldscript, *script;
+    JSString *str;
+    JSStackFrame *fp, *caller;
+    JSObject *scopeobj;
+    const char *file;
+    uintN line;
+    JSPrincipals *principals;
+
+    /* If no args, leave private undefined and return early. */
+    if (argc == 0)
+    	goto out;
+
+    /* Otherwise, the first arg is the script source to compile. */
+    str = js_ValueToString(cx, argv[0]);
+    if (!str)
+    	return JS_FALSE;
+
+    /* Compile using the caller's scope chain, which js_Invoke passes to fp. */
+    fp = cx->fp;
+    caller = fp->down;
+    PR_ASSERT(fp->scopeChain == caller->scopeChain);
+
+    scopeobj = NULL;
+    if (argc >= 2) {
+    	if (!js_ValueToObject(cx, argv[1], &scopeobj))
+	    return JS_FALSE;
+    	argv[1] = OBJECT_TO_JSVAL(scopeobj);
+    }
+    if (!scopeobj)
+    	scopeobj = caller->scopeChain;
+
+    if (caller->script) {
+	file = caller->script->filename;
+	line = js_PCToLineNumber(caller->script, caller->pc);
+	principals = caller->script->principals;
+    } else {
+	file = NULL;
+	line = 0;
+	principals = NULL;
+    }
+
+    /* Compile the new script using the caller's scope chain, a la eval(). */
+    script = JS_CompileUCScriptForPrincipals(cx, scopeobj, principals,
+					     str->chars, str->length,
+					     file, line);
+    if (!script)
+    	return JS_FALSE;
+
+    /* Swap script for obj's old script, if any. */
+    oldscript = JS_GetPrivate(cx, obj);
+    if (!JS_SetPrivate(cx, obj, script)) {
+	js_DestroyScript(cx, script);
+    	return JS_FALSE;
+    }
+    if (oldscript)
+	js_DestroyScript(cx, oldscript);
+
+    script->object = obj;
+out:
+    /* Return the object. */
+    *rval = OBJECT_TO_JSVAL(obj);
+    return JS_TRUE;
+}
+
+static JSBool
+script_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSScript *script;
+    JSStackFrame *fp, *caller;
+    JSObject *scopeobj;
+
+    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
+    	return JS_FALSE;
+    script = JS_GetPrivate(cx, obj);
+    if (!script)
+    	return JS_TRUE;
+
+    scopeobj = NULL;
+    if (argc) {
+    	if (!js_ValueToObject(cx, argv[0], &scopeobj))
+	    return JS_FALSE;
+    	argv[0] = OBJECT_TO_JSVAL(scopeobj);
+    }
+
+    /* Emulate eval() by using caller's this, scope chain, and sharp array. */
+    fp = cx->fp;
+    caller = fp->down;
+    if (!scopeobj)
+    	scopeobj = caller->scopeChain;
+    fp->thisp = caller->thisp;
+    PR_ASSERT(fp->scopeChain == caller->scopeChain);
+    fp->sharpArray = caller->sharpArray;
+    return js_Execute(cx, scopeobj, script, NULL, fp, JS_FALSE, rval);
+}
+
+#if JS_HAS_XDR
+static JSBool
+XDRAtom1(JSXDRState *xdr, JSAtomListElement *ale)
+{
+    uint32 type;
+    jsval value;
+
+    if (xdr->mode == JSXDR_ENCODE) {
+	type = JSVAL_TAG(ATOM_KEY(ale->atom));
+	value = ATOM_KEY(ale->atom);
+    }
+
+    if (!JS_XDRUint32(xdr, &ale->index) ||
+	!JS_XDRValue(xdr, &value))
+	return JS_FALSE;
+
+    if (xdr->mode == JSXDR_DECODE) {
+	ale->atom = js_AtomizeValue(xdr->cx, value, 0);
+	if (!ale->atom)
+	    return JS_FALSE;
+    }
+    return JS_TRUE;
+}
+
+static JSBool
+XDRAtomMap(JSXDRState *xdr, JSAtomMap *map)
+{
+    uint32 length;
+    uintN i;
+
+    if (xdr->mode == JSXDR_ENCODE)
+	length = map->length;
+
+    if (!JS_XDRUint32(xdr, &length))
+	return JS_FALSE;
+
+    if (xdr->mode == JSXDR_DECODE) {
+	JSContext *cx;
+	void *mark;
+	JSAtomList al;
+	JSAtomListElement *ale;
+
+	cx = xdr->cx;
+	mark = PR_ARENA_MARK(&cx->tempPool);
+	ATOM_LIST_INIT(&al);
+	for (i = 0; i < length; i++) {
+	    PR_ARENA_ALLOCATE(ale, &cx->tempPool, sizeof(*ale));
+	    if (!ale ||
+		!XDRAtom1(xdr, ale)) {
+		if (!ale)
+		    JS_ReportOutOfMemory(cx);
+		PR_ARENA_RELEASE(&cx->tempPool, mark);
+		return JS_FALSE;
+	    }
+	    ale->next = al.list;
+	    al.count++;
+	    al.list = ale;
+	}
+	if (!js_InitAtomMap(cx, map, &al)) {
+	    PR_ARENA_RELEASE(&cx->tempPool, mark);
+	    return JS_FALSE;
+	}
+	PR_ARENA_RELEASE(&cx->tempPool, mark);
+    } else if (xdr->mode == JSXDR_ENCODE) {
+	JSAtomListElement ale;
+
+	for (i = 0; i < map->length; i++) {
+	    ale.atom = map->vector[i];
+	    ale.index = i;
+	    if (!XDRAtom1(xdr, &ale))
+		return JS_FALSE;
+	}
+    }
+    return JS_TRUE;
+}
+
+JSBool
+js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *magic)
+{
+    JSScript *script;
+    uint32 length, lineno, depth, magicval;
+
+    if (xdr->mode == JSXDR_ENCODE)
+	magicval = SCRIPT_XDRMAGIC;
+    if (!JS_XDRUint32(xdr, &magicval))
+	return JS_FALSE;
+    if (magicval != SCRIPT_XDRMAGIC) {
+	*magic = JS_FALSE;
+	return JS_TRUE;
+    }
+    *magic = JS_TRUE;
+    if (xdr->mode == JSXDR_ENCODE) {
+	script = *scriptp;
+	length = script->length;
+	lineno = (uint32)script->lineno;
+	depth = (uint32)script->depth;
+    }
+    if (!JS_XDRUint32(xdr, &length))
+	return JS_FALSE;
+    if (xdr->mode == JSXDR_DECODE) {
+	script = js_NewScript(xdr->cx, length);
+	if (!script)
+	    return JS_FALSE;
+	*scriptp = script;
+    }
+    if (!JS_XDRBytes(xdr, (char **)&script->code, length) ||
+	!XDRAtomMap(xdr, &script->atomMap) ||
+	!JS_XDRCStringOrNull(xdr, (char **)&script->notes) ||
+	!JS_XDRCStringOrNull(xdr, (char **)&script->filename) ||
+	!JS_XDRUint32(xdr, &lineno) ||
+	!JS_XDRUint32(xdr, &depth)) {
+	if (xdr->mode == JSXDR_DECODE) {
+	    js_DestroyScript(xdr->cx, script);
+	    *scriptp = NULL;
+	}
+	return JS_FALSE;
+    }
+    if (xdr->mode == JSXDR_DECODE) {
+	script->lineno = (uintN)lineno;
+	script->depth = (uintN)depth;
+    }
+    return JS_TRUE;
+}
+
+static JSBool
+script_freeze(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	      jsval *rval)
+{
+    JSXDRState *xdr;
+    JSScript *script;
+    JSBool ok, magic;
+    uint32 len;
+    void *buf;
+    JSString *str;
+
+    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
+	return JS_FALSE;
+    script = JS_GetPrivate(cx, obj);
+    if (!script)
+	return JS_TRUE;
+
+    /* create new XDR */
+    xdr = JS_XDRNewMem(cx, JSXDR_ENCODE);
+    if (!xdr)
+	return JS_FALSE;
+
+    /* write  */
+    ok = js_XDRScript(xdr, &script, &magic);
+    if (!ok)
+	goto out;
+    if (!magic) {
+	*rval = JSVAL_VOID;
+	goto out;
+    }
+
+    buf = JS_XDRMemGetData(xdr, &len);
+    if (!buf) {
+	ok = JS_FALSE;
+	goto out;
+    }
+
+    PR_ASSERT((prword)buf % sizeof(jschar) == 0);
+    len /= sizeof(jschar);
+    str = JS_NewUCStringCopyN(cx, (jschar *)buf, len);
+    if (!str) {
+	ok = JS_FALSE;
+	goto out;
+    }
+
+#if IS_BIG_ENDIAN
+  {
+    jschar *chars;
+    uint32 i;
+
+    /* Swap bytes in Unichars to keep frozen strings machine-independent. */
+    chars = JS_GetStringChars(str);
+    for (i = 0; i < len; i++)
+    	chars[i] = JSXDR_SWAB16(chars[i]);
+  }
+#endif
+    *rval = STRING_TO_JSVAL(str);
+
+out:
+    JS_XDRDestroy(xdr);
+    return ok;
+}
+
+static JSBool
+script_thaw(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+	    jsval *rval)
+{
+    JSXDRState *xdr;
+    JSString *str;
+    void *buf;
+    uint32 len;
+    JSScript *script, *oldscript;
+    JSBool ok, magic;
+
+    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
+	return JS_FALSE;
+
+    if (argc == 0)
+    	return JS_TRUE;
+    str = js_ValueToString(cx, argv[0]);
+    if (!str)
+    	return JS_FALSE;
+
+    /* create new XDR */
+    xdr = JS_XDRNewMem(cx, JSXDR_DECODE);
+    if (!xdr)
+	return JS_FALSE;
+
+    buf = JS_GetStringChars(str);
+    len = JS_GetStringLength(str);
+#if IS_BIG_ENDIAN
+  {
+    jschar *from, *to;
+    uint32 i;
+
+    /* Swap bytes in Unichars to keep frozen strings machine-independent. */
+    from = (jschar *)buf;
+    to = JS_malloc(cx, len * sizeof(jschar));
+    if (!to)
+    	return JS_FALSE;
+    for (i = 0; i < len; i++)
+    	to[i] = JSXDR_SWAB16(from[i]);
+    buf = (char *)to;
+  }
+#endif
+    len *= sizeof(jschar);
+    JS_XDRMemSetData(xdr, buf, len);
+
+    /* XXXbe should magic mismatch be error, or false return value? */
+    ok = js_XDRScript(xdr, &script, &magic);
+    if (!ok)
+	goto out;
+    if (!magic) {
+	*rval = JSVAL_FALSE;
+	goto out;
+    }
+
+    /* Swap script for obj's old script, if any. */
+    oldscript = JS_GetPrivate(cx, obj);
+    ok = JS_SetPrivate(cx, obj, script);
+    if (!ok) {
+	JS_free(cx, script);
+	goto out;
+    }
+    if (oldscript)
+	js_DestroyScript(cx, oldscript);
+
+    script->object = obj;
+
+out:
+    /*
+     * We reset the buffer to be NULL so that it doesn't free the chars
+     * memory owned by str (argv[0]).
+     */
+    JS_XDRMemSetData(xdr, NULL, 0);
+    JS_XDRDestroy(xdr);
+#if IS_BIG_ENDIAN
+    JS_free(cx, buf);
+#endif
+    *rval = JSVAL_TRUE;
+    return ok;
+}
+
+#endif /* JS_HAS_XDR */
+
+static char js_thaw_str[] = "thaw";
+
+static JSFunctionSpec script_methods[] = {
+#if JS_HAS_TOSOURCE
+    {js_toSource_str,   script_toSource,        0},
+#endif
+    {js_toString_str,   script_toString,        0},
+    {"compile",         script_compile,         2},
+    {"exec",            script_exec,            1},
+#if JS_HAS_XDR
+    {"freeze",		script_freeze,		0},
+    {js_thaw_str,	script_thaw,		1},
+#endif /* JS_HAS_XDR */
+    {0}
+};
+
+#endif /* JS_HAS_SCRIPT_OBJECT */
+
+static void
+script_finalize(JSContext *cx, JSObject *obj)
+{
+    JSScript *script;
+
+    script = JS_GetPrivate(cx, obj);
+    if (script)
+    	js_DestroyScript(cx, script);
+}
+
+static JSBool
+script_call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    return script_exec(cx, JSVAL_TO_OBJECT(argv[-2]), argc, argv, rval);
+}
+
+JSClass js_ScriptClass = {
+    "Script",
+    JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   script_finalize,
+    NULL,             NULL,             script_call,      NULL,/*XXXbe xdr*/
+};
+
+#if JS_HAS_SCRIPT_OBJECT
+
+static JSBool
+Script(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    /* If not constructing, replace obj with a new Script object. */
+    if (!cx->fp->constructing) {
+    	obj = js_NewObject(cx, &js_ScriptClass, NULL, NULL);
+    	if (!obj)
+	    return JS_FALSE;
+    }
+    return script_compile(cx, obj, argc, argv, rval);
+}
+
+#if JS_HAS_XDR
+
+static JSBool
+script_static_thaw(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+		   jsval *rval)
+{
+    obj = js_NewObject(cx, &js_ScriptClass, NULL, NULL);
+    if (!obj)
+	return JS_FALSE;
+    if (!script_thaw(cx, obj, argc, argv, rval))
+    	return JS_FALSE;
+    *rval = OBJECT_TO_JSVAL(obj);
+    return JS_TRUE;
+}
+
+static JSFunctionSpec script_static_methods[] = {
+    {js_thaw_str,       script_static_thaw,     1},
+    {0}
+};
+
+#else  /* !JS_HAS_XDR */
+
+#define script_static_methods   NULL
+
+#endif /* !JS_HAS_XDR */
+
+JSObject *
+js_InitScriptClass(JSContext *cx, JSObject *obj)
+{
+    return JS_InitClass(cx, obj, NULL, &js_ScriptClass, Script, 1,
+			NULL, script_methods, NULL, script_static_methods);
+}
+
+#endif /* JS_HAS_SCRIPT_OBJECT */
+
+JSScript *
+js_NewScript(JSContext *cx, uint32 length)
+{
+    JSScript *script;
+
+    script = JS_malloc(cx, sizeof(JSScript) + length * sizeof(jsbytecode));
+    if (!script)
+	return NULL;
+    memset(script, 0, sizeof(JSScript));
+    script->code = (jsbytecode *)(script + 1);
+    script->length = length;
+    return script;
+}
+
+JSScript *
+js_NewScriptFromParams(JSContext *cx, jsbytecode *code, uint32 length,
+		       const char *filename, uintN lineno, uintN depth,
+		       jssrcnote *notes, JSTryNote *trynotes,
+		       JSPrincipals *principals)
+{
+    JSScript *script;
+
+    script = js_NewScript(cx, length);
+    if (!script)
+        return NULL;
+    memcpy(script->code, code, length * sizeof(jsbytecode));
+    if (filename) {
+        script->filename = JS_strdup(cx, filename);
+        if (!script->filename) {
+	    js_DestroyScript(cx, script);
+	    return NULL;
+	}
+    }
+    script->lineno = lineno;
+    script->depth = depth;
+    script->notes = notes;
+    script->trynotes = trynotes;
+    if (principals)
+        JSPRINCIPALS_HOLD(cx, principals);
+    script->principals = principals;
+    return script;
+}
+
+JS_FRIEND_API(JSScript *)
+js_NewScriptFromCG(JSContext *cx, JSCodeGenerator *cg, JSFunction *fun)
+{
+    JSTryNote *trynotes;
+    jssrcnote *notes;
+    JSScript *script;
+    JSRuntime *rt;
+    JSNewScriptHook hook;
+
+    if (!js_FinishTakingTryNotes(cx, cg, &trynotes))
+	return NULL;
+    notes = js_FinishTakingSrcNotes(cx, cg);
+    script = js_NewScriptFromParams(cx, cg->base, CG_OFFSET(cg),
+				    cg->filename, cg->firstLine,
+				    cg->maxStackDepth, notes, trynotes,
+				    cg->principals);
+    if (!script)
+        return NULL;
+    if (!notes || !js_InitAtomMap(cx, &script->atomMap, &cg->atomList)) {
+	js_DestroyScript(cx, script);
+	return NULL;
+    }
+
+    /* Tell the debugger about this compiled script. */
+    rt = cx->runtime;
+    hook = rt->newScriptHook;
+    if (hook) {
+        (*hook)(cx, cg->filename, cg->firstLine, script, fun,
+        	rt->newScriptHookData);
+    }
+    return script;
+}
+
+void
+js_DestroyScript(JSContext *cx, JSScript *script)
+{
+    JSRuntime *rt;
+    JSDestroyScriptHook hook;
+
+    rt = cx->runtime;
+    hook = rt->destroyScriptHook;
+    if (hook)
+        (*hook)(cx, script, rt->destroyScriptHookData);
+
+    JS_ClearScriptTraps(cx, script);
+    js_FreeAtomMap(cx, &script->atomMap);
+    if (js_InterpreterHooks && js_InterpreterHooks->destroyScript)
+        js_InterpreterHooks->destroyScript(cx, script);
+    JS_free(cx, (void *)script->filename);
+    JS_free(cx, script->notes);
+    JS_free(cx, script->trynotes);
+    if (script->principals)
+        JSPRINCIPALS_DROP(cx, script->principals);
+    JS_free(cx, script);
+}
+
+jssrcnote *
+js_GetSrcNote(JSScript *script, jsbytecode *pc)
+{
+    jssrcnote *sn;
+    ptrdiff_t offset, target;
+
+    sn = script->notes;
+    if (!sn)
+        return NULL;
+    target = PTRDIFF(pc, script->code, jsbytecode);
+    if ((uintN)target >= script->length)
+        return NULL;
+    for (offset = 0; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
+        offset += SN_DELTA(sn);
+        if (offset == target && SN_IS_GETTABLE(sn))
+            return sn;
+    }
+    return NULL;
+}
+
+uintN
+js_PCToLineNumber(JSScript *script, jsbytecode *pc)
+{
+    jssrcnote *sn;
+    ptrdiff_t offset, target;
+    uintN lineno;
+    JSSrcNoteType type;
+
+    sn = script->notes;
+    if (!sn)
+        return 0;
+    target = PTRDIFF(pc, script->code, jsbytecode);
+    lineno = script->lineno;
+    for (offset = 0; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
+        offset += SN_DELTA(sn);
+        type = SN_TYPE(sn);
+        if (type == SRC_SETLINE) {
+            if (offset <= target)
+                lineno = (uintN) js_GetSrcNoteOffset(sn, 0);
+        } else if (type == SRC_NEWLINE) {
+            if (offset <= target)
+                lineno++;
+        }
+        if (offset > target)
+            break;
+    }
+    return lineno;
+}
+
+jsbytecode *
+js_LineNumberToPC(JSScript *script, uintN target)
+{
+    jssrcnote *sn;
+    uintN lineno;
+    ptrdiff_t offset;
+    JSSrcNoteType type;
+
+    sn = script->notes;
+    if (!sn)
+        return NULL;
+    lineno = script->lineno;
+    for (offset = 0; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
+        if (lineno >= target)
+            break;
+        offset += SN_DELTA(sn);
+        type = SN_TYPE(sn);
+        if (type == SRC_SETLINE) {
+            lineno = (uintN) js_GetSrcNoteOffset(sn, 0);
+        } else if (type == SRC_NEWLINE) {
+            lineno++;
+        }
+    }
+    return script->code + offset;
+}
+
+uintN
+js_GetScriptLineExtent(JSScript *script)
+{
+    jssrcnote *sn;
+    uintN lineno;
+    JSSrcNoteType type;
+
+    sn = script->notes;
+    if (!sn)
+        return 0;
+    lineno = script->lineno;
+    for (; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
+        type = SN_TYPE(sn);
+        if (type == SRC_SETLINE) {
+            lineno = (uintN) js_GetSrcNoteOffset(sn, 0);
+        } else if (type == SRC_NEWLINE) {
+            lineno++;
+        }
+    }
+    return 1 + lineno - script->lineno;
+}

mozilla/js/src/jsscript.h

@@ -0,0 +1,94 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsscript_h___
+#define jsscript_h___
+/*
+ * JS script descriptor.
+ */
+#include "jsatom.h"
+#include "jsprvtd.h"
+
+PR_BEGIN_EXTERN_C
+
+/*
+ * Exception handling runtime information.
+ *
+ * All fields except length are code offsets, relative to the beginning of
+ * the script.  If script->trynotes is not null, it points to a vector of
+ * these structs terminated by one with start, catchStart, and finallyStart
+ * all equal to 0, and length == script->length.
+ */
+struct JSTryNote {
+    ptrdiff_t    start;         /* start of try statement */
+    ptrdiff_t    length;        /* count of try statement bytecodes */
+    ptrdiff_t    catchStart;    /* start of catch block (0 if none) */
+};
+
+struct JSScript {
+    jsbytecode   *code;         /* bytecodes and their immediate operands */
+    uint32       length;        /* length of code vector */
+    JSAtomMap    atomMap;       /* maps immediate index to literal struct */
+    const char   *filename;     /* source filename or null */
+    uintN        lineno;        /* base line number of script */
+    uintN        depth;         /* maximum stack depth in slots */
+    jssrcnote    *notes;        /* line number and other decompiling data */
+    JSTryNote    *trynotes;     /* exception table for this script */
+    JSPrincipals *principals;   /* principals for this script */
+    void         *javaData;     /* XXX extra data used by jsjava.c */
+    JSObject     *object;       /* optional Script-class object wrapper */
+};
+
+extern JSClass js_ScriptClass;
+
+extern JSObject *
+js_InitScriptClass(JSContext *cx, JSObject *obj);
+
+extern JSScript *
+js_NewScript(JSContext *cx, uint32 length);
+
+extern JSScript *
+js_NewScriptFromParams(JSContext *cx, jsbytecode *code, uint32 length,
+		       const char *filename, uintN lineno, uintN depth,
+		       jssrcnote *notes, JSTryNote *trynotes,
+		       JSPrincipals *principals);
+
+extern JS_FRIEND_API(JSScript *)
+js_NewScriptFromCG(JSContext *cx, JSCodeGenerator *cg, JSFunction *fun);
+
+extern void
+js_DestroyScript(JSContext *cx, JSScript *script);
+
+extern jssrcnote *
+js_GetSrcNote(JSScript *script, jsbytecode *pc);
+
+extern uintN
+js_PCToLineNumber(JSScript *script, jsbytecode *pc);
+
+extern jsbytecode *
+js_LineNumberToPC(JSScript *script, uintN lineno);
+
+extern uintN
+js_GetScriptLineExtent(JSScript *script);
+
+extern JSBool
+js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *magic);
+
+PR_END_EXTERN_C
+
+#endif /* jsscript_h___ */

mozilla/js/src/jsstddef.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * stddef inclusion here to first declare ptrdif as a signed long instead of a
+ * signed int.
+ */
+
+#ifdef _WINDOWS
+# ifndef XP_WIN
+# define XP_WIN
+# endif
+#if defined(_WIN32) || defined(WIN32)
+# ifndef XP_WIN32
+# define XP_WIN32
+# endif
+#else
+# ifndef XP_WIN16
+# define XP_WIN16
+# endif
+#endif
+#endif
+
+#ifdef XP_WIN16
+#ifndef _PTRDIFF_T_DEFINED
+typedef long ptrdiff_t;
+
+/*
+ * The Win16 compiler treats pointer differences as 16-bit signed values.
+ * This macro allows us to treat them as 17-bit signed values, stored in
+ * a 32-bit type.
+ */
+#define PTRDIFF(p1, p2, type)                                 \
+    ((((unsigned long)(p1)) - ((unsigned long)(p2))) / sizeof(type))
+
+#define _PTRDIFF_T_DEFINED
+#endif /*_PTRDIFF_T_DEFINED*/
+#else /*WIN16*/
+
+#define PTRDIFF(p1, p2, type)                                 \
+	((p1) - (p2))
+
+#endif
+
+#include <stddef.h>
+
+

mozilla/js/src/jsstr.h

@@ -0,0 +1,268 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsstr_h___
+#define jsstr_h___
+/*
+ * JS string type implementation.
+ *
+ * A JS string is a counted array of unicode characters.  To support handoff
+ * of API client memory, the chars are allocated separately from the length,
+ * necessitating a pointer after the count, to form a string header.  String
+ * headers are GC'ed while string bytes are allocated from the malloc heap.
+ *
+ * When a string is treated as an object (by following it with . or []), the
+ * runtime wraps it with a JSObject whose valueOf method returns the unwrapped
+ * string header.
+ */
+#include <ctype.h>
+#include "jspubtd.h"
+#include "jsprvtd.h"
+
+PR_BEGIN_EXTERN_C
+
+struct JSString {
+    size_t          length;
+    jschar          *chars;
+};
+
+struct JSSubString {
+    size_t          length;
+    const jschar    *chars;
+};
+
+extern jschar      js_empty_ucstr[];
+extern JSSubString js_EmptySubString;
+
+/* Unicode character attribute lookup tables. */
+extern const uint8 js_X[];
+extern const uint8 js_Y[];
+extern const uint32 js_A[];
+
+/* Enumerated Unicode general category types. */
+typedef enum JSCharType {
+    JSCT_UNASSIGNED             = 0,
+    JSCT_UPPERCASE_LETTER       = 1,
+    JSCT_LOWERCASE_LETTER       = 2,
+    JSCT_TITLECASE_LETTER       = 3,
+    JSCT_MODIFIER_LETTER        = 4,
+    JSCT_OTHER_LETTER           = 5,
+    JSCT_NON_SPACING_MARK       = 6,
+    JSCT_ENCLOSING_MARK         = 7,
+    JSCT_COMBINING_SPACING_MARK = 8,
+    JSCT_DECIMAL_DIGIT_NUMBER   = 9,
+    JSCT_LETTER_NUMBER          = 10,
+    JSCT_OTHER_NUMBER           = 11,
+    JSCT_SPACE_SEPARATOR        = 12,
+    JSCT_LINE_SEPARATOR         = 13,
+    JSCT_PARAGRAPH_SEPARATOR    = 14,
+    JSCT_CONTROL                = 15,
+    JSCT_FORMAT                 = 16,
+    JSCT_PRIVATE_USE            = 18,
+    JSCT_SURROGATE              = 19,
+    JSCT_DASH_PUNCTUATION       = 20,
+    JSCT_START_PUNCTUATION      = 21,
+    JSCT_END_PUNCTUATION        = 22,
+    JSCT_CONNECTOR_PUNCTUATION  = 23,
+    JSCT_OTHER_PUNCTUATION      = 24,
+    JSCT_MATH_SYMBOL            = 25,
+    JSCT_CURRENCY_SYMBOL        = 26,
+    JSCT_MODIFIER_SYMBOL        = 27,
+    JSCT_OTHER_SYMBOL           = 28
+} JSCharType;
+
+/* Character classifying and mapping macros, based on java.lang.Character. */
+#define JS_CCODE(c)     (js_A[js_Y[(js_X[(uint16)(c)>>6]<<6)|((c)&0x3F)]])
+#define JS_CTYPE(c)     (JS_CCODE(c) & 0x1F)
+
+#define JS_ISALPHA(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                     \
+			   (1 << JSCT_LOWERCASE_LETTER) |                     \
+			   (1 << JSCT_TITLECASE_LETTER) |                     \
+			   (1 << JSCT_MODIFIER_LETTER) |                      \
+			   (1 << JSCT_OTHER_LETTER))                          \
+			  >> JS_CTYPE(c)) & 1)
+
+#define JS_ISALNUM(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                     \
+			   (1 << JSCT_LOWERCASE_LETTER) |                     \
+			   (1 << JSCT_TITLECASE_LETTER) |                     \
+			   (1 << JSCT_MODIFIER_LETTER) |                      \
+			   (1 << JSCT_OTHER_LETTER) |                         \
+			   (1 << JSCT_DECIMAL_DIGIT_NUMBER))                  \
+			  >> JS_CTYPE(c)) & 1)
+
+#define JS_ISWORD(c)    (JS_ISALNUM(c) || (c) == '_')
+
+/* XXXbe unify on A/X/Y tbls, avoid ctype.h? */
+#define JS_ISIDENT(c)   ((c) < 128 && (isalpha(c) || (c) == '_' || (c) == '$'))
+#define JS_ISIDENT2(c)  ((c) < 128 && (isalnum(c) || (c) == '_' || (c) == '$'))
+
+#define JS_ISDIGIT(c)   (JS_CTYPE(c) == JSCT_DECIMAL_DIGIT_NUMBER)
+
+/* XXXbe fs, etc. ? */
+#define JS_ISSPACE(c)   ((JS_CCODE(c) & 0x00070000) == 0x00040000)
+#define JS_ISPRINT(c)   ((c) < 128 && isprint(c))
+
+#define JS_ISUPPER(c)   (JS_CTYPE(c) == JSCT_UPPERCASE_LETTER)
+#define JS_ISLOWER(c)   (JS_CTYPE(c) == JSCT_LOWERCASE_LETTER)
+
+#ifdef __GNUC__
+
+#define JS_TOUPPER(c)   ({uint32 _v = JS_CCODE(c);                            \
+			  (_v & 0x00100000) ? (c) - ((int32)_v >> 22) : (c);})
+#define JS_TOLOWER(c)   ({uint32 _v = JS_CCODE(c);                            \
+			  (_v & 0x00200000) ? (c) + ((int32)_v >> 22) : (c);})
+
+#else  /* !__GNUC__ */
+
+#define JS_TOUPPER(c)   js_ToUpper((jschar)c)
+#define JS_TOLOWER(c)   js_ToLower((jschar)c)
+
+extern jschar js_ToUpper(jschar c);
+extern jschar js_ToLower(jschar c);
+
+#endif /* !__GNUC__ */
+
+#define JS_TOCTRL(c)    ((c) ^ 64)      /* XXX unsafe! requires uppercase c */
+
+/* Shorthands for ASCII (7-bit) decimal and hex conversion. */
+#define JS7_ISDEC(c)    ((c) < 128 && isdigit(c))
+#define JS7_UNDEC(c)    ((c) - '0')
+#define JS7_ISHEX(c)    ((c) < 128 && isxdigit(c))
+#define JS7_UNHEX(c)    (uintN)(isdigit(c) ? (c) - '0' : 10 + tolower(c) - 'a')
+#define JS7_ISLET(c)    ((c) < 128 && isalpha(c))
+
+/* Initialize truly global state associated with JS strings. */
+extern JSBool
+js_InitStringGlobals(void);
+
+extern void
+js_FreeStringGlobals(void);
+
+/* Initialize the String class, returning its prototype object. */
+extern JSObject *
+js_InitStringClass(JSContext *cx, JSObject *obj);
+
+/* GC-allocate a string descriptor for the given malloc-allocated chars. */
+extern JSString *
+js_NewString(JSContext *cx, jschar *chars, size_t length, uintN gcflag);
+
+/* Copy a counted string and GC-allocate a descriptor for it. */
+extern JSString *
+js_NewStringCopyN(JSContext *cx, const jschar *s, size_t n, uintN gcflag);
+
+/* Copy a C string and GC-allocate a descriptor for it. */
+extern JSString *
+js_NewStringCopyZ(JSContext *cx, const jschar *s, uintN gcflag);
+
+/* Free the chars held by str when it is finalized by the GC. */
+extern void
+js_FinalizeString(JSContext *cx, JSString *str);
+
+/* Wrap a string value in a String object. */
+extern JSObject *
+js_StringToObject(JSContext *cx, JSString *str);
+
+/*
+ * Convert a value to a string, returning null after reporting an error,
+ * otherwise returning a new string reference.
+ */
+extern JSString *
+js_ValueToString(JSContext *cx, jsval v);
+
+/*
+ * Convert a value to its source expression, returning null after reporting
+ * an error, otherwise returning a new string reference.
+ */
+extern JSString *
+js_ValueToSource(JSContext *cx, jsval v);
+
+#ifdef HT_ENUMERATE_NEXT	/* XXX don't require prhash.h */
+/*
+ * Compute a hash function from str.
+ */
+extern PRHashNumber
+js_HashString(const JSString *str);
+#endif
+
+/*
+ * Return less than, equal to, or greater than zero depending on whether
+ * str1 is less than, equal to, or greater than str2.
+ */
+extern intN
+js_CompareStrings(const JSString *str1, const JSString *str2);
+
+/*
+ * Boyer-Moore-Horspool superlinear search for pat:patlen in text:textlen.
+ * The patlen argument must be positive and no greater than BMH_PATLEN_MAX.
+ * The start argument tells where in text to begin the search.
+ *
+ * Return the index of pat in text, or -1 if not found.
+ */
+#define BMH_CHARSET_SIZE 256    /* ISO-Latin-1 */
+#define BMH_PATLEN_MAX   255    /* skip table element is uint8 */
+
+#define BMH_BAD_PATTERN  (-2)   /* return value if pat is not ISO-Latin-1 */
+
+extern jsint
+js_BoyerMooreHorspool(const jschar *text, jsint textlen,
+		      const jschar *pat, jsint patlen,
+		      jsint start);
+
+extern size_t
+js_strlen(const jschar *s);
+
+extern jschar *
+js_strchr(const jschar *s, jschar c);
+
+extern jschar *
+js_strncpy(jschar *t, const jschar *s, size_t n);
+
+/*
+ * Return s advanced past any Unicode white space characters.
+ */
+extern const jschar *
+js_SkipWhiteSpace(const jschar *s);
+
+/*
+ * Inflate bytes to JS chars and vice versa.  Report out of memory via cx
+ * and return null on error, otherwise return the jschar or byte vector that
+ * was JS_malloc'ed.
+ */
+extern jschar *
+js_InflateString(JSContext *cx, const char *bytes, size_t length);
+
+extern char *
+js_DeflateString(JSContext *cx, const jschar *chars, size_t length);
+
+/*
+ * Associate bytes with str in the deflated string cache, returning true on
+ * successful association, false on out of memory.
+ */
+extern JSBool
+js_SetStringBytes(JSString *str, char *bytes, size_t length);
+
+/*
+ * Find or create a deflated string cache entry for str that contains its
+ * characters chopped from Unicode code points into bytes.
+ */
+extern char *
+js_GetStringBytes(JSString *str);
+
+PR_END_EXTERN_C
+
+#endif /* jsstr_h___ */

mozilla/js/src/jsxdrapi.c

@@ -0,0 +1,542 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "jsstddef.h"
+
+#include <string.h>
+#include "prtypes.h"
+#include "prlog.h"
+#include "jsapi.h"
+#include "jsobj.h"		/* js_XDRObject */
+#include "jsstr.h"
+#include "jsxdrapi.h"
+
+#ifdef DEBUG
+#define DBG(x) x
+#else
+#define DBG(x) ((void)0)
+#endif
+
+typedef struct JSXDRMemState {
+    JSXDRState  state;
+    uint32      count;
+    uint32      limit;
+} JSXDRMemState;
+
+#define MEM_BLOCK       8192
+#define MEM_PRIV(xdr)   ((JSXDRMemState *)(xdr))
+
+#define MEM_COUNT(xdr)  (MEM_PRIV(xdr)->count)
+#define MEM_LIMIT(xdr)  (MEM_PRIV(xdr)->limit)
+
+static char unexpected_end_of_data_str[] = "unexpected end of data";
+
+#define MEM_LEFT(xdr, bytes)                                                  \
+    PR_BEGIN_MACRO                                                            \
+        if ((xdr)->mode == JSXDR_DECODE &&                                    \
+	    MEM_COUNT(xdr) + bytes > MEM_LIMIT(xdr)) {                        \
+	    JS_ReportError((xdr)->cx, unexpected_end_of_data_str);            \
+	    return 0;                                                         \
+	}                                                                     \
+    PR_END_MACRO
+
+/* XXXbe why does NEED even allow or cope with non-ENCODE mode? */
+#define MEM_NEED(xdr, bytes)                                                  \
+    PR_BEGIN_MACRO                                                            \
+        if ((xdr)->mode == JSXDR_ENCODE) {                                    \
+	    if (MEM_LIMIT(xdr) &&                                             \
+		MEM_COUNT(xdr) + bytes > MEM_LIMIT(xdr)) {                    \
+		void *_data = JS_realloc((xdr)->cx,                           \
+					 (xdr)->data,                         \
+					 MEM_LIMIT(xdr) + MEM_BLOCK);         \
+		if (!_data)                                                   \
+		    return 0;                                                 \
+		(xdr)->data = _data;                                          \
+		MEM_LIMIT(xdr) += MEM_BLOCK;                                  \
+	    }                                                                 \
+	} else {                                                              \
+	    if (MEM_LIMIT(xdr) < MEM_COUNT(xdr) + bytes) {                    \
+		JS_ReportError((xdr)->cx, unexpected_end_of_data_str);        \
+		return 0;                                                     \
+	    }                                                                 \
+	}                                                                     \
+    PR_END_MACRO
+
+#define MEM_DATA(xdr)        ((void *)((char *)(xdr)->data + MEM_COUNT(xdr)))
+#define MEM_INCR(xdr,bytes)  (MEM_COUNT(xdr) += (bytes))
+
+static JSBool
+mem_get32(JSXDRState *xdr, uint32 *lp)
+{
+    MEM_LEFT(xdr, 4);
+    *lp = *(uint32 *)MEM_DATA(xdr);
+    MEM_INCR(xdr, 4);
+    return JS_TRUE;
+}
+
+static JSBool
+mem_set32(JSXDRState *xdr, uint32 *lp)
+{
+    MEM_NEED(xdr, 4);
+    *(uint32 *)MEM_DATA(xdr) = *lp;
+    MEM_INCR(xdr, 4);
+    return JS_TRUE;
+}
+
+static JSBool
+mem_getbytes(JSXDRState *xdr, char **bytesp, uint32 len)
+{
+    MEM_LEFT(xdr, len);
+    memcpy(*bytesp, MEM_DATA(xdr), len);
+    MEM_INCR(xdr, len);
+    return JS_TRUE;
+}
+
+static JSBool
+mem_setbytes(JSXDRState *xdr, char **bytesp, uint32 len)
+{
+    MEM_NEED(xdr, len);
+    memcpy(MEM_DATA(xdr), *bytesp, len);
+    MEM_INCR(xdr, len);
+    return JS_TRUE;
+}
+
+static void *
+mem_raw(JSXDRState *xdr, uint32 len)
+{
+    void *data;
+    if (xdr->mode == JSXDR_ENCODE) {
+      	MEM_NEED(xdr, len);
+    } else if (xdr->mode == JSXDR_DECODE) {
+      	MEM_LEFT(xdr, len);
+    }
+    data = MEM_DATA(xdr);
+    MEM_INCR(xdr, len);
+    return data;
+}
+
+static JSBool
+mem_seek(JSXDRState *xdr, int32 offset, JSXDRWhence whence)
+{
+    switch (whence) {
+      case JSXDR_SEEK_CUR:
+	if ((int32)MEM_COUNT(xdr) + offset < 0) {
+	    JS_ReportError(xdr->cx, "illegal seek beyond start");
+	    return JS_FALSE;
+	}
+	if (offset > 0)
+	    MEM_NEED(xdr, offset);
+	MEM_COUNT(xdr) += offset;
+	return JS_TRUE;
+      case JSXDR_SEEK_SET:
+	if (offset < 0) {
+	    JS_ReportError(xdr->cx, "illegal seek beyond start");
+	    return JS_FALSE;
+	}
+	if (xdr->mode == JSXDR_ENCODE) {
+	    if ((uint32)offset > MEM_COUNT(xdr))
+		MEM_NEED(xdr, offset - MEM_COUNT(xdr));
+	    MEM_COUNT(xdr) = offset;
+	} else {
+	    if ((uint32)offset > MEM_LIMIT(xdr)) {
+		JS_ReportError(xdr->cx, "illegal seek beyond end");
+		return JS_FALSE;
+	    }
+	    MEM_COUNT(xdr) = offset;
+	}
+	return JS_TRUE;
+      case JSXDR_SEEK_END:
+	if (offset >= 0 ||
+	    xdr->mode == JSXDR_ENCODE ||
+	    (int32)MEM_LIMIT(xdr) + offset < 0) {
+	    JS_ReportError(xdr->cx, "illegal end-based seek");
+	    return JS_FALSE;
+	}
+	MEM_COUNT(xdr) = MEM_LIMIT(xdr) + offset;
+	return JS_TRUE;
+      default:
+	JS_ReportError(xdr->cx, "unknown seek whence: %d", whence);
+	return JS_FALSE;
+    }
+}
+
+static uint32
+mem_tell(JSXDRState *xdr)
+{
+    return MEM_COUNT(xdr);
+}
+
+static void
+mem_finalize(JSXDRState *xdr)
+{
+    JSContext *cx = xdr->cx;
+    JS_free(cx, xdr->data);
+}
+
+static JSXDROps xdrmem_ops = {
+    mem_get32,      mem_set32,      mem_getbytes,   mem_setbytes,
+    mem_raw,        mem_seek,       mem_tell,       mem_finalize
+};
+
+JS_PUBLIC_API(void)
+JS_XDRNewBase(JSContext *cx, JSXDRState *xdr, JSXDRMode mode)
+{
+    xdr->cx = cx;
+    xdr->mode = mode;
+    xdr->registry = NULL;
+    xdr->nclasses = 0;
+}
+
+JS_PUBLIC_API(JSXDRState *)
+JS_XDRNewMem(JSContext *cx, JSXDRMode mode)
+{
+    JSXDRState *xdr = JS_malloc(cx, sizeof(JSXDRMemState));
+    if (!xdr)
+	return NULL;
+    JS_XDRNewBase(cx, xdr, mode);
+    if (mode == JSXDR_ENCODE) {
+	if (!(xdr->data = JS_malloc(cx, MEM_BLOCK))) {
+	    JS_free(cx, xdr);
+	    return NULL;
+	}
+    } else {
+	/* XXXbe ok, so better not deref xdr->data if not ENCODE */
+	xdr->data = NULL;
+    }
+    xdr->ops = &xdrmem_ops;
+    MEM_PRIV(xdr)->count = 0;
+    MEM_PRIV(xdr)->limit = MEM_BLOCK;
+    return xdr;
+}
+
+JS_PUBLIC_API(void *)
+JS_XDRMemGetData(JSXDRState *xdr, uint32 *lp)
+{
+    if (xdr->ops != &xdrmem_ops)
+	return NULL;
+    *lp = MEM_PRIV(xdr)->count;
+    return xdr->data;
+}
+
+JS_PUBLIC_API(void)
+JS_XDRMemSetData(JSXDRState *xdr, void *data, uint32 len)
+{
+    if (xdr->ops != &xdrmem_ops)
+	return;
+    MEM_PRIV(xdr)->limit = len;
+    xdr->data = data;
+    MEM_PRIV(xdr)->count = 0;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRUint8(JSXDRState *xdr, uint8 *b)
+{
+    uint32 l = *b;
+    if (!JS_XDRUint32(xdr, &l))
+	return JS_FALSE;
+    *b = (uint8) l & 0xff;
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRUint16(JSXDRState *xdr, uint16 *s)
+{
+    uint32 l = *s;
+    if (!JS_XDRUint32(xdr, &l))
+	return JS_FALSE;
+    *s = (uint16) l & 0xffff;
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRUint32(JSXDRState *xdr, uint32 *lp)
+{
+    JSBool ok = JS_FALSE;
+    if (xdr->mode == JSXDR_ENCODE) {
+	uint32 xl = JSXDR_SWAB32(*lp);
+	ok = xdr->ops->set32(xdr, &xl);
+    } else if (xdr->mode == JSXDR_DECODE) {
+	ok = xdr->ops->get32(xdr, lp);
+	*lp = JSXDR_SWAB32(*lp);
+    }
+    return ok;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRBytes(JSXDRState *xdr, char **bytesp, uint32 len)
+{
+    if (xdr->mode == JSXDR_ENCODE) {
+	if (!xdr->ops->setbytes(xdr, bytesp, len))
+	    return JS_FALSE;
+    } else {
+	if (!xdr->ops->getbytes(xdr, bytesp, len))
+	    return JS_FALSE;
+    }
+    len = xdr->ops->tell(xdr);
+    if (len % JSXDR_ALIGN) {
+	if (!xdr->ops->seek(xdr, JSXDR_ALIGN - (len % JSXDR_ALIGN),
+			    JSXDR_SEEK_CUR)) {
+	    return JS_FALSE;
+	}
+    }
+    return JS_TRUE;
+}
+
+/**
+ * Convert between a C string and the XDR representation:
+ * leading 32-bit count, then counted vector of chars,
+ * then possibly \0 padding to multiple of 4.
+ */
+JS_PUBLIC_API(JSBool)
+JS_XDRCString(JSXDRState *xdr, char **sp)
+{
+    uint32 len;
+
+    if (xdr->mode == JSXDR_ENCODE)
+	len = strlen(*sp);
+    JS_XDRUint32(xdr, &len);
+    if (xdr->mode == JSXDR_DECODE) {
+	if (!(*sp = JS_malloc(xdr->cx, len + 1)))
+	    return JS_FALSE;
+    }
+    if (!JS_XDRBytes(xdr, sp, len)) {
+	if (xdr->mode == JSXDR_DECODE)
+	    JS_free(xdr->cx, *sp);
+	return JS_FALSE;
+    }
+    if (xdr->mode == JSXDR_DECODE) {
+	(*sp)[len] = '\0';
+    } else if (xdr->mode == JSXDR_FREE) {
+    	JS_free(xdr->cx, *sp);
+    	*sp = NULL;
+    }
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRCStringOrNull(JSXDRState *xdr, char **sp)
+{
+    uint32 null = (*sp == NULL);
+    if (!JS_XDRUint32(xdr, &null))
+	return JS_FALSE;
+    if (null) {
+	*sp = NULL;
+	return JS_TRUE;
+    }
+    return JS_XDRCString(xdr, sp);
+}
+
+/*
+ * Convert between a JS (Unicode) string and the XDR representation.
+ */
+JS_PUBLIC_API(JSBool)
+JS_XDRString(JSXDRState *xdr, JSString **strp)
+{
+    uint32 i, len, nbytes;
+    jschar *chars, *raw;
+
+    if (xdr->mode == JSXDR_ENCODE)
+	len = (*strp)->length;
+    if (!JS_XDRUint32(xdr, &len))
+	return JS_FALSE;
+    nbytes = len * sizeof(jschar);
+
+    if (xdr->mode == JSXDR_ENCODE) {
+	chars = (*strp)->chars;
+    } else if (xdr->mode == JSXDR_DECODE) {
+	if (!(chars = JS_malloc(xdr->cx, nbytes + sizeof(jschar))))
+	    return JS_FALSE;
+    }
+
+    if (nbytes % JSXDR_ALIGN)
+    	nbytes += JSXDR_ALIGN - (nbytes % JSXDR_ALIGN);
+    if (!(raw = xdr->ops->raw(xdr, nbytes)))
+	goto bad;
+    if (xdr->mode == JSXDR_ENCODE) {
+	for (i = 0; i < len; i++)
+	    raw[i] = JSXDR_SWAB16(chars[i]);
+    } else if (xdr->mode == JSXDR_DECODE) {
+	for (i = 0; i < len; i++)
+	    chars[i] = JSXDR_SWAB16(raw[i]);
+	if (!(*strp = JS_NewUCString(xdr->cx, chars, len)))
+	    goto bad;
+    }
+    return JS_TRUE;
+
+bad:
+    if (xdr->mode == JSXDR_DECODE)
+	JS_free(xdr->cx, chars);
+    return JS_FALSE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRStringOrNull(JSXDRState *xdr, JSString **strp)
+{
+    uint32 null = (*strp == NULL);
+    if (!JS_XDRUint32(xdr, &null))
+	return JS_FALSE;
+    if (null) {
+	*strp = NULL;
+	return JS_TRUE;
+    }
+    return JS_XDRString(xdr, strp);
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRDouble(JSXDRState *xdr, jsdouble **dp)
+{
+    jsdouble d;
+    if (xdr->mode == JSXDR_ENCODE)
+	d = **dp;
+#if IS_BIG_ENDIAN
+    if (!JS_XDRUint32(xdr, (uint32 *)&d + 1) ||
+	!JS_XDRUint32(xdr, (uint32 *)&d))
+#else /* !IS_BIG_ENDIAN */
+    if (!JS_XDRUint32(xdr, (uint32 *)&d) ||
+	!JS_XDRUint32(xdr, (uint32 *)&d + 1))
+#endif /* IS_BIG_ENDIAN */
+	return JS_FALSE;
+    if (xdr->mode == JSXDR_DECODE) {
+	*dp = JS_NewDouble(xdr->cx, d);
+	if (!*dp)
+	    return JS_FALSE;
+    }
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(JSBool)
+JS_XDRValue(JSXDRState *xdr, jsval *vp)
+{
+    uint32 type = JSVAL_TAG(*vp);
+    if (!JS_XDRUint32(xdr, &type))
+	return JS_FALSE;
+
+    switch (type) {
+      case JSVAL_STRING: {
+	JSString *str = JSVAL_TO_STRING(*vp);
+	if (!JS_XDRString(xdr, &str))
+	    return JS_FALSE;
+	if (xdr->mode == JSXDR_DECODE)
+	    *vp = STRING_TO_JSVAL(str);
+	break;
+      }
+      case JSVAL_DOUBLE: {
+	jsdouble *dp;
+	if (xdr->mode == JSXDR_ENCODE)
+	    dp = JSVAL_TO_DOUBLE(*vp);
+	if (!JS_XDRDouble(xdr, &dp))
+	    return JS_FALSE;
+	if (xdr->mode == JSXDR_DECODE)
+	    *vp = DOUBLE_TO_JSVAL(dp);
+	break;
+      }
+      case JSVAL_OBJECT: {
+	JSObject *obj;
+	if (xdr->mode == JSXDR_ENCODE)
+	    obj = JSVAL_TO_OBJECT(*vp);
+	if (!js_XDRObject(xdr, &obj))
+	    return JS_FALSE;
+	if (xdr->mode == JSXDR_DECODE)
+	    *vp = OBJECT_TO_JSVAL(obj);
+	break;
+      }
+      case JSVAL_BOOLEAN: {
+        uint32 b;
+	if (xdr->mode == JSXDR_ENCODE)
+	    b = (uint32)JSVAL_TO_BOOLEAN(*vp);
+	if (!JS_XDRUint32(xdr, &b))
+	    return JS_FALSE;
+	if (xdr->mode == JSXDR_DECODE)
+	    *vp = BOOLEAN_TO_JSVAL((JSBool)b);
+	break;
+      }
+      case JSVAL_VOID:
+	if (!JS_XDRUint32(xdr, (uint32 *)vp))
+	    return JS_FALSE;
+	break;
+      default:
+	if (type & JSVAL_INT) {
+	    uint32 i;
+	    if (xdr->mode == JSXDR_ENCODE)
+		i = JSVAL_TO_INT(*vp);
+	    if (!JS_XDRUint32(xdr, &i))
+		return JS_FALSE;
+	    if (xdr->mode == JSXDR_DECODE)
+		*vp = INT_TO_JSVAL(i);
+	    break;
+	}
+	JS_ReportError(xdr->cx, "unknown jsval type %#lx for XDR", type);
+	return JS_FALSE;
+    }
+    return JS_TRUE;
+}
+
+
+JS_PUBLIC_API(void)
+JS_XDRDestroy(JSXDRState *xdr)
+{
+    JSContext *cx = xdr->cx;
+    xdr->ops->finalize(xdr);
+    if (xdr->registry)
+	JS_free(cx, xdr->registry);
+    JS_free(cx, xdr);
+}
+
+#define REGISTRY_CHUNK 4
+
+JS_PUBLIC_API(JSBool)
+JS_RegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *idp)
+{
+    uintN nclasses;
+    JSClass **registry;
+
+    nclasses = xdr->nclasses;
+    if (nclasses == 0) {
+	registry = JS_malloc(xdr->cx, REGISTRY_CHUNK * sizeof(JSClass *));
+    } else if (nclasses % REGISTRY_CHUNK == 0) {
+	registry = JS_realloc(xdr->cx,
+			      xdr->registry,
+			      (nclasses + REGISTRY_CHUNK) * sizeof(JSClass *));
+    }
+    if (!registry)
+	return JS_FALSE;
+    registry[nclasses++] = clasp;
+    xdr->registry = registry;
+    xdr->nclasses = nclasses;
+    *idp = nclasses;
+    return JS_TRUE;
+}
+
+JS_PUBLIC_API(uint32)
+JS_FindClassIdByName(JSXDRState *xdr, const char *name)
+{
+    uintN i;
+
+    for (i = 0; i < xdr->nclasses; i++) {
+	if (!strcmp(name, xdr->registry[i]->name))
+	    return i+1;
+    }
+    return 0;
+}
+
+JS_PUBLIC_API(JSClass *)
+JS_FindClassById(JSXDRState *xdr, uint32 id)
+{
+    if (id > xdr->nclasses)
+	return NULL;
+    return xdr->registry[id-1];
+}

mozilla/js/src/jsxdrapi.h

@@ -0,0 +1,158 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef jsxdrapi_h___
+#define jsxdrapi_h___
+
+/*
+ * JS external data representation interface API.
+ *
+ * The XDR system is comprised of three major parts:
+ *
+ * - the state serialization/deserialization APIs, which allow consumers
+ *   of the API to serialize JS runtime state (script bytecodes, atom maps,
+ *   object graphs, etc.) for later restoration.  These portions
+ *   are implemented in various appropriate files, such as jsscript.c
+ *   for the script portions and jsobj.c for object state.
+ * - the callback APIs through which the runtime requests an opaque
+ *   representation of a native object, and through which the runtime
+ *   constructs a live native object from an opaque representation. These
+ *   portions are the responsibility of the native object implementor.
+ * - utility functions for en/decoding of primitive types, such as
+ *   JSStrings.  This portion is implemented in jsxdrapi.c.
+ *
+ * Spiritually guided by Sun's XDR, where appropriate.
+ */
+
+#include "jspubtd.h"
+#include "jsprvtd.h"
+
+PR_BEGIN_EXTERN_C
+
+/* We use little-endian byteorder for all encoded data */
+
+#if defined IS_LITTLE_ENDIAN
+#define JSXDR_SWAB32(x) x
+#define JSXDR_SWAB16(x) x
+#elif defined IS_BIG_ENDIAN
+#define JSXDR_SWAB32(x) (((x) >> 24) |                                        \
+			 (((x) >> 8) & 0xff00) |                              \
+			 (((x) << 8) & 0xff0000) |                            \
+			 ((x) << 24))
+#define JSXDR_SWAB16(x) (((x) >> 8) | ((x) << 8))
+#else
+#error "unknown byte order"
+#endif
+
+#define JSXDR_ALIGN     4
+
+typedef enum JSXDRMode {
+    JSXDR_ENCODE,
+    JSXDR_DECODE,
+    JSXDR_FREE
+} JSXDRMode;
+
+typedef enum JSXDRWhence {
+    JSXDR_SEEK_SET,
+    JSXDR_SEEK_CUR,
+    JSXDR_SEEK_END
+} JSXDRWhence;
+
+typedef struct JSXDROps {
+    JSBool      (*get32)(JSXDRState *, uint32 *);
+    JSBool      (*set32)(JSXDRState *, uint32 *);
+    JSBool      (*getbytes)(JSXDRState *, char **, uint32);
+    JSBool      (*setbytes)(JSXDRState *, char **, uint32);
+    void *      (*raw)(JSXDRState *, uint32);
+    JSBool      (*seek)(JSXDRState *, int32, JSXDRWhence);
+    uint32      (*tell)(JSXDRState *);
+    void        (*finalize)(JSXDRState *);
+} JSXDROps;
+
+struct JSXDRState {
+    JSXDRMode   mode;
+    JSXDROps    *ops;
+    JSContext   *cx;
+    JSClass     **registry;
+    uintN       nclasses;
+    void        *data;
+};
+
+JS_PUBLIC_API(void)
+JS_XDRNewBase(JSContext *cx, JSXDRState *xdr, JSXDRMode mode);
+
+JS_PUBLIC_API(JSXDRState *)
+JS_XDRNewMem(JSContext *cx, JSXDRMode mode);
+
+JS_PUBLIC_API(void *)
+JS_XDRMemGetData(JSXDRState *xdr, uint32 *lp);
+
+JS_PUBLIC_API(void)
+JS_XDRMemSetData(JSXDRState *xdr, void *data, uint32 len);
+
+JS_PUBLIC_API(void)
+JS_XDRDestroy(JSXDRState *xdr);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRUint8(JSXDRState *xdr, uint8 *b);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRUint16(JSXDRState *xdr, uint16 *s);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRUint32(JSXDRState *xdr, uint32 *lp);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRBytes(JSXDRState *xdr, char **bytes, uint32 len);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRCString(JSXDRState *xdr, char **sp);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRCStringOrNull(JSXDRState *xdr, char **sp);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRString(JSXDRState *xdr, JSString **strp);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRStringOrNull(JSXDRState *xdr, JSString **strp);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRDouble(JSXDRState *xdr, jsdouble **dp);
+
+JS_PUBLIC_API(JSBool)
+JS_XDRValue(JSXDRState *xdr, jsval *vp);
+
+JS_PUBLIC_API(JSBool)
+JS_RegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *lp);
+
+JS_PUBLIC_API(uint32)
+JS_FindClassIdByName(JSXDRState *xdr, const char *name);
+
+JS_PUBLIC_API(JSClass *)
+JS_FindClassById(JSXDRState *xdr, uint32 id);
+
+/* Magic values */
+
+#define OBJ_XDRMAGIC            0xdead1000
+#define OBJ_XDRTYPE_OBJ         0xdead1001
+#define OBJ_XDRTYPE_FUN         0xdead1002
+#define OBJ_XDRTYPE_REGEXP      0xdead1003
+#define SCRIPT_XDRMAGIC         0xdead0001
+
+#endif /* ! jsxdrapi_h___ */

mozilla/js/src/liveconnect/MANIFEST

@@ -0,0 +1,5 @@
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsjava.h
+nsILiveconnect.h

mozilla/js/src/liveconnect/Makefile

@@ -0,0 +1,89 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH		= ../../..
+
+include $(DEPTH)/config/config.mk
+
+ifdef NSJVM
+DIRS		= classes
+endif
+
+MODULE		= java
+LIBRARY_NAME	= jsj
+
+REQUIRES	= java js applet nspr img util layer xpcom
+
+CSRCS = jsj.c		  \
+	jsj_JSObject.c	  \
+	jsj_JavaArray.c	  \
+	jsj_JavaClass.c	  \
+	jsj_JavaMember.c  \
+	jsj_JavaObject.c  \
+	jsj_JavaPackage.c \
+	jsj_array.c	  \
+	jsj_class.c	  \
+	jsj_convert.c	  \
+	jsj_field.c	  \
+	jsj_hash.c	  \
+	jsj_method.c	  \
+	jsj_utils.c		\
+    nsCLiveconnect.c          \
+	nsCLiveconnectFactory.c
+
+
+LLIBS=$(LIBNSPR) $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib \
+ $(DIST)/lib/xpcom32.lib	
+
+
+ifdef NSJVM
+JNI_GEN		= netscape.javascript.JSObject netscape.javascript.JSException
+endif
+
+EXPORTS		= jsjava.h \
+		  $(JNI_GEN_DIR)/netscape_javascript_JSObject.h \
+		  $(JNI_GEN_DIR)/netscape_javascript_JSException.h \
+		  nsILiveconnect.h \
+		  $(NULL)
+
+
+
+include $(DEPTH)/config/rules.mk
+
+######################################################################
+
+# Generate jsj_nodl.c (so that you can check it in)
+# These make rules only works on IRIX...sigh
+
+ifeq ($(OS_ARCH),IRIX)
+jsj_nodl.c: $(OBJDIR)/stubs.o Makefile $(DEPTH)/config/nodl.pl
+	rm -f $@
+	$(PERL) $(DEPTH)/config/nodl.pl "jsj_nodl_tab" \
+	    `nm -Bn $(OBJDIR)/stubs.o | egrep Java_.*_stub | awk '{print $$3;}'` > $@
+endif
+
+ifdef JAVA_OR_OJI
+$(OBJDIR)/stubs.o:					 \
+	$(JNI_GEN_DIR)/netscape_javascript_JSObject.c	 \
+	$(JNI_GEN_DIR)/netscape_javascript_JSException.c \
+	$(NULL)
+else
+$(OBJDIR)/stubs.o:
+endif
+

mozilla/js/src/liveconnect/Makefile.in

@@ -0,0 +1,90 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+ifdef NSJVM
+DIRS		= classes
+endif
+
+
+MODULE		= java
+LIBRARY_NAME	= jsj
+
+REQUIRES	= java js applet nspr img util layer xpcom caps oji plugin
+
+CSRCS = jsj.c		  \
+	jsj_JSObject.c	  \
+	jsj_JavaArray.c	  \
+	jsj_JavaClass.c	  \
+	jsj_JavaMember.c  \
+	jsj_JavaObject.c  \
+	jsj_JavaPackage.c \
+	jsj_array.c	  \
+	jsj_class.c	  \
+	jsj_convert.c	  \
+	jsj_field.c	  \
+	jsj_hash.c	  \
+	jsj_method.c	  \
+	jsj_utils.c
+ nsCLiveconnect.c  \
+	nsCLiveconnectFactory.c
+
+
+ifdef NSJVM
+JNI_GEN		= netscape.javascript.JSObject netscape.javascript.JSException
+endif
+
+EXPORTS		= $(srcdir)/jsjava.h \
+		  $(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSObject.h \
+		  $(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSException.h \
+		  $(NULL)
+
+
+
+include $(topsrcdir)/config/rules.mk
+
+######################################################################
+
+# Generate jsj_nodl.c (so that you can check it in)
+# These make rules only works on IRIX...sigh
+
+ifeq ($(OS_ARCH),IRIX)
+jsj_nodl.c: $(OBJDIR)/stubs.o Makefile $(topsrcdir)/config/nodl.pl
+	rm -f $@
+	$(PERL) $(topsrcdir)/config/nodl.pl "jsj_nodl_tab" \
+	    `nm -Bn $(OBJDIR)/stubs.o | egrep Java_.*_stub | awk '{print $$3;}'` > $@
+endif
+
+ifdef JAVA_OR_OJI
+$(OBJDIR)/stubs.o:					 \
+	$(JRI_GEN_DIR)/netscape_javascript_JSObject.c	 \
+	$(JRI_GEN_DIR)/netscape_javascript_JSException.c \
+	$(NULL)
+else
+$(OBJDIR)/stubs.o:
+endif
+

mozilla/js/src/liveconnect/_jni/netscape_javascript_JSException.h

@@ -0,0 +1,14 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include "jni.h"
+
+/* Header for class netscape_javascript_JSException */
+
+#ifndef _Included_netscape_javascript_JSException
+#define _Included_netscape_javascript_JSException
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif

mozilla/js/src/liveconnect/_jni/netscape_javascript_JSObject.h

@@ -0,0 +1,102 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include "jni.h"
+
+/* Header for class netscape_javascript_JSObject */
+
+#ifndef _Included_netscape_javascript_JSObject
+#define _Included_netscape_javascript_JSObject
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    initClass
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_initClass
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getMember
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getMember
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getSlot
+ * Signature: (I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getSlot
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    setMember
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setMember
+  (JNIEnv *, jobject, jstring, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    setSlot
+ * Signature: (ILjava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setSlot
+  (JNIEnv *, jobject, jint, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    removeMember
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_removeMember
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    call
+ * Signature: (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_call
+  (JNIEnv *, jobject, jstring, jobjectArray);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    eval
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_eval
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    toString
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_netscape_javascript_JSObject_toString
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getWindow
+ * Signature: (Ljava/applet/Applet;)Lnetscape/javascript/JSObject;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getWindow
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    finalize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_finalize
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

mozilla/js/src/liveconnect/_jri/netscape_javascript_JSException.h

@@ -0,0 +1,14 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include "jni.h"
+
+/* Header for class netscape_javascript_JSException */
+
+#ifndef _Included_netscape_javascript_JSException
+#define _Included_netscape_javascript_JSException
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif

mozilla/js/src/liveconnect/_jri/netscape_javascript_JSObject.h

@@ -0,0 +1,102 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include "jni.h"
+
+/* Header for class netscape_javascript_JSObject */
+
+#ifndef _Included_netscape_javascript_JSObject
+#define _Included_netscape_javascript_JSObject
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    initClass
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_initClass
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getMember
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getMember
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getSlot
+ * Signature: (I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getSlot
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    setMember
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setMember
+  (JNIEnv *, jobject, jstring, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    setSlot
+ * Signature: (ILjava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setSlot
+  (JNIEnv *, jobject, jint, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    removeMember
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_removeMember
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    call
+ * Signature: (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_call
+  (JNIEnv *, jobject, jstring, jobjectArray);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    eval
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_eval
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    toString
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_netscape_javascript_JSObject_toString
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    getWindow
+ * Signature: (Ljava/applet/Applet;)Lnetscape/javascript/JSObject;
+ */
+JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getWindow
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     netscape_javascript_JSObject
+ * Method:    finalize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_finalize
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

mozilla/js/src/liveconnect/classes/Makefile

@@ -0,0 +1,65 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH		= ../../../..
+
+MODULE		= java
+
+#
+# the idea is that the install phase for those modules will
+# make their own signed jar files
+# there are some exceptions here that we deal with
+# stuff in modules and in ns/js/jsj
+#
+JMODS		= netscape/javascript netscape/javascript/adapters
+
+#
+# JDIRS is dependant on JAVA_DESTPATH in config/rules.m[a]k. 
+# Be sure to touch that directory if you add a new directory to
+# JDIRS, or else it will not build. FIXME
+#
+JDIRS		= $(JMODS)
+
+JAR_JSJ		= jsj10.jar
+JAR_JSJ_CLASSES	= $(JMODS)  
+
+#
+# jars to build at install time
+#
+JARS		= $(JAR_JSJ)
+
+include $(DEPTH)/config/rules.mk
+
+JAVA_SOURCEPATH	= $(DEPTH)/js/src/liveconnect/classes
+
+doc::
+	$(JAVADOC) -d $(DIST)/doc netscape.javascript
+
+natives_list:: FORCE
+	rm -rf $@
+	find . -name "*.class" -print | sed 's@\./\(.*\)\.class$$@\1@' | \
+		sed 's@/@.@g' | xargs $(JVH) -natives | sort > $@
+
+check_natives:: natives_list
+	rm -f found_natives
+	nm -B	../$(OBJDIR)/*.o \
+	    | egrep "Java.*_stub" | awk '{ print $$3; }' | sort > found_natives
+	diff found_natives natives_list
+
+FORCE:

mozilla/js/src/liveconnect/classes/Makefile.in

@@ -0,0 +1,70 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= java
+
+#
+# the idea is that the install phase for those modules will
+# make their own signed jar files
+# there are some exceptions here that we deal with
+# stuff in modules and in ns/js/jsj
+#
+JMODS		= netscape/javascript netscape/javascript/adapters
+
+#
+# JDIRS is dependant on JAVA_DESTPATH in config/rules.m[a]k. 
+# Be sure to touch that directory if you add a new directory to
+# JDIRS, or else it will not build. FIXME
+#
+JDIRS		= $(JMODS)
+
+JAR_JSJ		= jsj10.jar
+JAR_JSJ_CLASSES	= $(JMODS)  
+
+#
+# jars to build at install time
+#
+JARS		= $(JAR_JSJ)
+
+include $(topsrcdir)/config/rules.mk
+
+JAVA_SOURCEPATH	= $(topsrcdir)/js/src/liveconnect/classes
+
+doc::
+	$(JAVADOC) -d $(DIST)/doc netscape.javascript
+
+natives_list:: FORCE
+	rm -rf $@
+	find . -name "*.class" -print | sed 's@\./\(.*\)\.class$$@\1@' | \
+		sed 's@/@.@g' | xargs $(JVH) -natives | sort > $@
+
+check_natives:: natives_list
+	rm -f found_natives
+	nm -B	../$(OBJDIR)/*.o \
+	    | egrep "Java.*_stub" | awk '{ print $$3; }' | sort > found_natives
+	diff found_natives natives_list
+
+FORCE:

mozilla/js/src/liveconnect/classes/makefile.win

@@ -0,0 +1,78 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+# 
+
+#//------------------------------------------------------------------------
+#//
+#// Makefile to build the JavaScript-Java tree
+#//
+#//------------------------------------------------------------------------
+
+DEPTH = ..\..\..\..
+
+JAVA_SOURCEPATH=$(DEPTH)\js\src\liveconnect\classes
+
+#//------------------------------------------------------------------------
+#// 
+#// Define the files necessary to build the target (ie. OBJS)
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)\config\config.mak>
+
+JMOZ =  \
+        netscape/javascript		\
+	$(NULL)
+
+
+all::
+
+MODULE=java 
+JMODS=netscape/javascript
+!ifdef JAVA_OR_NSJVM
+JDIRS=$(JMODS) 
+JAR_JSJ_CLASSES=$(JMODS) 
+JAR_NAME = jsj10.jar
+!endif
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef JAVA_OR_NSJVM
+install:: 
+	cd $(JAVA_DESTPATH)
+	@echo +++ building/updating $(JAR_NAME)
+	-for %i in ($(JAR_JSJ_CLASSES:/=\)) do @$(ZIP_PROG) $(ZIP_FLAGS) $(JAR_NAME) %i\*.class
+	cd $(MAKEDIR)
+
+!ifdef REGENERATE
+install::
+	cd $(JAVA_DESTPATH)
+	@echo +++ updating $(DEPTH)\nav-java\stubs\classes\$(JAR_NAME) for checkin
+	-for %i in ($(JAR_JSJ_CLASSES:/=\)) do @$(ZIP_PROG) $(ZIP_FLAGS) ..\..\nav-java\stubs\classes\$(JAR_NAME) %i\*.class
+	cd $(MAKEDIR)
+!endif
+!endif
+
+javadoc:
+	-mkdir $(XPDIST)\javadoc 2> NUL
+	echo $(JAVADOC) -sourcepath . -d $(XPDIST)\javadoc $(JDIRS:/=.)
+	$(JAVADOC) -sourcepath . -d $(XPDIST)\javadoc $(JDIRS:/=.)
+
+
+
+

mozilla/js/src/liveconnect/classes/netscape/javascript/JSException.java

@@ -0,0 +1,56 @@
+/* Insert copyright and license here 19** */
+
+package netscape.javascript;
+
+/**
+ * JSException is an exception which is thrown when JavaScript code
+ * returns an error.
+ */
+
+public
+class JSException extends Exception {
+    String filename;
+    int lineno;
+    String source;
+    int tokenIndex;
+
+    /**
+     * Constructs a JSException without a detail message.
+     * A detail message is a String that describes this particular exception.
+     */
+    public JSException() {
+	super();
+        filename = "unknown";
+        lineno = 0;
+        source = "";
+        tokenIndex = 0;
+    }
+
+    /**
+     * Constructs a JSException with a detail message.
+     * A detail message is a String that describes this particular exception.
+     * @param s the detail message
+     */
+    public JSException(String s) {
+	super(s);
+        filename = "unknown";
+        lineno = 0;
+        source = "";
+        tokenIndex = 0;
+    }
+
+    /**
+     * Constructs a JSException with a detail message and all the
+     * other info that usually comes with a JavaScript error.
+     * @param s the detail message
+     */
+    public JSException(String s, String filename, int lineno,
+                       String source, int tokenIndex) {
+	super(s);
+        this.filename = filename;
+        this.lineno = lineno;
+        this.source = source;
+        this.tokenIndex = tokenIndex;
+    }
+}
+

mozilla/js/src/liveconnect/classes/netscape/javascript/JSObject.java

@@ -0,0 +1,150 @@
+/* -*- Mode: C; tab-width: 4; -*- */
+
+/* Insert copyright and license here 19** */
+
+/* more doc todo:
+ *  threads
+ *  gc
+ *  
+ *
+ */
+
+package netscape.javascript;
+
+import java.applet.Applet;
+
+/**
+ * JSObject allows Java to manipulate objects that are
+ * defined in JavaScript.
+ * Values passed from Java to JavaScript are converted as
+ * follows:<ul>
+ * <li>JSObject is converted to the original JavaScript object
+ * <li>Any other Java object is converted to a JavaScript wrapper,
+ *   which can be used to access methods and fields of the java object.
+ *   Converting this wrapper to a string will call the toString method
+ *   on the original object, converting to a number will call the
+ *   floatValue method if possible and fail otherwise.  Converting
+ *   to a boolean will try to call the booleanValue method in the
+ *   same way.
+ * <li>Java arrays are wrapped with a JavaScript object that understands
+ *   array.length and array[index]
+ * <li>A Java boolean is converted to a JavaScript boolean
+ * <li>Java byte, char, short, int, long, float, and double are converted
+ *   to JavaScript numbers
+ * </ul>
+ * Values passed from JavaScript to Java are converted as follows:<ul>
+ * <li>objects which are wrappers around java objects are unwrapped
+ * <li>other objects are wrapped with a JSObject
+ * <li>strings, numbers and booleans are converted to String, Float,
+ *   and Boolean objects respectively
+ * </ul>
+ * This means that all JavaScript values show up as some kind
+ * of java.lang.Object in Java.  In order to make much use of them,
+ * you will have to cast them to the appropriate subclass of Object,
+ * e.g. <code>(String) window.getMember("name");</code> or
+ * <code>(JSObject) window.getMember("document");</code>.
+ */
+public final class JSObject {
+    /* the internal object data */
+    private int                               internal;
+
+    /**
+     * initialize
+     */
+    private static native void initClass();
+    static {
+    	// On MRJ, this property won't exist, because the library is preloaded.
+    	String liveConnectLibrary = System.getProperty("netscape.jsj.dll", null);
+    	if (liveConnectLibrary != null) {
+			System.loadLibrary(liveConnectLibrary);
+			initClass();
+		}
+    }
+
+    /**
+     * it is illegal to construct a JSObject manually
+     */
+    private JSObject(int jsobj_addr) {
+        internal = jsobj_addr;
+    }
+
+    /**
+     * Retrieves a named member of a JavaScript object. 
+     * Equivalent to "this.<i>name</i>" in JavaScript.
+     */
+    public native Object	getMember(String name);
+
+    /**
+     * Retrieves an indexed member of a JavaScript object.
+     * Equivalent to "this[<i>index</i>]" in JavaScript.
+     */
+//    public Object		getMember(int index) { return getSlot(index); }
+    public native Object	getSlot(int index);
+
+    /**
+     * Sets a named member of a JavaScript object. 
+     * Equivalent to "this.<i>name</i> = <i>value</i>" in JavaScript.
+     */
+    public native void 		setMember(String name, Object value);
+
+    /**
+     * Sets an indexed member of a JavaScript object. 
+     * Equivalent to "this[<i>index</i>] = <i>value</i>" in JavaScript.
+     */
+//    public void 		setMember(int index, Object value) {
+//        setSlot(index, value);
+//    }
+    public native void 		setSlot(int index, Object value);
+
+    /**
+     * Removes a named member of a JavaScript object.
+     */
+    public native void 		removeMember(String name);
+
+    /**
+     * Calls a JavaScript method.
+     * Equivalent to "this.<i>methodName</i>(<i>args</i>[0], <i>args</i>[1], ...)" in JavaScript.
+     */
+    public native Object	call(String methodName, Object args[]);
+
+    /**
+     * Evaluates a JavaScript expression. The expression is a string 
+     * of JavaScript source code which will be evaluated in the context
+     * given by "this".
+     */
+    public native Object	eval(String s);
+
+    /**
+     * Converts a JSObject to a String.
+     */
+    public native String        toString();
+
+    // should use some sort of identifier rather than String
+    // is "property" the right word?
+  //    native String[]                         listProperties();
+
+
+    /**
+     * get a JSObject for the window containing the given applet
+     */
+    public static native JSObject	getWindow(Applet applet);
+
+    /**
+     * Finalization decrements the reference count on the corresponding
+     * JavaScript object.
+     */
+    protected native void	finalize();
+
+    /**
+     * Override java.lang.Object.equals() because identity is not preserved
+     * with instances of JSObject.
+     */
+    public boolean equals(Object obj) {
+        JSObject jsobj;
+
+        if (!(obj instanceof JSObject))
+            return false;
+        jsobj = (JSObject)obj;
+	return (internal == jsobj.internal);
+    }
+}

mozilla/js/src/liveconnect/classes/netscape/javascript/JSProxy.java

@@ -0,0 +1,37 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* ** */
+/**
+ * The JSProxy interface allows applets and plugins to
+ * share javascript contexts.
+ */
+
+package netscape.javascript;
+import java.applet.Applet;
+
+public interface JSProxy {
+    Object  getMember(JSObject jso, String name);
+    Object  getSlot(JSObject jso, int index);
+    void    setMember(JSObject jso, String name, Object value);
+    void    setSlot(JSObject jso, int index, Object value);
+    void    removeMember(JSObject jso, String name);
+    Object  call(JSObject jso, String methodName, Object args[]);
+    Object  eval(JSObject jso, String s);
+    String      toString(JSObject jso);
+    JSObject    getWindow(Applet applet);
+}

mozilla/js/src/liveconnect/classes/netscape/javascript/JSRunnable.java

@@ -0,0 +1,31 @@
+package netscape.javascript;
+
+/**
+ * Runs a JavaScript object with a run() method in a separate thread.
+ */
+public class JSRunnable implements Runnable {
+	private JSObject runnable;
+
+	public JSRunnable(JSObject runnable) {
+		this.runnable = runnable;
+		synchronized(this) {
+			new Thread(this).start();
+			try {
+				this.wait();
+			} catch (InterruptedException ie) {
+			}
+		}
+	}
+	
+	public void run() {
+		try {
+			runnable.call("run", null);
+			synchronized(this) {
+				notifyAll();
+			}
+		} catch (Throwable t) {
+			System.err.println(t);
+			t.printStackTrace(System.err);
+		}
+	}
+}

mozilla/js/src/liveconnect/classes/netscape/javascript/JSUtil.java

@@ -0,0 +1,38 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* ** */
+
+package netscape.javascript;
+import java.io.*;
+
+public class JSUtil {
+
+    /* Return the stack trace of an exception or error as a String */
+    public static String getStackTrace(Throwable t) {
+	ByteArrayOutputStream captureStream;
+	PrintStream p;
+	
+	captureStream = new ByteArrayOutputStream();
+	p = new PrintStream(captureStream);
+
+	t.printStackTrace(p);
+	p.flush();
+
+	return captureStream.toString();
+    }
+}

mozilla/js/src/liveconnect/jsj.c

@@ -0,0 +1,876 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the top-level initialization code and the implementation of the
+ * public API.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"        /* LiveConnect internals */
+#include "jsjava.h"             /* LiveConnect external API */
+
+/*
+ * At certain times during initialization, there may be no JavaScript context
+ * available to direct error reports to, in which case the error messages
+ * are sent to this function.  The caller is responsible for free'ing
+ * the js_error_msg argument.
+ */
+static void
+report_java_initialization_error(JNIEnv *jEnv, const char *js_error_msg)
+{
+    const char *error_msg, *java_error_msg;
+
+    java_error_msg = NULL;
+#if 0   /* This can never work here, because jsj_GetJavaErrorMessage relies on 
+           jlThrowable_toString which is set up by the initialization that calls 
+           this function. */
+    if (jEnv) {
+        java_error_msg = jsj_GetJavaErrorMessage(jEnv);
+        (*jEnv)->ExceptionClear(jEnv);
+    }
+#endif
+    if (java_error_msg) { 
+        error_msg = PR_smprintf("initialization error: %s (%s)\n",
+                                js_error_msg, java_error_msg);
+        free((void*)java_error_msg);
+    } else {
+        error_msg = PR_smprintf("initialization error: %s\n",
+                                js_error_msg);
+    }
+
+    jsj_LogError(error_msg);
+}
+
+/*
+ * Opaque JVM handles to Java classes and methods required for Java reflection.
+ * These are computed and cached during initialization.
+ */
+
+jclass jlObject;                        /* java.lang.Object */
+jclass jlrMethod;                       /* java.lang.reflect.Method */
+jclass jlrField;                        /* java.lang.reflect.Field */
+jclass jlVoid;                          /* java.lang.Void */
+jclass jlrConstructor;                  /* java.lang.reflect.Constructor */
+jclass jlThrowable;                     /* java.lang.Throwable */
+jclass jlSystem;                        /* java.lang.System */
+jclass jlClass;                         /* java.lang.Class */
+jclass jlBoolean;                       /* java.lang.Boolean */
+jclass jlDouble;                        /* java.lang.Double */
+jclass jlString;                        /* java.lang.String */
+jclass njJSObject;                      /* netscape.javascript.JSObject */
+jclass njJSException;                   /* netscape.javascript.JSException */
+jclass njJSUtil;                        /* netscape.javascript.JSUtil */
+
+jmethodID jlClass_getMethods;           /* java.lang.Class.getMethods() */
+jmethodID jlClass_getConstructors;      /* java.lang.Class.getConstructors() */
+jmethodID jlClass_getFields;            /* java.lang.Class.getFields() */
+jmethodID jlClass_getName;              /* java.lang.Class.getName() */
+jmethodID jlClass_getComponentType;     /* java.lang.Class.getComponentType() */
+jmethodID jlClass_getModifiers;         /* java.lang.Class.getModifiers() */
+jmethodID jlClass_isArray;              /* java.lang.Class.isArray() */
+
+jmethodID jlrMethod_getName;            /* java.lang.reflect.Method.getName() */
+jmethodID jlrMethod_getParameterTypes;  /* java.lang.reflect.Method.getParameterTypes() */
+jmethodID jlrMethod_getReturnType;      /* java.lang.reflect.Method.getReturnType() */
+jmethodID jlrMethod_getModifiers;       /* java.lang.reflect.Method.getModifiers() */
+
+jmethodID jlrConstructor_getParameterTypes; /* java.lang.reflect.Constructor.getParameterTypes() */
+jmethodID jlrConstructor_getModifiers;  /* java.lang.reflect.Constructor.getModifiers() */
+
+jmethodID jlrField_getName;             /* java.lang.reflect.Field.getName() */
+jmethodID jlrField_getType;             /* java.lang.reflect.Field.getType() */
+jmethodID jlrField_getModifiers;        /* java.lang.reflect.Field.getModifiers() */
+
+jmethodID jlBoolean_Boolean;            /* java.lang.Boolean constructor */
+jmethodID jlBoolean_booleanValue;       /* java.lang.Boolean.booleanValue() */
+jmethodID jlDouble_Double;              /* java.lang.Double constructor */
+jmethodID jlDouble_doubleValue;         /* java.lang.Double.doubleValue() */
+
+jmethodID jlThrowable_toString;         /* java.lang.Throwable.toString() */
+jmethodID jlThrowable_getMessage;       /* java.lang.Throwable.getMessage() */
+
+jmethodID jlSystem_identityHashCode;    /* java.lang.System.identityHashCode() */
+
+jobject jlVoid_TYPE;                    /* java.lang.Void.TYPE value */
+
+jmethodID njJSException_JSException;    /* netscape.javascript.JSexception constructor */
+jmethodID njJSObject_JSObject;          /* netscape.javascript.JSObject constructor */
+jmethodID njJSUtil_getStackTrace;       /* netscape.javascript.JSUtil.getStackTrace() */
+jfieldID njJSObject_internal;           /* netscape.javascript.JSObject.internal */
+jfieldID njJSException_lineno;          /* netscape.javascript.JSException.lineno */
+jfieldID njJSException_tokenIndex;      /* netscape.javascript.JSException.tokenIndex */
+jfieldID njJSException_source;          /* netscape.javascript.JSException.source */
+jfieldID njJSException_filename;        /* netscape.javascript.JSException.filename */
+
+/* Obtain a reference to a Java class */
+#define LOAD_CLASS(qualified_name, class)                                    \
+    {                                                                        \
+        jclass _##class = (*jEnv)->FindClass(jEnv, #qualified_name);         \
+        if (_##class == 0) {                                                 \
+            (*jEnv)->ExceptionClear(jEnv);                                   \
+            report_java_initialization_error(jEnv,                           \
+                "Can't load class " #qualified_name);                        \
+            return JS_FALSE;                                                 \
+        }                                                                    \
+        class = (*jEnv)->NewGlobalRef(jEnv, _##class);                       \
+    }
+
+/* Obtain a methodID reference to a Java method or constructor */
+#define _LOAD_METHOD(qualified_class, method, mvar, signature, class, is_static)\
+    if (is_static) {                                                         \
+        class##_##mvar =                                                     \
+            (*jEnv)->GetStaticMethodID(jEnv, class, #method, signature);     \
+    } else {                                                                 \
+        class##_##mvar =                                                     \
+            (*jEnv)->GetMethodID(jEnv, class, #method, signature);           \
+    }                                                                        \
+    if (class##_##mvar == 0) {                                               \
+        report_java_initialization_error(jEnv,                               \
+               "Can't get mid for " #qualified_class "." #method "()");      \
+        return JS_FALSE;                                                     \
+    }
+
+/* Obtain a methodID reference to a Java instance method */
+#define LOAD_METHOD(qualified_class, method, signature, class)               \
+    _LOAD_METHOD(qualified_class, method, method, signature, class, JS_FALSE)
+
+/* Obtain a methodID reference to a Java static method */
+#define LOAD_STATIC_METHOD(qualified_class, method, signature, class)        \
+    _LOAD_METHOD(qualified_class, method, method, signature, class, JS_TRUE)
+
+/* Obtain a methodID reference to a Java constructor */
+#define LOAD_CONSTRUCTOR(qualified_class, method, signature, class)          \
+    _LOAD_METHOD(qualified_class,<init>, method, signature, class, JS_FALSE)
+
+/* Obtain a fieldID reference to a Java instance or static field */
+#define _LOAD_FIELDID(qualified_class, field, signature, class, is_static)   \
+    if (is_static) {                                                         \
+        class##_##field = (*jEnv)->GetStaticFieldID(jEnv, class, #field, signature);\
+    } else {                                                                 \
+        class##_##field = (*jEnv)->GetFieldID(jEnv, class, #field, signature);\
+    }                                                                        \
+    if (class##_##field == 0) {                                              \
+        report_java_initialization_error(jEnv,                               \
+                "Can't get fid for " #qualified_class "." #field);           \
+        return JS_FALSE;                                                     \
+    }
+
+/* Obtain a fieldID reference to a Java instance field */
+#define LOAD_FIELDID(qualified_class, field, signature, class)               \
+    _LOAD_FIELDID(qualified_class, field, signature, class, JS_FALSE)
+
+/* Obtain the value of a static field in a Java class */
+#define LOAD_FIELD_VAL(qualified_class, field, signature, class, type)       \
+    {                                                                        \
+        jfieldID field_id;                                                   \
+        field_id = (*jEnv)->GetStaticFieldID(jEnv, class, #field, signature);\
+        if (field_id == 0) {                                                 \
+            report_java_initialization_error(jEnv,                           \
+                "Can't get fid for " #qualified_class "." #field);           \
+            return JS_FALSE;                                                 \
+        }                                                                    \
+        class##_##field =                                                    \
+            (*jEnv)->GetStatic##type##Field(jEnv, class, field_id);          \
+        if (class##_##field == 0) {                                          \
+            report_java_initialization_error(jEnv,                           \
+                "Can't read static field " #qualified_class "." #field);     \
+            return JS_FALSE;                                                 \
+        }                                                                    \
+    }
+
+/* Obtain the value of a static field in a Java class, which is known to
+   contain an object value. */
+#define LOAD_FIELD_OBJ(qualified_class, field, signature, class)             \
+    LOAD_FIELD_VAL(qualified_class, field, signature, class, Object);        \
+    class##_##field = (*jEnv)->NewGlobalRef(jEnv, class##_##field);
+
+/*
+ * Load the Java classes, and the method and field descriptors required for Java reflection.
+ * Returns JS_TRUE on success, JS_FALSE on failure.
+ */
+static JSBool
+init_java_VM_reflection(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
+{
+    /* Load Java system classes and method, including java.lang.reflect classes */
+    LOAD_CLASS(java/lang/Object,                jlObject);
+    LOAD_CLASS(java/lang/Class,                 jlClass);
+    LOAD_CLASS(java/lang/reflect/Method,        jlrMethod);
+    LOAD_CLASS(java/lang/reflect/Constructor,   jlrConstructor);
+    LOAD_CLASS(java/lang/reflect/Field,         jlrField);
+    LOAD_CLASS(java/lang/Throwable,             jlThrowable);
+    LOAD_CLASS(java/lang/System,                jlSystem);
+    LOAD_CLASS(java/lang/Boolean,               jlBoolean);
+    LOAD_CLASS(java/lang/Double,                jlDouble);
+    LOAD_CLASS(java/lang/String,                jlString);
+    LOAD_CLASS(java/lang/Void,                  jlVoid);
+
+    LOAD_METHOD(java.lang.Class,            getMethods,         "()[Ljava/lang/reflect/Method;",jlClass);
+    LOAD_METHOD(java.lang.Class,            getConstructors,    "()[Ljava/lang/reflect/Constructor;",jlClass);
+    LOAD_METHOD(java.lang.Class,            getFields,          "()[Ljava/lang/reflect/Field;", jlClass);
+    LOAD_METHOD(java.lang.Class,            getName,            "()Ljava/lang/String;",         jlClass);
+    LOAD_METHOD(java.lang.Class,            isArray,            "()Z",                          jlClass);
+    LOAD_METHOD(java.lang.Class,            getComponentType,   "()Ljava/lang/Class;",          jlClass);
+    LOAD_METHOD(java.lang.Class,            getModifiers,       "()I",                          jlClass);
+
+    LOAD_METHOD(java.lang.reflect.Method,   getName,            "()Ljava/lang/String;",         jlrMethod);
+    LOAD_METHOD(java.lang.reflect.Method,   getParameterTypes,  "()[Ljava/lang/Class;",         jlrMethod);
+    LOAD_METHOD(java.lang.reflect.Method,   getReturnType,      "()Ljava/lang/Class;",          jlrMethod);
+    LOAD_METHOD(java.lang.reflect.Method,   getModifiers,       "()I",                          jlrMethod);
+
+    LOAD_METHOD(java.lang.reflect.Constructor,  getParameterTypes,  "()[Ljava/lang/Class;",     jlrConstructor);
+    LOAD_METHOD(java.lang.reflect.Constructor,  getModifiers,       "()I",                      jlrConstructor);
+    
+    LOAD_METHOD(java.lang.reflect.Field,    getName,            "()Ljava/lang/String;",         jlrField);
+    LOAD_METHOD(java.lang.reflect.Field,    getType,            "()Ljava/lang/Class;",          jlrField);
+    LOAD_METHOD(java.lang.reflect.Field,    getModifiers,       "()I",                          jlrField);
+
+    LOAD_METHOD(java.lang.Throwable,        toString,           "()Ljava/lang/String;",         jlThrowable);
+    LOAD_METHOD(java.lang.Throwable,        getMessage,         "()Ljava/lang/String;",         jlThrowable);
+
+    LOAD_METHOD(java.lang.Double,           doubleValue,        "()D",                          jlDouble);
+
+    LOAD_METHOD(java.lang.Boolean,          booleanValue,       "()Z",                          jlBoolean);
+    
+    LOAD_STATIC_METHOD(java.lang.System,    identityHashCode,   "(Ljava/lang/Object;)I",        jlSystem);
+
+    LOAD_CONSTRUCTOR(java.lang.Boolean,     Boolean,            "(Z)V",                         jlBoolean);
+    LOAD_CONSTRUCTOR(java.lang.Double,      Double,             "(D)V",                         jlDouble);
+
+    LOAD_FIELD_OBJ(java.lang.Void,          TYPE,               "Ljava/lang/Class;",            jlVoid);
+  
+    return JS_TRUE;
+}
+
+#if XP_MAC
+
+/**
+ * Workaround for the fact that MRJ loads a different instance of the shared library.
+ */
+
+#include "netscape_javascript_JSObject.h"
+
+static JSObject_RegisterNativeMethods(JNIEnv* jEnv)
+{
+    // Manually load the required native methods.
+    static JNINativeMethod nativeMethods[] = {
+        "initClass", "()V", (void*)&Java_netscape_javascript_JSObject_initClass,
+        "getMember", "(Ljava/lang/String;)Ljava/lang/Object;", (void*)&Java_netscape_javascript_JSObject_getMember,
+        "getSlot", "(I)Ljava/lang/Object;", (void*)&Java_netscape_javascript_JSObject_getSlot,
+        "setMember", "(Ljava/lang/String;Ljava/lang/Object;)V", (void*)&Java_netscape_javascript_JSObject_setMember,
+        "setSlot", "(ILjava/lang/Object;)V", (void*)&Java_netscape_javascript_JSObject_setSlot,
+        "removeMember", "(Ljava/lang/String;)V", (void*)&Java_netscape_javascript_JSObject_removeMember,
+        "call", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;", (void*)&Java_netscape_javascript_JSObject_call,
+        "eval", "(Ljava/lang/String;)Ljava/lang/Object;", (void*)&Java_netscape_javascript_JSObject_eval,
+        
+        "toString", "()Ljava/lang/String;", (void*)&Java_netscape_javascript_JSObject_toString,
+        "getWindow", "(Ljava/applet/Applet;)Lnetscape/javascript/JSObject;", (void*)&Java_netscape_javascript_JSObject_getWindow,
+        "finalize", "()V", (void*)&Java_netscape_javascript_JSObject_finalize,
+        /* "equals", "(Ljava/lang/Object;)Z", (void*)&Java_netscape_javascript_JSObject_equals */
+    };
+    (*jEnv)->RegisterNatives(jEnv, njJSObject, nativeMethods, sizeof(nativeMethods) / sizeof(JNINativeMethod));
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {
+        report_java_initialization_error(jEnv, "Couldn't initialize JSObject native methods.");
+        (*jEnv)->ExceptionClear(jEnv);
+    }
+    /* call the initClass method, since we nailed the static initializer for testing. */
+    Java_netscape_javascript_JSObject_initClass(jEnv, njJSObject);
+}
+
+#endif
+
+/* Load Netscape-specific Java extension classes, methods, and fields */
+static JSBool
+init_netscape_java_classes(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
+{
+    LOAD_CLASS(netscape/javascript/JSObject,    njJSObject);
+    LOAD_CLASS(netscape/javascript/JSException, njJSException);
+    LOAD_CLASS(netscape/javascript/JSUtil,      njJSUtil);
+
+#if XP_MAC
+    JSObject_RegisterNativeMethods(jEnv);
+#endif
+
+    LOAD_CONSTRUCTOR(netscape.javascript.JSObject,
+                                            JSObject,           "(I)V",                         njJSObject);
+    LOAD_CONSTRUCTOR(netscape.javascript.JSException,
+                                            JSException,        "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;I)V",
+                                                                                                njJSException);
+    LOAD_FIELDID(netscape.javascript.JSObject,  
+                                            internal,           "I",                            njJSObject);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            lineno,             "I",                            njJSException);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            tokenIndex,         "I",                            njJSException);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            source,             "Ljava/lang/String;",           njJSException);
+    LOAD_FIELDID(netscape.javascript.JSException,  
+                                            filename,           "Ljava/lang/String;",           njJSException);
+
+    LOAD_STATIC_METHOD(netscape.javascript.JSUtil,
+                                            getStackTrace,      "(Ljava/lang/Throwable;)Ljava/lang/String;",
+                                                                                                njJSUtil);
+
+    return JS_TRUE;
+}
+
+JSJavaVM *jsjava_vm_list = NULL;
+
+/*
+ * Called once per Java VM, this function initializes the classes, fields, and
+ * methods required for Java reflection.  If java_vm is NULL, a new Java VM is
+ * created, using the provided classpath in addition to any default classpath.
+ * The classpath argument is ignored, however, if java_vm_arg is non-NULL.
+ */
+JSJavaVM *
+JSJ_ConnectToJavaVM(SystemJavaVM *java_vm_arg, void* initargs)
+{
+    SystemJavaVM* java_vm;
+    JSJavaVM *jsjava_vm;
+    JNIEnv *jEnv;
+
+    PR_ASSERT(JSJ_callbacks);
+    PR_ASSERT(JSJ_callbacks->attach_current_thread);
+    PR_ASSERT(JSJ_callbacks->detach_current_thread);
+    PR_ASSERT(JSJ_callbacks->get_java_vm);
+
+    jsjava_vm = (JSJavaVM*)malloc(sizeof(JSJavaVM));
+    if (!jsjava_vm)
+        return NULL;
+    memset(jsjava_vm, 0, sizeof(JSJavaVM));
+
+    java_vm = java_vm_arg;
+
+    /* If a Java VM was passed in, try to attach to it on the current thread. */
+    if (java_vm) {
+        jEnv = JSJ_callbacks->attach_current_thread(java_vm);
+        if (jEnv == NULL) {
+            jsj_LogError("Failed to attach to Java VM thread\n");
+            free(jsjava_vm);
+            return NULL;
+        }
+    }
+    else {
+        PRBool ok;
+        PR_ASSERT(JSJ_callbacks->create_java_vm);
+        PR_ASSERT(JSJ_callbacks->destroy_java_vm);
+
+        ok = JSJ_callbacks->create_java_vm(&java_vm, &jEnv, initargs);
+        if (!ok || java_vm == NULL) {
+            jsj_LogError("Failed to create Java VM\n");
+            free(jsjava_vm);
+            return NULL;
+        }
+
+        /* Remember that we created the VM so that we know to destroy it later */
+        jsjava_vm->jsj_created_java_vm = JS_TRUE;
+    }
+
+    jsjava_vm->java_vm = java_vm;
+    jsjava_vm->main_thread_env = jEnv;
+    
+    /* Load the Java classes, and the method and field descriptors required for
+       Java reflection. */
+    if (!init_java_VM_reflection(jsjava_vm, jEnv)) {
+        JSJ_DisconnectFromJavaVM(jsjava_vm);
+        return NULL;
+    }
+
+    /*
+     * JVM initialization for netscape.javascript.JSObject is performed
+     * independently of the other classes that are initialized in
+     * init_java_VM_reflection, because we allow it to fail.  In the case
+     * of failure, LiveConnect is still operative, but only when calling
+     * from JS to Java and not vice-versa.
+     */
+    init_netscape_java_classes(jsjava_vm, jEnv);
+
+    /* Put this VM on the list of all created VMs */
+    jsjava_vm->next = jsjava_vm_list;
+    jsjava_vm_list = jsjava_vm;
+
+    return jsjava_vm;
+}
+
+JSJCallbacks *JSJ_callbacks = NULL;
+
+/* Called once to set up callbacks for all instances of LiveConnect */
+void
+JSJ_Init(JSJCallbacks *callbacks)
+{
+    PR_ASSERT(callbacks);
+    JSJ_callbacks = callbacks;
+}
+
+/*
+ * Initialize the provided JSContext by setting up the JS classes necessary for
+ * reflection and by defining JavaPackage objects for the default Java packages
+ * as properties of global_obj.  Additional packages may be pre-defined by
+ * setting the predefined_packages argument.  (Pre-defining a Java package at
+ * initialization time is not necessary, but it will make package lookup faster
+ * and, more importantly, will avoid unnecessary network accesses if classes
+ * are being loaded over the network.)
+ */
+JSBool
+JSJ_InitJSContext(JSContext *cx, JSObject *global_obj,
+                  JavaPackageDef *predefined_packages)
+{
+    /* Initialize the JavaScript classes used for reflection */
+    if (!jsj_init_JavaObject(cx, global_obj))
+        return JS_FALSE;
+    
+/*    if (!jsj_init_JavaMember(cx, global_obj))
+        return JS_FALSE; */
+    
+    if (!jsj_init_JavaPackage(cx, global_obj, predefined_packages))
+        return JS_FALSE;
+
+    if (!jsj_init_JavaClass(cx, global_obj))
+        return JS_FALSE;
+
+    if (!jsj_init_JavaArray(cx, global_obj))
+        return JS_FALSE;
+
+    if (!jsj_init_JavaMember(cx, global_obj))
+        return JS_FALSE;
+    
+    return JS_TRUE;
+}
+
+/* Eliminate a reference to a Java class */
+#define UNLOAD_CLASS(qualified_name, class)                                  \
+    if (class) {                                                             \
+        (*jEnv)->DeleteGlobalRef(jEnv, class);                               \
+        class = NULL;                                                        \
+    }
+
+/*
+ * This routine severs the connection to a Java VM, freeing all related resources.
+ * It shouldn't be called until the global scope has been cleared in all related
+ * JSContexts (so that all LiveConnect objects are finalized) and a JavaScript
+ * GC is performed.  Otherwise, accessed to free'ed memory could result.
+ */
+void
+JSJ_DisconnectFromJavaVM(JSJavaVM *jsjava_vm)
+{
+    JNIEnv *jEnv;
+    SystemJavaVM *java_vm;
+    JSJavaVM *j, **jp;
+
+    java_vm = jsjava_vm->java_vm;
+    jEnv = jsjava_vm->main_thread_env;
+
+    /* Drop all references to Java objects and classes */
+    jsj_DiscardJavaObjReflections(jEnv);
+    jsj_DiscardJavaClassReflections(jEnv);
+
+    if (jsjava_vm->jsj_created_java_vm) { 
+        (void)JSJ_callbacks->destroy_java_vm(java_vm, jEnv);
+    } else {
+        UNLOAD_CLASS(java/lang/Object,                jlObject);
+        UNLOAD_CLASS(java/lang/Class,                 jlClass);
+        UNLOAD_CLASS(java/lang/reflect/Method,        jlrMethod);
+        UNLOAD_CLASS(java/lang/reflect/Constructor,   jlrConstructor);
+        UNLOAD_CLASS(java/lang/reflect/Field,         jlrField);
+        UNLOAD_CLASS(java/lang/Throwable,             jlThrowable);
+        UNLOAD_CLASS(java/lang/System,                jlSystem);
+        UNLOAD_CLASS(java/lang/Boolean,               jlBoolean);
+        UNLOAD_CLASS(java/lang/Double,                jlDouble);
+        UNLOAD_CLASS(java/lang/String,                jlString);
+        UNLOAD_CLASS(java/lang/Void,                  jlVoid);
+        UNLOAD_CLASS(netscape/javascript/JSObject,    njJSObject);
+        UNLOAD_CLASS(netscape/javascript/JSException, njJSException);
+        UNLOAD_CLASS(netscape/javascript/JSUtil,      njJSUtil);
+    }
+
+
+    /* Remove this VM from the list of all JSJavaVM objects. */
+    for (jp = &jsjava_vm_list; (j = *jp) != NULL; jp = &j->next) {
+        if (j == jsjava_vm) {
+            *jp = jsjava_vm->next;
+            break;
+        }
+    }
+    PR_ASSERT(j);
+    
+    free(jsjava_vm);
+}
+
+static JSJavaThreadState *thread_list = NULL;
+
+static JSJavaThreadState *
+new_jsjava_thread_state(JSJavaVM *jsjava_vm, const char *thread_name, JNIEnv *jEnv)
+{
+    JSJavaThreadState *jsj_env;
+
+    jsj_env = (JSJavaThreadState *)malloc(sizeof(JSJavaThreadState));
+    if (!jsj_env)
+        return NULL;
+    memset(jsj_env, 0, sizeof(JSJavaThreadState));
+
+    jsj_env->jEnv = jEnv;
+    jsj_env->jsjava_vm = jsjava_vm;
+    if (thread_name)
+        jsj_env->name = strdup(thread_name);
+
+    /* THREADSAFETY - need to protect against races */
+    jsj_env->next = thread_list;
+    thread_list = jsj_env;
+
+    return jsj_env;
+}
+
+static JSJavaThreadState *
+find_jsjava_thread(JNIEnv *jEnv)
+{
+    JSJavaThreadState *e, **p, *jsj_env;
+    jsj_env = NULL;
+
+    /* THREADSAFETY - need to protect against races in manipulating the thread list */
+
+    /* Search for the thread state among the list of all created
+       LiveConnect threads */
+    for (p = &thread_list; (e = *p) != NULL; p = &(e->next)) {
+        if (e->jEnv == jEnv) {
+            jsj_env = e;
+            *p = jsj_env->next;
+            break;
+        }
+    }
+
+    /* Move a found thread to head of list for faster search next time. */
+    if (jsj_env)
+        thread_list = jsj_env;
+    
+    return jsj_env;
+}
+
+PR_IMPLEMENT(JSJavaThreadState *)
+JSJ_AttachCurrentThreadToJava(JSJavaVM *jsjava_vm, const char *name, JNIEnv **java_envp)
+{
+    JNIEnv *jEnv;
+    SystemJavaVM *java_vm;
+    JSJavaThreadState *jsj_env;
+
+    /* Try to attach a Java thread to the current native thread */
+    java_vm = jsjava_vm->java_vm;
+    jEnv = JSJ_callbacks->attach_current_thread(java_vm);
+    if (jEnv == NULL) 
+        return NULL;
+
+    /* If we found an existing thread state, just return it. */
+    jsj_env = find_jsjava_thread(jEnv);
+    if (jsj_env)
+        return jsj_env;
+
+    /* Create a new wrapper around the thread/VM state */
+    jsj_env = new_jsjava_thread_state(jsjava_vm, name, jEnv);
+
+    if (java_envp)
+        *java_envp = jEnv;
+    return jsj_env;
+}
+
+static JSJavaVM *
+map_java_vm_to_jsjava_vm(SystemJavaVM *java_vm)
+{
+    JSJavaVM *v;
+    for (v = jsjava_vm_list; v; v = v->next) {
+        if (v->java_vm == java_vm)
+            return v;
+    }
+    return NULL;
+}
+
+/*
+ * Unfortunately, there's no standard means to associate any private data with
+ * a JNI thread environment, so we need to use the Java environment pointer as
+ * the key in a lookup table that maps it to a JSJavaThreadState structure, 
+ * where we store all our per-thread private data.  If no existing thread state
+ * is found, a new one is created.
+ *
+ * If an error occurs, returns NULL and sets the errp argument to an error
+ * message, which the caller is responsible for free'ing.
+ */
+JSJavaThreadState *
+jsj_MapJavaThreadToJSJavaThreadState(JNIEnv *jEnv, char **errp)
+{
+    JSJavaThreadState *jsj_env;
+    SystemJavaVM *java_vm;
+    JSJavaVM *jsjava_vm;
+
+    /* If we found an existing thread state, just return it. */
+    jsj_env = find_jsjava_thread(jEnv);
+    if (jsj_env)
+        return jsj_env;
+
+    /* No one set up a LiveConnect thread state for a given Java thread.
+       Invoke the callback to create one on-the-fly. */
+
+    /* First, figure out which Java VM is calling us */
+    java_vm = JSJ_callbacks->get_java_vm(jEnv);
+    if (jsjava_vm == NULL)
+        return NULL;
+
+    /* Get our private JavaVM data */
+    jsjava_vm = map_java_vm_to_jsjava_vm(java_vm);
+    if (!jsjava_vm) {
+        *errp = PR_smprintf("Total weirdness:   No JSJavaVM wrapper ever created "
+                            "for JavaVM 0x%08x", java_vm);
+        return NULL;
+    }
+
+    jsj_env = new_jsjava_thread_state(jsjava_vm, NULL, jEnv);
+    if (!jsj_env)
+        return NULL;
+
+    return jsj_env;
+}
+
+/*
+ * This function is used to specify a particular JSContext as *the* JavaScript
+ * execution environment to be used when LiveConnect is accessed from the given
+ * Java thread, i.e. by using one of the methods of netscape.javascript.JSObject.
+ * (There can only be one such JS context for a given Java thread.  To
+ * multiplex JSContexts among a single thread, this function must be called
+ * before Java is invoked on that thread.)  The return value is the previous
+ * context associated with the given Java thread.
+ */
+PR_IMPLEMENT(JSContext *)
+JSJ_SetDefaultJSContextForJavaThread(JSContext *cx, JSJavaThreadState *jsj_env)
+{
+    JSContext *old_context;
+    old_context = jsj_env->cx;
+    jsj_env->cx = cx;
+    return old_context;
+}
+
+PR_IMPLEMENT(JSBool)
+JSJ_DetachCurrentThreadFromJava(JSJavaThreadState *jsj_env)
+{
+    SystemJavaVM *java_vm;
+    JNIEnv* jEnv;
+    JSJavaThreadState *e, **p;
+
+    /* Disassociate the current native thread from its corresponding Java thread */
+    java_vm = jsj_env->jsjava_vm->java_vm;
+    jEnv = jsj_env->jEnv;
+    if (!JSJ_callbacks->detach_current_thread(java_vm, jEnv))
+        return JS_FALSE;
+
+    /* Destroy the LiveConnect execution environment passed in */
+    jsj_ClearPendingJSErrors(jsj_env);
+
+    /* THREADSAFETY - need to protect against races */
+    for (p = &thread_list; (e = *p) != NULL; p = &(e->next)) {
+        if (e == jsj_env) {
+            *p = jsj_env->next;
+            break;
+        }
+    }
+
+    free(jsj_env);
+    return JS_TRUE;
+}
+
+JSBool
+JSJ_ConvertJavaObjectToJSValue(JSContext *cx, jobject java_obj, jsval *vp)
+{
+    JNIEnv *jEnv;
+            
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    return jsj_ConvertJavaObjectToJSValue(cx, jEnv, java_obj, vp);
+}
+
+/*===========================================================================*/
+
+#ifndef MOZILLA_CLIENT
+
+/* The convenience functions below present a complete, but simplified
+   LiveConnect API which is designed to handle the special case of a single 
+   Java-VM, single-threaded operation, and use of only one JSContext. */
+
+/* We can get away with global variables in our single-threaded,
+   single-JSContext case. */
+static JSJavaVM *           the_jsj_vm = NULL;
+static JSContext *          the_cx = NULL;
+static JSJavaThreadState *  the_jsj_thread = NULL;
+static JSObject *           the_global_js_obj = NULL;
+
+/* Trivial implementation of callback function */
+static JSJavaThreadState *
+default_map_js_context_to_jsj_thread(JSContext *cx, char **errp)
+{
+    return the_jsj_thread;
+}
+
+/* Trivial implementation of callback function */
+static JSContext *
+default_map_jsj_thread_to_js_context(JSJavaThreadState *jsj_env, JNIEnv *jEnv, char **errp)
+{
+    return the_cx;
+}
+
+/* Trivial implementation of callback function */
+static JSObject *
+default_map_java_object_to_js_object(JNIEnv *jEnv, jobject hint, char **errp)
+{
+    return the_global_js_obj;
+}
+
+static PRBool PR_CALLBACK
+default_create_java_vm(SystemJavaVM* *jvm, JNIEnv* *initialEnv, void* initargs)
+{
+    jint err;
+    const char* user_classpath = (const char*)initargs;
+
+    /* No Java VM supplied, so create our own */
+    JDK1_1InitArgs vm_args;
+        
+    /* Magic constant indicates JRE version 1.1 */
+    vm_args.version = 0x00010001;
+    JNI_GetDefaultJavaVMInitArgs(&vm_args);
+        
+    /* Prepend the classpath argument to the default JVM classpath */
+    if (user_classpath) {
+#ifdef XP_UNIX
+        const char *full_classpath = PR_smprintf("%s:%s", user_classpath, vm_args.classpath);
+#else
+        const char *full_classpath = PR_smprintf("%s;%s", user_classpath, vm_args.classpath);
+#endif
+        if (!full_classpath) {
+            return PR_FALSE;
+        }
+        vm_args.classpath = (char*)full_classpath;
+    }
+
+    err = JNI_CreateJavaVM((JavaVM**)jvm, initialEnv, &vm_args);
+    return err == 0;
+}
+
+static PRBool PR_CALLBACK
+default_destroy_java_vm(SystemJavaVM* jvm, JNIEnv* initialEnv)
+{
+    JavaVM* java_vm = (JavaVM*)jvm;
+    jint err = (*java_vm)->DestroyJavaVM(java_vm);
+    return err == 0;
+}
+
+static JNIEnv* PR_CALLBACK
+default_attach_current_thread(SystemJavaVM* jvm)
+{
+    JavaVM* java_vm = (JavaVM*)jvm;
+    JNIEnv* env = NULL;
+    jint err = (*java_vm)->AttachCurrentThread(java_vm, &env, NULL);
+    return env;
+}
+
+static PRBool PR_CALLBACK
+default_detach_current_thread(SystemJavaVM* jvm, JNIEnv* env)
+{
+    JavaVM* java_vm = (JavaVM*)jvm;
+    /* assert that env is the JNIEnv of the current thread */
+    jint err = (*java_vm)->DetachCurrentThread(java_vm);
+    return err == 0;
+}
+
+static SystemJavaVM* PR_CALLBACK
+default_get_java_vm(JNIEnv* env)
+{
+    JavaVM* java_vm = NULL;
+    jint err = (*env)->GetJavaVM(env, &java_vm);
+    return (SystemJavaVM*)java_vm;
+}
+
+/* Trivial implementations of callback functions */
+JSJCallbacks jsj_default_callbacks = {
+    default_map_jsj_thread_to_js_context,
+    default_map_js_context_to_jsj_thread,
+    default_map_java_object_to_js_object,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    default_create_java_vm,
+    default_destroy_java_vm,
+    default_attach_current_thread,
+    default_detach_current_thread,
+    default_get_java_vm
+};
+
+/*
+ * Initialize the provided JSContext by setting up the JS classes necessary for
+ * reflection and by defining JavaPackage objects for the default Java packages
+ * as properties of global_obj.  If java_vm is NULL, a new Java VM is
+ * created, using the provided classpath in addition to any default classpath.
+ * The classpath argument is ignored, however, if java_vm is non-NULL.
+ */
+JSBool
+JSJ_SimpleInit(JSContext *cx, JSObject *global_obj, SystemJavaVM *java_vm, const char *classpath)
+{
+    JNIEnv *jEnv;
+
+    PR_ASSERT(!the_jsj_vm);
+    the_jsj_vm = JSJ_ConnectToJavaVM(java_vm, (void*)classpath);
+    if (!the_jsj_vm)
+        return JS_FALSE;
+
+    JSJ_Init(&jsj_default_callbacks);
+
+    if (!JSJ_InitJSContext(cx, global_obj, NULL))
+        goto error;
+    the_cx = cx;
+    the_global_js_obj = global_obj;
+
+    the_jsj_thread = JSJ_AttachCurrentThreadToJava(the_jsj_vm, "main thread", &jEnv);
+    if (!the_jsj_thread)
+        goto error;
+    JSJ_SetDefaultJSContextForJavaThread(cx, the_jsj_thread);
+    return JS_TRUE;
+
+error:
+    JSJ_SimpleShutdown();
+    return JS_FALSE;
+}
+
+/*
+ * Free up all LiveConnect resources.  Destroy the Java VM if it was
+ * created by LiveConnect.
+ */
+PR_IMPLEMENT(void)
+JSJ_SimpleShutdown()
+{
+    PR_ASSERT(the_jsj_vm);
+    JSJ_DisconnectFromJavaVM(the_jsj_vm);
+    the_jsj_vm = NULL;
+    the_cx = NULL;
+    the_global_js_obj = NULL;
+    the_jsj_thread = NULL;
+}
+
+#endif /* MOZILLA_CLIENT */

mozilla/js/src/liveconnect/jsj1640.rc

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+// Version stamp for this .DLL
+
+#include <windows.h>
+
+#include <ver.h>
+
+
+
+VS_VERSION_INFO     VERSIONINFO
+
+  FILEVERSION       4 // major, minor, release (alpha 1), build #
+
+  PRODUCTVERSION    4
+
+  FILEFLAGSMASK     0
+
+  FILEFLAGS         0 // final version
+
+  FILEOS            VOS_DOS_WINDOWS16
+
+  FILETYPE          VFT_DLL
+
+  FILESUBTYPE       0   // not used
+
+BEGIN
+
+    BLOCK "StringFileInfo"
+
+    BEGIN
+
+        BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
+
+        BEGIN
+
+            VALUE "CompanyName",     "Netscape Communications Corporation\0"
+
+            VALUE "FileDescription", "Netscape 16-bit JavaScript-Java Module\0"
+
+            VALUE "FileVersion",     "4.0\0"
+
+            VALUE "InternalName",    "JSJ1640\0"
+
+            VALUE "LegalCopyright",  "Copyright Netscape Communications. 1994-96\0"
+
+            VALUE "LegalTrademarks", "Netscape, Mozilla\0"
+
+            VALUE "OriginalFilename","JSJ1640.DLL\0"
+
+            VALUE "ProductName",     "NETSCAPE\0"
+
+            VALUE "ProductVersion",  "4.0\0"
+
+        END
+
+    END
+
+END
+

mozilla/js/src/liveconnect/jsj_JavaArray.c

@@ -0,0 +1,403 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the definition of the JavaScript JavaArray class.
+ * Instances of JavaArray are used to reflect Java arrays.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/* Shorthands for ASCII (7-bit) decimal and hex conversion. */
+#define JS7_ISDEC(c)    (((c) >= '0') && ((c) <= '9'))
+#define JS7_UNDEC(c)    ((c) - '0')
+
+/*
+ * Convert any jsval v to an integer jsval if ToString(v)
+ * contains a base-10 integer that fits into 31 bits.
+ * Otherwise return v.
+ */
+static jsval
+try_convert_to_jsint(JSContext *cx, jsval idval)
+{
+    const jschar *cp;
+    JSString *jsstr;
+    
+    jsstr = JS_ValueToString(cx, idval);
+    if (!jsstr)
+        return idval;
+
+    cp = JS_GetStringChars(jsstr);
+    if (JS7_ISDEC(*cp)) {
+        jsuint index = JS7_UNDEC(*cp++);
+        jsuint oldIndex = 0;
+        jsuint c = 0;
+        if (index != 0) {
+            while (JS7_ISDEC(*cp)) {
+                oldIndex = index;
+                c = JS7_UNDEC(*cp);
+                index = 10*index + c;
+                cp++;
+            }
+        }
+        if (*cp == 0 &&
+            (oldIndex < (JSVAL_INT_MAX / 10) ||
+            (oldIndex == (JSVAL_INT_MAX / 10) && c < (JSVAL_INT_MAX % 10)))) {
+            return INT_TO_JSVAL(index);
+        }
+    }
+    return idval;
+}
+
+
+static JSBool
+access_java_array_element(JSContext *cx,
+                          JNIEnv *jEnv,
+                          JSObject *obj,
+                          jsid id,
+                          jsval *vp,
+                          JSBool do_assignment)
+{
+    jsval idval;
+    jarray java_array;
+    JavaClassDescriptor *class_descriptor;
+    JavaObjectWrapper *java_wrapper;
+    jsize array_length, index;
+    JavaSignature *array_component_signature;
+    
+    /* printf("In JavaArray_getProperty\n"); */
+    
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        const char *property_name;
+        if (JS_IdToValue(cx, id, &idval) && JSVAL_IS_STRING(idval) &&
+            (property_name = JS_GetStringBytes(JSVAL_TO_STRING(idval))) != NULL) {
+            if (!strcmp(property_name, "constructor")) {
+                *vp = JSVAL_VOID;
+                return JS_TRUE;
+            }
+        }
+        JS_ReportError(cx, "illegal operation on JavaArray prototype object");
+        return JS_FALSE;
+    }
+    class_descriptor = java_wrapper->class_descriptor;
+    java_array = java_wrapper->java_obj;
+    
+    PR_ASSERT(class_descriptor->type == JAVA_SIGNATURE_ARRAY);
+
+    JS_IdToValue(cx, id, &idval);
+
+    if (!JSVAL_IS_INT(idval))
+        idval = try_convert_to_jsint(cx, idval);
+
+    if (!JSVAL_IS_INT(idval)) {
+        /*
+         * Usually, properties of JavaArray objects are indexed by integers, but
+         * Java arrays also inherit all the methods of java.lang.Object, so a
+         * string-valued property is also possible.
+         */
+        if (JSVAL_IS_STRING(idval)) {
+            const char *member_name;
+            
+            member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+            
+            if (do_assignment) {
+                JSVersion version = JS_GetVersion(cx);
+
+                if (!JSVERSION_IS_ECMA(version)) {
+ 
+                    JS_ReportError(cx, "Attempt to write to invalid Java array "
+                                       "element \"%s\"", member_name);
+                    return JS_FALSE;
+                } else {
+                    *vp = JSVAL_VOID;
+                    return JS_TRUE;
+                }
+            } else {
+                if (!strcmp(member_name, "length")) {
+                    array_length = jsj_GetJavaArrayLength(cx, jEnv, java_array);
+                    if (array_length < 0)
+                        return JS_FALSE;
+                    if (vp)
+                        *vp = INT_TO_JSVAL(array_length);
+                    return JS_TRUE;
+                }
+
+                /* Check to see if we're reflecting a Java array method */
+                return JavaObject_getPropertyById(cx, obj, id, vp);
+            }
+        }
+
+        JS_ReportError(cx, "invalid Java array index expression");
+        return JS_FALSE;
+    }
+    
+    index = JSVAL_TO_INT(idval);
+
+#if 0
+    array_length = jsj_GetJavaArrayLength(cx, jEnv, java_array);
+    if (array_length < 0)
+        return JS_FALSE;
+
+    /* Just let Java throw an exception instead of checking array bounds here */
+    if (index < 0 || index >= array_length) {
+        JS_ReportError(cx, "Java array index %d out of range", index);
+        return JS_FALSE;
+    }
+#endif
+
+    array_component_signature = class_descriptor->array_component_signature;
+
+    if (!vp)
+        return JS_TRUE;
+
+    if (do_assignment) {
+        return jsj_SetJavaArrayElement(cx, jEnv, java_array, index,
+                                       array_component_signature, *vp);
+    } else {
+        return jsj_GetJavaArrayElement(cx, jEnv, java_array, index,
+                                       array_component_signature, vp);
+    }
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaArray_getPropertyById(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JNIEnv *jEnv;
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    return access_java_array_element(cx, jEnv, obj, id, vp, JS_FALSE);
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaArray_setPropertyById(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JNIEnv *jEnv;
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    return access_java_array_element(cx, jEnv, obj, id, vp, JS_TRUE);
+}
+
+static JSBool
+JavaArray_lookupProperty(JSContext *cx, JSObject *obj, jsid id,
+                         JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+                            , const char *file, uintN line
+#endif
+                            )
+{
+    JNIEnv *jEnv;
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    return access_java_array_element(cx, jEnv, obj, id, NULL, JS_FALSE);
+}
+
+static JSBool
+JavaArray_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+                         JSPropertyOp getter, JSPropertyOp setter,
+                         uintN attrs, JSProperty **propp)
+{
+    JS_ReportError(cx, "Cannot define a new property in a JavaArray");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaArray_getAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    *attrsp = JSPROP_PERMANENT|JSPROP_ENUMERATE;
+    return JS_FALSE;
+}
+
+static JSBool
+JavaArray_setAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    if (*attrsp != (JSPROP_PERMANENT|JSPROP_ENUMERATE)) {
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Silently ignore all setAttribute attempts */
+    return JS_TRUE;
+}
+
+static JSBool
+JavaArray_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    JSVersion version = JS_GetVersion(cx);
+
+    *vp = JSVAL_FALSE;
+    
+    if (!JSVERSION_IS_ECMA(version)) {
+        JS_ReportError(cx, "Properties of JavaArray objects may not be deleted");
+        return JS_FALSE;
+    } else {
+        /* Attempts to delete permanent properties are silently ignored
+           by ECMAScript. */
+        return JS_TRUE;
+    }
+}
+
+static JSBool
+JavaArray_defaultValue(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    /* printf("In JavaArray_defaultValue()\n"); */
+    return JavaObject_convert(cx, obj, JSTYPE_STRING, vp);
+}
+
+static JSBool
+JavaArray_newEnumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+                       jsval *statep, jsid *idp)
+{
+    JavaObjectWrapper *java_wrapper;
+    JNIEnv *jEnv;
+    jsize array_length, index;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    /* Check for prototype object */
+    if (!java_wrapper) {
+        *statep = JSVAL_NULL;
+        if (idp)
+            *idp = INT_TO_JSVAL(0);
+        return JS_TRUE;
+    }
+        
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    array_length = jsj_GetJavaArrayLength(cx, jEnv, java_wrapper->java_obj);
+    if (array_length < 0)
+        return JS_FALSE;
+
+    switch(enum_op) {
+    case JSENUMERATE_INIT:
+        *statep = INT_TO_JSVAL(0);
+
+        if (idp)
+            *idp = INT_TO_JSVAL(array_length);
+        return JS_TRUE;
+        
+    case JSENUMERATE_NEXT:
+        index = JSVAL_TO_INT(*statep);
+        if (index < array_length) {
+            JS_ValueToId(cx, INT_TO_JSVAL(index), idp);
+            index++;
+            *statep = INT_TO_JSVAL(index);
+            return JS_TRUE;
+        }
+
+        /* Fall through ... */
+
+    case JSENUMERATE_DESTROY:
+        *statep = JSVAL_NULL;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+JavaArray_checkAccess(JSContext *cx, JSObject *obj, jsid id,
+                      JSAccessMode mode, jsval *vp, uintN *attrsp)
+{
+    switch (mode) {
+    case JSACC_WATCH:
+        JS_ReportError(cx, "Cannot place watchpoints on JavaArray object properties");
+        return JS_FALSE;
+
+    case JSACC_IMPORT:
+        JS_ReportError(cx, "Cannot export a JavaArray object's properties");
+        return JS_FALSE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+JSObjectOps JavaArray_ops = {
+    /* Mandatory non-null function pointer members. */
+    NULL,                       /* newObjectMap */
+    NULL,                       /* destroyObjectMap */
+    JavaArray_lookupProperty,
+    JavaArray_defineProperty,
+    JavaArray_getPropertyById,  /* getProperty */
+    JavaArray_setPropertyById,  /* setProperty */
+    JavaArray_getAttributes,
+    JavaArray_setAttributes,
+    JavaArray_deleteProperty,
+    JavaArray_defaultValue,
+    JavaArray_newEnumerate,
+    JavaArray_checkAccess,
+
+    /* Optionally non-null members start here. */
+    NULL,                       /* thisObject */
+    NULL,                       /* dropProperty */
+    NULL,                       /* call */
+    NULL,                       /* construct */
+    NULL,                       /* xdrObject */
+    NULL                        /* hasInstance */
+};
+
+static JSObjectOps *
+JavaArray_getObjectOps(JSContext *cx, JSClass *clazz)
+{
+    return &JavaArray_ops;
+}
+
+JSClass JavaArray_class = {
+    "JavaArray", JSCLASS_HAS_PRIVATE,
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, JavaObject_convert, JavaObject_finalize,
+    JavaArray_getObjectOps,
+};
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+
+/* Initialize the JS JavaArray class */
+JSBool
+jsj_init_JavaArray(JSContext *cx, JSObject *global_obj)
+{
+    JavaArray_ops.newObjectMap = js_ObjectOps.newObjectMap;
+    JavaArray_ops.destroyObjectMap = js_ObjectOps.destroyObjectMap;
+
+    if (!JS_InitClass(cx, global_obj, 
+        0, &JavaArray_class, 0, 0,
+        0, 0, 0, 0))
+        return JS_FALSE;
+    
+    return JS_TRUE;
+}
+

mozilla/js/src/liveconnect/jsj_JavaClass.c

@@ -0,0 +1,586 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of JS's JavaClass class.
+ *
+ * A JavaClass is JavaScript's representation of a Java class.
+ * Its parent JS object is always a JavaPackage object.  A JavaClass is not an
+ * exact reflection of Java's corresponding java.lang.Class object.  Rather,
+ * the properties of a JavaClass are the static methods and properties of the
+ * corresponding Java class.
+ *
+ * Note that there is no runtime equivalent to the JavaClass class in Java.
+ * (Although there are instances of java.lang.String and there are static
+ * methods of java.lang.String that can be invoked, there's no such thing as
+ * a first-class object that can be referenced simply as "java.lang.String".)
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"        /* LiveConnect internals */
+
+static JSBool
+JavaClass_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    char *name;
+    JSString *str;
+
+    JavaClassDescriptor *class_descriptor;
+    
+    class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor)
+        return JS_FALSE;
+
+    switch(type) {
+
+
+    case JSTYPE_STRING:
+        /* Convert '/' to '.' so that it looks like Java language syntax. */
+        if (!class_descriptor->name)
+            break;
+        name = PR_smprintf("[JavaClass %s]", class_descriptor->name);
+        if (!name) {
+            JS_ReportOutOfMemory(cx);
+            return JS_FALSE;
+        }
+
+        str = JS_NewString(cx, name, strlen(name));
+        if (!str) {
+            free(name);
+            /* It's not necessary to call JS_ReportOutOfMemory(), as
+               JS_NewString() will do so on failure. */
+            return JS_FALSE;
+        }
+
+        *vp = STRING_TO_JSVAL(str);
+        return JS_TRUE;
+
+    default:
+      break;
+    }
+    return JS_TRUE;
+}
+
+static JSBool
+lookup_static_member_by_id(JSContext *cx, JNIEnv *jEnv, JSObject *obj,
+                           JavaClassDescriptor **class_descriptorp,
+                           jsid id, JavaMemberDescriptor **memberp)
+{
+    jsval idval;
+    JavaMemberDescriptor *member_descriptor;
+    const char *member_name;
+    JavaClassDescriptor *class_descriptor;
+
+    class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor) {
+        *class_descriptorp = NULL;
+        *memberp = NULL;
+        return JS_TRUE;
+    }
+    
+    if (class_descriptorp)
+        *class_descriptorp = class_descriptor;
+    
+    member_descriptor = jsj_LookupJavaStaticMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (!member_descriptor) {
+        JS_IdToValue(cx, id, &idval);
+        if (!JSVAL_IS_STRING(idval)) {
+            JS_ReportError(cx, "invalid JavaClass property expression. "
+                "(methods and fields of a JavaClass object can only be identified by their name)");
+            return JS_FALSE;
+        }
+
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+
+        /* Why do we have to do this ? */
+        if (!strcmp(member_name, "prototype")) {
+            *memberp = NULL;
+            return JS_TRUE;
+        }
+
+        JS_ReportError(cx, "Java class %s has no public static field or method named \"%s\"",
+                       class_descriptor->name, member_name);
+        return JS_FALSE;
+    }
+    if (memberp)
+        *memberp = member_descriptor;
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaClass_getPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jsval idval;
+    jclass java_class;
+    const char *member_name;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaClass_getProperty\n"); */
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    if (!lookup_static_member_by_id(cx, jEnv, obj, &class_descriptor, id, &member_descriptor))
+        return JS_FALSE;
+    if (!member_descriptor) {
+        *vp = JSVAL_VOID;
+        return JS_TRUE;
+    }
+
+    java_class = class_descriptor->java_class;
+
+    if (member_descriptor->field) {
+        if (!member_descriptor->methods) {
+            return jsj_GetJavaFieldValue(cx, jEnv, member_descriptor->field, java_class, vp);
+        } else {
+            PR_ASSERT(0);
+        }
+    } else {
+        JSFunction *function;
+        
+        /* TODO - eliminate JSFUN_BOUND_METHOD */
+        JS_IdToValue(cx, id, &idval);
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+        function = JS_NewFunction(cx, jsj_JavaStaticMethodWrapper, 0,
+                                  JSFUN_BOUND_METHOD, obj, member_name);
+        if (!function)
+            return JS_FALSE;
+
+        *vp = OBJECT_TO_JSVAL(JS_GetFunctionObject(function));
+    }
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaClass_setPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jclass java_class;
+    const char *member_name;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    jsval idval;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaClass_setProperty\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    
+    if (!lookup_static_member_by_id(cx, jEnv, obj, &class_descriptor, id, &member_descriptor))
+        return JS_FALSE;
+
+    /* Check for the case where there is a method with the given name, but no field
+       with that name */
+    if (!member_descriptor->field)
+        goto no_such_field;
+
+    /* Silently fail if field value is final (immutable), as required by ECMA spec */
+    if (member_descriptor->field->modifiers & ACC_FINAL)
+        return JS_TRUE;
+
+    java_class = class_descriptor->java_class;
+    return jsj_SetJavaFieldValue(cx, jEnv, member_descriptor->field, java_class, *vp);
+
+no_such_field:
+    JS_IdToValue(cx, id, &idval);
+    member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+    JS_ReportError(cx, "No static field named \"%s\" in Java class %s",
+                   member_name, class_descriptor->name);
+    return JS_FALSE;
+}
+
+/*
+ * Free the private native data associated with the JavaPackage object.
+ */
+PR_STATIC_CALLBACK(void)
+JavaClass_finalize(JSContext *cx, JSObject *obj)
+{
+    JNIEnv *jEnv;
+
+    JavaClassDescriptor *class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor)
+        return;
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return;
+
+    /* printf("Finalizing %s\n", class_descriptor->name); */
+    jsj_ReleaseJavaClassDescriptor(cx, jEnv, class_descriptor);
+}
+
+
+static JSBool
+JavaClass_lookupProperty(JSContext *cx, JSObject *obj, jsid id,
+                         JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+                            , const char *file, uintN line
+#endif
+                            )
+{
+    JNIEnv *jEnv;
+    JSErrorReporter old_reporter;
+
+    /* printf("In JavaClass_lookupProperty()\n"); */
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    old_reporter = JS_SetErrorReporter(cx, NULL);
+    if (lookup_static_member_by_id(cx, jEnv, obj, NULL, id, NULL)) {
+        *objp = obj;
+        *propp = (JSProperty*)1;
+    } else {
+        *objp = NULL;
+        *propp = NULL;
+    }
+
+    JS_SetErrorReporter(cx, old_reporter);
+    return JS_TRUE;
+}
+
+static JSBool
+JavaClass_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+                         JSPropertyOp getter, JSPropertyOp setter,
+                         uintN attrs, JSProperty **propp)
+{
+    JS_ReportError(cx, "Cannot define a new property in a JavaClass");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaClass_getAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    *attrsp = JSPROP_PERMANENT|JSPROP_ENUMERATE;
+    return JS_FALSE;
+}
+
+static JSBool
+JavaClass_setAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    if (*attrsp != (JSPROP_PERMANENT|JSPROP_ENUMERATE)) {
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Silently ignore all setAttribute attempts */
+    return JS_TRUE;
+}
+
+static JSBool
+JavaClass_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    JSVersion version = JS_GetVersion(cx);
+    
+    *vp = JSVAL_FALSE;
+
+    if (!JSVERSION_IS_ECMA(version)) {
+        JS_ReportError(cx, "Properties of JavaClass objects may not be deleted");
+        return JS_FALSE;
+    } else {
+        /* Attempts to delete permanent properties are silently ignored
+           by ECMAScript. */
+        return JS_TRUE;
+    }
+}
+
+static JSBool
+JavaClass_defaultValue(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    /* printf("In JavaClass_defaultValue()\n"); */
+    return JavaClass_convert(cx, obj, JSTYPE_STRING, vp);
+}
+
+static JSBool
+JavaClass_newEnumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+                       jsval *statep, jsid *idp)
+{
+    JavaMemberDescriptor *member_descriptor;
+    JavaClassDescriptor *class_descriptor;
+    JNIEnv *jEnv;
+    
+    class_descriptor = JS_GetPrivate(cx, obj);
+
+    /* Check for prototype JavaClass object */
+    if (!class_descriptor) {
+        *statep = JSVAL_NULL;
+        if (idp)
+            *idp = INT_TO_JSVAL(0);
+        return JS_TRUE;
+    }
+    
+    switch(enum_op) {
+    case JSENUMERATE_INIT:
+        /* Get the Java per-thread environment pointer for this JSContext */
+        jsj_MapJSContextToJSJThread(cx, &jEnv);
+        if (!jEnv)
+            return JS_FALSE;
+        member_descriptor = jsj_GetClassStaticMembers(cx, jEnv, class_descriptor);
+        *statep = PRIVATE_TO_JSVAL(member_descriptor);
+        if (idp)
+            *idp = INT_TO_JSVAL(class_descriptor->num_instance_members);
+        return JS_TRUE;
+        
+    case JSENUMERATE_NEXT:
+        member_descriptor = JSVAL_TO_PRIVATE(*statep);
+        if (member_descriptor) {
+            *idp = member_descriptor->id;
+            *statep = PRIVATE_TO_JSVAL(member_descriptor->next);
+            return JS_TRUE;
+        }
+        /* Fall through ... */
+
+    case JSENUMERATE_DESTROY:
+        *statep = JSVAL_NULL;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+JavaClass_checkAccess(JSContext *cx, JSObject *obj, jsid id,
+                      JSAccessMode mode, jsval *vp, uintN *attrsp)
+{
+    switch (mode) {
+    case JSACC_WATCH:
+        JS_ReportError(cx, "Cannot place watchpoints on JavaClass object properties");
+        return JS_FALSE;
+
+    case JSACC_IMPORT:
+        JS_ReportError(cx, "Cannot export a JavaClass object's properties");
+        return JS_FALSE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+/*
+ * Implement the JavaScript instanceof operator for JavaClass objects by using
+ * the equivalent Java instanceof operation.
+ */
+static JSBool
+JavaClass_hasInstance(JSContext *cx, JSObject *obj, jsval candidate_jsval,
+                      JSBool *has_instancep)
+{
+    JavaClassDescriptor *class_descriptor;
+    JavaObjectWrapper *java_wrapper;
+    JSClass *js_class;
+    JSBool has_instance;
+    JSObject *candidate_obj;
+    jclass java_class;
+    jobject java_obj;
+    JNIEnv *jEnv;
+    
+    has_instance = JS_FALSE;
+    class_descriptor = JS_GetPrivate(cx, obj);
+    if (!class_descriptor) {
+        JS_ReportError(cx, "illegal operation on JavaClass prototype object");
+        return JS_FALSE;
+    }
+
+    /*
+     * Make sure that the thing to the left of the instanceof operator is a
+     * Java object.
+     */
+    if (!JSVAL_IS_OBJECT(candidate_jsval))
+        goto done;
+    candidate_obj = JSVAL_TO_OBJECT(candidate_jsval);
+    js_class = JS_GetClass(candidate_obj);
+    if ((js_class != &JavaObject_class) && (js_class != &JavaArray_class))
+        goto done;
+
+    java_class = class_descriptor->java_class;
+    java_wrapper = JS_GetPrivate(cx, candidate_obj);
+    if (!java_wrapper) {
+        JS_ReportError(cx, "illegal operation on prototype object");
+        return JS_FALSE;
+    }
+    java_obj = java_wrapper->java_obj;
+    /* Get JNI pointer */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    has_instance = (*jEnv)->IsInstanceOf(jEnv, java_obj, java_class);
+
+done:
+    *has_instancep = has_instance;
+    return JS_TRUE;
+}
+
+JSObjectOps JavaClass_ops = {
+    /* Mandatory non-null function pointer members. */
+    NULL,                       /* newObjectMap */
+    NULL,                       /* destroyObjectMap */
+    JavaClass_lookupProperty,
+    JavaClass_defineProperty,
+    JavaClass_getPropertyById,  /* getProperty */
+    JavaClass_setPropertyById,  /* setProperty */
+    JavaClass_getAttributes,
+    JavaClass_setAttributes,
+    JavaClass_deleteProperty,
+    JavaClass_defaultValue,
+    JavaClass_newEnumerate,
+    JavaClass_checkAccess,
+
+    /* Optionally non-null members start here. */
+    NULL,                       /* thisObject */
+    NULL,                       /* dropProperty */
+    jsj_JavaConstructorWrapper, /* call */
+    jsj_JavaConstructorWrapper, /* construct */
+    NULL,                       /* xdrObject */
+    JavaClass_hasInstance,      /* hasInstance */
+};
+
+static JSObjectOps *
+JavaClass_getObjectOps(JSContext *cx, JSClass *clazz)
+{
+    return &JavaClass_ops;
+}
+
+JSClass JavaClass_class = {
+    "JavaClass", JSCLASS_HAS_PRIVATE,
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, JavaClass_convert, JavaClass_finalize,
+    JavaClass_getObjectOps,
+};
+
+static JSObject *
+jsj_new_JavaClass(JSContext *cx, JNIEnv *jEnv, JSObject* parent_obj,
+                  JavaClassDescriptor *class_descriptor)
+{
+    JSObject *JavaClass_obj;
+
+    JavaClass_obj = JS_NewObject(cx, &JavaClass_class, 0, parent_obj);
+    if (!JavaClass_obj)
+        return NULL;
+
+    JS_SetPrivate(cx, JavaClass_obj, (void *)class_descriptor);
+
+#ifdef DEBUG
+    /*    printf("JavaClass \'%s\' created\n", class_descriptor->name); */
+#endif
+
+    return JavaClass_obj;
+}
+
+JSObject *
+jsj_define_JavaClass(JSContext *cx, JNIEnv *jEnv, JSObject* parent_obj,
+                     const char *simple_class_name,
+                     jclass java_class)
+{
+    JavaClassDescriptor *class_descriptor;
+    JSObject *JavaClass_obj;
+
+    class_descriptor = jsj_GetJavaClassDescriptor(cx, jEnv, java_class);
+    if (!class_descriptor)
+        return NULL;
+
+    JavaClass_obj = jsj_new_JavaClass(cx, jEnv, parent_obj, class_descriptor);
+    if (!JavaClass_obj)
+        return NULL;
+
+    if (!JS_DefineProperty(cx, parent_obj, simple_class_name,
+                           OBJECT_TO_JSVAL(JavaClass_obj), 0, 0,
+                           JSPROP_PERMANENT|JSPROP_READONLY|JSPROP_ENUMERATE))
+        return NULL;
+    return JavaClass_obj;
+}
+
+
+/*
+ * The getClass() native JS method is defined as a property of the global
+ * object.  Given a JavaObject it returns the corresponding JavaClass.  This
+ * is useful for accessing static methods and fields.
+ *
+ *    js> getClass(new java.lang.String("foo"))
+ *    [JavaClass java.lang.String]
+ */
+static JSBool
+getClass(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+    JSObject *obj_arg, *JavaClass_obj;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    JNIEnv *jEnv;
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    if (argc != 1 ||
+    !JSVAL_IS_OBJECT(argv[0]) ||
+    !(obj_arg = JSVAL_TO_OBJECT(argv[0])) ||
+    (!JS_InstanceOf(cx, obj_arg, &JavaObject_class, 0) &&
+         !JS_InstanceOf(cx, obj_arg, &JavaArray_class, 0))) {
+        JS_ReportError(cx, "getClass expects a Java object argument");
+    return JS_FALSE;
+    }
+
+    java_wrapper = JS_GetPrivate(cx, obj_arg);
+    if (!java_wrapper) {
+        JS_ReportError(cx, "getClass called on prototype object");
+        return JS_FALSE;
+    }
+
+    class_descriptor = java_wrapper->class_descriptor;
+
+    JavaClass_obj = jsj_new_JavaClass(cx, jEnv, NULL, class_descriptor);
+    if (!JavaClass_obj)
+        return JS_FALSE;
+    *rval = OBJECT_TO_JSVAL(JavaClass_obj);
+    return JS_TRUE;
+}
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+JSBool
+jsj_init_JavaClass(JSContext *cx, JSObject *global_obj)
+{
+    JavaClass_ops.newObjectMap = js_ObjectOps.newObjectMap;
+    JavaClass_ops.destroyObjectMap = js_ObjectOps.destroyObjectMap;
+    
+    /* Define JavaClass class */
+    if (!JS_InitClass(cx, global_obj, 0, &JavaClass_class, 0, 0, 0, 0, 0, 0))
+        return JS_FALSE;
+
+    if (!JS_DefineFunction(cx, global_obj, "getClass", getClass, 0,
+                           JSPROP_READONLY))
+        return JS_FALSE;
+
+    return jsj_InitJavaClassReflectionsTable();
+}
+

mozilla/js/src/liveconnect/jsj_JavaMember.c

@@ -0,0 +1,134 @@
+/* -*- Mode: C; tab-width: 8 -*-
+ * Copyright (C) 1998 Netscape Communications Corporation, All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of JS's JavaMember class.
+ * JavaMember's are a strange beast required only to handle the special case
+ * of a public field and a public method that appear in the same class and
+ * have the same name.  When such a field/method is used in Java, the compiler
+ * can statically determine from context whether the field or the method is
+ * being referenced, but that is not possible with JavaScript.  For example:
+ *
+ * ambiguousVal = javaObj.fieldOrMethod; // ambiguousVal is a JavaMember object
+ * a = ambiguousVal();                   // ambiguousVal used as a method value
+ * b = ambiguousVal + 4;                 // ambiguousVal used as a field value
+ *
+ * A JavaMember instance carries both the captured value of the Java field and
+ * the method value until the context that the value is to be used in is known,
+ * at which point conversion forces the use of one or the other.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/* Private, native portion of a JavaMember */
+typedef struct JavaMethodOrFieldValue {
+    jsval method_val;
+    jsval field_val;
+} JavaMethodOrFieldValue;
+
+JSObject *
+jsj_CreateJavaMember(JSContext *cx, jsval method_val, jsval field_val)
+{
+    JavaMethodOrFieldValue *member_val;
+    JSObject *JavaMember_obj;
+    
+    member_val = (JavaMethodOrFieldValue *)JS_malloc(cx, sizeof(*member_val));
+    if (!member_val)
+        return NULL;
+    
+    JavaMember_obj = JS_NewObject(cx, &JavaMember_class, 0, 0);
+    if (!JavaMember_obj) {
+        JS_free(cx, member_val);
+        return NULL;
+    }
+
+    JS_SetPrivate(cx, JavaMember_obj, (void *)member_val);
+    member_val->method_val = method_val;
+    JS_AddRoot(cx, &member_val->method_val);
+    member_val->field_val = field_val;
+    if (JSVAL_IS_GCTHING(field_val))
+        JS_AddRoot(cx, &member_val->field_val);
+
+    return JavaMember_obj;
+}
+
+static void
+JavaMember_finalize(JSContext *cx, JSObject *obj)
+{
+    JavaMethodOrFieldValue *member_val;
+    JNIEnv *jEnv;
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return;
+
+    member_val = JS_GetPrivate(cx, obj);
+    if (!member_val)
+        return;
+    JS_RemoveRoot(cx, &member_val->method_val);
+    if (JSVAL_IS_GCTHING(member_val->method_val))
+        JS_RemoveRoot(cx, &member_val->method_val);
+    JS_free(cx, member_val);
+}
+
+static JSBool
+JavaMember_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    JavaMethodOrFieldValue *member_val;
+        
+    member_val = JS_GetPrivate(cx, obj);
+    if (!member_val) {
+        if (type == JSTYPE_OBJECT) {
+            *vp = OBJECT_TO_JSVAL(obj);
+            return JS_TRUE;
+        }
+        
+        JS_ReportError(cx, "illegal operation on JavaObject prototype object");
+        return JS_FALSE;
+    }
+
+    switch (type) {
+    case JSTYPE_VOID:
+    case JSTYPE_STRING:
+    case JSTYPE_NUMBER:
+    case JSTYPE_BOOLEAN:
+    case JSTYPE_OBJECT:
+        *vp = member_val->field_val;
+        return JS_TRUE;
+
+    case JSTYPE_FUNCTION:
+        *vp = member_val->method_val;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+JSClass JavaMember_class = {
+    "JavaMember", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, 
+    JavaMember_convert, JavaMember_finalize
+};
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+JSBool
+jsj_init_JavaMember(JSContext *cx, JSObject *global_obj)
+{
+    if (!JS_InitClass(cx, global_obj, 
+        0, &JavaMember_class, 0, 0,
+        0, 0,
+        0, 0))
+        return JS_FALSE;
+
+    return JS_TRUE;
+}

mozilla/js/src/liveconnect/jsj_JavaObject.c

@@ -0,0 +1,686 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of JS's JavaObject class.
+ *
+ * An instance of JavaObject is the JavaScript reflection of a Java object.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"      /* LiveConnect internals */
+#include "jsj_hash.h"         /* Hash table with Java object as key */
+
+
+/*
+ * This is a hash table that maps from Java objects to JS objects.
+ * It is used to ensure that the same JS object is obtained when a Java
+ * object is reflected more than once, so that JS object equality tests
+ * work in the expected manner, i.e. the "==" and "===" operators.
+ *
+ * The table entry keys are Java objects (of type jobject) and the entry values
+ * are JSObject pointers.  Because the jobject type is an opaque handle and
+ * not necessarily a pointer, the hashing and key comparison functions must
+ * invoke the appropriate JVM functions.
+ *
+ * When the corresponding JS object instance is finalized, the entry is
+ * removed from the table, and a Java GC root for the Java object is removed.
+ */
+static JSJHashTable *java_obj_reflections = NULL;
+
+#ifdef JS_THREADSAFE
+static PRMonitor *java_obj_reflections_monitor = NULL;
+#endif
+
+static JSBool
+init_java_obj_reflections_table()
+{
+    java_obj_reflections =
+        JSJ_NewHashTable(512, jsj_HashJavaObject, jsj_JavaObjectComparator,
+                         NULL, NULL, NULL);
+    if (!java_obj_reflections)
+        return JS_FALSE;
+
+#ifdef JS_THREADSAFE
+    java_obj_reflections_monitor = PR_NewNamedMonitor("java_obj_reflections");
+    if (!java_obj_reflections_monitor) {
+        PR_HashTableDestroy(java_obj_reflections);
+        return JS_FALSE;
+    }
+#endif
+
+    return JS_TRUE;
+}
+
+JSObject *
+jsj_WrapJavaObject(JSContext *cx,
+                   JNIEnv *jEnv,
+                   jobject java_obj,
+                   jclass java_class)
+{
+    JSJHashNumber hash_code;
+    JSClass *js_class;
+    JSObject *js_wrapper_obj;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    JSJHashEntry *he, **hep;
+
+    js_wrapper_obj = NULL;
+
+    hash_code = jsj_HashJavaObject((void*)java_obj, (void*)jEnv);
+
+#ifdef JS_THREADSAFE
+    PR_EnterMonitor(java_obj_reflections_monitor);
+#endif
+    
+    hep = JSJ_HashTableRawLookup(java_obj_reflections,
+                                 hash_code, java_obj, (void*)jEnv);
+    he = *hep;
+    if (he) {
+        js_wrapper_obj = (JSObject *)he->value;
+        if (js_wrapper_obj)
+            goto done;
+    }
+
+    /* No existing reflection found.  Construct a new one */
+    class_descriptor = jsj_GetJavaClassDescriptor(cx, jEnv, java_class);
+    if (!class_descriptor)
+        goto done;
+    if (class_descriptor->type == JAVA_SIGNATURE_ARRAY) {
+        js_class = &JavaArray_class;
+    } else {
+        PR_ASSERT(class_descriptor->type == JAVA_SIGNATURE_CLASS);
+        js_class = &JavaObject_class;
+    }
+    
+    /* Create new JS object to reflect Java object */
+    js_wrapper_obj = JS_NewObject(cx, js_class, NULL, NULL);
+    if (!js_wrapper_obj)
+        goto done;
+
+    /* Create private, native portion of JavaObject */
+    java_wrapper =
+        (JavaObjectWrapper *)JS_malloc(cx, sizeof(JavaObjectWrapper));
+    if (!java_wrapper) {
+        jsj_ReleaseJavaClassDescriptor(cx, jEnv, class_descriptor);
+        goto done;
+    }
+    JS_SetPrivate(cx, js_wrapper_obj, java_wrapper);
+    java_wrapper->class_descriptor = class_descriptor;
+
+    java_obj = (*jEnv)->NewGlobalRef(jEnv, java_obj);
+    java_wrapper->java_obj = java_obj;
+    if (!java_obj)
+        goto out_of_memory;
+
+    /* Add the JavaObject to the hash table */
+    he = JSJ_HashTableRawAdd(java_obj_reflections, hep, hash_code,
+                             java_obj, js_wrapper_obj, (void*)jEnv);
+    if (!he) {
+        (*jEnv)->DeleteGlobalRef(jEnv, java_obj);
+        goto out_of_memory;
+    } 
+
+done:
+#ifdef JS_THREADSAFE
+        PR_ExitMonitor(java_obj_reflections_monitor);
+#endif
+        
+    return js_wrapper_obj;
+
+out_of_memory:
+    /* No need to free js_wrapper_obj, as it will be finalized by GC. */
+    JS_ReportOutOfMemory(cx);
+    js_wrapper_obj = NULL;
+    goto done;
+}
+
+static void
+remove_java_obj_reflection_from_hashtable(jobject java_obj, JNIEnv *jEnv)
+{
+    JSJHashNumber hash_code;
+    JSJHashEntry *he, **hep;
+
+    hash_code = jsj_HashJavaObject((void*)java_obj, (void*)jEnv);
+
+#ifdef JS_THREADSAFE
+    PR_EnterMonitor(java_obj_reflections_monitor);
+#endif
+
+    hep = JSJ_HashTableRawLookup(java_obj_reflections, hash_code,
+                                 java_obj, (void*)jEnv);
+    he = *hep;
+
+    PR_ASSERT(he);
+    if (he)
+        JSJ_HashTableRawRemove(java_obj_reflections, hep, he, (void*)jEnv);
+
+#ifdef JS_THREADSAFE
+    PR_ExitMonitor(java_obj_reflections_monitor);
+#endif
+}
+
+void
+JavaObject_finalize(JSContext *cx, JSObject *obj)
+{
+    JavaObjectWrapper *java_wrapper;
+    jobject java_obj;
+    JNIEnv *jEnv;
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper)
+        return;
+    java_obj = java_wrapper->java_obj;
+
+    if (java_obj) {
+        remove_java_obj_reflection_from_hashtable(java_obj, jEnv);
+        (*jEnv)->DeleteGlobalRef(jEnv, java_obj);
+    }
+    jsj_ReleaseJavaClassDescriptor(cx, jEnv, java_wrapper->class_descriptor);
+    JS_free(cx, java_wrapper);
+}
+
+/* Trivial helper for jsj_DiscardJavaObjReflections(), below */
+static PRIntn
+enumerate_remove_java_obj(JSJHashEntry *he, PRIntn i, void *arg)
+{
+    JNIEnv *jEnv = (JNIEnv*)arg;
+    jobject java_obj;
+    JavaObjectWrapper *java_wrapper;
+    JSObject *java_wrapper_obj;
+
+    java_wrapper_obj = (JSObject *)he->value;
+    java_wrapper = JS_GetPrivate(NULL, java_wrapper_obj);
+    java_obj = java_wrapper->java_obj;
+    (*jEnv)->DeleteGlobalRef(jEnv, java_obj);
+    java_wrapper->java_obj = NULL;
+    return HT_ENUMERATE_REMOVE;
+}
+
+/* This shutdown routine discards all JNI references to Java objects
+   that have been reflected into JS, even if there are still references
+   to them from JS. */
+void
+jsj_DiscardJavaObjReflections(JNIEnv *jEnv)
+{
+    if (java_obj_reflections) {
+        JSJ_HashTableEnumerateEntries(java_obj_reflections,
+                                      enumerate_remove_java_obj,
+                                      (void*)jEnv);
+        JSJ_HashTableDestroy(java_obj_reflections);
+        java_obj_reflections = NULL;
+    }
+}
+
+PR_CALLBACK JSBool
+JavaObject_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    jobject java_obj;
+    JNIEnv *jEnv;
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+        
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        if (type == JSTYPE_OBJECT) {
+            *vp = OBJECT_TO_JSVAL(obj);
+            return JS_TRUE;
+        }
+        
+        JS_ReportError(cx, "illegal operation on JavaObject prototype object");
+        return JS_FALSE;
+    }
+
+    java_obj = java_wrapper->java_obj;
+    class_descriptor = java_wrapper->class_descriptor;
+
+    switch (type) {
+    case JSTYPE_OBJECT:
+        *vp = OBJECT_TO_JSVAL(obj);
+        return JS_TRUE;
+
+    case JSTYPE_FUNCTION:
+        JS_ReportError(cx, "can't convert Java object to function");
+        return JS_FALSE;
+
+    case JSTYPE_VOID:
+    case JSTYPE_STRING:
+        /* Either extract a C-string from the java.lang.String object
+           or call the Java toString() method */
+        return jsj_ConvertJavaObjectToJSString(cx, jEnv, class_descriptor, java_obj, vp);
+
+    case JSTYPE_NUMBER:
+        /* Call Java doubleValue() method, if applicable */
+        return jsj_ConvertJavaObjectToJSNumber(cx, jEnv, class_descriptor, java_obj, vp);
+
+    case JSTYPE_BOOLEAN:
+        /* Call booleanValue() method, if applicable */
+        return jsj_ConvertJavaObjectToJSBoolean(cx, jEnv, class_descriptor, java_obj, vp);
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+lookup_member_by_id(JSContext *cx, JNIEnv *jEnv, JSObject *obj,
+                    JavaObjectWrapper **java_wrapperp,
+                    jsid id,
+                    JavaMemberDescriptor **member_descriptorp)
+{
+    jsval idval;
+    JavaObjectWrapper *java_wrapper;
+    JavaMemberDescriptor *member_descriptor;
+    const char *member_name, *property_name;
+    JavaClassDescriptor *class_descriptor;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    if (!java_wrapper) {
+        if (JS_IdToValue(cx, id, &idval) && JSVAL_IS_STRING(idval) &&
+            (property_name = JS_GetStringBytes(JSVAL_TO_STRING(idval))) != NULL) {
+            if (!strcmp(property_name, "constructor")) {
+                *java_wrapperp = NULL;
+                *member_descriptorp = NULL;
+                return JS_TRUE;
+            }
+        }
+        JS_ReportError(cx, "illegal operation on JavaObject prototype object");
+        return JS_FALSE;
+    }
+
+    class_descriptor = java_wrapper->class_descriptor;
+    PR_ASSERT(class_descriptor->type == JAVA_SIGNATURE_CLASS ||
+              class_descriptor->type == JAVA_SIGNATURE_ARRAY);
+
+    member_descriptor = jsj_LookupJavaMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (!member_descriptor) {
+        JS_IdToValue(cx, id, &idval);
+        if (!JSVAL_IS_STRING(idval)) {
+            JS_ReportError(cx, "invalid JavaObject property expression. "
+                "(methods and field properties of a JavaObject object can only be strings)");
+            return JS_FALSE;
+        }
+
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+
+        JS_ReportError(cx, "Java class %s has no public instance field or "
+                           "method named \"%s\"",
+                       class_descriptor->name, member_name);
+        return JS_FALSE;
+    }
+
+    /* Success.  Handle the multiple return values */
+    if (java_wrapperp)
+        *java_wrapperp = java_wrapper;
+    if (member_descriptorp)
+        *member_descriptorp = member_descriptor;
+    return JS_TRUE;
+}
+
+PR_CALLBACK JSBool
+JavaObject_getPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jobject java_obj;
+    JavaMemberDescriptor *member_descriptor;
+    JavaObjectWrapper *java_wrapper;
+    JNIEnv *jEnv;
+    JSObject *funobj;
+    jsval field_val, method_val;
+    JSBool success;
+
+    /* printf("In JavaObject_getProperty\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+        
+    if (!lookup_member_by_id(cx, jEnv, obj, &java_wrapper, id, &member_descriptor))
+        return JS_FALSE;
+
+    /* Handle access to "constructor" property of prototype object with
+       silent failure. */
+    if (!member_descriptor) {
+        *vp = JSVAL_VOID;
+        return JS_TRUE;
+    }
+
+    java_obj = java_wrapper->java_obj;
+    field_val = method_val = JSVAL_VOID;
+
+    /* If a field member, get the value of the field */
+    if (member_descriptor->field) {
+        success = jsj_GetJavaFieldValue(cx, jEnv, member_descriptor->field, java_obj, &field_val);
+        if (!success)
+            return JS_FALSE;
+    }
+
+    /* If a method member, build a wrapper around the Java method */
+    if (member_descriptor->methods) {
+        /* Create a function object with this JavaObject as its parent, so that
+           JSFUN_BOUND_METHOD binds it as the default 'this' for the function. */
+        funobj = JS_CloneFunctionObject(cx, member_descriptor->invoke_func_obj, obj);
+        if (!funobj)
+            return JS_FALSE;
+        method_val = OBJECT_TO_JSVAL(funobj);
+    }
+
+#if TEST_JAVAMEMBER
+    /* Always create a JavaMember object, even though it's inefficient */
+    obj = jsj_CreateJavaMember(cx, method_val, field_val);
+    if (!obj)
+        return JS_FALSE;
+    *vp = OBJECT_TO_JSVAL(obj);
+#else   /* !TEST_JAVAMEMBER */
+
+    if (member_descriptor->field) {
+        if (!member_descriptor->methods) {
+            /* Return value of Java field */
+            *vp = field_val;
+        } else {
+            /* Handle special case of access to a property that could refer
+               to either a Java field or a method that share the same name.
+               In Java, such ambiguity is not possible because the compiler 
+               can statically determine which is being accessed. */
+            obj = jsj_CreateJavaMember(cx, method_val, field_val);
+            if (!obj)
+                return JS_FALSE;
+            *vp = OBJECT_TO_JSVAL(obj);
+        }
+
+    } else {
+        /* Return wrapper around Java method */
+        *vp = method_val;
+    }
+
+#endif  /* !TEST_JAVAMEMBER */
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+JavaObject_setPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    jobject java_obj;
+    const char *member_name;
+    JavaObjectWrapper *java_wrapper;
+    JavaClassDescriptor *class_descriptor;
+    JavaMemberDescriptor *member_descriptor;
+    jsval idval;
+    JNIEnv *jEnv;
+
+    /* printf("In JavaObject_setProperty\n"); */
+
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+    
+    if (!lookup_member_by_id(cx, jEnv, obj, &java_wrapper, id, &member_descriptor))
+        return JS_FALSE;
+
+    /* Check for the case where there is a method with the give name, but no field
+       with that name */
+    if (!member_descriptor->field)
+        goto no_such_field;
+
+    /* Silently fail if field value is final (immutable), as required by ECMA spec */
+    if (member_descriptor->field->modifiers & ACC_FINAL)
+        return JS_TRUE;
+    
+    java_obj = java_wrapper->java_obj;
+    return jsj_SetJavaFieldValue(cx, jEnv, member_descriptor->field, java_obj, *vp);
+
+no_such_field:
+        JS_IdToValue(cx, id, &idval);
+        member_name = JS_GetStringBytes(JSVAL_TO_STRING(idval));
+        class_descriptor = java_wrapper->class_descriptor;
+        JS_ReportError(cx, "No instance field named \"%s\" in Java class %s",
+                       member_name, class_descriptor->name);
+        return JS_FALSE;
+}
+
+static JSBool
+JavaObject_lookupProperty(JSContext *cx, JSObject *obj, jsid id,
+                         JSObject **objp, JSProperty **propp
+#if defined JS_THREADSAFE && defined DEBUG
+                            , const char *file, uintN line
+#endif
+                            )
+{
+    JNIEnv *jEnv;
+    JSErrorReporter old_reporter;
+
+    /* printf("In JavaObject_lookupProperty()\n"); */
+    
+    /* Get the Java per-thread environment pointer for this JSContext */
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    old_reporter = JS_SetErrorReporter(cx, NULL);
+    if (lookup_member_by_id(cx, jEnv, obj, NULL, id, NULL)) {
+        *objp = obj;
+        *propp = (JSProperty*)1;
+    } else {
+        *objp = NULL;
+        *propp = NULL;
+    }
+
+    JS_SetErrorReporter(cx, old_reporter);
+    return JS_TRUE;
+}
+
+static JSBool
+JavaObject_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
+                         JSPropertyOp getter, JSPropertyOp setter,
+                         uintN attrs, JSProperty **propp)
+{
+    JS_ReportError(cx, "Cannot define a new property in a JavaObject");
+    return JS_FALSE;
+}
+
+static JSBool
+JavaObject_getAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    *attrsp = JSPROP_PERMANENT|JSPROP_ENUMERATE;
+    return JS_FALSE;
+}
+
+static JSBool
+JavaObject_setAttributes(JSContext *cx, JSObject *obj, jsid id,
+                        JSProperty *prop, uintN *attrsp)
+{
+    /* We don't maintain JS property attributes for Java class members */
+    if (*attrsp != (JSPROP_PERMANENT|JSPROP_ENUMERATE)) {
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Silently ignore all setAttribute attempts */
+    return JS_TRUE;
+}
+
+static JSBool
+JavaObject_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    JSVersion version = JS_GetVersion(cx);
+    
+    *vp = JSVAL_FALSE;
+
+    if (!JSVERSION_IS_ECMA(version)) {
+        JS_ReportError(cx, "Properties of JavaObject objects may not be deleted");
+        return JS_FALSE;
+    } else {
+        /* Attempts to delete permanent properties are silently ignored
+           by ECMAScript. */
+        return JS_TRUE;
+    }
+}
+
+static JSBool
+JavaObject_defaultValue(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    /* printf("In JavaObject_defaultValue()\n"); */
+    return JavaObject_convert(cx, obj, type, vp);
+}
+
+static JSBool
+JavaObject_newEnumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
+                        jsval *statep, jsid *idp)
+{
+    JavaObjectWrapper *java_wrapper;
+    JavaMemberDescriptor *member_descriptor;
+    JavaClassDescriptor *class_descriptor;
+    JNIEnv *jEnv;
+
+    java_wrapper = JS_GetPrivate(cx, obj);
+    /* Check for prototype object */
+    if (!java_wrapper) {
+        *statep = JSVAL_NULL;
+        if (idp)
+            *idp = INT_TO_JSVAL(0);
+        return JS_TRUE;
+    }
+
+    class_descriptor = java_wrapper->class_descriptor;
+
+    switch(enum_op) {
+    case JSENUMERATE_INIT:
+        
+        /* Get the Java per-thread environment pointer for this JSContext */
+        jsj_MapJSContextToJSJThread(cx, &jEnv);
+        if (!jEnv)
+            return JS_FALSE;
+
+        member_descriptor = jsj_GetClassInstanceMembers(cx, jEnv, class_descriptor);
+        *statep = PRIVATE_TO_JSVAL(member_descriptor);
+        if (idp)
+            *idp = INT_TO_JSVAL(class_descriptor->num_instance_members);
+        return JS_TRUE;
+        
+    case JSENUMERATE_NEXT:
+        member_descriptor = JSVAL_TO_PRIVATE(*statep);
+        if (member_descriptor) {
+            *idp = member_descriptor->id;
+            *statep = PRIVATE_TO_JSVAL(member_descriptor->next);
+            return JS_TRUE;
+        }
+
+        /* Fall through ... */
+
+    case JSENUMERATE_DESTROY:
+        *statep = JSVAL_NULL;
+        return JS_TRUE;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+
+static JSBool
+JavaObject_checkAccess(JSContext *cx, JSObject *obj, jsid id,
+                      JSAccessMode mode, jsval *vp, uintN *attrsp)
+{
+    switch (mode) {
+    case JSACC_WATCH:
+        JS_ReportError(cx, "Cannot place watchpoints on JavaObject object properties");
+        return JS_FALSE;
+
+    case JSACC_IMPORT:
+        JS_ReportError(cx, "Cannot export a JavaObject object's properties");
+        return JS_FALSE;
+
+    default:
+        return JS_TRUE;
+    }
+}
+
+JSObjectOps JavaObject_ops = {
+    /* Mandatory non-null function pointer members. */
+    NULL,                       /* newObjectMap */
+    NULL,                       /* destroyObjectMap */
+    JavaObject_lookupProperty,
+    JavaObject_defineProperty,
+    JavaObject_getPropertyById, /* getProperty */
+    JavaObject_setPropertyById, /* setProperty */
+    JavaObject_getAttributes,
+    JavaObject_setAttributes,
+    JavaObject_deleteProperty,
+    JavaObject_defaultValue,
+    JavaObject_newEnumerate,
+    JavaObject_checkAccess,
+
+    /* Optionally non-null members start here. */
+    NULL,                       /* thisObject */
+    NULL,                       /* dropProperty */
+    NULL,                       /* call */
+    NULL,                       /* construct */
+    NULL,                       /* xdrObject */
+    NULL,                       /* hasInstance */
+};
+
+static JSObjectOps *
+JavaObject_getObjectOps(JSContext *cx, JSClass *clazz)
+{
+    return &JavaObject_ops;
+}
+
+JSClass JavaObject_class = {
+    "JavaObject", JSCLASS_HAS_PRIVATE,
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, JavaObject_convert, JavaObject_finalize,
+    JavaObject_getObjectOps,
+};
+
+extern PR_IMPORT_DATA(JSObjectOps) js_ObjectOps;
+
+
+JSBool
+jsj_init_JavaObject(JSContext *cx, JSObject *global_obj)
+{
+    JavaObject_ops.newObjectMap = js_ObjectOps.newObjectMap;
+    JavaObject_ops.destroyObjectMap = js_ObjectOps.destroyObjectMap;
+
+    if (!JS_InitClass(cx, global_obj, 
+        0, &JavaObject_class, 0, 0,
+        0, 0,
+        0, 0))
+        return JS_FALSE;
+
+    return init_java_obj_reflections_table();
+}

mozilla/js/src/liveconnect/jsj_JavaPackage.c

@@ -0,0 +1,500 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the native code implementation of the JavaPackage class.
+ *
+ * A JavaPackage is JavaScript's representation of a Java package.  The
+ * JavaPackage object contains only a string, which is the path to the package,
+ * e.g. "java/lang".  The JS properties of a JavaPackage are either nested packages
+ * or a JavaClass object, which represents the path to a Java class.
+ *
+ * Note that there is no equivalent to a JavaPackage object in Java.  Example:
+ * Although there are instances of java.lang.String and there are static methods
+ * of java.lang.String that can be invoked, there's no such thing as a java.lang
+ * object in Java that exists at run time.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"        /* LiveConnect internals */
+#include "jsjava.h"
+
+
+JSClass JavaPackage_class;      /* Forward declaration */
+
+/*
+ * The native part of a JavaPackage object.  It gets stored in the object's
+ * private slot.
+ */
+typedef struct {
+    const char * path;          /* e.g. "java/lang" or NULL if top level package */
+    int flags;                  /* e.g. PKG_SYSTEM, PKG_CLASS */
+} JavaPackage_Private;
+
+static JSObject *
+define_JavaPackage(JSContext *cx, JSObject *parent_obj,
+                   const char *obj_name, const char *path, int flags)
+{
+    JSObject *package_obj;
+    JavaPackage_Private *package;
+
+    package_obj = JS_DefineObject(cx, parent_obj, obj_name, &JavaPackage_class, 0,
+                                  JSPROP_PERMANENT | JSPROP_READONLY);
+    if (!package_obj)
+        return NULL;
+    
+    /* Attach private, native data to the JS object */
+    package = (JavaPackage_Private *)JS_malloc(cx, sizeof(JavaPackage_Private));
+    JS_SetPrivate(cx, package_obj, (void *)package);
+    if (path)
+        package->path = JS_strdup(cx, path);
+    else
+        package->path = "";
+
+    package->flags = flags;
+
+    /* Check for OOM */
+    if (!package->path) {
+        JS_DeleteProperty(cx, parent_obj, obj_name);
+        JS_free(cx, package);
+        return NULL;
+    }
+
+    return package_obj;
+}
+
+/* JavaPackage uses standard JS getProperty */
+
+/*
+ * Don't allow user-defined properties to be set on Java package objects, e.g.
+ * it is illegal to write "java.lang.myProperty = 4".  We probably could relax
+ * this restriction, but it's potentially confusing and not clearly useful.
+ */
+static JSBool
+JavaPackage_setProperty(JSContext *cx, JSObject *obj, jsval slot, jsval *vp)
+{
+    JavaPackage_Private *package = JS_GetPrivate(cx, obj);
+    if (!package) {
+        JS_ReportError(cx, "illegal attempt to add property to "
+                           "JavaPackage prototype object");
+        return JS_FALSE;
+    }
+    JS_ReportError(cx, "You may not add properties to a JavaPackage object");
+    return JS_FALSE;
+}
+
+static JSBool quiet_resolve_failure;
+
+/*
+ * Resolve a component name to be either the name of a class or a package.
+ */
+static JSBool
+JavaPackage_resolve(JSContext *cx, JSObject *obj, jsval id)
+{
+    JavaPackage_Private *package;
+    JSBool ok = JS_TRUE;
+    jclass jclazz;
+    char *subPath, *newPath;
+    const char *path;
+    JNIEnv *jEnv;
+
+    package = (JavaPackage_Private *)JS_GetPrivate(cx, obj);
+    if (!package)
+        return JS_TRUE;
+
+    if (!JSVAL_IS_STRING(id))
+        return JS_TRUE;
+    subPath = JS_GetStringBytes(JSVAL_TO_STRING(id));
+
+    /*
+     * There will be an attempt to invoke the toString() method when producing
+     * the string representation of a JavaPackage.  When this occurs, avoid
+     * creating a bogus toString package.  (This means that no one can ever
+     * create a package with the simple name "toString", but we'll live with
+     * that limitation.)
+     */
+    if (!strcmp(subPath, "toString"))
+        return JS_FALSE;
+
+    path = package->path;
+    newPath = PR_smprintf("%s%s%s", path, (path[0] ? "/" : ""), subPath);
+    if (!newPath) {
+        JS_ReportOutOfMemory(cx);
+        return JS_FALSE;
+    }
+
+    jsj_MapJSContextToJSJThread(cx, &jEnv);
+    if (!jEnv)
+        return JS_FALSE;
+
+    /*
+        Unfortunately, Java provides no way to find out whether a particular
+        name is a package or not.  The only way to tell is to try to load the
+        name as a class file and, if that fails, assume it's a package.  This
+        makes things work as expected for the most part, but it has three
+        noticeable problems that keep coming up:
+
+        - You can refer to a package like java.lang.i.buried.paul without
+          generating a complaint.  Of course, you'll never be able to refer to
+          any classes through it.
+
+        - An annoying consequence of the above is that misspelling a class name
+          results in a cryptic error about packages.
+
+        - In a browser context, i.e. where applets are involved, figuring out
+          whether something is a class may require looking for it over the net
+          using the current classloader.  This means that the first time you
+          refer to java.lang.System in a js context, there will be an attempt
+          to search for [[DOCBASE]]/java.class on the server.
+    
+        A solution is to explicitly tell jsjava the names of all the (local)
+        packages on the CLASSPATH.  (Not implemented yet.)
+
+    */
+    jclazz = (*jEnv)->FindClass(jEnv, newPath);
+    if (jclazz) {
+        JSObject *newClass;
+
+        newClass = jsj_define_JavaClass(cx, jEnv, obj, subPath, jclazz);
+        if (!newClass) {
+            ok = JS_FALSE;
+            goto out;
+        }
+    } else {
+
+        /* We assume that any failed attempt to load a class is because it
+           doesn't exist.  If we wanted to do a better job, we would check
+           the exception type and make sure that it's NoClassDefFoundError */
+        (*jEnv)->ExceptionClear(jEnv);
+
+        /* beard: this has to be done here, so built-in classes will be defined. */
+        /* Painful hack for pre_define_java_packages() */
+        if (quiet_resolve_failure) {
+            ok = JS_FALSE;
+            goto out;
+        }
+
+        /*
+         * If there's no class of the given name, then we must be referring to
+         * a package.  However, don't allow bogus sub-packages of pre-defined
+         * system packages to be created.
+         */
+        if (JS_InstanceOf(cx, obj, &JavaPackage_class, NULL)) {
+            JavaPackage_Private *package;
+
+            package = JS_GetPrivate(cx, obj);
+            if (package->flags & PKG_SYSTEM) {
+                char *msg, *cp;
+
+                msg = PR_smprintf("No Java system package with name \"%s\" was identified "
+                                  "and no Java class with that name exists either",
+                                  newPath);
+
+                /* Check for OOM */
+                if (msg) {
+                    /* Convert package of form "java/lang" to "java.lang" */
+                    for (cp = msg; *cp != '\0'; cp++)
+                        if (*cp == '/')
+                            *cp = '.';
+                    JS_ReportError(cx, msg);
+                    free((char*)msg);
+                }
+                               
+                ok = JS_FALSE;
+                goto out;
+            }
+        }
+
+        if (!define_JavaPackage(cx, obj, subPath, newPath, 0)) {
+            ok = JS_FALSE;
+            goto out;
+        }
+        
+#ifdef DEBUG
+        /* printf("JavaPackage \'%s\' created\n", newPath); */
+#endif
+
+    }
+    
+out:
+    free(newPath);
+    return ok;
+}
+
+static JSBool
+JavaPackage_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
+{
+    JSString *str;
+    char *name, *cp;
+
+    JavaPackage_Private *package = JS_GetPrivate(cx, obj);
+    if (!package) {
+        fprintf(stderr, "JavaPackage_resolve: no private data!\n");
+        return JS_FALSE;
+    }
+
+    switch (type) {
+
+    /* Pretty-printing of JavaPackage */
+    case JSTYPE_VOID:   /* Default value */
+    case JSTYPE_NUMBER:
+    case JSTYPE_STRING:
+        /* Convert '/' to '.' so that it looks like Java language syntax. */
+        if (!package->path)
+            break;
+        name = PR_smprintf("[JavaPackage %s]", package->path);
+        if (!name) {
+            JS_ReportOutOfMemory(cx);
+            return JS_FALSE;
+        }
+        for (cp = name; *cp != '\0'; cp++)
+            if (*cp == '/')
+                *cp = '.';
+        str = JS_NewString(cx, name, strlen(name));
+        if (!str) {
+            free(name);
+            /* It's not necessary to call JS_ReportOutOfMemory(), as
+               JS_NewString() will do so on failure. */
+            return JS_FALSE;
+        }
+
+        *vp = STRING_TO_JSVAL(str);
+        break;
+
+    case JSTYPE_OBJECT:
+        *vp = OBJECT_TO_JSVAL(obj);
+        break;
+
+    default:
+        break;
+    }
+    return JS_TRUE;
+}
+
+/*
+ * Free the private native data associated with the JavaPackage object.
+ */
+static void
+JavaPackage_finalize(JSContext *cx, JSObject *obj)
+{
+    JavaPackage_Private *package = JS_GetPrivate(cx, obj);
+    if (!package)
+        return;
+
+    if (package->path)
+        JS_free(cx, (char *)package->path);
+    JS_free(cx, package);
+}
+
+/*
+ * The definition of the JavaPackage class
+ */
+JSClass JavaPackage_class = {
+    "JavaPackage", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JavaPackage_setProperty,
+    JS_EnumerateStub, JavaPackage_resolve,
+    JavaPackage_convert, JavaPackage_finalize
+};
+
+JavaPackageDef
+standard_java_packages[] = {
+    {"java",                NULL,   PKG_USER},
+    {"java.applet",         NULL,   PKG_USER},
+    {"java.awt",            NULL,   PKG_USER},
+    {"java.awt.datatransfer",
+                            NULL,   PKG_SYSTEM},
+    {"java.awt.event",      NULL,   PKG_SYSTEM},
+    {"java.awt.image",      NULL,   PKG_SYSTEM},
+    {"java.awt.peer",       NULL,   PKG_SYSTEM},
+    {"java.beans",          NULL,   PKG_USER},
+    {"java.io",             NULL,   PKG_SYSTEM},
+    {"java.lang",           NULL,   PKG_USER},
+    {"java.lang.reflect",   NULL,   PKG_SYSTEM},
+    {"java.math",           NULL,   PKG_SYSTEM},
+    {"java.net",            NULL,   PKG_USER},
+    {"java.rmi",            NULL,   PKG_USER},
+    {"java.rmi.dgc",        NULL,   PKG_USER},
+    {"java.rmi.user",       NULL,   PKG_USER},
+    {"java.rmi.registry",   NULL,   PKG_USER},
+    {"java.rmi.server",     NULL,   PKG_USER},
+    {"java.security",       NULL,   PKG_USER},
+    {"java.security.acl",   NULL,   PKG_SYSTEM},
+    {"java.security.interfaces",
+                            NULL,   PKG_SYSTEM},
+    {"java.sql",            NULL,   PKG_USER},
+    {"java.text",           NULL,   PKG_USER},
+    {"java.text.resources", NULL,   PKG_SYSTEM},
+    {"java.util",           NULL,   PKG_USER},
+    {"java.util.zip",       NULL,   PKG_SYSTEM},
+
+    {"netscape",            NULL,   PKG_USER},
+    {"netscape.applet",     NULL,   PKG_SYSTEM},
+    {"netscape.application",NULL,   PKG_SYSTEM},
+    {"netscape.debug",      NULL,   PKG_SYSTEM},
+    {"netscape.javascript", NULL,   PKG_SYSTEM},
+    {"netscape.ldap",       NULL,   PKG_SYSTEM},
+    {"netscape.misc",       NULL,   PKG_SYSTEM},
+    {"netscape.net",        NULL,   PKG_SYSTEM},
+    {"netscape.plugin",     NULL,   PKG_SYSTEM},
+    {"netscape.util",       NULL,   PKG_SYSTEM},
+    {"netscape.secfile",    NULL,   PKG_SYSTEM},
+    {"netscape.security",   NULL,   PKG_SYSTEM},
+    {"netscape.WAI",        NULL,   PKG_SYSTEM},
+
+    {"sun",                 NULL,   PKG_USER},
+    {"Packages",            "",     PKG_USER},
+
+    {NULL,                  NULL,   0}
+};
+
+/*
+ * Pre-define a hierarchy of JavaPackage objects.
+ * Pre-defining a Java package at initialization time is not necessary, but
+ * it will make package lookup faster and, more importantly, will avoid
+ * unnecessary network accesses if classes are being loaded over the network.
+ */
+static JSBool
+pre_define_java_packages(JSContext *cx, JSObject *global_obj,
+                         JavaPackageDef *predefined_packages)
+{
+    JSBool package_exists;
+    JSObject *parent_obj;
+    JavaPackageDef *package_def;
+    char *simple_name, *cp, *package_name, *path;
+    int flags;
+
+    if (!predefined_packages)
+        return JS_TRUE;
+
+    /* Iterate over all pre-defined Java packages */
+    for (package_def = predefined_packages; package_def->name; package_def++) {
+        package_name = path = NULL;
+
+        parent_obj = global_obj;
+        package_name = strdup(package_def->name);
+        if (!package_name)
+            goto out_of_memory;
+
+        /* Walk the chain of JavaPackage objects to get to the parent of the
+           rightmost sub-package in the fully-qualified package name. */
+        for (simple_name = strtok(package_name, "."); 1; simple_name = strtok(NULL, ".")) {
+            jsval v;
+
+            if (!simple_name) {
+                JS_ReportError(cx, "Package %s defined twice ?", package_name);
+                goto error;
+            }
+
+            /* Check to see if the sub-package already exists */
+            quiet_resolve_failure = JS_TRUE;
+            package_exists = JS_LookupProperty(cx, parent_obj, simple_name, &v) && JSVAL_IS_OBJECT(v);
+            quiet_resolve_failure = JS_FALSE;
+
+            if (package_exists) {
+                    parent_obj = JSVAL_TO_OBJECT(v);
+                    continue;
+            } else {
+                /* New package objects should only be created at the terminal
+                   sub-package in a fully-qualified package-name */
+                if (strtok(NULL, ".")) {
+                    JS_ReportError(cx, "Illegal predefined package definition for %s",
+                                   package_def->name);
+                    goto error;
+                }
+                
+                if (package_def->path) {
+                    path = strdup(package_def->path);
+                    if (!path)
+                        goto out_of_memory;
+                } else {
+
+                    /*
+                     * The default path is specified, so create it from the
+                     * fully-qualified package name.
+                     */
+                    path = strdup(package_def->name);
+                    if (!path)
+                        goto out_of_memory;
+                    /* Transform package name, e.g. "java.lang" ==> "java/lang" */
+                    for (cp = path; *cp != '\0'; cp++) {
+                        if (*cp == '.')
+                             *cp = '/';
+                    }
+                }
+                flags = package_def->flags;
+                parent_obj = define_JavaPackage(cx, parent_obj, simple_name, path, flags);
+                if (!parent_obj)
+                    goto error;
+     
+                free(path);
+                break;
+            }
+        }
+        free(package_name);
+    }
+    return JS_TRUE;
+
+out_of_memory:
+    JS_ReportOutOfMemory(cx);
+
+error:
+    JS_FREE_IF(cx, package_name);
+    JS_FREE_IF(cx, path);
+    return JS_FALSE;
+}
+
+static JSBool
+JavaPackage_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
+                 jsval *rval)
+{
+    if (!JS_InstanceOf(cx, obj, &JavaPackage_class, argv))
+        return JS_FALSE;
+    return JavaPackage_convert(cx, obj, JSTYPE_STRING, rval);
+}
+
+static JSFunctionSpec JavaPackage_methods[] = {
+    {"toString",   JavaPackage_toString,        0},
+    {0}
+};
+
+/*
+ * One-time initialization for the JavaPackage class.  (This is not
+ * run once per thread, rather it's run once for a given JSContext.)
+ */
+JSBool
+jsj_init_JavaPackage(JSContext *cx, JSObject *global_obj,
+                     JavaPackageDef *additional_predefined_packages) {
+
+    /* Define JavaPackage class */
+    if (!JS_InitClass(cx, global_obj, 0, &JavaPackage_class,
+                      0, 0, 0, JavaPackage_methods, 0, 0))
+        return JS_FALSE;
+
+    /* Add top-level packages, e.g. : java, netscape, sun */
+    if (!pre_define_java_packages(cx, global_obj, standard_java_packages))
+        return JS_FALSE;
+    if (!pre_define_java_packages(cx, global_obj, additional_predefined_packages))
+        return JS_FALSE;
+    
+    return JS_TRUE;
+}

mozilla/js/src/liveconnect/jsj_array.c

@@ -0,0 +1,180 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the code for reading and writing elements of a Java array.
+ */
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/*
+ * Read the Java value at a given index into a Java array and convert it
+ * to a JS value.  The array_component_signature describes the type of
+ * the resulting Java value, which can be a primitive type or an object type.
+ * More specifically it can be an array type in the case of multidimensional
+ * arrays.
+ */
+JSBool
+jsj_GetJavaArrayElement(JSContext *cx, JNIEnv *jEnv, jarray java_array, jsize index,
+                        JavaSignature *array_component_signature,
+                        jsval *vp)
+{
+    jvalue java_value;
+    JavaSignatureChar component_type;
+
+#define GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Type,member)                   \
+    (*jEnv)->Get##Type##ArrayRegion(jEnv, java_array, index, 1,              \
+                                    &java_value.member);                     \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_ReportJavaError(cx, jEnv, "Error reading element of "            \
+                                      "Java primitive array");               \
+        return JS_FALSE;                                                     \
+    }
+
+    component_type = array_component_signature->type;
+    switch(component_type) {
+    case JAVA_SIGNATURE_BYTE:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        java_value.l = (*jEnv)->GetObjectArrayElement(jEnv, java_array, index);
+        if ((*jEnv)->ExceptionOccurred(jEnv)) {
+            jsj_ReportJavaError(cx, jEnv, "Error reading Java object array");
+            return JS_FALSE;
+        }
+        break;
+
+#undef GET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+
+    return jsj_ConvertJavaValueToJSValue(cx, jEnv, array_component_signature, &java_value, vp);
+}
+
+JSBool
+jsj_SetJavaArrayElement(JSContext *cx, JNIEnv *jEnv, jarray java_array, jsize index,
+                        JavaSignature *array_component_signature,
+                        jsval js_val)
+{
+    int dummy_cost;
+    jvalue java_value;
+    JavaSignatureChar component_type;
+    JSBool is_local_ref;
+
+    if (!jsj_ConvertJSValueToJavaValue(cx, jEnv, js_val, array_component_signature,
+                                       &dummy_cost, &java_value, &is_local_ref))
+        return JS_FALSE;
+
+#define SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Type,member)                   \
+    (*jEnv)->Set##Type##ArrayRegion(jEnv, java_array, index, 1,              \
+                                    &java_value.member);                     \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_ReportJavaError(cx, jEnv, "Error assigning to element of "       \
+                                      "Java primitive array");               \
+        return JS_FALSE;                                                     \
+    }
+
+    component_type = array_component_signature->type;
+    switch(component_type) {
+    case JAVA_SIGNATURE_BYTE:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        (*jEnv)->SetObjectArrayElement(jEnv, java_array, index, java_value.l);
+        if (is_local_ref)                                                           \
+            (*jEnv)->DeleteLocalRef(jEnv, java_value.l);
+        if ((*jEnv)->ExceptionOccurred(jEnv)) {
+            jsj_ReportJavaError(cx, jEnv, "Error assigning to Java object array");
+            return JS_FALSE;
+        }
+        break;
+
+#undef SET_ELEMENT_FROM_PRIMITIVE_JAVA_ARRAY
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+
+    return JS_TRUE;
+}
+

mozilla/js/src/liveconnect/jsj_class.c

@@ -0,0 +1,605 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the code that constructs and manipulates JavaClassDescriptor
+ * structs, which are the native wrappers for Java classes.
+ * JavaClassDescriptors are used to describe the signatures of methods and
+ * fields.  There is a JavaClassDescriptor associated with the reflection of
+ * each Java Object.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"        /* LiveConnect internals */
+#include "jsj_hash.h"           /* Hash tables */
+
+/* A one-to-one mapping between all referenced java.lang.Class objects and
+   their corresponding JavaClassDescriptor objects */
+static JSJHashTable *java_class_reflections;
+
+/*
+ * Given a JVM handle to a java.lang.Class object, malloc a C-string
+ * containing the UTF8 encoding of the fully qualified name of the class.
+ * It's the caller's responsibility to free the returned string.
+ *
+ * If an error occurs, NULL is returned and the error reporter called.
+ */
+const char *
+jsj_GetJavaClassName(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    jstring java_class_name_jstr;
+    const char *java_class_name;
+
+    /* Get java.lang.String object containing class name */
+    java_class_name_jstr =
+        (*jEnv)->CallObjectMethod(jEnv, java_class, jlClass_getName);
+
+
+    if (!java_class_name_jstr)
+        goto error;
+
+    /* Convert to UTF8 encoding and copy */
+    java_class_name = jsj_DupJavaStringUTF(cx, jEnv, java_class_name_jstr);
+    if (!java_class_name)
+        return NULL;
+
+    return java_class_name;
+
+error:
+    jsj_UnexpectedJavaError(cx, jEnv, "Can't get Java class name using"
+                                      "java.lang.Class.getName()");
+    return NULL;
+}
+
+/*
+ * Convert in-place a string of the form "java.lang.String" into "java/lang/String".
+ * Though the former style is conventionally used by Java programmers, the latter is
+ * what the JNI functions require.
+ */
+void
+jsj_MakeJNIClassname(char * class_name)
+{
+    char * c;
+    for (c = class_name; *c; c++)
+        if (*c == '.')
+            *c = '/';
+}
+
+/*
+ * Classify an instance of java.lang.Class as either one of the primitive
+ * types, e.g. int, char, etc., as an array type or as a non-array object type
+ * (subclass of java.lang.Object) by returning the appropriate enum member.
+ *
+ */
+static JavaSignatureChar
+get_signature_type(JSContext *cx, JavaClassDescriptor *class_descriptor)
+{
+    JavaSignatureChar type;
+    const char *java_class_name;
+
+    /* Get UTF8 encoding of class name */
+    java_class_name = class_descriptor->name;
+    PR_ASSERT(java_class_name);
+    if (!java_class_name)
+        return JAVA_SIGNATURE_UNKNOWN;
+
+    if (!strcmp(java_class_name, "byte"))
+        type = JAVA_SIGNATURE_BYTE;
+    else if (!strcmp(java_class_name, "char"))
+        type = JAVA_SIGNATURE_CHAR;
+    else if (!strcmp(java_class_name, "float"))
+        type = JAVA_SIGNATURE_FLOAT;
+    else if (!strcmp(java_class_name, "double"))
+        type = JAVA_SIGNATURE_DOUBLE;
+    else if (!strcmp(java_class_name, "int"))
+        type = JAVA_SIGNATURE_INT;
+    else if (!strcmp(java_class_name, "long"))
+        type = JAVA_SIGNATURE_LONG;
+    else if (!strcmp(java_class_name, "short"))
+        type = JAVA_SIGNATURE_SHORT;
+    else if (!strcmp(java_class_name, "boolean"))
+        type = JAVA_SIGNATURE_BOOLEAN;
+    else if (!strcmp(java_class_name, "void"))
+        type = JAVA_SIGNATURE_VOID;
+    else
+        /* Well, I guess it's a Java class, then. */
+        type = JAVA_SIGNATURE_CLASS;
+    
+    return type;
+}
+
+static JSBool
+is_java_array_class(JNIEnv *jEnv, jclass java_class)
+{
+    return (*jEnv)->CallBooleanMethod(jEnv, java_class, jlClass_isArray);
+}
+
+/*
+ * Return the class of a Java array's component type.  This is not the same
+ * as the array's element type.  For example, the component type of an array
+ * of type SomeType[][][] is SomeType[][], but its element type is SomeType.
+ *
+ * If an error occurs, NULL is returned and an error reported.
+ */
+static jclass
+get_java_array_component_class(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    jclass result;
+    result = (*jEnv)->CallObjectMethod(jEnv, java_class, jlClass_getComponentType);
+    if (!result) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Can't get Java array component class using "
+                                "java.lang.Class.getComponentType()");
+        return NULL;
+    }
+    return result;
+}
+
+/*
+ * Given a Java class, fill in the signature structure that describes the class.
+ * If an error occurs, JS_FALSE is returned and the error reporter called.
+ */
+static JSBool
+compute_java_class_signature(JSContext *cx, JNIEnv *jEnv, JavaSignature *signature)
+{
+    jclass java_class = signature->java_class;
+
+    if (is_java_array_class(jEnv, java_class)) {
+        jclass component_class;
+        
+        signature->type = JAVA_SIGNATURE_ARRAY;
+
+        component_class = get_java_array_component_class(cx, jEnv, java_class);
+        if (!component_class)
+            return JS_FALSE;
+
+        signature->array_component_signature =
+            jsj_GetJavaClassDescriptor(cx, jEnv, component_class);
+        if (!signature->array_component_signature)
+            return JS_FALSE;
+    } else {
+        signature->type = get_signature_type(cx, signature);
+    }
+    return JS_TRUE;
+}
+
+/*
+ * Convert a JavaSignature object into a string format as used by
+ * the JNI functions, e.g. java.lang.Object ==> "Ljava/lang/Object;"
+ * The caller is responsible for freeing the resulting string.
+ *
+ * If an error is encountered, NULL is returned and an error reported.
+ */
+const char *
+jsj_ConvertJavaSignatureToString(JSContext *cx, JavaSignature *signature)
+{
+    char *sig;
+
+    if (signature->type == JAVA_SIGNATURE_CLASS) {
+        /* A non-array object class */
+        sig = PR_smprintf("L%s;", signature->name);
+        if (sig)
+            jsj_MakeJNIClassname(sig);
+
+    } else if (signature->type == JAVA_SIGNATURE_ARRAY) {
+        /* An array class */
+        const char *component_signature_string;
+
+        component_signature_string =
+            jsj_ConvertJavaSignatureToString(cx, signature->array_component_signature);
+        if (!component_signature_string)
+            return NULL;
+        sig = PR_smprintf("[%s", component_signature_string);
+        JS_free(cx, (char*)component_signature_string);
+
+    } else {
+        /* A primitive class */
+        sig = PR_smprintf("%c", (char)signature->type);
+    }
+
+    if (!sig) {
+        JS_ReportOutOfMemory(cx);
+        return NULL;
+    }
+    return sig;
+}
+
+/*
+ * Convert a JavaSignature object into a human-readable string format as seen
+ * in Java source files, e.g. "byte", or "int[][]" or "java.lang.String".
+ * The caller is responsible for freeing the resulting string.
+ *
+ * If an error is encountered, NULL is returned and an error reported.
+ */
+const char *
+jsj_ConvertJavaSignatureToHRString(JSContext *cx,
+                                   JavaSignature *signature)
+{
+    char *sig;
+    JavaSignature *acs;
+
+    if (signature->type == JAVA_SIGNATURE_ARRAY) {
+        /* An array class */
+        const char *component_signature_string;
+        acs = signature->array_component_signature;
+        component_signature_string =
+            jsj_ConvertJavaSignatureToHRString(cx, acs);
+        if (!component_signature_string)
+            return NULL;
+        sig = PR_smprintf("%s[]", component_signature_string);
+        JS_free(cx, (char*)component_signature_string);
+
+    } else {
+        /* A primitive class or a non-array object class */
+        sig = JS_strdup(cx, signature->name);
+    }
+
+    if (!sig) {
+        JS_ReportOutOfMemory(cx);
+        return NULL;
+    }
+    return sig;
+}
+
+static void
+destroy_java_member_descriptor(JSContext *cx, JNIEnv *jEnv, JavaMemberDescriptor *member_descriptor)
+{
+    JavaMethodSpec *method, *next_method;
+    if (member_descriptor->field)
+        jsj_DestroyFieldSpec(cx, jEnv, member_descriptor->field);
+
+    method = member_descriptor->methods;
+    while (method) {
+        next_method = method->next;
+        jsj_DestroyMethodSpec(cx, jEnv, method);
+        method = next_method;
+    }
+
+    if (member_descriptor->invoke_func_obj)
+        JS_RemoveRoot(cx, &member_descriptor->invoke_func_obj);
+}
+
+static void
+destroy_class_member_descriptors(JSContext *cx, JNIEnv *jEnv, JavaMemberDescriptor *member_descriptor)
+{
+    JavaMemberDescriptor *next_member;
+    
+    while (member_descriptor) {
+        next_member = member_descriptor->next;
+        destroy_java_member_descriptor(cx, jEnv, member_descriptor);
+        member_descriptor = next_member;
+    }
+}
+
+static void
+destroy_class_descriptor(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor)
+{
+    JS_FREE_IF(cx, (char *)class_descriptor->name);
+    if (class_descriptor->java_class) {
+        JSJ_HashTableRemove(java_class_reflections,
+                            class_descriptor->java_class, (void*)jEnv);
+        (*jEnv)->DeleteGlobalRef(jEnv, class_descriptor->java_class);
+    }
+
+    if (class_descriptor->array_component_signature)
+        jsj_ReleaseJavaClassDescriptor(cx, jEnv, class_descriptor->array_component_signature);
+
+    destroy_class_member_descriptors(cx, jEnv, class_descriptor->instance_members);
+    destroy_class_member_descriptors(cx, jEnv, class_descriptor->static_members);
+    destroy_class_member_descriptors(cx, jEnv, class_descriptor->constructors);
+    JS_free(cx, class_descriptor);
+}
+
+static JavaClassDescriptor *
+new_class_descriptor(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    JavaClassDescriptor *class_descriptor;
+
+    class_descriptor = (JavaClassDescriptor *)JS_malloc(cx, sizeof(JavaClassDescriptor));
+    if (!class_descriptor)
+        return NULL;
+    memset(class_descriptor, 0, sizeof(JavaClassDescriptor));
+
+    class_descriptor->name = jsj_GetJavaClassName(cx, jEnv, java_class);
+    if (!class_descriptor->name)
+        goto error;
+
+    java_class = (*jEnv)->NewGlobalRef(jEnv, java_class);
+    if (!java_class) {
+        jsj_UnexpectedJavaError(cx, jEnv, "Unable to reference Java class");
+        goto error;
+    }
+    class_descriptor->java_class = java_class;
+
+    if (!compute_java_class_signature(cx, jEnv, class_descriptor))
+        goto error;
+
+    class_descriptor->modifiers =
+        (*jEnv)->CallIntMethod(jEnv, java_class, jlClass_getModifiers);
+    class_descriptor->ref_count = 1;
+
+    if (!JSJ_HashTableAdd(java_class_reflections, java_class, class_descriptor,
+                          (void*)jEnv))
+        goto error;
+
+    return class_descriptor;
+
+error:
+    destroy_class_descriptor(cx, jEnv, class_descriptor);
+    return NULL;
+}
+
+/* Trivial helper for jsj_DiscardJavaClassReflections(), below */
+static PRIntn
+enumerate_remove_java_class(JSJHashEntry *he, PRIntn i, void *arg)
+{
+    JNIEnv *jEnv = (JNIEnv*)arg;
+    jclass java_class;
+    JavaClassDescriptor *class_descriptor;
+
+    class_descriptor = (JavaClassDescriptor*)he->value;
+
+    java_class = class_descriptor->java_class;
+    (*jEnv)->DeleteGlobalRef(jEnv, java_class);
+    class_descriptor->java_class = NULL;
+
+    return HT_ENUMERATE_REMOVE;
+}
+
+/* This shutdown routine discards all JNI references to Java objects
+   that have been reflected into JS, even if there are still references
+   to them from JS. */
+void
+jsj_DiscardJavaClassReflections(JNIEnv *jEnv)
+{
+    if (java_class_reflections) {
+        JSJ_HashTableEnumerateEntries(java_class_reflections,
+                                      enumerate_remove_java_class,
+                                      (void*)jEnv);
+        JSJ_HashTableDestroy(java_class_reflections);
+        java_class_reflections = NULL;
+    }
+}
+
+extern JavaClassDescriptor *
+jsj_GetJavaClassDescriptor(JSContext *cx, JNIEnv *jEnv, jclass java_class)
+{
+    JavaClassDescriptor *class_descriptor;
+    class_descriptor = JSJ_HashTableLookup(java_class_reflections,
+                                           (const void *)java_class,
+                                           (void*)jEnv);
+    if (!class_descriptor)
+        return new_class_descriptor(cx, jEnv, java_class);
+
+    PR_ASSERT(class_descriptor->ref_count > 0);
+    class_descriptor->ref_count++;
+    return class_descriptor;
+}
+
+void
+jsj_ReleaseJavaClassDescriptor(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor)
+{
+    if (!--class_descriptor->ref_count)
+        destroy_class_descriptor(cx, jEnv, class_descriptor);
+}
+
+static JSBool
+reflect_java_methods_and_fields(JSContext *cx,
+                                JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor,
+                                JSBool reflect_statics_only)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    if (reflect_statics_only)
+        class_descriptor->static_members_reflected = JS_TRUE;
+    else
+        class_descriptor->instance_members_reflected = JS_TRUE;
+    
+    if (!jsj_ReflectJavaMethods(cx, jEnv, class_descriptor, reflect_statics_only))
+        return JS_FALSE;
+    if (!jsj_ReflectJavaFields(cx, jEnv, class_descriptor, reflect_statics_only))
+        return JS_FALSE;
+
+    if (reflect_statics_only) {
+        member_descriptor = class_descriptor->static_members;
+        while (member_descriptor) {
+            class_descriptor->num_static_members++;
+            member_descriptor = member_descriptor->next;
+        }
+    } else {
+        member_descriptor = class_descriptor->instance_members;
+        while (member_descriptor) {
+            class_descriptor->num_instance_members++;
+            member_descriptor = member_descriptor->next;
+        }
+    }
+    return JS_TRUE;
+}
+
+JavaMemberDescriptor *
+jsj_GetClassStaticMembers(JSContext *cx,
+                          JNIEnv *jEnv,
+                          JavaClassDescriptor *class_descriptor)
+{
+    if (!class_descriptor->static_members_reflected)
+        reflect_java_methods_and_fields(cx, jEnv, class_descriptor, JS_TRUE);
+    return class_descriptor->static_members;
+}
+
+JavaMemberDescriptor *
+jsj_GetClassInstanceMembers(JSContext *cx,
+                            JNIEnv *jEnv,
+                            JavaClassDescriptor *class_descriptor)
+{
+    if (!class_descriptor->instance_members_reflected)
+        reflect_java_methods_and_fields(cx, jEnv, class_descriptor, JS_FALSE);
+    return class_descriptor->instance_members;
+}
+
+JavaMemberDescriptor *
+jsj_LookupJavaStaticMemberDescriptorById(JSContext *cx,
+                                         JNIEnv *jEnv,
+                                         JavaClassDescriptor *class_descriptor,
+                                         jsid id)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    member_descriptor = jsj_GetClassStaticMembers(cx, jEnv, class_descriptor);
+    while (member_descriptor) {
+        if (id == member_descriptor->id)
+            return member_descriptor;
+        member_descriptor = member_descriptor->next;
+    }
+    return NULL;
+}
+
+JavaMemberDescriptor *
+jsj_GetJavaStaticMemberDescriptor(JSContext *cx,
+                                  JNIEnv *jEnv, 
+                                  JavaClassDescriptor *class_descriptor,
+                                  jstring member_name_jstr)
+{
+    JavaMemberDescriptor *member_descriptor;
+    jsid id;
+
+    if (!JavaStringToId(cx, jEnv, member_name_jstr, &id))
+        return NULL;
+
+    member_descriptor = jsj_LookupJavaStaticMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (member_descriptor)
+        return member_descriptor;
+
+    member_descriptor = JS_malloc(cx, sizeof(JavaMemberDescriptor));
+    if (!member_descriptor)
+        return NULL;
+    memset(member_descriptor, 0, sizeof(JavaMemberDescriptor));
+
+    member_descriptor->name = jsj_DupJavaStringUTF(cx, jEnv, member_name_jstr);
+    if (!member_descriptor->name) {
+        JS_free(cx, member_descriptor);
+        return NULL;
+    }
+    member_descriptor->id = id;
+
+    member_descriptor->next = class_descriptor->static_members;
+    class_descriptor->static_members = member_descriptor;
+
+    return member_descriptor;
+}
+
+JavaMemberDescriptor *
+jsj_GetJavaClassConstructors(JSContext *cx,
+                             JavaClassDescriptor *class_descriptor)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    if (class_descriptor->constructors)
+        return class_descriptor->constructors;
+
+    member_descriptor = JS_malloc(cx, sizeof(JavaMemberDescriptor));
+    if (!member_descriptor)
+        return NULL;
+    memset(member_descriptor, 0, sizeof(JavaMemberDescriptor));
+
+    member_descriptor->name = JS_strdup(cx, "<init>");
+    if (!member_descriptor->name) {
+        JS_free(cx, member_descriptor);
+        return NULL;
+    }
+
+    class_descriptor->constructors = member_descriptor;
+
+    return member_descriptor;
+}
+
+JavaMemberDescriptor *
+jsj_LookupJavaClassConstructors(JSContext *cx, JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor)
+{
+    if (!class_descriptor->static_members_reflected)
+        reflect_java_methods_and_fields(cx, jEnv, class_descriptor, JS_TRUE);
+    return class_descriptor->constructors;
+}
+
+JavaMemberDescriptor *
+jsj_LookupJavaMemberDescriptorById(JSContext *cx, JNIEnv *jEnv,
+                                   JavaClassDescriptor *class_descriptor,
+                                   jsid id)
+{
+    JavaMemberDescriptor *member_descriptor;
+
+    member_descriptor = jsj_GetClassInstanceMembers(cx, jEnv, class_descriptor);
+    while (member_descriptor) {
+        if (id == member_descriptor->id)
+            return member_descriptor;
+        member_descriptor = member_descriptor->next;
+    }
+    return NULL;
+}
+
+JavaMemberDescriptor *
+jsj_GetJavaMemberDescriptor(JSContext *cx,
+                            JNIEnv *jEnv, 
+                            JavaClassDescriptor *class_descriptor,
+                            jstring member_name_jstr)
+{
+    JavaMemberDescriptor *member_descriptor;
+    jsid id;
+
+    if (!JavaStringToId(cx, jEnv, member_name_jstr, &id))
+        return NULL;
+
+    member_descriptor = jsj_LookupJavaMemberDescriptorById(cx, jEnv, class_descriptor, id);
+    if (member_descriptor)
+        return member_descriptor;
+
+    member_descriptor = JS_malloc(cx, sizeof(JavaMemberDescriptor));
+    if (!member_descriptor)
+        return NULL;
+    memset(member_descriptor, 0, sizeof(JavaMemberDescriptor));
+
+    member_descriptor->name = jsj_DupJavaStringUTF(cx, jEnv, member_name_jstr);
+    if (!member_descriptor->name) {
+        JS_free(cx, member_descriptor);
+        return NULL;
+    }
+    member_descriptor->id = id;
+
+    member_descriptor->next = class_descriptor->instance_members;
+    class_descriptor->instance_members = member_descriptor;
+
+    return member_descriptor;
+}
+
+JSBool
+jsj_InitJavaClassReflectionsTable()
+{
+    java_class_reflections =
+        JSJ_NewHashTable(64, jsj_HashJavaObject, jsj_JavaObjectComparator,
+                         NULL, NULL, NULL);
+
+    if (!java_class_reflections)
+        return JS_FALSE;
+    return JS_TRUE;
+}

mozilla/js/src/liveconnect/jsj_convert.c

@@ -0,0 +1,806 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * Below is the code that converts between Java and JavaScript values of all
+ * types.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/* Floating-point double utilities, stolen from jsnum.h */
+#ifdef IS_LITTLE_ENDIAN
+#define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[1])
+#define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[0])
+#else
+#define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[0])
+#define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[1])
+#endif
+#define JSDOUBLE_HI32_SIGNBIT   0x80000000
+#define JSDOUBLE_HI32_EXPMASK   0x7ff00000
+#define JSDOUBLE_HI32_MANTMASK  0x000fffff
+
+#define JSDOUBLE_IS_NaN(x)                                                    \
+    ((JSDOUBLE_HI32(x) & JSDOUBLE_HI32_EXPMASK) == JSDOUBLE_HI32_EXPMASK &&   \
+     (JSDOUBLE_LO32(x) || (JSDOUBLE_HI32(x) & JSDOUBLE_HI32_MANTMASK)))
+
+#define JSDOUBLE_IS_INFINITE(x)                                               \
+    ((JSDOUBLE_HI32(x) & ~JSDOUBLE_HI32_SIGNBIT) == JSDOUBLE_HI32_EXPMASK &&  \
+     !JSDOUBLE_LO32(x))
+
+static JSBool
+convert_js_obj_to_JSObject_wrapper(JSContext *cx, JNIEnv *jEnv, JSObject *js_obj,
+                                   JavaSignature *signature,
+                                   int *cost, jobject *java_value)
+{
+    if (!njJSObject) {
+        if (java_value)
+            JS_ReportError(cx, "Couldn't convert JavaScript object to an "
+                               "instance of netscape.javascript.JSObject "
+                               "because that class could not be loaded.");
+        return JS_FALSE;
+    }
+
+    if (!(*jEnv)->IsAssignableFrom(jEnv, njJSObject, signature->java_class))
+        return JS_FALSE;
+
+    if (!java_value)
+        return JS_TRUE;
+
+    *java_value = jsj_WrapJSObject(cx, jEnv, js_obj);
+
+    return (*java_value != NULL);   
+}
+
+jstring
+jsj_ConvertJSStringToJavaString(JSContext *cx, JNIEnv *jEnv, JSString *js_str)
+{
+    jstring result;
+    result = (*jEnv)->NewString(jEnv, JS_GetStringChars(js_str),
+                                JS_GetStringLength(js_str));
+    if (!result) {
+        jsj_UnexpectedJavaError(cx, jEnv, "Couldn't construct instance "
+                                          "of java.lang.String");
+    }
+    return result;
+}
+
+/*
+ * Convert a JS value to an instance of java.lang.Object or one of its subclasses, 
+ * performing any necessary type coercion.  If non-trivial coercion is required,
+ * the cost value is incremented.  If the java_value pass-by-reference argument
+ * is non-NULL, the resulting Java value is stored there.
+ *
+ * Returns JS_TRUE if the conversion is possible, JS_FALSE otherwise
+ */
+JSBool
+jsj_ConvertJSValueToJavaObject(JSContext *cx, JNIEnv *jEnv, jsval v, JavaSignature *signature,
+                               int *cost, jobject *java_value, JSBool *is_local_refp)
+{
+    JSString *jsstr;
+    jclass target_java_class;
+    
+    PR_ASSERT(signature->type == JAVA_SIGNATURE_CLASS ||
+        signature->type == JAVA_SIGNATURE_ARRAY);
+
+    /* Initialize to default case, in which no new Java object is
+       synthesized to perform the conversion and, therefore, no JNI local
+       references are being held. */
+    *is_local_refp = JS_FALSE;
+
+    /* Get the Java type of the target value */
+    target_java_class = signature->java_class;
+    
+    if (JSVAL_IS_OBJECT(v)) {
+        JSObject *js_obj = JSVAL_TO_OBJECT(v);
+        
+        /* JS null is always assignable to a Java object */
+        if (!js_obj) {
+            if (java_value)
+                *java_value = NULL;
+            return JS_TRUE;
+        }
+        
+        if (JS_InstanceOf(cx, js_obj, &JavaObject_class, 0) ||
+            JS_InstanceOf(cx, js_obj, &JavaArray_class, 0)) {
+            
+            /* The source value is a Java object wrapped inside a JavaScript
+               object.  Unwrap the JS object and return the original Java
+               object if it's class makes it assignment-compatible with the
+               target class using Java's assignability rules. */
+            JavaObjectWrapper *java_wrapper = JS_GetPrivate(cx, js_obj);
+            jobject java_obj = java_wrapper->java_obj;
+            
+            if ((*jEnv)->IsInstanceOf(jEnv, java_obj, target_java_class)) {
+                if (java_value)
+                    *java_value = java_obj;
+                return JS_TRUE;
+            }
+            
+#ifdef LIVECONNECT_IMPROVEMENTS
+            /* Don't allow wrapped Java objects to be converted to strings */
+            goto conversion_error;
+#else
+            /* Fall through, to attempt conversion to a Java string */
+#endif
+            
+        } else if (JS_InstanceOf(cx, js_obj, &JavaClass_class, 0)) {
+            /* We're dealing with the reflection of a Java class */
+            JavaClassDescriptor *java_class_descriptor = JS_GetPrivate(cx, js_obj);
+            
+            /* Check if target type is java.lang.Class class */
+            if ((*jEnv)->IsAssignableFrom(jEnv, jlClass, target_java_class)) {
+                if (java_value)
+                    *java_value = java_class_descriptor->java_class;
+                return JS_TRUE;
+            }
+            
+            /* Check if target type is netscape.javascript.JSObject wrapper class */
+            if (convert_js_obj_to_JSObject_wrapper(cx, jEnv, js_obj, signature, cost, java_value)) {
+                if (*java_value)
+                    *is_local_refp = JS_TRUE;
+                return JS_TRUE;
+            }
+            
+            /* Fall through, to attempt conversion to a Java string */
+            
+        } else if (JS_InstanceOf(cx, js_obj, &JavaMember_class, 0)) {
+
+            if (!JS_ConvertValue(cx, v, JSTYPE_OBJECT, &v))
+                return JS_FALSE;
+            return jsj_ConvertJSValueToJavaObject(cx, jEnv, v, signature, cost,
+                                                  java_value, is_local_refp);
+
+        } else {
+            /* Otherwise, see if the target type is the  netscape.javascript.JSObject
+               wrapper class or one of its subclasses, in which case a
+               reference is passed to the original JS object by wrapping it
+               inside an instance of netscape.javascript.JSObject */
+            if (convert_js_obj_to_JSObject_wrapper(cx, jEnv, js_obj, signature, cost, java_value))             {
+                return JS_TRUE;
+            }
+            
+            /* Fall through, to attempt conversion to a Java string */
+        }
+        
+    } else if (JSVAL_IS_NUMBER(v)) {
+        /* JS numbers, integral or not, can be converted to instances of java.lang.Double */
+        if ((*jEnv)->IsAssignableFrom(jEnv, jlDouble, target_java_class)) {
+            if (java_value) {
+                jsdouble d;
+                if (!JS_ValueToNumber(cx, v, &d))
+                    goto conversion_error;
+                *java_value = (*jEnv)->NewObject(jEnv, jlDouble, jlDouble_Double, d);
+                if (*java_value) {
+                    *is_local_refp = JS_TRUE;
+                } else {
+                    jsj_UnexpectedJavaError(cx, jEnv,
+                        "Couldn't construct instance of java.lang.Double");
+                    return JS_FALSE;
+                }
+            }
+#ifdef LIVECONNECT_IMPROVEMENTS
+            (*cost)++;
+#endif
+            return JS_TRUE;
+        }
+        /* Fall through, to attempt conversion to a java.lang.String ... */
+        
+    } else if (JSVAL_IS_BOOLEAN(v)) {
+        /* JS boolean values can be converted to instances of java.lang.Boolean */
+        if ((*jEnv)->IsAssignableFrom(jEnv, jlBoolean, target_java_class)) {
+            if (java_value) {
+                JSBool b;
+                if (!JS_ValueToBoolean(cx, v, &b))
+                    goto conversion_error;
+                *java_value =
+                    (*jEnv)->NewObject(jEnv, jlBoolean, jlBoolean_Boolean, b);
+                if (*java_value) {
+                    *is_local_refp = JS_TRUE;
+                } else {
+                    jsj_UnexpectedJavaError(cx, jEnv, "Couldn't construct instance " 
+                        "of java.lang.Boolean");
+                    return JS_FALSE;
+                }
+            }
+#ifdef LIVECONNECT_IMPROVEMENTS
+            (*cost)++;
+#endif
+            return JS_TRUE;
+        }
+        /* Fall through, to attempt conversion to a java.lang.String ... */
+    }
+    
+    /* If no other conversion is possible, see if the target type is java.lang.String */
+    if ((*jEnv)->IsAssignableFrom(jEnv, jlString, target_java_class)) {
+#ifdef LIVECONNECT_IMPROVEMENTS
+        JSBool is_string = JSVAL_IS_STRING(v);
+#endif
+        
+        /* Convert to JS string, if necessary, and then to a Java Unicode string */
+        jsstr = JS_ValueToString(cx, v);
+        if (jsstr) {
+            if (java_value) {
+                *java_value = jsj_ConvertJSStringToJavaString(cx, jEnv, jsstr);
+                if (*java_value) {
+                    *is_local_refp = JS_TRUE;
+                } else {
+                    return JS_FALSE;
+                }
+            }
+#ifdef LIVECONNECT_IMPROVEMENTS
+            if (!is_string)
+                (*cost)++;
+#endif
+            return JS_TRUE;
+        }
+    }
+    
+conversion_error:
+    return JS_FALSE;
+}
+
+/* Valid ranges for Java numeric types */
+#define jbyte_MAX_VALUE   127.0
+#define jbyte_MIN_VALUE  -128.0
+#define jchar_MAX_VALUE   65535.0
+#define jchar_MIN_VALUE   0.0
+#define jshort_MAX_VALUE  32767.0
+#define jshort_MIN_VALUE -32768.0
+#define jint_MAX_VALUE    2147483647.0
+#define jint_MIN_VALUE   -2147483648.0
+#define jlong_MAX_VALUE   9223372036854775807.0
+#define jlong_MIN_VALUE  -9223372036854775808.0
+
+/* Utility macro for jsj_ConvertJSValueToJavaValue(), below */
+#define JSVAL_TO_INTEGRAL_JVALUE(type_name, member_name, member_type, jsval, java_value) \
+    if (!JSVAL_IS_NUMBER(v)) {                                           \
+        if (!JS_ConvertValue(cx, v, JSTYPE_NUMBER, &v))                  \
+            goto conversion_error;                                       \
+        (*cost)++;                                                       \
+    }                                                                    \
+    {                                                                    \
+        member_type member_name;                                         \
+                                                                         \
+        if (JSVAL_IS_INT(v)) {                                           \
+            jsint ival = JSVAL_TO_INT(v);                                \
+            member_name = (member_type) ival;                            \
+                                                                         \
+            /* Check to see if the jsval's magnitude is too large to be  \
+               representable in the target java type */                  \
+            if (member_name != ival)                                     \
+                goto numeric_conversion_error;                           \
+        } else {                                                         \
+            jdouble dval = *JSVAL_TO_DOUBLE(v);                          \
+                                                                         \
+            /* NaN becomes zero when converted to integral value */      \
+            if (JSDOUBLE_IS_NaN(dval))                                   \
+                member_name = 0;                                         \
+                                                                         \
+            /* Unrepresentably large numbers, including infinities, */   \
+            /* cause an error. */                                        \
+            else if ((dval > member_type ## _MAX_VALUE) ||               \
+                     (dval < member_type ## _MIN_VALUE)) {               \
+                goto numeric_conversion_error;                           \
+            } else                                                       \
+                member_name = (member_type) dval;                        \
+                                                                         \
+            /* Don't allow a non-integral number to be converted         \
+               to an integral type */                                    \
+            /* Actually, we have to allow this for LC1 compatibility */  \
+            /* if ((jdouble)member_name != dval)                         \
+                (*cost)++; */                                            \
+        }                                                                \
+        if (java_value)                                                  \
+            java_value->member_name = member_name;                       \
+    }
+
+#if XP_MAC
+
+/* on MRJ jlong is typedef'd to wide, which is a struct. */
+#include <Math64.h>
+
+static jsint jlong_to_jsint(jlong lvalue)
+{
+    SInt64 val = WideToSInt64(lvalue);
+    return S32Set(val);
+}
+
+static jlong jsint_to_jlong(jsint ivalue)
+{
+    SInt64 val = S64Set(ivalue);
+    wide wval =SInt64ToWide(val);
+    return *(jlong*)&wval;
+}
+
+static jdouble jlong_to_jdouble(jlong lvalue)
+{
+    SInt64 val = WideToSInt64(lvalue);
+    return SInt64ToLongDouble(val);
+}
+
+static jlong jdouble_to_jlong(jdouble dvalue)
+{
+    SInt64 val = LongDoubleToSInt64(dvalue);
+    wide wval = SInt64ToWide(val);
+    return *(jlong*)&wval;
+}
+
+/* Mac utility macro for jsj_ConvertJSValueToJavaValue(), below */
+#define JSVAL_TO_JLONG_JVALUE(member_name, member_type, jsvalue, java_value) \
+if (!JSVAL_IS_NUMBER(jsvalue)) {                                         \
+        if (!JS_ConvertValue(cx, jsvalue, JSTYPE_NUMBER, &jsvalue))      \
+        goto conversion_error;                                           \
+    (*cost)++;                                                           \
+    }                                                                    \
+    {                                                                    \
+        member_type member_name;                                         \
+                                                                         \
+        if (JSVAL_IS_INT(jsvalue)) {                                     \
+            jsint ival = JSVAL_TO_INT(jsvalue);                          \
+            member_name = jsint_to_jlong(ival);                          \
+                                                                         \
+        } else {                                                         \
+            jdouble dval = *JSVAL_TO_DOUBLE(jsvalue);                    \
+                                                                         \
+            /* NaN becomes zero when converted to integral value */      \
+            if (JSDOUBLE_IS_NaN(dval))                                   \
+                member_name = jsint_to_jlong(0);                         \
+                                                                         \
+            /* Unrepresentably large numbers, including infinities, */   \
+            /* cause an error. */                                        \
+            else if ((dval > member_type ## _MAX_VALUE) ||               \
+                     (dval < member_type ## _MIN_VALUE)) {               \
+                goto numeric_conversion_error;                           \
+            } else                                                       \
+                member_name = jdouble_to_jlong(dval);                    \
+                                                                         \
+            /* Don't allow a non-integral number to be converted         \
+               to an integral type */                                    \
+            /* Actually, we have to allow this for LC1 compatibility */  \
+            /*if (jlong_to_jdouble(member_name) != dval)                 \
+                (*cost)++;*/                                             \
+        }                                                                \
+        if (java_value)                                                  \
+            java_value->member_name = member_name;                       \
+    }
+
+#else
+
+#define jlong_to_jdouble(lvalue) ((jdouble) lvalue)
+
+#endif
+
+/*
+ * Convert a JS value to a Java value of the given type signature.  The cost
+ * variable is incremented if coercion is required, e.g. the source value is
+ * a string, but the target type is a boolean.
+ *
+ * Returns JS_FALSE if no conversion is possible, either because the jsval has
+ * a type that is wholly incompatible with the Java value, or because a scalar
+ * jsval can't be represented in a variable of the target type without loss of
+ * precision, e.g. the source value is "4.2" but the destination type is byte.
+ * If conversion is not possible and java_value is non-NULL, the JS error
+ * reporter is called with an appropriate message.
+ */  
+JSBool
+jsj_ConvertJSValueToJavaValue(JSContext *cx, JNIEnv *jEnv, jsval v,
+                              JavaSignature *signature,
+                              int *cost, jvalue *java_value, JSBool *is_local_refp)
+{
+    JavaSignatureChar type;
+    JSBool success = JS_FALSE;
+
+    /* Initialize to default case, in which no new Java object is
+       synthesized to perform the conversion and, therefore, no JNI local
+       references are being held. */
+    *is_local_refp = JS_FALSE;   
+    
+    type = signature->type;
+    switch (type) {
+    case JAVA_SIGNATURE_BOOLEAN:
+        if (!JSVAL_IS_BOOLEAN(v)) {
+            if (!JS_ConvertValue(cx, v, JSTYPE_BOOLEAN, &v))
+                goto conversion_error;
+            (*cost)++;
+        }
+        if (java_value)
+            java_value->z = (jboolean)(JSVAL_TO_BOOLEAN(v) == JS_TRUE);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        JSVAL_TO_INTEGRAL_JVALUE(short, s, jshort, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_BYTE:
+        JSVAL_TO_INTEGRAL_JVALUE(byte, b, jbyte, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        /* A one-character string can be converted into a character */
+        if (JSVAL_IS_STRING(v) && (JS_GetStringLength(JSVAL_TO_STRING(v)) == 1)) {
+            v = INT_TO_JSVAL(*JS_GetStringChars(JSVAL_TO_STRING(v)));
+        }
+        JSVAL_TO_INTEGRAL_JVALUE(char, c, jchar, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        JSVAL_TO_INTEGRAL_JVALUE(int, i, jint, v, java_value);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+#if XP_MAC
+        JSVAL_TO_JLONG_JVALUE(j, jlong, v, java_value);
+#else
+        JSVAL_TO_INTEGRAL_JVALUE(long, j, jlong, v, java_value);
+#endif
+        break;
+    
+    case JAVA_SIGNATURE_FLOAT:
+        if (!JSVAL_IS_NUMBER(v)) {
+            if (!JS_ConvertValue(cx, v, JSTYPE_NUMBER, &v))
+                goto conversion_error;
+            (*cost)++;
+        }
+        if (java_value) {
+            if (JSVAL_IS_INT(v))
+                java_value->f = (jfloat) JSVAL_TO_INT(v);
+            else
+                java_value->f = (jfloat) *JSVAL_TO_DOUBLE(v);
+        }
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        if (!JSVAL_IS_NUMBER(v)) {
+            if (!JS_ConvertValue(cx, v, JSTYPE_NUMBER, &v))
+                goto conversion_error;
+            (*cost)++;
+        }
+        if (java_value) {
+            if (JSVAL_IS_INT(v))
+                java_value->d = (jdouble) JSVAL_TO_INT(v);
+            else
+                java_value->d = (jdouble) *JSVAL_TO_DOUBLE(v);
+        }
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        if (!jsj_ConvertJSValueToJavaObject(cx, jEnv, v, signature, cost,
+            &java_value->l, is_local_refp))
+            goto conversion_error;
+        break;
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+
+    /* Success */
+    return JS_TRUE;
+
+numeric_conversion_error:
+    success = JS_TRUE;
+    /* Fall through ... */
+
+conversion_error:
+
+    if (java_value) {
+        const char *jsval_string;
+        JSString *jsstr;
+
+        jsval_string = NULL;
+        jsstr = JS_ValueToString(cx, v);
+        if (jsstr)
+            jsval_string = JS_GetStringBytes(jsstr);
+        if (!jsval_string)
+            jsval_string = "";
+        
+        JS_ReportError(cx, "Unable to convert JavaScript value %s to "
+                           "Java value of type %s",
+                       jsval_string, signature->name);
+        return JS_FALSE;
+    }
+    return success;
+}
+
+/*
+ * A utility routine to create a JavaScript Unicode string from a
+ * java.lang.String (Unicode) string.
+ */
+JSString *
+jsj_ConvertJavaStringToJSString(JSContext *cx, JNIEnv *jEnv, jstring java_str)
+{
+    JSString *js_str;
+    jboolean is_copy;
+    const jchar *ucs2_str;
+    jchar *copy_ucs2_str;
+    jsize ucs2_str_len, num_bytes;
+
+    ucs2_str_len = (*jEnv)->GetStringLength(jEnv, java_str);
+    ucs2_str = (*jEnv)->GetStringChars(jEnv, java_str, &is_copy);
+    if (!ucs2_str) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Unable to extract native Unicode from Java string");
+        return NULL;
+    }
+
+    js_str = NULL;
+
+    /* The string data passed into JS_NewUCString() is
+       not copied, so make a copy of the Unicode character vector. */
+    num_bytes = ucs2_str_len * sizeof(jchar);
+    copy_ucs2_str = (jchar*)JS_malloc(cx, num_bytes);
+    if (!copy_ucs2_str)
+        goto done;
+    memcpy(copy_ucs2_str, ucs2_str, num_bytes);
+
+    js_str = JS_NewUCString(cx, (jschar*)copy_ucs2_str, ucs2_str_len);
+
+done:
+    (*jEnv)->ReleaseStringChars(jEnv, java_str, ucs2_str);
+    return js_str;
+}
+
+/*
+ * Attempt to obtain a JS string representation of a Java object.
+ * The java_obj argument must be of type java.lang.Object or a subclass.
+ * If java_obj is a Java string, it's value is simply extracted and
+ * copied into a JS string.  Otherwise, the toString() method is called
+ * on java_obj.
+ */
+JSBool
+jsj_ConvertJavaObjectToJSString(JSContext *cx,
+                                JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor,
+                                jobject java_obj, jsval *vp)
+{
+    JSString *js_str;
+    jstring java_str;
+    jmethodID toString;
+    
+    /* Create a Java string, unless java_obj is already a java.lang.String */
+    if ((*jEnv)->IsInstanceOf(jEnv, java_obj, jlString)) {
+        java_str = java_obj;
+    } else {
+        jclass java_class;
+
+        java_class = class_descriptor->java_class;
+        toString = (*jEnv)->GetMethodID(jEnv, java_class, "toString",
+                                        "()Ljava/lang/String;");
+        if (!toString) {
+            /* All Java objects have a toString method */
+            jsj_UnexpectedJavaError(cx, jEnv, "No toString() method for class %s!",
+                                    class_descriptor->name);
+            return JS_FALSE;
+        }
+        java_str = (*jEnv)->CallObjectMethod(jEnv, java_obj, toString);
+        if (!java_str) {
+            jsj_ReportJavaError(cx, jEnv, "toString() method failed");
+            return JS_FALSE;
+        }
+    }
+
+    /* Extract Unicode from java.lang.String instance and convert to JS string */
+    js_str = jsj_ConvertJavaStringToJSString(cx, jEnv, java_str);
+    if (!js_str)
+        return JS_FALSE;
+
+    *vp = STRING_TO_JSVAL(js_str);
+    return JS_TRUE;
+}
+
+/*
+ * Convert a Java object to a number by attempting to call the
+ * doubleValue() method on a Java object to get a double result.
+ * This usually only works on instances of java.lang.Double, but the code
+ * is generalized to work with any Java object that supports this method.
+ *
+ * Returns JS_TRUE if the call was successful.
+ * Returns JS_FALSE if conversion is not possible or an error occurs.
+ */
+JSBool
+jsj_ConvertJavaObjectToJSNumber(JSContext *cx, JNIEnv *jEnv,
+                                JavaClassDescriptor *class_descriptor,
+                                jobject java_obj, jsval *vp)
+{
+    jdouble d;
+    jmethodID doubleValue;
+    jclass java_class;
+
+    java_class = class_descriptor->java_class;
+    doubleValue = (*jEnv)->GetMethodID(jEnv, java_class, "doubleValue", "()D");
+    if (!doubleValue) {
+        /* There is no doubleValue() method for the object.  Try toString()
+           instead and the JS engine will attempt to convert the result to
+           a number. */
+        (*jEnv)->ExceptionClear(jEnv);
+        return jsj_ConvertJavaObjectToJSString(cx, jEnv, class_descriptor,
+                                               java_obj, vp);
+    }
+
+    d = (*jEnv)->CallDoubleMethod(jEnv, java_obj, doubleValue);
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {
+        jsj_UnexpectedJavaError(cx, jEnv, "doubleValue() method failed");
+        return JS_FALSE;
+    }
+    return JS_NewDoubleValue(cx, d, vp);
+}
+
+/*
+ * Convert a Java object to a boolean by attempting to call the
+ * booleanValue() method on a Java object to get a boolean result.
+ * This usually only works on instances of java.lang.Boolean, but the code
+ * is generalized to work with any Java object that supports this method.
+ *
+ * Returns JS_TRUE if the call was successful.
+ * Returns JS_FALSE if conversion is not possible or an error occurs.
+ */
+extern JSBool
+jsj_ConvertJavaObjectToJSBoolean(JSContext *cx, JNIEnv *jEnv,
+                                 JavaClassDescriptor *class_descriptor,
+                                 jobject java_obj, jsval *vp)
+{
+    jboolean b;
+    jmethodID booleanValue;
+    jclass java_class;
+    
+    /* Null converts to false. */
+    if (!java_obj) {
+        *vp = JSVAL_FALSE;
+        return JS_TRUE;
+    }
+    java_class = class_descriptor->java_class;
+    booleanValue = (*jEnv)->GetMethodID(jEnv, java_obj, "booleanValue", "()Z");
+
+    /* Non-null Java object does not have a booleanValue() method, so
+       it converts to true. */
+    if (!booleanValue) {
+        (*jEnv)->ExceptionClear(jEnv);
+        *vp = JSVAL_TRUE;
+        return JS_TRUE;
+    }
+
+    b = (*jEnv)->CallBooleanMethod(jEnv, java_obj, booleanValue);
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {
+        jsj_UnexpectedJavaError(cx, jEnv, "booleanValue() method failed");
+        return JS_FALSE;
+    }
+    *vp = BOOLEAN_TO_JSVAL(b);
+    return JS_TRUE;
+}
+
+/*
+ * Reflect a Java object into a JS value.  The source object, java_obj, must
+ * be of type java.lang.Object or a subclass and may, therefore, be an array.
+ */
+JSBool
+jsj_ConvertJavaObjectToJSValue(JSContext *cx, JNIEnv *jEnv,
+                               jobject java_obj, jsval *vp)
+{
+    jclass java_class;
+    JSObject *js_obj;
+
+    /* A null in Java-land is also null in JS */
+    if (!java_obj) {
+        *vp = JSVAL_NULL;
+        return JS_TRUE;
+    }
+
+    java_class = (*jEnv)->GetObjectClass(jEnv, java_obj);
+
+    /*
+     * If it's an instance of netscape.javascript.JSObject, i.e. a wrapper
+     * around a JS object that has been passed into the Java world, unwrap
+     * it to obtain the original JS object.
+     */
+     if (njJSObject && (*jEnv)->IsInstanceOf(jEnv, java_obj, njJSObject)) {
+#ifdef PRESERVE_JSOBJECT_IDENTITY
+        js_obj = (JSObject *)((*jEnv)->GetIntField(jEnv, java_obj, njJSObject_internal));
+#else
+        js_obj = jsj_UnwrapJSObjectWrapper(jEnv, java_obj);
+#endif
+        PR_ASSERT(js_obj);
+        if (!js_obj)
+            return JS_FALSE;
+        *vp = OBJECT_TO_JSVAL(js_obj);
+        return JS_TRUE;
+     }
+
+    /*
+     * Instances of java.lang.String are wrapped so we can call methods on
+     * them, but they convert to a JS string if used in a string context.
+     */
+    /* TODO - let's get rid of this annoying "feature" */
+
+    /* otherwise, wrap it inside a JavaObject */
+    js_obj = jsj_WrapJavaObject(cx, jEnv, java_obj, java_class);
+    if (!js_obj)
+        return JS_FALSE;
+    *vp = OBJECT_TO_JSVAL(js_obj);
+    return JS_TRUE;
+}
+
+/*
+ * Convert a Java value (primitive or object) to a JS value.
+ *
+ * This is usually an infallible operation, but JS_FALSE is returned
+ * on an out-of-memory condition and the error reporter is called.
+ */
+JSBool
+jsj_ConvertJavaValueToJSValue(JSContext *cx, JNIEnv *jEnv,
+                              JavaSignature *signature,
+                              jvalue *java_value,
+                              jsval *vp)
+{
+    int32 ival32;
+
+    switch (signature->type) {
+    case JAVA_SIGNATURE_VOID:
+        *vp = JSVAL_VOID;
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_BYTE:
+        *vp = INT_TO_JSVAL((jsint)java_value->b);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_CHAR:
+        *vp = INT_TO_JSVAL((jsint)java_value->c);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_SHORT:
+        *vp = INT_TO_JSVAL((jsint)java_value->s);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_INT:
+        ival32 = java_value->i;
+        if (INT_FITS_IN_JSVAL(ival32)) {
+            *vp = INT_TO_JSVAL((jsint) ival32);
+            return JS_TRUE;
+        } else {
+            return JS_NewDoubleValue(cx, ival32, vp);
+        }
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        *vp = BOOLEAN_TO_JSVAL((JSBool) java_value->z);
+        return JS_TRUE;
+
+    case JAVA_SIGNATURE_LONG:
+        return JS_NewDoubleValue(cx, jlong_to_jdouble(java_value->j), vp);
+  
+    case JAVA_SIGNATURE_FLOAT:
+        return JS_NewDoubleValue(cx, java_value->f, vp);
+
+    case JAVA_SIGNATURE_DOUBLE:
+        return JS_NewDoubleValue(cx, java_value->d, vp);
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        return jsj_ConvertJavaObjectToJSValue(cx, jEnv, java_value->l, vp);
+
+    default:
+        PR_ASSERT(0);
+        return JS_FALSE;
+    }
+}
+

mozilla/js/src/liveconnect/jsj_field.c

@@ -0,0 +1,383 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This file is part of the Java-vendor-neutral implementation of LiveConnect
+ *
+ * It contains the code used to reflect Java fields as properties of
+ * JavaObject objects and the code to access those fields.
+ *
+ */
+
+#include <stdlib.h>
+
+#include "jsj_private.h"      /* LiveConnect internals */
+
+/*
+ * Add a single field, described by java_field, to the JavaMemberDescriptor
+ * named by field_name within the given JavaClassDescriptor.
+ *
+ * Returns JS_TRUE on success. Otherwise, returns JS_FALSE and reports an error.
+ */
+static JSBool
+add_java_field_to_class_descriptor(JSContext *cx,
+                                   JNIEnv *jEnv,
+                                   JavaClassDescriptor *class_descriptor, 
+                                   jstring field_name_jstr,
+                                   jobject java_field,  /* a java.lang.reflect.Field */
+                                   jint modifiers)
+{
+    jclass fieldType;
+    jfieldID fieldID;
+    jclass java_class;
+
+    JSBool is_static_field;
+    JavaMemberDescriptor *member_descriptor = NULL;
+    const char *sig_cstr = NULL;
+    const char *field_name = NULL;
+    JavaSignature *signature = NULL;
+    JavaFieldSpec *field_spec = NULL;
+        
+    is_static_field = modifiers & ACC_STATIC;
+    if (is_static_field) {
+        member_descriptor = jsj_GetJavaStaticMemberDescriptor(cx, jEnv, class_descriptor, field_name_jstr);
+    } else {
+        member_descriptor = jsj_GetJavaMemberDescriptor(cx, jEnv, class_descriptor, field_name_jstr);
+    }
+    if (!member_descriptor)
+        goto error;
+    
+    field_spec = (JavaFieldSpec*)JS_malloc(cx, sizeof(JavaFieldSpec));
+    if (!field_spec)
+        goto error;
+
+    field_spec->modifiers = modifiers;
+
+    /* Get the Java class corresponding to the type of the field */
+    fieldType = (*jEnv)->CallObjectMethod(jEnv, java_field, jlrField_getType);
+    if (!fieldType) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Unable to determine type of field using"
+                                " java.lang.reflect.Field.getType()");
+        goto error;
+    }
+    
+    signature = jsj_GetJavaClassDescriptor(cx, jEnv, fieldType);
+    if (!signature)
+        goto error;
+    field_spec->signature = signature;
+
+    field_name = jsj_DupJavaStringUTF(cx, jEnv, field_name_jstr);
+    if (!field_name)
+        goto error;
+    field_spec->name = field_name;
+
+    /* Compute the JNI-style (string-based) signature of the field type */
+    sig_cstr = jsj_ConvertJavaSignatureToString(cx, signature);
+    if (!sig_cstr)
+        goto error;
+
+    /* Compute the JNI fieldID and cache it for quick field access */
+    java_class = class_descriptor->java_class;
+    if (is_static_field)
+        fieldID = (*jEnv)->GetStaticFieldID(jEnv, java_class, field_name, sig_cstr);
+    else
+        fieldID = (*jEnv)->GetFieldID(jEnv, java_class, field_name, sig_cstr);
+    if (!fieldID) {
+       jsj_UnexpectedJavaError(cx, jEnv,
+                           "Can't get Java field ID for class %s, field %s (sig=%s)",
+                           class_descriptor->name, field_name, sig_cstr);
+       goto error;
+    }
+    field_spec->fieldID = fieldID;
+    
+    JS_free(cx, (char*)sig_cstr);
+    
+    member_descriptor->field = field_spec;
+
+    /* Success */
+    return JS_TRUE;
+
+error:
+    if (field_spec) {
+        JS_FREE_IF(cx, (char*)field_spec->name);
+        JS_free(cx, field_spec);
+    }
+    JS_FREE_IF(cx, (char*)sig_cstr);
+    if (signature)
+        jsj_ReleaseJavaClassDescriptor(cx, jEnv, signature);
+    return JS_FALSE;
+}
+
+/*
+ * Free up a JavaFieldSpec and all its resources.
+ */
+void
+jsj_DestroyFieldSpec(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field)
+{
+    JS_FREE_IF(cx, (char*)field->name);
+    jsj_ReleaseJavaClassDescriptor(cx, jEnv, field->signature);
+    JS_free(cx, field);
+}
+
+/*
+ * Add a JavaMemberDescriptor to the collection of members in class_descriptor
+ * for every public field of the identified Java class.  (A separate collection
+ * is kept in class_descriptor for static and instance members.)
+ * If reflect_only_static_fields is set, instance fields are not reflected.  If
+ * it isn't set, only instance fields are reflected and static fields are not
+ * reflected.
+ *
+ * Returns JS_TRUE on success. Otherwise, returns JS_FALSE and reports an error.
+ */
+JSBool 
+jsj_ReflectJavaFields(JSContext *cx, JNIEnv *jEnv, JavaClassDescriptor *class_descriptor,
+                      JSBool reflect_only_static_fields)
+{
+    int i;
+    JSBool ok;
+    jint modifiers;
+    jobject java_field;
+    jstring field_name_jstr;
+    jarray joFieldArray;
+    jsize num_fields;
+    jclass java_class;
+
+    /* Get a java array of java.lang.reflect.Field objects, by calling
+       java.lang.Class.getFields(). */
+    java_class = class_descriptor->java_class;
+    joFieldArray = (*jEnv)->CallObjectMethod(jEnv, java_class, jlClass_getFields);
+    if (!joFieldArray) {
+        jsj_UnexpectedJavaError(cx, jEnv,
+                                "Can't determine Java object's fields "
+                                "using java.lang.Class.getFields()");
+        return JS_FALSE;
+    }
+
+    /* Iterate over the class fields */
+    num_fields = (*jEnv)->GetArrayLength(jEnv, joFieldArray);
+    for (i = 0; i < num_fields; i++) {
+       
+        /* Get the i'th reflected field */
+        java_field = (*jEnv)->GetObjectArrayElement(jEnv, joFieldArray, i);
+        if (!java_field) {
+            jsj_UnexpectedJavaError(cx, jEnv, "Can't access a Field[] array");
+            return JS_FALSE;
+        }
+
+        /* Get the field modifiers, e.g. static, public, private, etc. */
+        modifiers = (*jEnv)->CallIntMethod(jEnv, java_field, jlrField_getModifiers);
+        if ((*jEnv)->ExceptionOccurred(jEnv)) {
+            jsj_UnexpectedJavaError(cx, jEnv,
+                                    "Can't access a Field's modifiers using"
+                                    "java.lang.reflect.Field.getModifiers()");
+            return JS_FALSE;
+        }
+
+        /* Don't allow access to private or protected Java fields. */
+        if (!(modifiers & ACC_PUBLIC))
+            continue;
+
+        /* Reflect all instance fields or all static fields, but not both */
+        if (reflect_only_static_fields != ((modifiers & ACC_STATIC) != 0))
+            continue;
+
+        /* Determine the unqualified name of the field */
+        field_name_jstr = (*jEnv)->CallObjectMethod(jEnv, java_field, jlrField_getName);
+        if (!field_name_jstr) {
+            jsj_UnexpectedJavaError(cx, jEnv,
+                                    "Can't obtain a Field's name"
+                                    "java.lang.reflect.Field.getName()");
+            return JS_FALSE;
+        }
+        
+        /* Add a JavaFieldSpec object to the JavaClassDescriptor */
+        ok = add_java_field_to_class_descriptor(cx, jEnv, class_descriptor, field_name_jstr,
+                                                java_field, modifiers);
+        if (!ok)
+            return JS_FALSE;
+    }
+
+    /* Success */
+    return JS_TRUE;
+}
+
+/*
+ * Read the value of a Java field and return it as a JavaScript value.
+ * If the field is static, then java_obj is a Java class, otherwise
+ * it's a Java instance object.
+ *
+ * Returns JS_TRUE on success. Otherwise, returns JS_FALSE and reports an error.
+ */
+JSBool
+jsj_GetJavaFieldValue(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field_spec,
+                      jobject java_obj, jsval *vp)
+{
+    JSBool is_static_field;
+    jvalue java_value;
+    JavaSignature *signature;
+    JavaSignatureChar field_type;
+    jfieldID fieldID = field_spec->fieldID;
+
+    is_static_field = field_spec->modifiers & ACC_STATIC;
+
+#define GET_JAVA_FIELD(Type,member)                                          \
+    PR_BEGIN_MACRO                                                           \
+    if (is_static_field)                                                     \
+        java_value.member =                                                  \
+            (*jEnv)->GetStatic##Type##Field(jEnv, java_obj, fieldID);        \
+    else                                                                     \
+        java_value.member =                                                  \
+            (*jEnv)->Get##Type##Field(jEnv, java_obj, fieldID);              \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_UnexpectedJavaError(cx, jEnv, "Error reading Java field");           \
+        return JS_FALSE;                                                     \
+    }                                                                        \
+    PR_END_MACRO
+
+    signature = field_spec->signature;
+    field_type = signature->type;
+    switch(field_type) {
+    case JAVA_SIGNATURE_BYTE:
+        GET_JAVA_FIELD(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        GET_JAVA_FIELD(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        GET_JAVA_FIELD(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        GET_JAVA_FIELD(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        GET_JAVA_FIELD(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        GET_JAVA_FIELD(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        GET_JAVA_FIELD(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        GET_JAVA_FIELD(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        GET_JAVA_FIELD(Object,l);
+        break;
+
+#undef GET_JAVA_FIELD
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+
+    return jsj_ConvertJavaValueToJSValue(cx, jEnv, signature, &java_value, vp);
+}
+
+JSBool
+jsj_SetJavaFieldValue(JSContext *cx, JNIEnv *jEnv, JavaFieldSpec *field_spec,
+                      jclass java_obj, jsval js_val)
+{
+    JSBool is_static_field, is_local_ref;
+    int dummy_cost;
+    jvalue java_value;
+    JavaSignature *signature;
+    JavaSignatureChar field_type;
+    jfieldID fieldID = field_spec->fieldID;
+
+    is_static_field = field_spec->modifiers & ACC_STATIC;
+
+#define SET_JAVA_FIELD(Type,member)                                          \
+    PR_BEGIN_MACRO                                                           \
+    if (is_static_field) {                                                   \
+        (*jEnv)->SetStatic##Type##Field(jEnv, java_obj, fieldID,             \
+                                        java_value.member);                  \
+    } else {                                                                 \
+        (*jEnv)->Set##Type##Field(jEnv, java_obj, fieldID,java_value.member);\
+    }                                                                        \
+    if ((*jEnv)->ExceptionOccurred(jEnv)) {                                  \
+        jsj_UnexpectedJavaError(cx, jEnv, "Error assigning to Java field");      \
+        return JS_FALSE;                                                     \
+    }                                                                        \
+    PR_END_MACRO
+
+    signature = field_spec->signature;
+    if (!jsj_ConvertJSValueToJavaValue(cx, jEnv, js_val, signature, &dummy_cost,
+                                       &java_value, &is_local_ref))
+        return JS_FALSE;
+
+    field_type = signature->type;
+    switch(field_type) {
+    case JAVA_SIGNATURE_BYTE:
+        SET_JAVA_FIELD(Byte,b);
+        break;
+
+    case JAVA_SIGNATURE_CHAR:
+        SET_JAVA_FIELD(Char,c);
+        break;
+
+    case JAVA_SIGNATURE_SHORT:
+        SET_JAVA_FIELD(Short,s);
+        break;
+
+    case JAVA_SIGNATURE_INT:
+        SET_JAVA_FIELD(Int,i);
+        break;
+
+    case JAVA_SIGNATURE_BOOLEAN:
+        SET_JAVA_FIELD(Boolean,z);
+        break;
+
+    case JAVA_SIGNATURE_LONG:
+        SET_JAVA_FIELD(Long,j);
+        break;
+  
+    case JAVA_SIGNATURE_FLOAT:
+        SET_JAVA_FIELD(Float,f);
+        break;
+
+    case JAVA_SIGNATURE_DOUBLE:
+        SET_JAVA_FIELD(Double,d);
+        break;
+
+    case JAVA_SIGNATURE_CLASS:
+    case JAVA_SIGNATURE_ARRAY:
+        SET_JAVA_FIELD(Object,l);
+        if (is_local_ref)
+            (*jEnv)->DeleteLocalRef(jEnv, java_value.l);
+        break;
+
+#undef SET_JAVA_FIELD
+    default:
+        PR_ASSERT(0);        /* Unknown java type signature */
+        return JS_FALSE;
+    }
+    
+    return JS_TRUE;
+}

mozilla/js/src/liveconnect/jsj_hash.c

@@ -0,0 +1,487 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+ 
+/*
+ * This is a copy of the NSPR hash-table library, but it has been slightly
+ * modified to allow an additional argument to be passed into the hash
+ * key-comparision function.  This is used to maintain thread-safety by
+ * passing in a JNIEnv pointer to the key-comparison function rather
+ * than storing it in a global.  All types,function names, etc. have
+ * been renamed from their original NSPR names to protect the innocent.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "jsj_hash.h"
+#include "prtypes.h"
+#ifdef NSPR20
+#    include "prlog.h"
+#    include "prbit.h"
+#else
+#    include "prassert.h"
+#endif
+
+/* Compute the number of buckets in ht */
+#define NBUCKETS(ht)    (1 << (JSJ_HASH_BITS - (ht)->shift))
+
+/* The smallest table has 16 buckets */
+#define MINBUCKETSLOG2  4
+#define MINBUCKETS      (1 << MINBUCKETSLOG2)
+
+/* Compute the maximum entries given n buckets that we will tolerate, ~90% */
+#define OVERLOADED(n)   ((n) - ((n) >> 3))
+
+/* Compute the number of entries below which we shrink the table by half */
+#define UNDERLOADED(n)  (((n) > MINBUCKETS) ? ((n) >> 2) : 0)
+
+/*
+** Stubs for default hash allocator ops.
+*/
+static void *
+DefaultAllocTable(void *pool, size_t size)
+{
+#if defined(XP_MAC)
+#pragma unused (pool)
+#endif
+
+    return malloc(size);
+}
+
+static void
+DefaultFreeTable(void *pool, void *item)
+{
+#if defined(XP_MAC)
+#pragma unused (pool)
+#endif
+
+    free(item);
+}
+
+static JSJHashEntry *
+DefaultAllocEntry(void *pool, const void *key)
+{
+#if defined(XP_MAC)
+#pragma unused (pool,key)
+#endif
+
+    return malloc(sizeof(JSJHashEntry));
+}
+
+static void
+DefaultFreeEntry(void *pool, JSJHashEntry *he, PRUintn flag)
+{
+#if defined(XP_MAC)
+#pragma unused (pool)
+#endif
+
+    if (flag == HT_FREE_ENTRY)
+        free(he);
+}
+
+static JSJHashAllocOps defaultHashAllocOps = {
+    DefaultAllocTable, DefaultFreeTable,
+    DefaultAllocEntry, DefaultFreeEntry
+};
+
+PR_IMPLEMENT(JSJHashTable *)
+JSJ_NewHashTable(PRUint32 n, JSJHashFunction keyHash,
+                JSJHashComparator keyCompare, JSJHashComparator valueCompare,
+                JSJHashAllocOps *allocOps, void *allocPriv)
+{
+    JSJHashTable *ht;
+    PRUint32 nb;
+
+    if (n <= MINBUCKETS) {
+        n = MINBUCKETSLOG2;
+    } else {
+        n = PR_CeilingLog2(n);
+        if ((PRInt32)n < 0)
+            return 0;
+    }
+
+    if (!allocOps) allocOps = &defaultHashAllocOps;
+
+    ht = (*allocOps->allocTable)(allocPriv, sizeof *ht);
+    if (!ht)
+    return 0;
+    memset(ht, 0, sizeof *ht);
+    ht->shift = JSJ_HASH_BITS - n;
+    n = 1 << n;
+#if defined(XP_PC) && !defined(_WIN32)
+    if (n > 16000) {
+        (*allocOps->freeTable)(allocPriv, ht);
+        return 0;
+    }
+#endif  /* WIN16 */
+    nb = n * sizeof(JSJHashEntry *);
+    ht->buckets = (*allocOps->allocTable)(allocPriv, nb);
+    if (!ht->buckets) {
+        (*allocOps->freeTable)(allocPriv, ht);
+        return 0;
+    }
+    memset(ht->buckets, 0, nb);
+
+    ht->keyHash = keyHash;
+    ht->keyCompare = keyCompare;
+    ht->valueCompare = valueCompare;
+    ht->allocOps = allocOps;
+    ht->allocPriv = allocPriv;
+    return ht;
+}
+
+PR_IMPLEMENT(void)
+JSJ_HashTableDestroy(JSJHashTable *ht)
+{
+    PRUint32 i, n;
+    JSJHashEntry *he, *next;
+    JSJHashAllocOps *allocOps = ht->allocOps;
+    void *allocPriv = ht->allocPriv;
+
+    n = NBUCKETS(ht);
+    for (i = 0; i < n; i++) {
+        for (he = ht->buckets[i]; he; he = next) {
+            next = he->next;
+            (*allocOps->freeEntry)(allocPriv, he, HT_FREE_ENTRY);
+        }
+    }
+#ifdef DEBUG
+    memset(ht->buckets, 0xDB, n * sizeof ht->buckets[0]);
+#endif
+    (*allocOps->freeTable)(allocPriv, ht->buckets);
+#ifdef DEBUG
+    memset(ht, 0xDB, sizeof *ht);
+#endif
+    (*allocOps->freeTable)(allocPriv, ht);
+}
+
+/*
+** Multiplicative hash, from Knuth 6.4.
+*/
+#define GOLDEN_RATIO    0x9E3779B9U
+
+PR_IMPLEMENT(JSJHashEntry **)
+JSJ_HashTableRawLookup(JSJHashTable *ht, JSJHashNumber keyHash, const void *key, void *arg)
+{
+    JSJHashEntry *he, **hep, **hep0;
+    JSJHashNumber h;
+
+#ifdef HASHMETER
+    ht->nlookups++;
+#endif
+    h = keyHash * GOLDEN_RATIO;
+    h >>= ht->shift;
+    hep = hep0 = &ht->buckets[h];
+    while ((he = *hep) != 0) {
+        if (he->keyHash == keyHash && (*ht->keyCompare)(key, he->key, arg)) {
+            /* Move to front of chain if not already there */
+            if (hep != hep0) {
+                *hep = he->next;
+                he->next = *hep0;
+                *hep0 = he;
+            }
+            return hep0;
+        }
+        hep = &he->next;
+#ifdef HASHMETER
+        ht->nsteps++;
+#endif
+    }
+    return hep;
+}
+
+PR_IMPLEMENT(JSJHashEntry *)
+JSJ_HashTableRawAdd(JSJHashTable *ht, JSJHashEntry **hep,
+                    JSJHashNumber keyHash, const void *key, void *value,
+                    void *arg)
+{
+    PRUint32 i, n;
+    JSJHashEntry *he, *next, **oldbuckets;
+    PRUint32 nb;
+
+    /* Grow the table if it is overloaded */
+    n = NBUCKETS(ht);
+    if (ht->nentries >= OVERLOADED(n)) {
+#ifdef HASHMETER
+        ht->ngrows++;
+#endif
+        ht->shift--;
+        oldbuckets = ht->buckets;
+#if defined(XP_PC) && !defined(_WIN32)
+        if (2 * n > 16000)
+            return 0;
+#endif  /* WIN16 */
+        nb = 2 * n * sizeof(JSJHashEntry *);
+        ht->buckets = (*ht->allocOps->allocTable)(ht->allocPriv, nb);
+        if (!ht->buckets) {
+            ht->buckets = oldbuckets;
+            return 0;
+        }
+        memset(ht->buckets, 0, nb);
+
+        for (i = 0; i < n; i++) {
+            for (he = oldbuckets[i]; he; he = next) {
+                next = he->next;
+                hep = JSJ_HashTableRawLookup(ht, he->keyHash, he->key, arg);
+                PR_ASSERT(*hep == 0);
+                he->next = 0;
+                *hep = he;
+            }
+        }
+#ifdef DEBUG
+        memset(oldbuckets, 0xDB, n * sizeof oldbuckets[0]);
+#endif
+        (*ht->allocOps->freeTable)(ht->allocPriv, oldbuckets);
+        hep = JSJ_HashTableRawLookup(ht, keyHash, key, arg);
+    }
+
+    /* Make a new key value entry */
+    he = (*ht->allocOps->allocEntry)(ht->allocPriv, key);
+    if (!he)
+    return 0;
+    he->keyHash = keyHash;
+    he->key = key;
+    he->value = value;
+    he->next = *hep;
+    *hep = he;
+    ht->nentries++;
+    return he;
+}
+
+PR_IMPLEMENT(JSJHashEntry *)
+JSJ_HashTableAdd(JSJHashTable *ht, const void *key, void *value, void *arg)
+{
+    JSJHashNumber keyHash;
+    JSJHashEntry *he, **hep;
+
+    keyHash = (*ht->keyHash)(key, arg);
+    hep = JSJ_HashTableRawLookup(ht, keyHash, key, arg);
+    if ((he = *hep) != 0) {
+        /* Hit; see if values match */
+        if ((*ht->valueCompare)(he->value, value, arg)) {
+            /* key,value pair is already present in table */
+            return he;
+        }
+        if (he->value)
+            (*ht->allocOps->freeEntry)(ht->allocPriv, he, HT_FREE_VALUE);
+        he->value = value;
+        return he;
+    }
+    return JSJ_HashTableRawAdd(ht, hep, keyHash, key, value, arg);
+}
+
+PR_IMPLEMENT(void)
+JSJ_HashTableRawRemove(JSJHashTable *ht, JSJHashEntry **hep, JSJHashEntry *he, void *arg)
+{
+    PRUint32 i, n;
+    JSJHashEntry *next, **oldbuckets;
+    PRUint32 nb;
+
+    *hep = he->next;
+    (*ht->allocOps->freeEntry)(ht->allocPriv, he, HT_FREE_ENTRY);
+
+    /* Shrink table if it's underloaded */
+    n = NBUCKETS(ht);
+    if (--ht->nentries < UNDERLOADED(n)) {
+#ifdef HASHMETER
+        ht->nshrinks++;
+#endif
+        ht->shift++;
+        oldbuckets = ht->buckets;
+        nb = n * sizeof(JSJHashEntry*) / 2;
+        ht->buckets = (*ht->allocOps->allocTable)(ht->allocPriv, nb);
+        if (!ht->buckets) {
+            ht->buckets = oldbuckets;
+            return;
+        }
+        memset(ht->buckets, 0, nb);
+
+        for (i = 0; i < n; i++) {
+            for (he = oldbuckets[i]; he; he = next) {
+                next = he->next;
+                hep = JSJ_HashTableRawLookup(ht, he->keyHash, he->key, arg);
+                PR_ASSERT(*hep == 0);
+                he->next = 0;
+                *hep = he;
+            }
+        }
+#ifdef DEBUG
+        memset(oldbuckets, 0xDB, n * sizeof oldbuckets[0]);
+#endif
+        (*ht->allocOps->freeTable)(ht->allocPriv, oldbuckets);
+    }
+}
+
+PR_IMPLEMENT(PRBool)
+JSJ_HashTableRemove(JSJHashTable *ht, const void *key, void *arg)
+{
+    JSJHashNumber keyHash;
+    JSJHashEntry *he, **hep;
+
+    keyHash = (*ht->keyHash)(key, arg);
+    hep = JSJ_HashTableRawLookup(ht, keyHash, key, arg);
+    if ((he = *hep) == 0)
+        return PR_FALSE;
+
+    /* Hit; remove element */
+    JSJ_HashTableRawRemove(ht, hep, he, arg);
+    return PR_TRUE;
+}
+
+PR_IMPLEMENT(void *)
+JSJ_HashTableLookup(JSJHashTable *ht, const void *key, void *arg)
+{
+    JSJHashNumber keyHash;
+    JSJHashEntry *he, **hep;
+
+    keyHash = (*ht->keyHash)(key, arg);
+    hep = JSJ_HashTableRawLookup(ht, keyHash, key, arg);
+    if ((he = *hep) != 0) {
+        return he->value;
+    }
+    return 0;
+}
+
+/*
+** Iterate over the entries in the hash table calling func for each
+** entry found. Stop if "f" says to (return value & PR_ENUMERATE_STOP).
+** Return a count of the number of elements scanned.
+*/
+PR_IMPLEMENT(int)
+JSJ_HashTableEnumerateEntries(JSJHashTable *ht, JSJHashEnumerator f, void *arg)
+{
+    JSJHashEntry *he, **hep;
+    PRUint32 i, nbuckets;
+    int rv, n = 0;
+    JSJHashEntry *todo = 0;
+
+    nbuckets = NBUCKETS(ht);
+    for (i = 0; i < nbuckets; i++) {
+        hep = &ht->buckets[i];
+        while ((he = *hep) != 0) {
+            rv = (*f)(he, n, arg);
+            n++;
+            if (rv & (HT_ENUMERATE_REMOVE | HT_ENUMERATE_UNHASH)) {
+                *hep = he->next;
+                if (rv & HT_ENUMERATE_REMOVE) {
+                    he->next = todo;
+                    todo = he;
+                }
+            } else {
+                hep = &he->next;
+            }
+            if (rv & HT_ENUMERATE_STOP) {
+                goto out;
+            }
+        }
+    }
+
+out:
+    hep = &todo;
+    while ((he = *hep) != 0) {
+        JSJ_HashTableRawRemove(ht, hep, he, arg);
+    }
+    return n;
+}
+
+#ifdef HASHMETER
+#include <math.h>
+#include <stdio.h>
+
+PR_IMPLEMENT(void)
+JSJ_HashTableDumpMeter(JSJHashTable *ht, JSJHashEnumerator dump, FILE *fp)
+{
+    double mean, variance;
+    PRUint32 nchains, nbuckets;
+    PRUint32 i, n, maxChain, maxChainLen;
+    JSJHashEntry *he;
+
+    variance = 0;
+    nchains = 0;
+    maxChainLen = 0;
+    nbuckets = NBUCKETS(ht);
+    for (i = 0; i < nbuckets; i++) {
+        he = ht->buckets[i];
+        if (!he)
+            continue;
+        nchains++;
+        for (n = 0; he; he = he->next)
+            n++;
+        variance += n * n;
+        if (n > maxChainLen) {
+            maxChainLen = n;
+            maxChain = i;
+        }
+    }
+    mean = (double)ht->nentries / nchains;
+    variance = fabs(variance / nchains - mean * mean);
+
+    fprintf(fp, "\nHash table statistics:\n");
+    fprintf(fp, "     number of lookups: %u\n", ht->nlookups);
+    fprintf(fp, "     number of entries: %u\n", ht->nentries);
+    fprintf(fp, "       number of grows: %u\n", ht->ngrows);
+    fprintf(fp, "     number of shrinks: %u\n", ht->nshrinks);
+    fprintf(fp, "   mean steps per hash: %g\n", (double)ht->nsteps
+                                                / ht->nlookups);
+    fprintf(fp, "mean hash chain length: %g\n", mean);
+    fprintf(fp, "    standard deviation: %g\n", sqrt(variance));
+    fprintf(fp, " max hash chain length: %u\n", maxChainLen);
+    fprintf(fp, "        max hash chain: [%u]\n", maxChain);
+
+    for (he = ht->buckets[maxChain], i = 0; he; he = he->next, i++)
+        if ((*dump)(he, i, fp) != HT_ENUMERATE_NEXT)
+            break;
+}
+#endif /* HASHMETER */
+
+PR_IMPLEMENT(int)
+JSJ_HashTableDump(JSJHashTable *ht, JSJHashEnumerator dump, FILE *fp)
+{
+    int count;
+
+    count = JSJ_HashTableEnumerateEntries(ht, dump, fp);
+#ifdef HASHMETER
+    JSJ_HashTableDumpMeter(ht, dump, fp);
+#endif
+    return count;
+}
+
+PR_IMPLEMENT(JSJHashNumber)
+JSJ_HashString(const void *key)
+{
+    JSJHashNumber h;
+    const unsigned char *s;
+
+    h = 0;
+    for (s = key; *s; s++)
+        h = (h >> 28) ^ (h << 4) ^ *s;
+    return h;
+}
+
+PR_IMPLEMENT(int)
+JSJ_CompareStrings(const void *v1, const void *v2)
+{
+    return strcmp(v1, v2) == 0;
+}
+
+PR_IMPLEMENT(int)
+JSJ_CompareValues(const void *v1, const void *v2)
+{
+    return v1 == v2;
+}

mozilla/js/src/liveconnect/jsj_hash.h

@@ -0,0 +1,141 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+ * This is a copy of the NSPR hash-table library, but it has been slightly
+ * modified to allow an additional argument to be passed into the hash
+ * key-comparision function.  This is used to maintain thread-safety by
+ * passing in a JNIEnv pointer to the key-comparison function rather
+ * than storing it in a global.  All types,function names, etc. have
+ * been renamed from their original NSPR names to protect the innocent.
+ */
+
+#ifndef jsj_hash_h___
+#define jsj_hash_h___
+/*
+ * API to portable hash table code.
+ */
+#include <stddef.h>
+#include <stdio.h>
+#include "prtypes.h"
+
+PR_BEGIN_EXTERN_C
+
+typedef struct JSJHashEntry  JSJHashEntry;
+typedef struct JSJHashTable  JSJHashTable;
+typedef PRUint32 JSJHashNumber;
+#define JSJ_HASH_BITS 32
+typedef JSJHashNumber (*JSJHashFunction)(const void *key, void *arg);
+typedef PRIntn (*JSJHashComparator)(const void *v1, const void *v2, void *arg);
+typedef PRIntn (*JSJHashEnumerator)(JSJHashEntry *he, PRIntn i, void *arg);
+
+/* Flag bits in JSJHashEnumerator's return value */
+#define HT_ENUMERATE_NEXT       0       /* continue enumerating entries */
+#define HT_ENUMERATE_STOP       1       /* stop enumerating entries */
+#define HT_ENUMERATE_REMOVE     2       /* remove and free the current entry */
+#define HT_ENUMERATE_UNHASH     4       /* just unhash the current entry */
+
+typedef struct JSJHashAllocOps {
+    void *              (*allocTable)(void *pool, size_t size);
+    void                (*freeTable)(void *pool, void *item);
+    JSJHashEntry *      (*allocEntry)(void *pool, const void *key);
+    void                (*freeEntry)(void *pool, JSJHashEntry *he, PRUintn flag);
+} JSJHashAllocOps;
+
+#define HT_FREE_VALUE   0               /* just free the entry's value */
+#define HT_FREE_ENTRY   1               /* free value and entire entry */
+
+struct JSJHashEntry {
+    JSJHashEntry        *next;          /* hash chain linkage */
+    JSJHashNumber       keyHash;        /* key hash function result */
+    const void          *key;           /* ptr to opaque key */
+    void                *value;         /* ptr to opaque value */
+};
+
+struct JSJHashTable {
+    JSJHashEntry         **buckets;      /* vector of hash buckets */
+    PRUint32              nentries;       /* number of entries in table */
+    PRUint32              shift;          /* multiplicative hash shift */
+    JSJHashFunction     keyHash;        /* key hash function */
+    JSJHashComparator   keyCompare;     /* key comparison function */
+    JSJHashComparator   valueCompare;   /* value comparison function */
+    JSJHashAllocOps     *allocOps;      /* allocation operations */
+    void                *allocPriv;     /* allocation private data */
+#ifdef HASHMETER
+    PRUint32              nlookups;       /* total number of lookups */
+    PRUint32              nsteps;         /* number of hash chains traversed */
+    PRUint32              ngrows;         /* number of table expansions */
+    PRUint32              nshrinks;       /* number of table contractions */
+#endif
+};
+
+/*
+ * Create a new hash table.
+ * If allocOps is null, use default allocator ops built on top of malloc().
+ */
+PR_EXTERN(JSJHashTable *)
+JSJ_NewHashTable(PRUint32 n, JSJHashFunction keyHash,
+                JSJHashComparator keyCompare, JSJHashComparator valueCompare,
+                JSJHashAllocOps *allocOps, void *allocPriv);
+
+PR_EXTERN(void)
+JSJ_HashTableDestroy(JSJHashTable *ht);
+
+/* Low level access methods */
+PR_EXTERN(JSJHashEntry **)
+JSJ_HashTableRawLookup(JSJHashTable *ht, JSJHashNumber keyHash, const void *key, void *arg);
+
+PR_EXTERN(JSJHashEntry *)
+JSJ_HashTableRawAdd(JSJHashTable *ht, JSJHashEntry **hep, JSJHashNumber keyHash,
+                   const void *key, void *value, void *arg);
+
+PR_EXTERN(void)
+JSJ_HashTableRawRemove(JSJHashTable *ht, JSJHashEntry **hep, JSJHashEntry *he, void *arg);
+
+/* Higher level access methods */
+PR_EXTERN(JSJHashEntry *)
+JSJ_HashTableAdd(JSJHashTable *ht, const void *key, void *value, void *arg);
+
+PR_EXTERN(PRBool)
+JSJ_HashTableRemove(JSJHashTable *ht, const void *key, void *arg);
+
+PR_EXTERN(PRIntn)
+JSJ_HashTableEnumerateEntries(JSJHashTable *ht, JSJHashEnumerator f, void *arg);
+
+PR_EXTERN(void *)
+JSJ_HashTableLookup(JSJHashTable *ht, const void *key, void *arg);
+
+PR_EXTERN(PRIntn)
+JSJ_HashTableDump(JSJHashTable *ht, JSJHashEnumerator dump, FILE *fp);
+
+/* General-purpose C string hash function. */
+PR_EXTERN(JSJHashNumber)
+JSJ_HashString(const void *key);
+
+/* Compare strings using strcmp(), return true if equal. */
+PR_EXTERN(int)
+JSJ_CompareStrings(const void *v1, const void *v2);
+
+/* Stub function just returns v1 == v2 */
+PR_EXTERN(PRIntn)
+JSJ_CompareValues(const void *v1, const void *v2);
+
+PR_END_EXTERN_C
+
+#endif /* jsj_hash_h___ */