X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch_t.h;h=efba49542a4c8edb7df33677cf1199a8ca867855;hb=4a4a64bc6a7bec26b2870746a2873a16579bf413;hp=bbdd35c5ad346478f5bf7e45d8655e68b25cddcc;hpb=c23b55879df97f49fc6f1e95651f9f28a980b620;p=libfirm

diff --git a/ir/be/bearch_t.h b/ir/be/bearch_t.h
index bbdd35c5a..efba49542 100644
--- a/ir/be/bearch_t.h
+++ b/ir/be/bearch_t.h
@@ -406,24 +406,6 @@ struct arch_code_generator_t {
 	const arch_code_generator_if_t *impl;
 };
 
-/**
- * ISA base class.
- */
-struct arch_isa_t {
-	const arch_isa_if_t   *impl;
-	const arch_register_t *sp;        /** The stack pointer register. */
-	const arch_register_t *bp;        /** The base pointer register. */
-	int                    stack_dir; /** -1 for decreasing, 1 for increasing. */
-	int                    stack_alignment; /** stack alignment */
-	const be_main_env_t   *main_env;  /** the be main environment */
-	int                    spill_cost;  /** cost for a be_Spill node */
-	int                    reload_cost; /** cost for a be_Reload node */
-};
-
-#define arch_isa_stack_dir(isa)  ((isa)->stack_dir)
-#define arch_isa_sp(isa)         ((isa)->sp)
-#define arch_isa_bp(isa)         ((isa)->bp)
-
 /**
  * Architecture interface.
  */
@@ -434,7 +416,7 @@ struct arch_isa_if_t {
 	 * @param main_env     the be main environment
 	 * @return a new isa instance
 	 */
-	void *(*init)(FILE *file_handle);
+	arch_env_t *(*init)(FILE *file_handle);
 
 	/**
 	 * Free the isa instance.
@@ -540,31 +522,60 @@ struct arch_isa_if_t {
 	 * @return A flexible array ARR_F containing all desired irgs in the desired order.
 	 */
 	ir_graph **(*get_backend_irg_list)(const void *self, ir_graph ***irgs);
+
+	/**
+	 * mark node as rematerialized
+	 */
+	void (*mark_remat)(const void *self, ir_node *node);
+
+	/**
+	 * parse an assembler constraint part and set flags according to its nature
+	 * advances the *c pointer to point to the last parsed character (so if you
+	 * parse a single character don't advance c)
+	 */
+	asm_constraint_flags_t (*parse_asm_constraint)(const void *self, const char **c);
+
+	/**
+	 * returns true if the string is a valid clobbered (register) in this
+	 * backend
+	 */
+	int (*is_valid_clobber)(const void *self, const char *clobber);
 };
 
-#define arch_isa_get_n_reg_class(isa)                  ((isa)->impl->get_n_reg_class(isa))
-#define arch_isa_get_reg_class(isa,i)                  ((isa)->impl->get_reg_class(isa, i))
-#define arch_isa_get_call_abi(isa,tp,abi)              ((isa)->impl->get_call_abi((isa), (tp), (abi)))
-#define arch_isa_get_reg_class_for_mode(isa,mode)      ((isa)->impl->get_reg_class_for_mode((isa), (mode)))
-#define arch_isa_make_code_generator(isa,irg)          ((isa)->impl->make_code_generator((isa), (irg)))
-#define arch_isa_get_reg_class_alignment(isa, cls)     ((isa)->impl->get_reg_class_alignment((isa), (cls)))
-#define arch_isa_get_allowed_execution_units(isa, irn) ((isa)->impl->get_allowed_execution_units((isa), (irn)))
-#define arch_isa_get_machine(isa)                      ((isa)->impl->get_machine((isa)))
-#define arch_isa_get_backend_irg_list(isa, irgs)       ((isa)->impl->get_backend_irg_list((isa), (irgs)))
+#define arch_env_done(env)                             ((env)->impl->done(env))
+#define arch_env_get_n_reg_class(env)                  ((env)->impl->get_n_reg_class(env))
+#define arch_env_get_reg_class(env,i)                  ((env)->impl->get_reg_class(env, i))
+#define arch_env_get_reg_class_for_mode(env,mode)      ((env)->impl->get_reg_class_for_mode((env), (mode)))
+#define arch_env_get_call_abi(env,tp,abi)              ((env)->impl->get_call_abi((env), (tp), (abi)))
+#define arch_env_get_code_generator_if(env)            ((env)->impl->get_code_generator_if((env)))
+#define arch_env_get_list_sched_selector(env,selector) ((env)->impl->get_list_sched_selector((env), (selector)))
+#define arch_env_get_ilp_sched_selector(env)           ((env)->impl->get_ilp_sched_selector(env))
+#define arch_env_get_reg_class_alignment(env,cls)      ((env)->impl->get_reg_class_alignment((env), (cls)))
+#define arch_env_get_params(env)                       ((env)->impl->get_params())
+#define arch_env_get_allowed_execution_units(env,irn)  ((env)->impl->get_allowed_execution_units((env), (irn)))
+#define arch_env_get_machine(env)                      ((env)->impl->get_machine(env))
+#define arch_env_get_backend_irg_list(env,irgs)        ((env)->impl->get_backend_irg_list((env), (irgs)))
+#define arch_env_parse_asm_constraint(env,c)           ((env)->impl->parse_asm_constraint((env), (c))
+#define arch_env_is_valid_clobber(env,clobber)         ((env)->impl->is_valid_clobber((env), (clobber))
+#define arch_env_mark_remat(env,node) \
+	do { if ((env)->impl->mark_remat != NULL) (env)->impl->mark_remat((env), (node)); } while(0)
 
 /**
- * Environment for the architecture infrastructure.
- * Keep this everywhere you're going.
+ * ISA base class.
  */
 struct arch_env_t {
-	arch_isa_t *isa;                  /**< The isa about which everything is. */
+	const arch_isa_if_t   *impl;
+	const arch_register_t *sp;              /** The stack pointer register. */
+	const arch_register_t *bp;              /** The base pointer register. */
+	int                    stack_dir;       /** -1 for decreasing, 1 for increasing. */
+	int                    stack_alignment; /** power of 2 stack alignment */
+	const be_main_env_t   *main_env;        /** the be main environment */
+	int                    spill_cost;      /** cost for a be_Spill node */
+	int                    reload_cost;     /** cost for a be_Reload node */
 };
 
-/**
- * Get the isa of an arch environment.
- * @param env The environment.
- * @return The isa with which the env was initialized with.
- */
-#define arch_env_get_isa(env)   ((env)->isa)
+#define arch_env_stack_dir(env)  ((env)->stack_dir)
+#define arch_env_sp(env)         ((env)->sp)
+#define arch_env_bp(env)         ((env)->bp)
 
 #endif /* FIRM_BE_BEARCH_T_H */