Periodic merge from bleeding_edge to experimental code generator...

src/log.cc

 // Copyright 2006-2008 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
@@ skipping 332 matching lines @@
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (logfile_ == NULL || !FLAG_prof) return;
   ScopedLock sl(mutex_);
   fprintf(logfile_, "shared-library,\"%ls\",0x%08x,0x%08x\n", library_path,
           start, end);
 #endif
 }
 
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
-void Logger::LogString(Handle<String> str) {
+void Logger::LogString(Handle<String> str, bool show_impl_info) {
   StringShape shape(*str);
   int len = str->length(shape);
-  if (len > 256)
-    len = 256;
+  if (len > 0x1000)
+    len = 0x1000;
+  if (show_impl_info) {
+    fputc(shape.IsAsciiRepresentation() ? 'a' : '2', logfile_);
+    if (shape.IsExternal())
+      fputc('e', logfile_);
+    if (shape.IsSymbol())
+      fputc('#', logfile_);
+    fprintf(logfile_, ":%i:", str->length());
+  }
   for (int i = 0; i < len; i++) {
     uc32 c = str->Get(shape, i);
     if (c > 0xff) {
       fprintf(logfile_, "\\u%04x", c);
     } else if (c < 32 || c > 126) {
       fprintf(logfile_, "\\x%02x", c);
     } else if (c == ',') {
       fprintf(logfile_, "\\,");
     } else if (c == '\\') {
       fprintf(logfile_, "\\\\");
@@ skipping 14 matching lines @@
   }
 
   switch (regexp->TypeTag()) {
     case JSRegExp::ATOM:
       fprintf(logfile_, "a");
       break;
     default:
       break;
   }
   fprintf(logfile_, "/");
-  LogString(Handle<String>::cast(source));
+  LogString(Handle<String>::cast(source), false);
   fprintf(logfile_, "/");
 
   // global flag
   Handle<Object> global = GetProperty(regexp, "global");
   if (global->IsTrue()) {
     fprintf(logfile_, "g");
   }
   // ignorecase flag
   Handle<Object> ignorecase = GetProperty(regexp, "ignoreCase");
   if (ignorecase->IsTrue()) {
@@ skipping 13 matching lines @@
   if (logfile_ == NULL || !FLAG_log_regexp) return;
   ScopedLock sl(mutex_);
 
   fprintf(logfile_, "regexp-compile,");
   LogRegExpSource(regexp);
   fprintf(logfile_, in_cache ? ",hit\n" : ",miss\n");
 #endif
 }
 
 
-void Logger::RegExpExecEvent(Handle<JSRegExp> regexp,
-                             int start_index,
-                             Handle<String> input_string) {
-#ifdef ENABLE_LOGGING_AND_PROFILING
-  if (logfile_ == NULL || !FLAG_log_regexp) return;
+void Logger::LogRuntime(Vector<const char> format, JSArray* args) {
   ScopedLock sl(mutex_);
-
-  fprintf(logfile_, "regexp-run,");
-  LogRegExpSource(regexp);
-  fprintf(logfile_, ",");
-  LogString(input_string);
-  fprintf(logfile_, ",%d..%d\n", start_index, input_string->length());
-#endif
+  HandleScope scope;
+  for (int i = 0; i < format.length(); i++) {
+    char c = format[i];
+    if (c == '%' && i <= format.length() - 2) {
+      i++;
+      ASSERT('0' <= format[i] && format[i] <= '9');
+      Object* obj = args->GetElement(format[i] - '0');
+      i++;
+      switch (format[i]) {
+        case 's':
+          Logger::LogString(Handle<String>(String::cast(obj)), false);
+          break;
+        case 'S':
+          Logger::LogString(Handle<String>(String::cast(obj)), true);
+          break;
+        case 'r':
+          Logger::LogRegExpSource(Handle<JSRegExp>(JSRegExp::cast(obj)));
+          break;
+        case 'x':
+          fprintf(logfile_, "0x%x", Smi::cast(obj)->value());
+          break;
+        case 'i':
+          fprintf(logfile_, "%i", Smi::cast(obj)->value());
+          break;
+        default:
+          UNREACHABLE();
+      }
+    } else {
+      fputc(c, logfile_);
+    }
+  }
+  fputc('\n', logfile_);
 }
 
 
 void Logger::ApiIndexedSecurityCheck(uint32_t index) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (logfile_ == NULL || !FLAG_log_api) return;
   ApiEvent("api,check-security,%u\n", index);
 #endif
 }
 
@@ skipping 437 matching lines @@
   if (FLAG_log_state_changes) {
     LOG(StringEvent("Leaving", StateToString(state_)));
     if (previous_) {
       LOG(StringEvent("To", StateToString(previous_->state_)));
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal