* src/vm/options.h, src/vm/method.c, src/vm/jit/inline/inline.c,

[cacao.git] / src / vm / options.h

diff --git a/src/vm/options.h b/src/vm/options.h
index 292b145fa4761af5cd4113e2d98e531a752857ce..983083c8934cc67cf2d8cb3888cd2c6cf2124afe 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.h 5253 2006-08-18 18:37:19Z tbfg $
+   $Id: options.h 7228 2007-01-19 01:13:48Z edwin $
 
 */
 
@@ -80,7 +80,7 @@ extern s4   opt_heapstartsize;
 extern s4   opt_stacksize;
 
 extern bool opt_verbose;
-extern bool opt_colorverbose;
+extern bool opt_debugcolor;
 extern bool compileall;
 
 extern bool loadverbose;         /* Print debug messages during loading */
@@ -102,18 +102,14 @@ extern char *opt_signature;
 
 extern bool compileverbose;
 extern bool showstack;
+
 extern bool opt_showdisassemble;
+extern bool opt_shownops;
 extern bool opt_showddatasegment;
 extern bool opt_showintermediate;
 extern bool opt_showexceptionstubs;
 extern bool opt_shownativestub;
 
-extern bool useinlining;
-extern bool inlinevirtuals;
-extern bool inlineexceptions;
-extern bool inlineparamopt;
-extern bool inlineoutsiders;
-
 extern bool checkbounds;
 extern bool checknull;
 extern bool opt_noieee;
@@ -134,8 +130,26 @@ extern bool opt_verify;
 #endif
 extern bool opt_eager;
 
+#if defined(ENABLE_PROFILING)
 extern bool opt_prof;
 extern bool opt_prof_bb;
+#endif
+
+/* inlining options ***********************************************************/
+
+#if defined(ENABLE_INLINING)
+extern bool opt_inlining;
+#if defined(ENABLE_INLINING_DEBUG) || !defined(NDEBUG)
+extern s4 opt_replace_verbose;
+extern s4 opt_inline_debug_min_size;
+extern s4 opt_inline_debug_max_size;
+extern s4 opt_inline_debug_end_counter;
+extern bool opt_inline_debug_all;
+#endif /* defined(ENABLE_INLINING_DEBUG) || !defined(NDEBUG) */
+#if !defined(NDEBUG)
+extern bool opt_inline_debug_log;
+#endif /* !defined(NDEBUG) */
+#endif /* defined(ENABLE_INLINING) */
 
 
 /* optimization options *******************************************************/
@@ -164,7 +178,6 @@ extern bool vm_debug;
 /* function prototypes ********************************************************/
 
 s4 options_get(opt_struct *opts, JavaVMInitArgs *vm_args);
-JavaVMInitArgs *options_prepare(int argc, char **argv);
 
 #endif /* _OPTIONS_H */