Moved global variable heights to ia32_common_transform.

[r21082]

diff --git a/ir/be/ia32/ia32_common_transform.c b/ir/be/ia32/ia32_common_transform.c
index 0a023fc..616615e 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.c
+++ b/ir/be/ia32/ia32_common_transform.c
@@ -41,7 +41,9 @@
 #include "gen_ia32_regalloc_if.h"
 
 /** hold the current code generator during transformation */
-ia32_code_gen_t *env_cg       = NULL;
+ia32_code_gen_t *env_cg = NULL;
+
+heights_t *heights = NULL;
 
 static const arch_register_req_t no_register_req = {
        arch_register_req_type_none,

diff --git a/ir/be/ia32/ia32_common_transform.h b/ir/be/ia32/ia32_common_transform.h
index 1f7a524..2e22b5e 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.h
+++ b/ir/be/ia32/ia32_common_transform.h
@@ -28,6 +28,7 @@
 #define FIRM_BE_IA32_IA32_COMMON_TRANSFORM_H
 
 #include "bearch_ia32_t.h"
+#include "height.h"
 
 /**
  * An assembler constraint.
@@ -43,6 +44,7 @@ struct constraint_t {
 };
 
 extern ia32_code_gen_t *env_cg;
+extern heights_t *heights;
 
 /**
  * Get an atomic entity that is initialized with a tarval forming

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 47afa08..3e0cc10 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -95,7 +95,6 @@
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 static ir_node         *initial_fpcw = NULL;
-static heights_t       *heights      = NULL;
 
 extern ir_op *get_op_Mulh(void);