Changes to get the back end building again.

Removed "dependencies" file (part of old make system.)

js2/src/Makefile.am

@@ -1,14 +1,12 @@
 
 include $(top_srcdir)/common.mk
 
-gc_dir = $(top_srcdir)/../gc/boehm/
-
-LIBS = $(gc_dir)/gc.a
-INCLUDES = -I$(gc_dir)
+INCLUDES = -I$(BOEHM_DIR)
 
 noinst_LIBRARIES = libjs2.a
 
-libjs2_a_DEPENDENCIES = $(gc_dir)/gc.a
+libjs2_a_LIBADD = $(LIBBOEHM)
+libjs2_a_DEPENDENCIES = $(BOEHM_DIR)/gc.a
 libjs2_a_SOURCES = \
 	algo.h \
 	cpucfg.h \
@@ -24,7 +22,6 @@ libjs2_a_SOURCES = \
 	hash.cpp \
 	hash.h \
 	icode_emitter.cpp \
-	icode_emitter.h \
 	icodegenerator.cpp \
     icodegenerator.h \
 	interpreter.cpp \

js2/src/dependencies

@@ -1,43 +0,0 @@
-debugger.o: debugger.cpp world.h utilities.h systemtypes.h hash.h \
- parser.h debugger.h interpreter.h jstypes.h gc_allocator.h vmtypes.h \
- numerics.h jsclasses.h icode.h icodegenerator.h
-exception.o: exception.cpp exception.h utilities.h systemtypes.h
-exception_msgs.o: exception_msgs.cpp
-gc_allocator.o: gc_allocator.cpp gc_allocator.h gc_container.h
-hash.o: hash.cpp hash.h utilities.h systemtypes.h
-ica_test.o: ica_test.cpp utilities.h systemtypes.h icodegenerator.h \
- parser.h vmtypes.h numerics.h jstypes.h gc_allocator.h jsclasses.h \
- world.h hash.h icode.h lexutils.h exception.h icodeasm.h \
- interpreter.h
-icodeasm.o: icodeasm.cpp icodeasm.h vmtypes.h numerics.h utilities.h \
- systemtypes.h jstypes.h gc_allocator.h parser.h jsclasses.h world.h \
- hash.h icode.h interpreter.h icodegenerator.h icodemap.h lexutils.h \
- exception.h
-icodegenerator.o: icodegenerator.cpp numerics.h utilities.h \
- systemtypes.h world.h hash.h parser.h vmtypes.h jstypes.h \
- gc_allocator.h jsclasses.h icode.h icodegenerator.h interpreter.h \
- xmlparser.h icodeasm.h
-interpreter.o: interpreter.cpp interpreter.h utilities.h systemtypes.h \
- jstypes.h gc_allocator.h parser.h vmtypes.h numerics.h jsclasses.h \
- world.h hash.h icode.h icodegenerator.h jsmath.h
-js2.o: js2.cpp world.h utilities.h systemtypes.h hash.h parser.h \
- interpreter.h jstypes.h gc_allocator.h vmtypes.h numerics.h \
- jsclasses.h icode.h icodegenerator.h xmlparser.h debugger.h
-jsmath.o: jsmath.cpp jsmath.h jstypes.h utilities.h systemtypes.h \
- gc_allocator.h parser.h
-jstypes.o: jstypes.cpp jstypes.h utilities.h systemtypes.h \
- gc_allocator.h parser.h jsclasses.h numerics.h icodegenerator.h \
- vmtypes.h world.h hash.h icode.h interpreter.h
-lexutils.o: lexutils.cpp lexutils.h utilities.h systemtypes.h \
- exception.h vmtypes.h numerics.h jstypes.h gc_allocator.h parser.h \
- jsclasses.h world.h hash.h icode.h
-numerics.o: numerics.cpp numerics.h utilities.h systemtypes.h \
- jstypes.h gc_allocator.h parser.h
-parser.o: parser.cpp numerics.h utilities.h systemtypes.h parser.h \
- world.h hash.h nodefactory.h
-utilities.o: utilities.cpp utilities.h systemtypes.h
-vmtypes.o: vmtypes.cpp utilities.h systemtypes.h vmtypes.h numerics.h \
- jstypes.h gc_allocator.h parser.h jsclasses.h world.h hash.h icode.h
-world.o: world.cpp world.h utilities.h systemtypes.h hash.h parser.h
-xmlparser.o: xmlparser.cpp parser.h utilities.h systemtypes.h world.h \
- hash.h xmlparser.h

js2/src/icodegenerator.cpp

@@ -39,7 +39,9 @@
 #include "icodegenerator.h"
 #include "interpreter.h"
 #include "exception.h"
+#ifdef TEST_ICASM
 #include "icodeasm.h"
+#endif
 
 #include <algorithm>
 #include <stdexcept>
@@ -52,8 +54,10 @@ using namespace VM;
 using namespace JSTypes;
 using namespace JSClasses;
 using namespace Interpreter;
+#ifdef TEST_ICASM
 using namespace ICodeASM;
-
+#endif
+    
 inline char narrow(char16 ch) { return char(ch); }
 
 
@@ -647,6 +651,7 @@ Formatter& operator<<(Formatter &f, string &s)
 
 ICodeModule *ICodeGenerator::readFunction(XMLNode *element, JSClass *thisClass)
 {
+#ifdef TEST_ICASM
     ICodeModule *result = NULL;
 
     String resultTypeName;
@@ -693,10 +698,16 @@ ICodeModule *ICodeGenerator::readFunction(XMLNode *element, JSClass *thisClass)
                                             NotABanana);            /* exception register */
     }
     return result;
+#else
+
+    return 0;
+
+#endif
 }
 
 ICodeModule *ICodeGenerator::readICode(const char *fileName)
 {
+#ifdef TEST_ICASM
     ICodeModule *result = NULL;
 
     XMLParser xp(fileName);
@@ -814,6 +825,12 @@ ICodeModule *ICodeGenerator::readICode(const char *fileName)
 
     }
     return result;
+
+#else
+
+    return 0;
+
+#endif
 }
     
 

js2/src/jstypes.h

@@ -31,8 +31,8 @@
  * file under either the NPL or the GPL.
  */
 
-#ifndef jstypes_h
-#define jstypes_h
+#ifndef jstypes_h___
+#define jstypes_h___
 
 #include "utilities.h"
 #include "gc_allocator.h"

js2/src/numerics.cpp

@@ -35,13 +35,12 @@
 #include <cstring>
 #include <cfloat>
 #include "numerics.h"
-//#include "jstypes.h"
-
-//using namespace JSTypes;
+#include "jstypes.h"
 
 namespace JavaScript
 {
-    
+    using namespace JSTypes;
+
 //
 // Portable double-precision floating point to string and back conversions
 //
@@ -240,20 +239,20 @@ namespace JavaScript
         word1(nan) = 0xFFFFFFFF;
     }
 
-/*
+
 // had to move these here since they depend upon the values
 // initialized above, and we can't guarantee order other than
 // lexically in a single file.
-const JSValue JSTypes::kUndefinedValue;
-const JSValue JSTypes::kNaNValue = JSValue(nan);
-const JSValue JSTypes::kTrueValue = JSValue(true);
-const JSValue JSTypes::kFalseValue = JSValue(false);
-const JSValue JSTypes::kNullValue = JSValue(JSValue::null_tag);
-const JSValue JSTypes::kNegativeZero = JSValue(-0.0);
-const JSValue JSTypes::kPositiveZero = JSValue(0.0);
-const JSValue JSTypes::kNegativeInfinity = JSValue(negativeInfinity);
-const JSValue JSTypes::kPositiveInfinity = JSValue(positiveInfinity);
-*/
+    const JSValue JSTypes::kUndefinedValue;
+    const JSValue JSTypes::kNaNValue = JSValue(nan);
+    const JSValue JSTypes::kTrueValue = JSValue(true);
+    const JSValue JSTypes::kFalseValue = JSValue(false);
+    const JSValue JSTypes::kNullValue = JSValue(JSValue::null_tag);
+    const JSValue JSTypes::kNegativeZero = JSValue(-0.0);
+    const JSValue JSTypes::kPositiveZero = JSValue(0.0);
+    const JSValue JSTypes::kNegativeInfinity = JSValue(negativeInfinity);
+    const JSValue JSTypes::kPositiveInfinity = JSValue(positiveInfinity);
+
 //
 // Portable double-precision floating point to string and back conversions
 //