Periodic merge from bleeding_edge to experimental code generator...

src/regexp-macro-assembler-tracer.cc

 // Copyright 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 277 matching lines @@
   for (int i = 0; i < str.length(); i++) {
     PrintF("u%04x", str[i]);
   }
   PrintF("\", cp_offset=%d, label[%08x])\n", cp_offset, on_failure);
   assembler_->CheckCharacters(str, cp_offset, on_failure, check_end_of_string);
 }
 
 
 void RegExpMacroAssemblerTracer::CheckBitmap(uc16 start, Label* bitmap,
                                              Label* on_zero) {
-  PrintF(" CheckBitmap(start=u$04x, <bitmap>, label[%08x]);\n", start, on_zero);
+  PrintF(" CheckBitmap(start=u%04x, <bitmap>, label[%08x]);\n", start, on_zero);
   assembler_->CheckBitmap(start, bitmap, on_zero);
 }
 
 
+bool RegExpMacroAssemblerTracer::CheckSpecialCharacterClass(
+    uc16 type,
+    int cp_offset,
+    bool check_offset,
+    Label* on_no_match) {
+  bool supported = assembler_->CheckSpecialCharacterClass(type,
+                                                          cp_offset,
+                                                          check_offset,
+                                                          on_no_match);
+  PrintF(" CheckSpecialCharacterClass(type='%c', offset=%d, "
+             "check_offset=%s, label[%08x]): %s;\n",
+         type,
+         cp_offset,
+         check_offset ? "true" : "false",
+         on_no_match,
+         supported ? "true" : "false");
+  return supported;
+}
+
+
 void RegExpMacroAssemblerTracer::DispatchHalfNibbleMap(
     uc16 start,
     Label* half_nibble_map,
     const Vector<Label*>& destinations) {
-  PrintF(" DispatchHalfNibbleMap(start=u$04x, <half_nibble_map>, [", start);
+  PrintF(" DispatchHalfNibbleMap(start=u%04x, <half_nibble_map>, [", start);
   for (int i = 0; i < destinations.length(); i++) {
     if (i > 0)
       PrintF(", ");
     PrintF("label[%08x]", destinations[i]);
   }
   PrintF(");\n");
   assembler_->DispatchHalfNibbleMap(start, half_nibble_map, destinations);
 }
 
 
 void RegExpMacroAssemblerTracer::DispatchByteMap(
     uc16 start,
     Label* byte_map,
     const Vector<Label*>& destinations) {
-  PrintF(" DispatchByteMap(start=u$04x, <byte_map>, [", start);
+  PrintF(" DispatchByteMap(start=u%04x, <byte_map>, [", start);
   for (int i = 0; i < destinations.length(); i++) {
     if (i > 0)
       PrintF(", ");
     PrintF("label[%08x]", destinations[i]);
   }
   PrintF(");\n");
   assembler_->DispatchByteMap(start, byte_map, destinations);
 }
 
 
 void RegExpMacroAssemblerTracer::DispatchHighByteMap(
     byte start,
     Label* byte_map,
     const Vector<Label*>& destinations) {
-  PrintF(" DispatchHighByteMap(start=u$04x, <byte_map>, [", start);
+  PrintF(" DispatchHighByteMap(start=u%04x, <byte_map>, [", start);
   for (int i = 0; i < destinations.length(); i++) {
     if (i > 0)
       PrintF(", ");
     PrintF("label[%08x]", destinations[i]);
   }
   PrintF(");\n");
   assembler_->DispatchHighByteMap(start, byte_map, destinations);
 }
 
 
@@ skipping 18 matching lines @@
   return assembler_->Implementation();
 }
 
 
 Handle<Object> RegExpMacroAssemblerTracer::GetCode(Handle<String> source) {
   PrintF(" GetCode(%s);\n", *(source->ToCString()));
   return assembler_->GetCode(source);
 }
 
 }}  // namespace v8::internal