Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
arch/mmix/include/arch/instruction.h | 8 --------
arch/x86/include/arch/instruction.h | 8 --------
arch/x86/instruction.c | 3 +--
arch/x86/use-def.c | 2 +-
include/jit/instruction.h | 10 ++++++++++
jit/basic-block.c | 3 +--
jit/bc-offset-mapping.c | 3 +--
jit/compilation-unit.c | 2 +-
jit/emit.c | 5 ++---
jit/liveness.c | 2 +-
jit/trace-jit.c | 1 +
test/jit/compilation-unit-test.c | 2 +-
12 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/arch/mmix/include/arch/instruction.h
b/arch/mmix/include/arch/instruction.h
index d12bf83..27dc801 100644
--- a/arch/mmix/include/arch/instruction.h
+++ b/arch/mmix/include/arch/instruction.h
@@ -113,17 +113,9 @@ static inline bool insn_is_branch(struct insn *insn)
return insn->type == INSN_JMP;
}
-struct insn *alloc_insn(enum insn_type);
-void free_insn(struct insn *);
-
-int insn_defs(struct compilation_unit *, struct insn *, struct var_info **);
-int insn_uses(struct insn *, struct var_info **);
-
static inline const char *reg_name(enum machine_reg reg)
{
return "<unknown>";
}
-#define for_each_insn(insn, insn_list) list_for_each_entry(insn, insn_list,
insn_list_node)
-
#endif /* __ARCH_INSTRUCTION_H */
diff --git a/arch/x86/include/arch/instruction.h
b/arch/x86/include/arch/instruction.h
index 962dc0a..5e04d92 100644
--- a/arch/x86/include/arch/instruction.h
+++ b/arch/x86/include/arch/instruction.h
@@ -328,12 +328,4 @@ static inline bool insn_is_branch(struct insn *insn)
}
}
-struct insn *alloc_insn(enum insn_type);
-void free_insn(struct insn *);
-
-int insn_defs(struct compilation_unit *, struct insn *, struct var_info **);
-int insn_uses(struct insn *, struct var_info **);
-
-#define for_each_insn(insn, insn_list) list_for_each_entry(insn, insn_list,
insn_list_node)
-
#endif
diff --git a/arch/x86/instruction.c b/arch/x86/instruction.c
index c8e1044..8213e8b 100644
--- a/arch/x86/instruction.c
+++ b/arch/x86/instruction.c
@@ -25,8 +25,7 @@
*/
#include "jit/bc-offset-mapping.h"
-
-#include "arch/instruction.h"
+#include "jit/instruction.h"
#include <stdlib.h>
#include <string.h>
diff --git a/arch/x86/use-def.c b/arch/x86/use-def.c
index 9f76d13..59e1f2a 100644
--- a/arch/x86/use-def.c
+++ b/arch/x86/use-def.c
@@ -6,7 +6,7 @@
*/
#include "jit/compilation-unit.h"
-#include "arch/instruction.h"
+#include "jit/instruction.h"
#include "jit/vars.h"
enum {
diff --git a/include/jit/instruction.h b/include/jit/instruction.h
index 376e278..cc303fe 100644
--- a/include/jit/instruction.h
+++ b/include/jit/instruction.h
@@ -9,4 +9,14 @@ static inline struct insn *next_insn(struct insn *insn)
return list_entry(insn->insn_list_node.next, struct insn,
insn_list_node);
}
+struct insn *alloc_insn(enum insn_type);
+void free_insn(struct insn *);
+
+int insn_defs(struct compilation_unit *, struct insn *, struct var_info **);
+int insn_uses(struct insn *, struct var_info **);
+
+#define for_each_insn(insn, insn_list) list_for_each_entry(insn, insn_list,
insn_list_node)
+
+#define for_each_insn_reverse(insn, insn_list)
list_for_each_entry_reverse(insn, insn_list, insn_list_node)
+
#endif /* JATO_JIT_INSTRUCTION_H */
diff --git a/jit/basic-block.c b/jit/basic-block.c
index bcb2866..e19ee7e 100644
--- a/jit/basic-block.c
+++ b/jit/basic-block.c
@@ -9,10 +9,9 @@
#include "jit/compilation-unit.h"
#include "jit/basic-block.h"
+#include "jit/instruction.h"
#include "jit/statement.h"
-#include "arch/instruction.h"
-
#include "vm/die.h"
#include <stdlib.h>
diff --git a/jit/bc-offset-mapping.c b/jit/bc-offset-mapping.c
index ac92221..7db42f9 100644
--- a/jit/bc-offset-mapping.c
+++ b/jit/bc-offset-mapping.c
@@ -31,8 +31,7 @@
#include "jit/bc-offset-mapping.h"
#include "jit/statement.h"
#include "jit/expression.h"
-
-#include "arch/instruction.h"
+#include "jit/instruction.h"
#include "lib/buffer.h"
diff --git a/jit/compilation-unit.c b/jit/compilation-unit.c
index 956d8b8..44b5c46 100644
--- a/jit/compilation-unit.c
+++ b/jit/compilation-unit.c
@@ -23,11 +23,11 @@
*
* Please refer to the file LICENSE for details.
*/
-#include "arch/instruction.h"
#include "arch/registers.h"
#include "jit/basic-block.h"
#include "jit/compilation-unit.h"
+#include "jit/instruction.h"
#include "jit/stack-slot.h"
#include "jit/statement.h"
#include "jit/vars.h"
diff --git a/jit/emit.c b/jit/emit.c
index a65f35f..ee5c4d9 100644
--- a/jit/emit.c
+++ b/jit/emit.c
@@ -16,14 +16,13 @@
#include "jit/compilation-unit.h"
#include "jit/basic-block.h"
+#include "jit/compiler.h"
#include "jit/emit-code.h"
#include "jit/exception.h"
-#include "jit/compiler.h"
+#include "jit/instruction.h"
#include "jit/statement.h"
#include "jit/text.h"
-#include "arch/instruction.h"
-
#include <stdlib.h>
#include <string.h>
#include <errno.h>
diff --git a/jit/liveness.c b/jit/liveness.c
index ee01989..5c8c303 100644
--- a/jit/liveness.c
+++ b/jit/liveness.c
@@ -27,9 +27,9 @@
#include "jit/compilation-unit.h"
#include "jit/compiler.h"
+#include "jit/instruction.h"
#include "jit/vars.h"
-#include "arch/instruction.h"
#include "lib/bitset.h"
#include "vm/die.h"
diff --git a/jit/trace-jit.c b/jit/trace-jit.c
index c648a40..58ecaa4 100644
--- a/jit/trace-jit.c
+++ b/jit/trace-jit.c
@@ -11,6 +11,7 @@
#include "jit/tree-printer.h"
#include "jit/basic-block.h"
#include "jit/disassemble.h"
+#include "jit/instruction.h"
#include "jit/lir-printer.h"
#include "jit/exception.h"
#include "jit/cu-mapping.h"
diff --git a/test/jit/compilation-unit-test.c b/test/jit/compilation-unit-test.c
index f2a5a19..f496d7f 100644
--- a/test/jit/compilation-unit-test.c
+++ b/test/jit/compilation-unit-test.c
@@ -3,7 +3,7 @@
*/
#include <libharness.h>
-#include "arch/instruction.h"
+#include "jit/instruction.h"
#include "jit/compilation-unit.h"
#include "vm/method.h"
#include "vm/vm.h"
--
1.6.3.3
------------------------------------------------------------------------------
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
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
