fixed some minor bugs

[libfirm] / ir / be / bearch.h

diff --git a/ir/be/bearch.h b/ir/be/bearch.h
index db3eacf..743b906 100644 (file)
--- a/ir/be/bearch.h
+++ b/ir/be/bearch.h
@@ -1,42 +1,21 @@
 #ifndef _FIRM_BEARCH_H
 #define _FIRM_BEARCH_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "firm_config.h"
 
 #ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #endif
 
-#include "type.h"
-
-#include "irnode.h"
-#include "irmode.h"
+#include "firm_types.h"
 
 #include "bitset.h"
-#include "hashptr.h"
-#include "fourcc.h"
-#include "set.h"
-#include "list.h"
-#include "ident.h"
 
 #include "belistsched.h"
 #include "beabi_t.h"
+#include "bearch_t.h"
 #include "be_t.h"
 
-typedef struct _arch_register_class_t     arch_register_class_t;
-typedef struct _arch_register_t           arch_register_t;
-typedef struct _arch_isa_if_t             arch_isa_if_t;
-typedef struct _arch_isa_t                arch_isa_t;
-typedef struct _arch_env_t                arch_env_t;
-typedef struct _arch_irn_ops_if_t         arch_irn_ops_if_t;
-typedef struct _arch_irn_ops_t            arch_irn_ops_t;
-typedef struct _arch_irn_handler_t        arch_irn_handler_t;
-typedef struct _arch_code_generator_t     arch_code_generator_t;
-typedef struct _arch_code_generator_if_t  arch_code_generator_if_t;
-
 struct _be_node_factory_t;
 
 typedef enum _arch_register_type_t {
@@ -270,14 +249,20 @@ struct _arch_irn_ops_if_t {
   arch_irn_flags_t (*get_flags)(const void *self, const ir_node *irn);
 
   /**
-   * Set a bias for the stack pointer.
-   * If the node in question uses the stack pointer for indexing, it must
-   * consider the value of <code>bias</code> additionally.
+   * Get the entity on the stack frame this node depends on.
    * @param self The this pointer.
    * @param irn  The node in question.
-   * @param bias The bias.
+   * @return The entity on the stack frame or NULL, if the node does not has a stack frame entity.
    */
-  void (*set_stack_bias)(const void *self, ir_node *irn, int bias);
+  entity *(*get_frame_entity)(const void *self, const ir_node *irn);
+
+  /**
+   * Set the offset of a node carrying an entity on the stack frame.
+   * @param self The this pointer.
+   * @param irn  The node.
+   * @param offset The offset of the node's stack frame entity.
+   */
+  void (*set_frame_offset)(const void *self, ir_node *irn, int offset);
 };
 
 /**
@@ -287,8 +272,9 @@ struct _arch_irn_ops_t {
        const arch_irn_ops_if_t *impl;
 };
 
-extern void
-arch_set_stack_bias(const arch_env_t *env, ir_node *irn, int bias);
+extern void arch_set_frame_offset(const arch_env_t *env, ir_node *irn, int bias);
+
+extern entity *arch_get_frame_entity(const arch_env_t *env, ir_node *irn);
 
 /**
  * Get the register requirements for a node.
@@ -434,6 +420,11 @@ struct _arch_code_generator_if_t {
         */
        void *(*init)(FILE *file, const be_irg_t *birg);
 
+       /**
+        * Called before abi introduce.
+        */
+       void (*before_abi)(void *self);
+
        /**
         * Called, when the graph is being normalized.
         */
@@ -450,20 +441,9 @@ struct _arch_code_generator_if_t {
        void (*before_ra)(void *self);
 
        /**
-        * Called after register allocation to lower Spills to Stores
-        * @param self  The code generator
-        * @param spill The spill node to lower
-        * @return      The new backend node which substitutes the spill
+        * Called after register allocation.
         */
-       ir_node *(*lower_spill)(void *self, ir_node *spill);
-
-       /**
-        * Called after register allocation to lower Reloads to Loads
-        * @param self   The code generator
-        * @param reload The reload node to lower
-        * @return       The new backend node which substitutes the reload
-        */
-       ir_node *(*lower_reload)(void *self, ir_node *reload);
+       void (*after_ra)(void *self);
 
        /**
         * Called after everything happened.
@@ -479,9 +459,11 @@ do { \
                (cg)->impl->func(cg); \
 } while(0)
 
+#define arch_code_generator_before_abi(cg)      _arch_cg_call(cg, before_abi)
 #define arch_code_generator_prepare_graph(cg)   _arch_cg_call(cg, prepare_graph)
 #define arch_code_generator_before_sched(cg)    _arch_cg_call(cg, before_sched)
 #define arch_code_generator_before_ra(cg)       _arch_cg_call(cg, before_ra)
+#define arch_code_generator_after_ra(cg)        _arch_cg_call(cg, after_ra)
 #define arch_code_generator_done(cg)            _arch_cg_call(cg, done)
 
 /**
@@ -575,14 +557,6 @@ struct _arch_isa_if_t {
    */
   const list_sched_selector_t *(*get_list_sched_selector)(const void *self);
 
-  /**
-   * Take a proj from a call, set the correct register and projnum for this proj
-   * @param self    The isa object.
-   * @param proj    The proj
-   * @param is_keep Non-zero if proj is a Keep argument
-   * @return        The backend proj number assigned to this proj
-   */
-  long (*handle_call_proj)(const void *self, ir_node *proj, int is_keep);
 };
 
 #define arch_isa_get_n_reg_class(isa)                       ((isa)->impl->get_n_reg_class(isa))
@@ -629,6 +603,13 @@ extern arch_env_t *arch_env_init(arch_env_t *env, const arch_isa_if_t *isa);
  * @param handler A node handler.
  * @return The environment itself.
  */
-extern arch_env_t *arch_env_add_irn_handler(arch_env_t *env, const arch_irn_handler_t *handler);
+extern arch_env_t *arch_env_push_irn_handler(arch_env_t *env, const arch_irn_handler_t *handler);
+
+/**
+ * Remove a node handler from the handler stack.
+ * @param env The architecture environment.
+ * @return The popped handler.
+ */
+extern const arch_irn_handler_t *arch_env_pop_irn_handler(arch_env_t *env);
 
 #endif /* _FIRM_BEARCH_H */