Introduces a light version of D8 that links against shared library.

src/d8.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+#if (defined(USING_V8_SHARED) || defined(V8_SHARED))
+#define D8_LIGHT

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

How about renaming D8_LIGHT to D8_WITH_SHARED?

It would be even better if we could just use USING_V8_SHARED instead of adding a
new define.

+#endif
+
 #ifdef COMPRESS_STARTUP_DATA_BZ2
 #include <bzlib.h>
 #endif
+
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include "v8.h"
+#ifdef D8_LIGHT
+#include <assert.h>
+#include "../include/v8-testing.h"
+#endif // D8_LIGHT

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

Two spaces before //. Also in other places below.

 
 #include "d8.h"
+
+#ifndef D8_LIGHT
+#include "api.h"
+#include "checks.h"
 #include "d8-debug.h"
 #include "debug.h"
-#include "api.h"
 #include "natives.h"
 #include "platform.h"
+#include "v8.h"
+#endif // D8_LIGHT
 
 #if !defined(_WIN32) && !defined(_WIN64)
 #include <unistd.h>  // NOLINT
 #endif
 
+#ifdef D8_LIGHT
+#define ASSERT(condition) assert(condition)
+#endif // D8_LIGHT
+
 namespace v8 {
 
 
+#ifndef D8_LIGHT
+LineEditor *LineEditor::first_ = NULL;
 const char* Shell::kHistoryFileName = ".d8_history";
-const char* Shell::kPrompt = "d8> ";
-
-
-LineEditor *LineEditor::first_ = NULL;
 
 
 LineEditor::LineEditor(Type type, const char* name)
     : type_(type),
       name_(name),
       next_(first_) {
   first_ = this;
 }
 
 
@@ skipping 25 matching lines @@
   printf("%s", prompt);
   char* str = fgets(buffer, kBufferSize, stdin);
   return i::SmartPointer<char>(str ? i::StrDup(str) : str);
 }
 
 
 CounterMap* Shell::counter_map_;
 i::OS::MemoryMappedFile* Shell::counters_file_ = NULL;
 CounterCollection Shell::local_counters_;
 CounterCollection* Shell::counters_ = &local_counters_;
+i::Mutex* Shell::context_mutex_(i::OS::CreateMutex());
 Persistent<Context> Shell::utility_context_;
+#endif // D8_LIGHT
+
 Persistent<Context> Shell::evaluation_context_;
-i::Mutex* Shell::context_mutex_(i::OS::CreateMutex());
 ShellOptions Shell::options;
+const char* Shell::kPrompt = "d8> ";
 
 
+#ifndef D8_LIGHT
 bool CounterMap::Match(void* key1, void* key2) {
   const char* name1 = reinterpret_cast<const char*>(key1);
   const char* name2 = reinterpret_cast<const char*>(key2);
   return strcmp(name1, name2) == 0;
 }
+#endif // D8_LIGHT
 
 
 // Converts a V8 value to a C string.
 const char* Shell::ToCString(const v8::String::Utf8Value& value) {
   return *value ? *value : "<string conversion failed>";
 }
 
 
 // Executes a string within the current v8 context.
 bool Shell::ExecuteString(Handle<String> source,
                           Handle<Value> name,
                           bool print_result,
                           bool report_exceptions) {
+#ifndef D8_LIGHT
+  bool FLAG_debugger = i::FLAG_debugger;
+#else
+  bool FLAG_debugger = false;
+#endif // D8_LIGHT
   HandleScope handle_scope;
   TryCatch try_catch;
   options.script_executed = true;
-  if (i::FLAG_debugger) {
+  if (FLAG_debugger) {
     // When debugging make exceptions appear to be uncaught.
     try_catch.SetVerbose(true);
   }
   Handle<Script> script = Script::Compile(source, name);
   if (script.IsEmpty()) {
     // Print errors that happened during compilation.
-    if (report_exceptions && !i::FLAG_debugger)
+    if (report_exceptions && !FLAG_debugger)
       ReportException(&try_catch);
     return false;
   } else {
     Handle<Value> result = script->Run();
     if (result.IsEmpty()) {
       ASSERT(try_catch.HasCaught());
       // Print errors that happened during execution.
-      if (report_exceptions && !i::FLAG_debugger)
+      if (report_exceptions && !FLAG_debugger)
         ReportException(&try_catch);
       return false;
     } else {
       ASSERT(!try_catch.HasCaught());
       if (print_result && !result->IsUndefined()) {
         // If all went well and the result wasn't undefined then print
         // the returned value.
         v8::String::Utf8Value str(result);
         const char* cstr = ToCString(str);
         printf("%s\n", cstr);
@@ skipping 35 matching lines @@
   }
   Handle<String> source = ReadFile(*file);
   if (source.IsEmpty()) {
     return ThrowException(String::New("Error loading file"));
   }
   return source;
 }
 
 
 Handle<Value> Shell::ReadLine(const Arguments& args) {
-  i::SmartPointer<char> line(i::ReadLine(""));
-  if (*line == NULL) {
-    return Null();
-  }
-  size_t len = strlen(*line);
-  if (len > 0 && line[len - 1] == '\n') {
-    --len;
-  }
-  return String::New(*line, len);
+  static const int kBufferSize = 256;
+  char buffer[kBufferSize];
+  if (fgets(buffer, kBufferSize, stdin) == NULL) return Null();
+  buffer[strlen(buffer) - 1] = '\0'; // chomp

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

Check for '\' before overwriting with '\0'?

Two spaces between ; and //.

Start comment with uppercase and end with dot - and maybe more elaborate.

+  return String::New(buffer);
 }
 
 
 Handle<Value> Shell::Load(const Arguments& args) {
   for (int i = 0; i < args.Length(); i++) {
     HandleScope handle_scope;
     String::Utf8Value file(args[i]);
     if (*file == NULL) {
       return ThrowException(String::New("Error loading file"));
     }
@@ skipping 11 matching lines @@
 
 Handle<Value> Shell::CreateExternalArray(const Arguments& args,
                                          ExternalArrayType type,
                                          size_t element_size) {
   ASSERT(element_size == 1 || element_size == 2 || element_size == 4 ||
          element_size == 8);
   if (args.Length() != 1) {
     return ThrowException(
         String::New("Array constructor needs one parameter."));
   }
+  static const int kMaxLength = 0x3fffffff;

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

Maybe assert that this is equal to  i::ExternalArray::kMaxLength (if not
building the light version).

   size_t length = 0;
   if (args[0]->IsUint32()) {
     length = args[0]->Uint32Value();
   } else if (args[0]->IsNumber()) {
     double raw_length = args[0]->NumberValue();
     if (raw_length < 0) {
       return ThrowException(String::New("Array length must not be negative."));
     }
-    if (raw_length > i::ExternalArray::kMaxLength) {
+    if (raw_length > kMaxLength) {
       return ThrowException(
           String::New("Array length exceeds maximum length."));
     }
     length = static_cast<size_t>(raw_length);
   } else {
     return ThrowException(String::New("Array length must be a number."));
   }
-  if (length > static_cast<size_t>(i::ExternalArray::kMaxLength)) {
+  if (length > static_cast<size_t>(kMaxLength)) {
     return ThrowException(String::New("Array length exceeds maximum length."));
   }
   void* data = calloc(length, element_size);
   if (data == NULL) {
     return ThrowException(String::New("Memory allocation failed."));
   }
   Handle<Object> array = Object::New();
   Persistent<Object> persistent_array = Persistent<Object>::New(array);
   persistent_array.MakeWeak(data, ExternalArrayWeakCallback);
   persistent_array.MarkIndependent();
@@ skipping 59 matching lines @@
 
 
 Handle<Value> Shell::Yield(const Arguments& args) {
   v8::Unlocker unlocker;
   return Undefined();
 }
 
 
 Handle<Value> Shell::Quit(const Arguments& args) {
   int exit_code = args[0]->Int32Value();
+#ifndef D8_LIGHT
   OnExit();
+#endif // D8_LIGHT
   exit(exit_code);
   return Undefined();
 }
 
 
 Handle<Value> Shell::Version(const Arguments& args) {
   return String::New(V8::GetVersion());
 }
 
 
@@ skipping 28 matching lines @@
     printf("\n");
     v8::String::Utf8Value stack_trace(try_catch->StackTrace());
     if (stack_trace.length() > 0) {
       const char* stack_trace_string = ToCString(stack_trace);
       printf("%s\n", stack_trace_string);
     }
   }
 }
 
 
+#ifndef D8_LIGHT
 Handle<Array> Shell::GetCompletions(Handle<String> text, Handle<String> full) {
   HandleScope handle_scope;
   Context::Scope context_scope(utility_context_);
   Handle<Object> global = utility_context_->Global();
   Handle<Value> fun = global->Get(String::New("GetCompletions"));
   static const int kArgc = 3;
   Handle<Value> argv[kArgc] = { evaluation_context_->Global(), text, full };
   Handle<Value> val = Handle<Function>::Cast(fun)->Call(global, kArgc, argv);
   return handle_scope.Close(Handle<Array>::Cast(val));
 }
@@ skipping 13 matching lines @@
 
 Handle<Value> Shell::DebugCommandToJSONRequest(Handle<String> command) {
   Context::Scope context_scope(utility_context_);
   Handle<Object> global = utility_context_->Global();
   Handle<Value> fun = global->Get(String::New("DebugCommandToJSONRequest"));
   static const int kArgc = 1;
   Handle<Value> argv[kArgc] = { command };
   Handle<Value> val = Handle<Function>::Cast(fun)->Call(global, kArgc, argv);
   return val;
 }
-#endif
+#endif // ENABLE_DEBUGGER_SUPPORT
+#endif // D8_LIGHT
 
 
+#ifndef D8_LIGHT
 int32_t* Counter::Bind(const char* name, bool is_histogram) {
   int i;
   for (i = 0; i < kMaxNameSize - 1 && name[i]; i++)
     name_[i] = static_cast<char>(name[i]);
   name_[i] = '\0';
   is_histogram_ = is_histogram;
   return ptr();
 }
 
 
@@ skipping 11 matching lines @@
 }
 
 
 Counter* CounterCollection::GetNextCounter() {
   if (counters_in_use_ == kMaxCounters) return NULL;
   return &counters_[counters_in_use_++];
 }
 
 
 void Shell::MapCounters(const char* name) {
   counters_file_ = i::OS::MemoryMappedFile::create(name,

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

While at it consider moving name to the line with parameters.

-    sizeof(CounterCollection), &local_counters_);
+      sizeof(CounterCollection), &local_counters_);
   void* memory = (counters_file_ == NULL) ?
       NULL : counters_file_->memory();
   if (memory == NULL) {
     printf("Could not map counters file %s\n", name);
     exit(1);
   }
   counters_ = static_cast<CounterCollection*>(memory);
   V8::SetCounterFunction(LookupCounter);
   V8::SetCreateHistogramFunction(CreateHistogram);
   V8::SetAddHistogramSampleFunction(AddHistogramSample);
@@ skipping 44 matching lines @@
                              size_t buckets) {
   return GetCounter(name, true);
 }
 
 
 void Shell::AddHistogramSample(void* histogram, int sample) {
   Counter* counter = reinterpret_cast<Counter*>(histogram);
   counter->AddSample(sample);
 }
 
+
 void Shell::InstallUtilityScript() {
   Locker lock;
   HandleScope scope;
   // If we use the utility context, we have to set the security tokens so that
   // utility, evaluation and debug context can all access each other.
   utility_context_->SetSecurityToken(Undefined());
   evaluation_context_->SetSecurityToken(Undefined());
   Context::Scope utility_scope(utility_context_);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Install the debugger object in the utility scope
   i::Debug* debug = i::Isolate::Current()->debug();
   debug->Load();
   i::Handle<i::JSObject> js_debug
       = i::Handle<i::JSObject>(debug->debug_context()->global());
   utility_context_->Global()->Set(String::New("$debug"),
                                   Utils::ToLocal(js_debug));
   debug->debug_context()->set_security_token(HEAP->undefined_value());
-#endif
+#endif // ENABLE_DEBUGGER_SUPPORT
 
   // Run the d8 shell utility script in the utility context
   int source_index = i::NativesCollection<i::D8>::GetIndex("d8");
   i::Vector<const char> shell_source =
       i::NativesCollection<i::D8>::GetRawScriptSource(source_index);
   i::Vector<const char> shell_source_name =
       i::NativesCollection<i::D8>::GetScriptName(source_index);
   Handle<String> source = String::New(shell_source.start(),
       shell_source.length());
   Handle<String> name = String::New(shell_source_name.start(),
       shell_source_name.length());
   Handle<Script> script = Script::Compile(source, name);
   script->Run();
   // Mark the d8 shell script as native to avoid it showing up as normal source
   // in the debugger.
   i::Handle<i::Object> compiled_script = Utils::OpenHandle(*script);
   i::Handle<i::Script> script_object = compiled_script->IsJSFunction()
-     ? i::Handle<i::Script>(i::Script::cast(
-         i::JSFunction::cast(*compiled_script)->shared()->script()))
-     : i::Handle<i::Script>(i::Script::cast(
-         i::SharedFunctionInfo::cast(*compiled_script)->script()));
+      ? i::Handle<i::Script>(i::Script::cast(
+          i::JSFunction::cast(*compiled_script)->shared()->script()))
+      : i::Handle<i::Script>(i::Script::cast(
+          i::SharedFunctionInfo::cast(*compiled_script)->script()));
   script_object->set_type(i::Smi::FromInt(i::Script::TYPE_NATIVE));
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Start the in-process debugger if requested.
   if (i::FLAG_debugger && !i::FLAG_debugger_agent) {
     v8::Debug::SetDebugEventListener(HandleDebugEvent);
   }
-#endif
+#endif // ENABLE_DEBUGGER_SUPPORT
 }
+#endif // D8_LIGHT
 
 
 #ifdef COMPRESS_STARTUP_DATA_BZ2
 class BZip2Decompressor : public v8::StartupDataDecompressor {
  public:
   virtual ~BZip2Decompressor() { }
 
  protected:
   virtual int DecompressData(char* raw_data,
                              int* raw_data_size,
@@ skipping 46 matching lines @@
                        FunctionTemplate::New(Float64Array));
   global_template->Set(String::New("PixelArray"),
                        FunctionTemplate::New(PixelArray));
 
 #ifdef LIVE_OBJECT_LIST
   global_template->Set(String::New("lol_is_enabled"), Boolean::New(true));
 #else
   global_template->Set(String::New("lol_is_enabled"), Boolean::New(false));
 #endif
 
+#ifndef D8_LIGHT
   Handle<ObjectTemplate> os_templ = ObjectTemplate::New();
   AddOSMethods(os_templ);
   global_template->Set(String::New("os"), os_templ);
+#endif // D8_LIGHT
 
   return global_template;
 }
 
 
 void Shell::Initialize() {
 #ifdef COMPRESS_STARTUP_DATA_BZ2
   BZip2Decompressor startup_data_decompressor;
   int bz2_result = startup_data_decompressor.Decompress();
   if (bz2_result != BZ_OK) {
     fprintf(stderr, "bzip error code: %d\n", bz2_result);
     exit(1);
   }
 #endif
 
+#ifndef D8_LIGHT
   Shell::counter_map_ = new CounterMap();
   // Set up counters
   if (i::StrLength(i::FLAG_map_counters) != 0)
     MapCounters(i::FLAG_map_counters);
   if (i::FLAG_dump_counters) {
     V8::SetCounterFunction(LookupCounter);
     V8::SetCreateHistogramFunction(CreateHistogram);
     V8::SetAddHistogramSampleFunction(AddHistogramSample);
   }
-
+#endif // D8_LIGHT
   if (options.test_shell) return;
 
+#ifndef D8_LIGHT
   Locker lock;
   HandleScope scope;
   Handle<ObjectTemplate> global_template = CreateGlobalTemplate();
   utility_context_ = Context::New(NULL, global_template);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Start the debugger agent if requested.
   if (i::FLAG_debugger_agent) {
     v8::Debug::EnableAgent("d8 shell", i::FLAG_debugger_port, true);
   }
-#endif
+#endif // ENABLE_DEBUGGER_SUPPORT
+#endif // D8_LIGHT
 }
 
 
 Persistent<Context> Shell::CreateEvaluationContext() {
+#ifndef D8_LIGHT
   // This needs to be a critical section since this is not thread-safe
   i::ScopedLock lock(context_mutex_);
+#endif // D8_LIGHT
   // Initialize the global objects
   Handle<ObjectTemplate> global_template = CreateGlobalTemplate();
   Persistent<Context> context = Context::New(NULL, global_template);
   Context::Scope scope(context);
 
+#ifndef D8_LIGHT
   i::JSArguments js_args = i::FLAG_js_arguments;
   i::Handle<i::FixedArray> arguments_array =
       FACTORY->NewFixedArray(js_args.argc());
   for (int j = 0; j < js_args.argc(); j++) {
     i::Handle<i::String> arg =
         FACTORY->NewStringFromUtf8(i::CStrVector(js_args[j]));
     arguments_array->set(j, *arg);
   }
   i::Handle<i::JSArray> arguments_jsarray =
       FACTORY->NewJSArrayWithElements(arguments_array);
   context->Global()->Set(String::New("arguments"),
-                                     Utils::ToLocal(arguments_jsarray));
+                         Utils::ToLocal(arguments_jsarray));
+#endif // D8_LIGHT
   return context;
 }
 
 
+#ifndef D8_LIGHT
 void Shell::OnExit() {
   if (i::FLAG_dump_counters) {
     printf("+----------------------------------------+-------------+\n");
     printf("| Name                                   | Value       |\n");
     printf("+----------------------------------------+-------------+\n");
     for (CounterMap::Iterator i(counter_map_); i.More(); i.Next()) {
       Counter* counter = i.CurrentValue();
       if (counter->is_histogram()) {
         printf("| c:%-36s | %11i |\n", i.CurrentKey(), counter->count());
         printf("| t:%-36s | %11i |\n", i.CurrentKey(), counter->sample_total());
       } else {
         printf("| %-38s | %11i |\n", i.CurrentKey(), counter->count());
       }
     }
     printf("+----------------------------------------+-------------+\n");
   }
   if (counters_file_ != NULL)
     delete counters_file_;
 }
+#endif // D8_LIGHT
 
 
 static char* ReadChars(const char* name, int* size_out) {
   // Release the V8 lock while reading files.
   v8::Unlocker unlocker(Isolate::GetCurrent());
+#ifndef D8_LIGHT
   FILE* file = i::OS::FOpen(name, "rb");
+#else
+  FILE* file = fopen(name, "rb"); // TODO: reading from a directory hangs!

[Yang, 2011/07/13 13:26:10]

This is a known minor issue. I'll come with a solution for this in another CL.

+#endif // D8_LIGHT
   if (file == NULL) return NULL;
 
   fseek(file, 0, SEEK_END);
   int size = ftell(file);
   rewind(file);
 
   char* chars = new char[size + 1];
   chars[size] = '\0';
   for (int i = 0; i < size;) {
     int read = fread(&chars[i], 1, size - i, file);
     i += read;
   }
   fclose(file);
   *size_out = size;
   return chars;
 }
 
 
+#ifndef D8_LIGHT
 static char* ReadToken(char* data, char token) {
   char* next = i::OS::StrChr(data, token);
   if (next != NULL) {
     *next = '\0';
     return (next + 1);
   }
 
   return NULL;
 }
 
 
 static char* ReadLine(char* data) {
   return ReadToken(data, '\n');
 }
 
 
 static char* ReadWord(char* data) {
   return ReadToken(data, ' ');
 }
+#endif // D8_LIGHT
 
 
 // Reads a file into a v8 string.
 Handle<String> Shell::ReadFile(const char* name) {
   int size = 0;
   char* chars = ReadChars(name, &size);
   if (chars == NULL) return Handle<String>();
   Handle<String> result = String::New(chars);
   delete[] chars;
   return result;
 }
 
 
 void Shell::RunShell() {
+  Locker locker;
+  Context::Scope context_scope(evaluation_context_);
+  HandleScope handle_scope;
+  Handle<String> name = String::New("(d8)");
+#ifndef D8_LIGHT
   LineEditor* editor = LineEditor::Get();
   printf("V8 version %s [console: %s]\n", V8::GetVersion(), editor->name());
   if (i::FLAG_debugger) {
     printf("JavaScript debugger enabled\n");
   }
-
   editor->Open();
   while (true) {
-    Locker locker;
-    HandleScope handle_scope;
-    Context::Scope context_scope(evaluation_context_);
     i::SmartPointer<char> input = editor->Prompt(Shell::kPrompt);
-    if (input.is_empty())
-      break;
+    if (input.is_empty()) break;
     editor->AddHistory(*input);
-    Handle<String> name = String::New("(d8)");
     ExecuteString(String::New(*input), name, true, true);
   }
   editor->Close();
+#else
+  printf("V8 version %s [D8 light with shared library]\n", V8::GetVersion());

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

with -> using

+  static const int kBufferSize = 256;
+  while (true) {
+    char buffer[kBufferSize];
+    printf("%s", Shell::kPrompt);
+    if (fgets(buffer, kBufferSize, stdin) == NULL) break;
+    ExecuteString(String::New(buffer), name, true, true);
+  }
+#endif // D8_LIGHT
   printf("\n");
 }
 
 
+#ifndef D8_LIGHT
 class ShellThread : public i::Thread {
  public:
   ShellThread(int no, i::Vector<const char> files)
-    : Thread("d8:ShellThread"),
-      no_(no), files_(files) { }
+      : Thread("d8:ShellThread"),
+        no_(no), files_(files) { }
   virtual void Run();
  private:
   int no_;
   i::Vector<const char> files_;
 };
 
 
 void ShellThread::Run() {
   char* ptr = const_cast<char*>(files_.start());
   while ((ptr != NULL) && (*ptr != '\0')) {
@@ skipping 27 matching lines @@
         break;
       }
 
       Shell::ExecuteString(str, String::New(filename), false, false);
     }
 
     thread_context.Dispose();
     ptr = next_line;
   }
 }
+#endif // D8_LIGHT
 
 
 void SourceGroup::ExitShell(int exit_code) {
   // Use _exit instead of exit to avoid races between isolate
   // threads and static destructors.
   fflush(stdout);
   fflush(stderr);
   _exit(exit_code);
 }
 
@@ skipping 26 matching lines @@
       if (!Shell::ExecuteString(source, file_name, false, true)) {
         ExitShell(1);
         return;
       }
     }
   }
 }
 
 
 Handle<String> SourceGroup::ReadFile(const char* name) {
-  FILE* file = fopen(name, "rb");
+#ifndef D8_LIGHT
+  FILE* file = i::OS::FOpen(name, "rb");
+#else
+  FILE* file = fopen(name, "rb"); // TODO: reading from a directory hangs!

[Yang, 2011/07/13 13:26:10]

Ditto.

+#endif // D8_LIGHT
   if (file == NULL) return Handle<String>();
 
   fseek(file, 0, SEEK_END);
   int size = ftell(file);
   rewind(file);
 
   char* chars = new char[size + 1];
   chars[size] = '\0';
   for (int i = 0; i < size;) {
     int read = fread(&chars[i], 1, size - i, file);
     i += read;
   }
   fclose(file);
   Handle<String> result = String::New(chars, size);
   delete[] chars;
   return result;
 }
 
 
+#ifndef D8_LIGHT
 i::Thread::Options SourceGroup::GetThreadOptions() {
   i::Thread::Options options;
   options.name = "IsolateThread";
   // On some systems (OSX 10.6) the stack size default is 0.5Mb or less
   // which is not enough to parse the big literal expressions used in tests.
   // The stack size should be at least StackGuard::kLimitSize + some
   // OS-specific padding for thread startup code.
   options.stack_size = 2 << 20;  // 2 Mb seems to be enough
   return options;
 }
@@ skipping 31 matching lines @@
 
 void SourceGroup::WaitForThread() {
   if (thread_ == NULL) return;
   if (Shell::options.last_run) {
     thread_->Join();
     thread_ = NULL;
   } else {
     done_semaphore_->Wait();
   }
 }
+#endif // D8_LIGHT
 
 
 bool Shell::SetOptions(int argc, char* argv[]) {
   for (int i = 0; i < argc; i++) {
     if (strcmp(argv[i], "--stress-opt") == 0) {
       options.stress_opt = true;
       argv[i] = NULL;
     } else if (strcmp(argv[i], "--stress-deopt") == 0) {
       options.stress_deopt = true;
       argv[i] = NULL;
     } else if (strcmp(argv[i], "--noalways-opt") == 0) {
       // No support for stressing if we can't use --always-opt.
       options.stress_opt = false;
       options.stress_deopt = false;
     } else if (strcmp(argv[i], "--shell") == 0) {
       options.interactive_shell = true;
       argv[i] = NULL;
     } else if (strcmp(argv[i], "--test") == 0) {
       options.test_shell = true;
       argv[i] = NULL;
     } else if (strcmp(argv[i], "--preemption") == 0) {

[Yang, 2011/07/13 13:26:10]

Many options are not supported by the light version.

+#ifdef D8_LIGHT
+      printf("D8 with shared library does not support multi-threading\n");
+      return false;
+#else
       options.use_preemption = true;
       argv[i] = NULL;
+#endif // D8_LIGHT
     } else if (strcmp(argv[i], "--no-preemption") == 0) {
+#ifdef D8_LIGHT
+      printf("D8 with shared library does not support multi-threading\n");
+      return false;
+#else
       options.use_preemption = false;
       argv[i] = NULL;
+#endif // D8_LIGHT
     } else if (strcmp(argv[i], "--preemption-interval") == 0) {
+#ifdef D8_LIGHT
+      printf("D8 with shared library does not support multi-threading\n");
+      return false;
+#else
       if (++i < argc) {
         argv[i-1] = NULL;
         char* end = NULL;
         options.preemption_interval = strtol(argv[i], &end, 10);  // NOLINT
         if (options.preemption_interval <= 0
             || *end != '\0'
             || errno == ERANGE) {
           printf("Invalid value for --preemption-interval '%s'\n", argv[i]);
           return false;
         }
         argv[i] = NULL;
       } else {
         printf("Missing value for --preemption-interval\n");
         return false;
       }
+#endif // D8_LIGHT
     } else if (strcmp(argv[i], "-f") == 0) {
       // Ignore any -f flags for compatibility with other stand-alone
       // JavaScript engines.
       continue;
     } else if (strcmp(argv[i], "--isolate") == 0) {
+#ifdef D8_LIGHT
+      printf("D8 with shared library does not support multi-threading\n");
+      return false;
+#endif // D8_LIGHT
       options.num_isolates++;
     }
+#ifdef D8_LIGHT
+    else if (strcmp(argv[i], "--dump-counters") == 0) {
+      printf("D8 with shared library does not include counters\n");
+      return false;
+    } else if (strcmp(argv[i], "-p") == 0) {
+      printf("D8 with shared library does not support multi-threading\n");
+      return false;
+    } else if (strcmp(argv[i], "--debugger") == 0) {
+      printf("Javascript debugger not included\n");
+      return false;
+    }
+#endif // D8_LIGHT
   }
 
+#ifndef D8_LIGHT
   // Run parallel threads if we are not using --isolate
   for (int i = 1; i < argc; i++) {
     if (argv[i] == NULL) continue;
     if (strcmp(argv[i], "-p") == 0 && i + 1 < argc) {
       if (options.num_isolates > 1) {
         printf("-p is not compatible with --isolate\n");
         return false;
       }
       argv[i] = NULL;
       if (options.parallel_files == NULL) {
         options.parallel_files = new i::List<i::Vector<const char> >();
       }
       int size = 0;
       const char* files = ReadChars(argv[++i], &size);
       if (files == NULL) {
         printf("-p option incomplete\n");
         return false;
       }
       argv[i] = NULL;
       options.parallel_files->Add(i::Vector<const char>(files, size));
     }
   }
+#endif // D8_LIGHT
 
   v8::V8::SetFlagsFromCommandLine(&argc, argv, true);
 
   // set up isolated source groups
   options.isolate_sources = new SourceGroup[options.num_isolates];
   SourceGroup* current = options.isolate_sources;
   current->Begin(argv, 1);
   for (int i = 1; i < argc; i++) {
     const char* str = argv[i];
     if (strcmp(str, "--isolate") == 0) {
       current->End(i);
       current++;
       current->Begin(argv, i + 1);
     } else if (strncmp(argv[i], "--", 2) == 0) {
       printf("Warning: unknown flag %s.\nTry --help for options\n", argv[i]);
     }
   }
   current->End(argc);
 
   return true;
-}
+} 
 
 
 int Shell::RunMain(int argc, char* argv[]) {
+#ifndef D8_LIGHT
   i::List<i::Thread*> threads(1);
-
+#endif // D8_LIGHT
   {
+#ifndef D8_LIGHT
     if (options.parallel_files != NULL)
       for (int i = 0; i < options.parallel_files->length(); i++) {
         i::Vector<const char> files = options.parallel_files->at(i);
         ShellThread* thread = new ShellThread(threads.length(), files);
         thread->Start();
         threads.Add(thread);
       }
 
     for (int i = 1; i < options.num_isolates; ++i) {
       options.isolate_sources[i].StartExecuteInThread();
     }
+#endif // D8_LIGHT
 
     Locker lock;
     HandleScope scope;
     Persistent<Context> context = CreateEvaluationContext();
     {
       Context::Scope cscope(context);
       options.isolate_sources[0].Execute();
     }
     if (options.last_run) {
       // Keep using the same context in the interactive shell
       evaluation_context_ = context;
     } else {
       context.Dispose();
     }
+    
+#ifndef D8_LIGHT
     // Start preemption if threads have been created and preemption is enabled.
     if (options.parallel_files != NULL
         && threads.length() > 0
         && options.use_preemption) {
       Locker::StartPreemption(options.preemption_interval);
     }
+#endif // D8_LIGHT
   }
 
+#ifndef D8_LIGHT
   for (int i = 1; i < options.num_isolates; ++i) {
     options.isolate_sources[i].WaitForThread();
   }
 
   if (options.parallel_files != NULL)
     for (int i = 0; i < threads.length(); i++) {
       i::Thread* thread = threads[i];
       thread->Join();
       delete thread;
     }
 
   OnExit();
+#endif // D8_LIGHT
   return 0;
 }
 
 
 int Shell::Main(int argc, char* argv[]) {
   if (!SetOptions(argc, argv)) return 1;
   Initialize();
 
   int result = 0;
   if (options.stress_opt || options.stress_deopt) {
     Testing::SetStressRunType(
         options.stress_opt ? Testing::kStressTypeOpt
                            : Testing::kStressTypeDeopt);
     int stress_runs = Testing::GetStressRuns();
     for (int i = 0; i < stress_runs && result == 0; i++) {
       printf("============ Stress %d/%d ============\n", i + 1, stress_runs);
       Testing::PrepareStressRun(i);
       options.last_run = (i == stress_runs - 1);
       result = RunMain(argc, argv);
     }
     printf("======== Full Deoptimization =======\n");
     Testing::DeoptimizeAll();
   } else {
     result = RunMain(argc, argv);
   }
 
-#ifdef ENABLE_DEBUGGER_SUPPORT
+
+#if defined(D8_FULL) && defined(ENABLE_DEBUGGER_SUPPORT)

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

D8_FULL is newer defined. Did you mean !defined(V8_LIGHT).

   // Run remote debugger if requested, but never on --test
   if (i::FLAG_remote_debugger && !options.test_shell) {
     InstallUtilityScript();
     RunRemoteDebugger(i::FLAG_debugger_port);
     return 0;
   }
-#endif
+#endif // D8_LIGHT && ENABLE_DEBUGGER_SUPPORT
 
   // Run interactive shell if explicitly requested or if no script has been
   // executed, but never on --test
 
   if (( options.interactive_shell
       || !options.script_executed )
       && !options.test_shell ) {
+#ifndef D8_LIGHT
     InstallUtilityScript();
+#endif // D8_LIGHT
     RunShell();
   }
 
   V8::Dispose();
 
   return result;
 }
 
 }  // namespace v8
 
 
 #ifndef GOOGLE3
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }
 #endif
+
+#undef D8_LIGHT
+#undef D8_FULL

[Søren Thygesen Gjesse, 2011/07/13 14:12:38]

D8_FULL?