Author: [email protected]
Date: Wed Jan 7 06:24:08 2009
New Revision: 1039
Modified:
branches/bleeding_edge/src/codegen-arm.cc
branches/bleeding_edge/src/codegen-arm.h
branches/bleeding_edge/src/codegen-ia32.cc
branches/bleeding_edge/src/codegen-ia32.h
branches/bleeding_edge/src/codegen.cc
branches/bleeding_edge/src/log.cc
branches/bleeding_edge/src/log.h
Log:
Fixed build with no ENABLE_LOGGING_AND_PROFILING
Modified: branches/bleeding_edge/src/codegen-arm.cc
==============================================================================
--- branches/bleeding_edge/src/codegen-arm.cc (original)
+++ branches/bleeding_edge/src/codegen-arm.cc Wed Jan 7 06:24:08 2009
@@ -2580,11 +2580,13 @@
void CodeGenerator::GenerateLog(ZoneList<Expression*>* args) {
// See comment in CodeGenerator::GenerateLog in codegen-ia32.cc.
ASSERT_EQ(args->length(), 3);
+#ifdef ENABLE_LOGGING_AND_PROFILING
if (ShouldGenerateLog(args->at(0))) {
Load(args->at(1));
Load(args->at(2));
__ CallRuntime(Runtime::kLog, 2);
}
+#endif
__ mov(r0, Operand(Factory::undefined_value()));
frame_->Push(r0);
}
Modified: branches/bleeding_edge/src/codegen-arm.h
==============================================================================
--- branches/bleeding_edge/src/codegen-arm.h (original)
+++ branches/bleeding_edge/src/codegen-arm.h Wed Jan 7 06:24:08 2009
@@ -195,7 +195,9 @@
Handle<Script> script,
bool is_eval);
+#ifdef ENABLE_LOGGING_AND_PROFILING
static bool ShouldGenerateLog(Expression* type);
+#endif
static void SetFunctionInfo(Handle<JSFunction> fun,
int length,
Modified: branches/bleeding_edge/src/codegen-ia32.cc
==============================================================================
--- branches/bleeding_edge/src/codegen-ia32.cc (original)
+++ branches/bleeding_edge/src/codegen-ia32.cc Wed Jan 7 06:24:08 2009
@@ -2909,11 +2909,13 @@
// with '%2s' (see Logger::LogRuntime for all the formats).
// 2 (array): Arguments to the format string.
ASSERT_EQ(args->length(), 3);
+#ifdef ENABLE_LOGGING_AND_PROFILING
if (ShouldGenerateLog(args->at(0))) {
Load(args->at(1));
Load(args->at(2));
__ CallRuntime(Runtime::kLog, 2);
}
+#endif
// Finally, we're expected to leave a value on the top of the stack.
frame_->Push(Immediate(Factory::undefined_value()));
}
Modified: branches/bleeding_edge/src/codegen-ia32.h
==============================================================================
--- branches/bleeding_edge/src/codegen-ia32.h (original)
+++ branches/bleeding_edge/src/codegen-ia32.h Wed Jan 7 06:24:08 2009
@@ -201,7 +201,9 @@
Handle<Script> script,
bool is_eval);
+#ifdef ENABLE_LOGGING_AND_PROFILING
static bool ShouldGenerateLog(Expression* type);
+#endif
static void SetFunctionInfo(Handle<JSFunction> fun,
int length,
Modified: branches/bleeding_edge/src/codegen.cc
==============================================================================
--- branches/bleeding_edge/src/codegen.cc (original)
+++ branches/bleeding_edge/src/codegen.cc Wed Jan 7 06:24:08 2009
@@ -163,6 +163,8 @@
}
+#ifdef ENABLE_LOGGING_AND_PROFILING
+
bool CodeGenerator::ShouldGenerateLog(Expression* type) {
ASSERT(type != NULL);
if (!Logger::is_enabled()) return false;
@@ -174,6 +176,8 @@
}
return false;
}
+
+#endif
// Sets the function info on a function.
Modified: branches/bleeding_edge/src/log.cc
==============================================================================
--- branches/bleeding_edge/src/log.cc (original)
+++ branches/bleeding_edge/src/log.cc Wed Jan 7 06:24:08 2009
@@ -432,6 +432,7 @@
void Logger::LogRuntime(Vector<const char> format, JSArray* args) {
+#ifdef ENABLE_LOGGING_AND_PROFILING
ScopedLock sl(mutex_);
HandleScope scope;
for (int i = 0; i < format.length(); i++) {
@@ -465,6 +466,7 @@
}
}
fputc('\n', logfile_);
+#endif
}
Modified: branches/bleeding_edge/src/log.h
==============================================================================
--- branches/bleeding_edge/src/log.h (original)
+++ branches/bleeding_edge/src/log.h Wed Jan 7 06:24:08 2009
@@ -200,11 +200,9 @@
static StateTag state() {
return current_state_ ? current_state_->state() : OTHER;
}
-#endif
static bool is_enabled() { return logfile_ != NULL; }
-#ifdef ENABLE_LOGGING_AND_PROFILING
private:
// Emits the source code of a regexp. Used by regexp events.
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
