arch/instruction.h indirectly includes arch/registers.h whose machine_reg
enumerator conflicts with definitions from ucontext.h. There will be a
need to include both compilation-unit.h and ucontext.h hence arch/instruction.h
inclusion is moved.
Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
arch/x86/use-def.c | 1 +
include/jit/compilation-unit.h | 3 ++-
include/jit/exception.h | 2 +-
jit/fixup-site.c | 1 +
jit/liveness.c | 1 +
jit/spill-reload.c | 1 +
test/arch-mmix/use-def.c | 1 +
test/jit/compilation-unit-test.c | 1 +
test/jit/linear-scan-test.c | 1 +
test/jit/spill-reload-test.c | 1 +
10 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/x86/use-def.c b/arch/x86/use-def.c
index 37524e3..9f035bc 100644
--- a/arch/x86/use-def.c
+++ b/arch/x86/use-def.c
@@ -6,6 +6,7 @@
*/
#include <jit/compilation-unit.h>
+#include <arch/instruction.h>
enum {
DEF_DST = 1,
diff --git a/include/jit/compilation-unit.h b/include/jit/compilation-unit.h
index 88d87b1..4b1891c 100644
--- a/include/jit/compilation-unit.h
+++ b/include/jit/compilation-unit.h
@@ -7,12 +7,13 @@
#include <vm/stack.h>
#include <arch/stack-frame.h>
-#include <arch/instruction.h>
#include <stdbool.h>
#include <pthread.h>
struct buffer;
+struct insn;
+enum machine_reg;
struct compilation_unit {
struct methodblock *method;
diff --git a/include/jit/exception.h b/include/jit/exception.h
index 10e88fd..3635cb3 100644
--- a/include/jit/exception.h
+++ b/include/jit/exception.h
@@ -1,10 +1,10 @@
#ifndef _JIT_EXCEPTION_H
#define _JIT_EXCEPTION_H
-#include <jit/compilation-unit.h>
#include <vm/vm.h>
#include <arch/stack-frame.h>
+struct compilation_unit;
struct jit_stack_frame;
struct exception_table_entry *exception_find_entry(struct methodblock *,
diff --git a/jit/fixup-site.c b/jit/fixup-site.c
index 9a63f28..51b3edb 100644
--- a/jit/fixup-site.c
+++ b/jit/fixup-site.c
@@ -25,6 +25,7 @@
*/
#include <jit/compiler.h>
+#include <arch/instruction.h>
#include <memory.h>
#include <malloc.h>
diff --git a/jit/liveness.c b/jit/liveness.c
index 74b656a..820d79d 100644
--- a/jit/liveness.c
+++ b/jit/liveness.c
@@ -9,6 +9,7 @@
#include <jit/compilation-unit.h>
#include <jit/vars.h>
#include <vm/bitset.h>
+#include <arch/instruction.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/jit/spill-reload.c b/jit/spill-reload.c
index f8d3230..ff74c33 100644
--- a/jit/spill-reload.c
+++ b/jit/spill-reload.c
@@ -26,6 +26,7 @@
#include <jit/compilation-unit.h>
#include <jit/stack-slot.h>
+#include <arch/instruction.h>
#include <errno.h>
static struct insn *last_insn(struct live_interval *interval)
diff --git a/test/arch-mmix/use-def.c b/test/arch-mmix/use-def.c
index adfb599..d8a704d 100644
--- a/test/arch-mmix/use-def.c
+++ b/test/arch-mmix/use-def.c
@@ -6,6 +6,7 @@
*/
#include <jit/compilation-unit.h>
+#include <arch/instruction.h>
enum {
NO_USE_DEF = 0,
diff --git a/test/jit/compilation-unit-test.c b/test/jit/compilation-unit-test.c
index 7b45429..455a0d5 100644
--- a/test/jit/compilation-unit-test.c
+++ b/test/jit/compilation-unit-test.c
@@ -4,6 +4,7 @@
#include <libharness.h>
#include <jit/compilation-unit.h>
+#include <arch/instruction.h>
#include <vm/vm.h>
static struct methodblock method = { };
diff --git a/test/jit/linear-scan-test.c b/test/jit/linear-scan-test.c
index 31f1dab..e69d0c8 100644
--- a/test/jit/linear-scan-test.c
+++ b/test/jit/linear-scan-test.c
@@ -3,6 +3,7 @@
*/
#include <jit/compiler.h>
+#include <arch/instruction.h>
#include <libharness.h>
#include <vm/vm.h>
diff --git a/test/jit/spill-reload-test.c b/test/jit/spill-reload-test.c
index b09bee4..c686e46 100644
--- a/test/jit/spill-reload-test.c
+++ b/test/jit/spill-reload-test.c
@@ -26,6 +26,7 @@
#include <jit/compilation-unit.h>
#include <jit/compiler.h>
+#include <arch/instruction.h>
#include <vm/vm.h>
#include <libharness.h>
--
1.6.0.6
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
