projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/vm/jit/stack.c (new_stack_analyse): Add a third move at the
[cacao.git]
/
src
/
vm
/
vm.c
diff --git
a/src/vm/vm.c
b/src/vm/vm.c
index 2a9325df55ad4387dcee290fa75a2d648e88a168..3b98ce35386a81e5c41da48ff28b1dfc9034458f 100644
(file)
--- a/
src/vm/vm.c
+++ b/
src/vm/vm.c
@@
-164,11
+164,14
@@
enum {
OPT_LOG,
OPT_CHECK,
OPT_LOAD,
OPT_LOG,
OPT_CHECK,
OPT_LOAD,
- OPT_METHOD,
- OPT_SIGNATURE,
OPT_SHOW,
OPT_SHOW,
- OPT_COLORVERBOSE,
+ OPT_DEBUGCOLOR,
+
+#if !defined(NDEBUG)
OPT_ALL,
OPT_ALL,
+ OPT_METHOD,
+ OPT_SIGNATURE,
+#endif
#if defined(ENABLE_VERIFIER)
OPT_NOVERIFY,
#if defined(ENABLE_VERIFIER)
OPT_NOVERIFY,
@@
-271,8
+274,12
@@
opt_struct opts[] = {
{ "c", true, OPT_CHECK },
{ "l", false, OPT_LOAD },
{ "eager", false, OPT_EAGER },
{ "c", true, OPT_CHECK },
{ "l", false, OPT_LOAD },
{ "eager", false, OPT_EAGER },
- { "sig", true, OPT_SIGNATURE },
+
+#if !defined(NDEBUG)
{ "all", false, OPT_ALL },
{ "all", false, OPT_ALL },
+ { "sig", true, OPT_SIGNATURE },
+#endif
+
#if defined(ENABLE_LOOP)
{ "oloop", false, OPT_OLOOP },
#endif
#if defined(ENABLE_LOOP)
{ "oloop", false, OPT_OLOOP },
#endif
@@
-328,9
+335,13
@@
opt_struct opts[] = {
#if defined(ENABLE_INLINING)
{ "i", true, OPT_INLINING },
#endif
#if defined(ENABLE_INLINING)
{ "i", true, OPT_INLINING },
#endif
+
+#if !defined(NDEBUG)
{ "m", true, OPT_METHOD },
{ "m", true, OPT_METHOD },
+#endif
+
{ "s", true, OPT_SHOW },
{ "s", true, OPT_SHOW },
- { "
verbosecolor", false, OPT_COLORVERBOSE
},
+ { "
debug-color", false, OPT_DEBUGCOLOR
},
{ NULL, false, 0 }
};
{ NULL, false, 0 }
};
@@
-382,7
+393,7
@@
void usage(void)
puts(" -v write state-information");
puts(" -verbose[:call|exception|jit]");
puts(" enable specific verbose output");
puts(" -v write state-information");
puts(" -verbose[:call|exception|jit]");
puts(" enable specific verbose output");
- puts(" -
verbosecolor
colored output for ANSI terms");
+ puts(" -
debug-color
colored output for ANSI terms");
#ifdef TYPECHECK_VERBOSE
puts(" -verbosetc write debug messages while typechecking");
#endif
#ifdef TYPECHECK_VERBOSE
puts(" -verbosetc write debug messages while typechecking");
#endif
@@
-405,9
+416,12
@@
void usage(void)
#endif
puts(" -l don't start the class after loading");
puts(" -eager perform eager class loading and linking");
#endif
puts(" -l don't start the class after loading");
puts(" -eager perform eager class loading and linking");
+#if !defined(NDEBUG)
puts(" -all compile all methods, no execution");
puts(" -m compile only a specific method");
puts(" -sig specify signature for a specific method");
puts(" -all compile all methods, no execution");
puts(" -m compile only a specific method");
puts(" -sig specify signature for a specific method");
+#endif
+
puts(" -s(how)... show...");
puts(" c(onstants) the constant pool");
puts(" m(ethods) class fields and methods");
puts(" -s(how)... show...");
puts(" c(onstants) the constant pool");
puts(" m(ethods) class fields and methods");
@@
-861,8
+875,8
@@
bool vm_create(JavaVMInitArgs *vm_args)
else if (strcmp("exception", opt_arg) == 0)
opt_verboseexception = true;
break;
else if (strcmp("exception", opt_arg) == 0)
opt_verboseexception = true;
break;
- case OPT_
COLORVERBOSE
:
- opt_
colorverbose
= true;
+ case OPT_
DEBUGCOLOR
:
+ opt_
debugcolor
= true;
break;
#if defined(ENABLE_VERIFIER) && defined(TYPECHECK_VERBOSE)
break;
#if defined(ENABLE_VERIFIER) && defined(TYPECHECK_VERBOSE)
@@
-937,22
+951,24
@@
bool vm_create(JavaVMInitArgs *vm_args)
opt_eager = true;
break;
opt_eager = true;
break;
+#if !defined(NDEBUG)
+ case OPT_ALL:
+ compileall = true;
+ opt_run = false;
+ makeinitializations = false;
+ break;
+
case OPT_METHOD:
opt_run = false;
opt_method = opt_arg;
makeinitializations = false;
break;
case OPT_METHOD:
opt_run = false;
opt_method = opt_arg;
makeinitializations = false;
break;
-
+
case OPT_SIGNATURE:
opt_signature = opt_arg;
break;
case OPT_SIGNATURE:
opt_signature = opt_arg;
break;
-
- case OPT_ALL:
- compileall = true;
- opt_run = false;
- makeinitializations = false;
- break;
-
+#endif
+
case OPT_SHOW: /* Display options */
for (j = 0; j < strlen(opt_arg); j++) {
switch (opt_arg[j]) {
case OPT_SHOW: /* Display options */
for (j = 0; j < strlen(opt_arg); j++) {
switch (opt_arg[j]) {