Revision: 5544
Author: [email protected]
Date: Tue Sep 28 05:18:19 2010
Log: More changes to 32/64 bit correctness.
TBR=vegorov
Review URL: http://codereview.chromium.org/3412038
http://code.google.com/p/v8/source/detail?r=5544
Modified:
/branches/bleeding_edge/src/log.cc
/branches/bleeding_edge/src/log.h
/branches/bleeding_edge/src/utils.h
=======================================
--- /branches/bleeding_edge/src/log.cc Fri Sep 24 04:45:12 2010
+++ /branches/bleeding_edge/src/log.cc Tue Sep 28 05:18:19 2010
@@ -1005,11 +1005,12 @@
void Logger::HeapSampleStats(const char* space, const char* kind,
- int capacity, int used) {
+ intptr_t capacity, intptr_t used) {
#ifdef ENABLE_LOGGING_AND_PROFILING
if (!Log::IsEnabled() || !FLAG_log_gc) return;
LogMessageBuilder msg;
- msg.Append("heap-sample-stats,\"%s\",\"%s\",%d,%d\n",
+ msg.Append("heap-sample-stats,\"%s\",\"%s\","
+ "%" V8_PTR_PREFIX "d,%" V8_PTR_PREFIX "d\n",
space, kind, capacity, used);
msg.WriteToLogFile();
#endif
=======================================
--- /branches/bleeding_edge/src/log.h Fri Sep 24 04:45:12 2010
+++ /branches/bleeding_edge/src/log.h Tue Sep 28 05:18:19 2010
@@ -237,7 +237,7 @@
static void HeapSampleJSProducerEvent(const char* constructor,
Address* stack);
static void HeapSampleStats(const char* space, const char* kind,
- int capacity, int used);
+ intptr_t capacity, intptr_t used);
static void SharedLibraryEvent(const char* library_path,
uintptr_t start,
=======================================
--- /branches/bleeding_edge/src/utils.h Tue Sep 28 04:44:30 2010
+++ /branches/bleeding_edge/src/utils.h Tue Sep 28 05:18:19 2010
@@ -224,16 +224,18 @@
#if __GNUC__ >= 4
// On gcc we can ask the compiler to check the types of %d-style format
-// specifiers and their associated arguments.
+// specifiers and their associated arguments. TODO(erikcorry) fix this
+// so it works on MacOSX.
+#if defined(__MACH__) && defined(__APPLE__)
+#define PRINTF_CHECKING
+#else // MacOsX.
#define PRINTF_CHECKING __attribute__ ((format (printf, 1, 2)))
+#endif
#else
#define PRINTF_CHECKING
#endif
-// Our version of printf(). Avoids compilation errors that we get
-// with standard printf when attempting to print pointers, etc.
-// (the errors are due to the extra compilation flags, which we
-// want elsewhere).
+// Our version of printf().
void PRINTF_CHECKING PrintF(const char* format, ...);
// Our version of fflush.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
