Size and offset fixes to compile for 64b host
Some Runtime fields have moved after deletion of other fields.
ParsedOptions uses size_t, but parsing function works on unsigned int.
Change-Id: I6b7f25787af5d3f9e38554abea2bfb220299f475
diff --git a/runtime/arch/x86_64/asm_support_x86_64.h b/runtime/arch/x86_64/asm_support_x86_64.h
index 444fa22..5a4e63e 100644
--- a/runtime/arch/x86_64/asm_support_x86_64.h
+++ b/runtime/arch/x86_64/asm_support_x86_64.h
@@ -20,11 +20,11 @@
#include "asm_support.h"
// Offset of field Runtime::callee_save_methods_[kSaveAll]
-#define RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET 208
+#define RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET 200
// Offset of field Runtime::callee_save_methods_[kRefsOnly]
-#define RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET 216
+#define RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET 208
// Offset of field Runtime::callee_save_methods_[kRefsAndArgs]
-#define RUNTIME_REF_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET 224
+#define RUNTIME_REF_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET 216
// Offset of field Thread::self_ verified in InitCpu
#define THREAD_SELF_OFFSET 72
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index b6f36b6..04f1a05 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -288,13 +288,13 @@
return false;
}
} else if (StartsWith(option, "-XX:LongPauseLogThreshold=")) {
- size_t value;
+ unsigned int value;
if (!ParseUnsignedInteger(option, '=', &value)) {
return false;
}
long_pause_log_threshold_ = MsToNs(value);
} else if (StartsWith(option, "-XX:LongGCLogThreshold=")) {
- size_t value;
+ unsigned int value;
if (!ParseUnsignedInteger(option, '=', &value)) {
return false;
}
diff --git a/runtime/parsed_options.h b/runtime/parsed_options.h
index 0af17ee..f07bba1 100644
--- a/runtime/parsed_options.h
+++ b/runtime/parsed_options.h
@@ -44,8 +44,8 @@
bool verify_post_gc_heap_;
bool verify_pre_gc_rosalloc_;
bool verify_post_gc_rosalloc_;
- size_t long_pause_log_threshold_;
- size_t long_gc_log_threshold_;
+ unsigned int long_pause_log_threshold_;
+ unsigned int long_gc_log_threshold_;
bool dump_gc_performance_on_shutdown_;
bool ignore_max_footprint_;
size_t heap_initial_size_;
@@ -54,18 +54,18 @@
size_t heap_min_free_;
size_t heap_max_free_;
double heap_target_utilization_;
- size_t parallel_gc_threads_;
- size_t conc_gc_threads_;
+ unsigned int parallel_gc_threads_;
+ unsigned int conc_gc_threads_;
gc::CollectorType collector_type_;
gc::CollectorType background_collector_type_;
size_t stack_size_;
- size_t max_spins_before_thin_lock_inflation_;
+ unsigned int max_spins_before_thin_lock_inflation_;
bool low_memory_mode_;
- size_t lock_profiling_threshold_;
+ unsigned int lock_profiling_threshold_;
std::string stack_trace_file_;
bool method_trace_;
std::string method_trace_file_;
- size_t method_trace_file_size_;
+ unsigned int method_trace_file_size_;
bool (*hook_is_sensitive_thread_)();
jint (*hook_vfprintf_)(FILE* stream, const char* format, va_list ap);
void (*hook_exit_)(jint status);