Merging DIKDIK_BRANCH into main line.

js2/common.mk

@@ -6,11 +6,15 @@ JS2_DIR = $(top_srcdir)/src/
 LIBJS2 = $(JS2_DIR)/libjs2.a
 
 WFLAGS = -Wmissing-prototypes -Wstrict-prototypes -Wunused \
-         -Wswitch
-
+         -Wswitch -Wall -Wconversion
 
 if DEBUG
-CXXFLAGS = -DXP_UNIX -g -DDEBUG -DNEW_PARSER $(WFLAGS)
+CXXFLAGS = -DXP_UNIX -g -DDEBUG $(WFLAGS)
+JS1x_BINDIR = Linux_All_DBG.OBJ
 else
-CXXFLAGS = -DXP_UNIX -O2 -DNEW_PARSER -Wuninitialized $(WFLAGS)
+CXXFLAGS = -DXP_UNIX -O2 -Wuninitialized $(WFLAGS)
+JS1x_BINDIR = Linux_All_OPT.OBJ
 endif
+
+FDLIBM_DIR = $(top_srcdir)/../js/src/fdlibm/$(JS1x_BINDIR)
+LIBFDLIBM = $(FDLIBM_DIR)/libfdm.a

js2/src/Makefile.am

@@ -1,57 +1,28 @@
-
 include $(top_srcdir)/common.mk
 
-INCLUDES = -I$(BOEHM_DIR)
-
 noinst_LIBRARIES = libjs2.a
 
-# can't add this to the library, clients will need to link to gc.a
-# libjs2_a_LIBADD = $(LIBBOEHM)
+libjs2_a_DEPENDENCIES = $(LIBFDLIBM)
 
-libjs2_a_DEPENDENCIES = $(LIBBOEHM)
 libjs2_a_SOURCES = \
-	algo.h \
-	cpucfg.h \
-	debugger.cpp \
-	debugger.h \
-	ds.h \
+	bytecodegen.cpp \
+	collector.cpp \
 	exception.cpp \
-	exception.h \
 	formatter.cpp \
-	formatter.h \
-	gc_allocator.h \
-	gc_container.h \
+	fdlibm_ns.cpp \
 	hash.cpp \
-	hash.h \
-	icode_emitter.cpp \
-	icodegenerator.cpp \
-    icodegenerator.h \
-	interpreter.cpp \
-	interpreter.h \
+	js2runtime.cpp \
+	js2execution.cpp \
+	jsarray.cpp \
 	jsmath.cpp \
-	jsmath.h \
-	jstypes.cpp \
-	jstypes.h \
+	jsstring.cpp \
 	lexer.cpp \
-	lexer.h \
 	mem.cpp \
-	mem.h \
-	nodefactory.h \
 	numerics.cpp \
-	numerics.h \
 	parser.cpp \
-	parser.h \
 	reader.cpp \
-	reader.h \
-	stlcfg.h \
 	strings.cpp \
-	strings.h \
-	systemtypes.h \
+	tracer.cpp \
 	token.cpp \
-	token.h \
 	utilities.cpp \
-	utilities.h \
-	vmtypes.cpp \
-	vmtypes.h \
-	world.cpp \
-	world.h
+	world.cpp

js2/tests/cpp/Makefile.am

@@ -2,13 +2,9 @@
 include $(top_srcdir)/common.mk
 
 INCLUDES = -I$(JS2_DIR)
-LIBS = -L$(JS2_DIR) -ljs2 $(LIBBOEHM)
+LIBS = -L$(JS2_DIR) -ljs2 -L$(FDLIBM_DIR) -lfdm
 
-bin_PROGRAMS = parser_test js2_shell
+bin_PROGRAMS = dikdik
 
-parser_test_DEPENDENCIES = $(LIBJS2)
-parser_test_SOURCES = parser_test.cpp
-
-js2_shell_DEPENDENCIES = $(LIBJS2) $(LIBBOEHM)
-js2_shell_LDADD = $(LIBBOEHM)
-js2_shell_SOURCES = js2_shell.cpp
+dikdik_DEPENDENCIES = $(LIBJS2) $(LIBFDLIBM)
+dikdik_SOURCES = DikDik_Shell.cpp