Signed-off-by: Tomek Grabiec <[email protected]>
---
arch/x86/insn-selector.brg | 6 +++---
include/jit/compiler.h | 1 -
jit/trace-jit.c | 1 -
test/jit/trace-stub.c | 2 +-
vm/jato.c | 6 ------
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/arch/x86/insn-selector.brg b/arch/x86/insn-selector.brg
index 3860422..fe9e113 100644
--- a/arch/x86/insn-selector.brg
+++ b/arch/x86/insn-selector.brg
@@ -753,7 +753,7 @@ reg: EXPR_INVOKEINTERFACE(arg) 1
if (nr_stack_args)
method_args_cleanup(s, tree, nr_stack_args);
- if (opt_trace_return_value)
+ if (opt_trace_invoke_verbose)
select_trace_return_value(s, tree, method);
select_insn(s, tree, reg_reg_insn(INSN_MOV_REG_REG, eax, state->reg1));
@@ -2972,7 +2972,7 @@ static void invoke(struct basic_block *s, struct
tree_node *tree, struct compila
if (nr_stack_args)
method_args_cleanup(s, tree, nr_stack_args);
- if (opt_trace_return_value)
+ if (opt_trace_invoke_verbose)
select_trace_return_value(s, tree, method);
if (vm_method_is_jni(method))
@@ -3018,7 +3018,7 @@ static void invokevirtual(struct _MBState *state, struct
basic_block *s, struct
if (nr_stack_args)
method_args_cleanup(s, tree, nr_stack_args);
- if (opt_trace_return_value)
+ if (opt_trace_invoke_verbose)
select_trace_return_value(s, tree, method);
}
diff --git a/include/jit/compiler.h b/include/jit/compiler.h
index 0c65253..776196f 100644
--- a/include/jit/compiler.h
+++ b/include/jit/compiler.h
@@ -104,7 +104,6 @@ extern bool opt_trace_invoke_verbose;
extern bool opt_trace_exceptions;
extern bool opt_trace_bytecode;
extern bool opt_trace_compile;
-extern bool opt_trace_return_value;
void trace_magic_trampoline(struct compilation_unit *);
void trace_method(struct compilation_unit *);
diff --git a/jit/trace-jit.c b/jit/trace-jit.c
index fe615c6..e1d698e 100644
--- a/jit/trace-jit.c
+++ b/jit/trace-jit.c
@@ -52,7 +52,6 @@ bool opt_trace_exceptions;
bool opt_trace_bytecode;
bool opt_trace_compile;
bool opt_trace_threads;
-bool opt_trace_return_value;
void trace_method(struct compilation_unit *cu)
{
diff --git a/test/jit/trace-stub.c b/test/jit/trace-stub.c
index dc48d5c..4692620 100644
--- a/test/jit/trace-stub.c
+++ b/test/jit/trace-stub.c
@@ -9,7 +9,7 @@ bool opt_trace_invoke = false;
bool opt_trace_exceptions = false;
bool opt_trace_bytecode = false;
bool opt_trace_threads = false;
-bool opt_trace_return_value = false;
+bool opt_trace_invoke_verbose = false;
void trace_invoke(struct compilation_unit *cu)
{
diff --git a/vm/jato.c b/vm/jato.c
index a282a47..b1d69f8 100644
--- a/vm/jato.c
+++ b/vm/jato.c
@@ -847,11 +847,6 @@ static void handle_define(const char *arg)
free(str);
}
-static void handle_trace_return(void)
-{
- opt_trace_return_value = true;
-}
-
struct option {
const char *name;
@@ -897,7 +892,6 @@ const struct option options[] = {
DEFINE_OPTION("Xtrace:itable", handle_trace_itable),
DEFINE_OPTION("Xtrace:jit", handle_trace_jit),
DEFINE_OPTION("Xtrace:trampoline", handle_trace_trampoline),
- DEFINE_OPTION("Xtrace:return", handle_trace_return),
};
static const struct option *get_option(const char *name)
--
1.6.0.6
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
