Author: [email protected]
Date: Mon Mar 2 01:09:07 2009
New Revision: 1393
Modified:
branches/bleeding_edge/src/api.cc
branches/bleeding_edge/src/checks.cc
branches/bleeding_edge/src/globals.h
branches/bleeding_edge/src/interpreter-irregexp.cc
branches/bleeding_edge/src/runtime.cc
branches/bleeding_edge/src/v8.h
Log:
all-in-one
Modified: branches/bleeding_edge/src/api.cc
==============================================================================
--- branches/bleeding_edge/src/api.cc (original)
+++ branches/bleeding_edge/src/api.cc Mon Mar 2 01:09:07 2009
@@ -39,7 +39,6 @@
#include "v8threads.h"
-namespace i = v8::internal;
#define LOG_API(expr) LOG(ApiEntryCall(expr))
Modified: branches/bleeding_edge/src/checks.cc
==============================================================================
--- branches/bleeding_edge/src/checks.cc (original)
+++ branches/bleeding_edge/src/checks.cc Mon Mar 2 01:09:07 2009
@@ -32,8 +32,6 @@
#include "platform.h"
#include "top.h"
-using namespace v8::internal;
-
static int fatal_error_handler_nesting_depth = 0;
// Contains protection against recursive calls (faults while handling
faults).
@@ -41,21 +39,21 @@
fatal_error_handler_nesting_depth++;
// First time we try to print an error message
if (fatal_error_handler_nesting_depth < 2) {
- OS::PrintError("\n\n#\n# Fatal error in %s, line %d\n# ", file, line);
+ i::OS::PrintError("\n\n#\n# Fatal error in %s, line %d\n# ", file,
line);
va_list arguments;
va_start(arguments, format);
- OS::VPrintError(format, arguments);
+ i::OS::VPrintError(format, arguments);
va_end(arguments);
- OS::PrintError("\n#\n\n");
+ i::OS::PrintError("\n#\n\n");
}
// First two times we may try to print a stack dump.
if (fatal_error_handler_nesting_depth < 3) {
- if (FLAG_stack_trace_on_abort) {
+ if (i::FLAG_stack_trace_on_abort) {
// Call this one twice on double fault
- Top::PrintStack();
+ i::Top::PrintStack();
}
}
- OS::Abort();
+ i::OS::Abort();
}
@@ -90,11 +88,11 @@
void API_Fatal(const char* location, const char* format, ...) {
- OS::PrintError("\n#\n# Fatal error in %s\n# ", location);
+ i::OS::PrintError("\n#\n# Fatal error in %s\n# ", location);
va_list arguments;
va_start(arguments, format);
- OS::VPrintError(format, arguments);
+ i::OS::VPrintError(format, arguments);
va_end(arguments);
- OS::PrintError("\n#\n\n");
- OS::Abort();
+ i::OS::PrintError("\n#\n\n");
+ i::OS::Abort();
}
Modified: branches/bleeding_edge/src/globals.h
==============================================================================
--- branches/bleeding_edge/src/globals.h (original)
+++ branches/bleeding_edge/src/globals.h Mon Mar 2 01:09:07 2009
@@ -141,6 +141,7 @@
class AccessorInfo;
class Allocation;
+class Arguments;
class Assembler;
class BreakableStatement;
class Code;
Modified: branches/bleeding_edge/src/interpreter-irregexp.cc
==============================================================================
--- branches/bleeding_edge/src/interpreter-irregexp.cc (original)
+++ branches/bleeding_edge/src/interpreter-irregexp.cc Mon Mar 2 01:09:07
2009
@@ -39,7 +39,7 @@
namespace v8 { namespace internal {
-static unibrow::Mapping<unibrow::Ecma262Canonicalize> canonicalize;
+static unibrow::Mapping<unibrow::Ecma262Canonicalize> interp_canonicalize;
static bool BackRefMatchesNoCase(int from,
@@ -50,8 +50,8 @@
unibrow::uchar old_char = subject[from++];
unibrow::uchar new_char = subject[current++];
if (old_char == new_char) continue;
- canonicalize.get(old_char, '\0', &old_char);
- canonicalize.get(new_char, '\0', &new_char);
+ interp_canonicalize.get(old_char, '\0', &old_char);
+ interp_canonicalize.get(new_char, '\0', &new_char);
if (old_char != new_char) {
return false;
}
Modified: branches/bleeding_edge/src/runtime.cc
==============================================================================
--- branches/bleeding_edge/src/runtime.cc (original)
+++ branches/bleeding_edge/src/runtime.cc Mon Mar 2 01:09:07 2009
@@ -84,7 +84,7 @@
type name = NumberTo##Type(obj);
// Non-reentrant string buffer for efficient general use in this file.
-static StaticResource<StringInputBuffer> string_input_buffer;
+static StaticResource<StringInputBuffer> runtime_string_input_buffer;
static Object* IllegalOperation() {
@@ -2315,7 +2315,7 @@
int escaped_length = 0;
int length = source->length();
{
- Access<StringInputBuffer> buffer(&string_input_buffer);
+ Access<StringInputBuffer> buffer(&runtime_string_input_buffer);
buffer->Reset(source);
while (buffer->has_more()) {
uint16_t character = buffer->GetNext();
@@ -2343,7 +2343,7 @@
StringShape dshape(destination);
int dest_position = 0;
- Access<StringInputBuffer> buffer(&string_input_buffer);
+ Access<StringInputBuffer> buffer(&runtime_string_input_buffer);
buffer->Rewind();
while (buffer->has_more()) {
uint16_t chr = buffer->GetNext();
@@ -2579,7 +2579,7 @@
// Convert all characters to upper case, assuming that they will fit
// in the buffer
- Access<StringInputBuffer> buffer(&string_input_buffer);
+ Access<StringInputBuffer> buffer(&runtime_string_input_buffer);
buffer->Reset(s);
unibrow::uchar chars[Converter::kMaxWidth];
int i = 0;
Modified: branches/bleeding_edge/src/v8.h
==============================================================================
--- branches/bleeding_edge/src/v8.h (original)
+++ branches/bleeding_edge/src/v8.h Mon Mar 2 01:09:07 2009
@@ -92,4 +92,6 @@
} } // namespace v8::internal
+namespace i = v8::internal;
+
#endif // V8_V8_H_
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
