X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini.h;h=f8d052627cd72c45b10e5563471039bbb43eb0b9;hb=919a03d17d36604f05e1d99c3f9f26a1509e9655;hp=0edfea186b4e5adfaacc6013a6d1e6f82e83613e;hpb=f98d0799d89401853f59e4427764932d633b8935;p=mono.git

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 0edfea186b4..f8d052627cd 100644
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -552,7 +552,7 @@ extern MonoMethodDesc *mono_break_at_bb_method;
 extern int mono_break_at_bb_bb_num;
 extern gboolean mono_verify_all;
 extern gboolean mono_do_x86_stack_align;
-extern const char *mono_build_date;
+extern MONO_API const char *mono_build_date;
 extern gboolean mono_do_signal_chaining;
 extern gboolean mono_do_crash_chaining;
 extern MONO_API gboolean mono_use_llvm;
@@ -1217,6 +1217,10 @@ typedef struct {
 	int active_jit_methods;
 
 	gpointer interp_context;
+
+#if defined(TARGET_WIN32)
+	MonoContext stack_restore_ctx;
+#endif
 } MonoJitTlsData;
 
 /*
@@ -1963,49 +1967,49 @@ typedef struct {
 	gint32 loads_eliminated;
 	gint32 stores_eliminated;
 	gint32 optimized_divisions;
-	int methods_with_llvm;
-	int methods_without_llvm;
+	gint32 methods_with_llvm;
+	gint32 methods_without_llvm;
 	char *max_ratio_method;
 	char *biggest_method;
-	double jit_method_to_ir;
-	double jit_liveness_handle_exception_clauses;
-	double jit_handle_out_of_line_bblock;
-	double jit_decompose_long_opts;
-	double jit_decompose_typechecks;
-	double jit_local_cprop;
-	double jit_local_emulate_ops;
-	double jit_optimize_branches;
-	double jit_handle_global_vregs;
-	double jit_local_deadce;
-	double jit_local_alias_analysis;
-	double jit_if_conversion;
-	double jit_bb_ordering;
-	double jit_compile_dominator_info;
-	double jit_compute_natural_loops;
-	double jit_insert_safepoints;
-	double jit_ssa_compute;
-	double jit_ssa_cprop;
-	double jit_ssa_deadce;
-	double jit_perform_abc_removal;
-	double jit_ssa_remove;
-	double jit_local_cprop2;
-	double jit_handle_global_vregs2;
-	double jit_local_deadce2;
-	double jit_optimize_branches2;
-	double jit_decompose_vtype_opts;
-	double jit_decompose_array_access_opts;
-	double jit_liveness_handle_exception_clauses2;
-	double jit_analyze_liveness;
-	double jit_linear_scan;
-	double jit_arch_allocate_vars;
-	double jit_spill_global_vars;
-	double jit_local_cprop3;
-	double jit_local_deadce3;
-	double jit_codegen;
-	double jit_create_jit_info;
-	double jit_gc_create_gc_map;
-	double jit_save_seq_point_info;
-	double jit_time;
+	gdouble jit_method_to_ir;
+	gdouble jit_liveness_handle_exception_clauses;
+	gdouble jit_handle_out_of_line_bblock;
+	gdouble jit_decompose_long_opts;
+	gdouble jit_decompose_typechecks;
+	gdouble jit_local_cprop;
+	gdouble jit_local_emulate_ops;
+	gdouble jit_optimize_branches;
+	gdouble jit_handle_global_vregs;
+	gdouble jit_local_deadce;
+	gdouble jit_local_alias_analysis;
+	gdouble jit_if_conversion;
+	gdouble jit_bb_ordering;
+	gdouble jit_compile_dominator_info;
+	gdouble jit_compute_natural_loops;
+	gdouble jit_insert_safepoints;
+	gdouble jit_ssa_compute;
+	gdouble jit_ssa_cprop;
+	gdouble jit_ssa_deadce;
+	gdouble jit_perform_abc_removal;
+	gdouble jit_ssa_remove;
+	gdouble jit_local_cprop2;
+	gdouble jit_handle_global_vregs2;
+	gdouble jit_local_deadce2;
+	gdouble jit_optimize_branches2;
+	gdouble jit_decompose_vtype_opts;
+	gdouble jit_decompose_array_access_opts;
+	gdouble jit_liveness_handle_exception_clauses2;
+	gdouble jit_analyze_liveness;
+	gdouble jit_linear_scan;
+	gdouble jit_arch_allocate_vars;
+	gdouble jit_spill_global_vars;
+	gdouble jit_local_cprop3;
+	gdouble jit_local_deadce3;
+	gdouble jit_codegen;
+	gdouble jit_create_jit_info;
+	gdouble jit_gc_create_gc_map;
+	gdouble jit_save_seq_point_info;
+	gdouble jit_time;
 	gboolean enabled;
 } MonoJitStats;
 
@@ -2779,7 +2783,8 @@ void      mono_arch_emit_outarg_vt              (MonoCompile *cfg, MonoInst *ins
 void      mono_arch_emit_setret                 (MonoCompile *cfg, MonoMethod *method, MonoInst *val);
 MonoDynCallInfo *mono_arch_dyn_call_prepare     (MonoMethodSignature *sig);
 void      mono_arch_dyn_call_free               (MonoDynCallInfo *info);
-void      mono_arch_start_dyn_call              (MonoDynCallInfo *info, gpointer **args, guint8 *ret, guint8 *buf, int buf_len);
+int       mono_arch_dyn_call_get_buf_size       (MonoDynCallInfo *info);
+void      mono_arch_start_dyn_call              (MonoDynCallInfo *info, gpointer **args, guint8 *ret, guint8 *buf);
 void      mono_arch_finish_dyn_call             (MonoDynCallInfo *info, guint8 *buf);
 MonoInst *mono_arch_emit_inst_for_method        (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args);
 void      mono_arch_decompose_opts              (MonoCompile *cfg, MonoInst *ins);
@@ -3128,7 +3133,7 @@ void mono_cfg_set_exception_invalid_program (MonoCompile *cfg, char *msg);
 	}
 
 GTimer *mono_time_track_start (void);
-void mono_time_track_end (double *time, GTimer *timer);
+void mono_time_track_end (gdouble *time, GTimer *timer);
 
 void mono_update_jit_stats (MonoCompile *cfg);
 
@@ -3269,22 +3274,22 @@ void mono_interruption_checkpoint_from_trampoline (void);
 
 #if defined (HOST_WASM)
 
-#define RETURN_ADDRESS_N(N) NULL
-#define RETURN_ADDRESS() RETURN_ADDRESS_N(0)
+#define MONO_RETURN_ADDRESS_N(N) NULL
+#define MONO_RETURN_ADDRESS() MONO_RETURN_ADDRESS_N(0)
 
 
 #elif defined (__GNUC__)
 
-#define RETURN_ADDRESS_N(N) (__builtin_extract_return_addr (__builtin_return_address (N)))
-#define RETURN_ADDRESS() RETURN_ADDRESS_N(0)
+#define MONO_RETURN_ADDRESS_N(N) (__builtin_extract_return_addr (__builtin_return_address (N)))
+#define MONO_RETURN_ADDRESS() MONO_RETURN_ADDRESS_N(0)
 
 #elif defined(_MSC_VER)
 
 #include <intrin.h>
 #pragma intrinsic(_ReturnAddress)
 
-#define RETURN_ADDRESS() _ReturnAddress()
-#define RETURN_ADDRESS_N(N) NULL
+#define MONO_RETURN_ADDRESS() _ReturnAddress()
+#define MONO_RETURN_ADDRESS_N(N) NULL
 
 #else