make most of irarch API private

This removes functions from the public API which are pointless outside
localopt rules, and also avoids another struct in the public API.

include/libfirm/irarch.h

@@ -20,56 +20,6 @@
  * @{
  */
 
-/**
- * The Multiplication replacement can consist of the following instructions.
- */
-typedef enum insn_kind {
-	LEA,   /**< the LEA instruction */
-	SHIFT, /**< the SHIFT instruction */
-	SUB,   /**< the SUB instruction */
-	ADD,   /**< the ADD instruction */
-	ZERO,  /**< creates a ZERO constant */
-	MUL,   /**< the original MUL instruction */
-	ROOT   /**< the ROOT value that is multiplied */
-} insn_kind;
-
-/**
- * A Callback for evaluating the costs of an instruction.
- *
- * @param kind   the instruction
- * @param mode   the mode of the instruction
- * @param tv     for MUL instruction, the multiplication constant
- *
- * @return the costs of this instruction
- */
-typedef int (*evaluate_costs_func)(insn_kind kind, const ir_mode *mode, ir_tarval *tv);
-
-/**
- * A parameter structure that drives the machine dependent Firm
- * optimizations.
- */
-typedef struct ir_settings_arch_dep_t {
-	/* Mul optimization */
-	unsigned also_use_subs : 1;    /**< Use also Subs when resolving Muls to shifts */
-	unsigned maximum_shifts;       /**< The maximum number of shifts that shall be inserted for a mul. */
-	unsigned highest_shift_amount; /**< The highest shift amount you want to
-	                                    tolerate. Muls which would require a higher
-	                                    shift constant are left. */
-	evaluate_costs_func evaluate;  /**< Evaluate the costs of a generated instruction. */
-
-	/* Div/Mod optimization */
-	unsigned allow_mulhs   : 1;    /**< Use the Mulhs operation for division by constant */
-	unsigned allow_mulhu   : 1;    /**< Use the Mulhu operation for division by constant */
-	unsigned max_bits_for_mulh;    /**< Maximum number of bits the Mulh operation can take.
-	                                    Modes with higher amount of bits will use Mulh */
-} ir_settings_arch_dep_t;
-
-/**
- * A factory function, that provides architecture parameters for
- * machine dependent optimizations.
- */
-typedef const ir_settings_arch_dep_t *(*arch_dep_params_factory_t)(void);
-
 /**
  * Optimization flags.
  */
@@ -81,55 +31,14 @@ typedef enum arch_dep_opts_t {
 } arch_dep_opts_t;
 ENUM_BITSET(arch_dep_opts_t)
 
+typedef struct ir_settings_arch_dep_t ir_settings_arch_dep_t;
+
 /**
  * Sets the optimizations that shall be applied.
  * @param opts  An optimization bit mask.
  */
 FIRM_API void arch_dep_set_opts(arch_dep_opts_t opts);
 
-/**
- * Replaces Muls with Lea/Shifts/Add/Subs if these
- * have smaller costs than the original multiplication.
- *
- * @param irn       The Firm node to inspect.
- * @return          A replacement expression for irn.
- */
-FIRM_API ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn);
-
-/**
- * Replaces Divs with Shifts and Add/Subs and Mulh.
- * This function is driven by the 3 parameters:
- * - allow_mulhu
- * - allow_mulhs
- * - max_bits_for_mulh
- *
- * If irn is a Div with a Const, the constant is inspected if it meets the
- * requirements of the variables stated above. If a Shl/Add/Sub/Mulh
- * sequence can be generated that meets these requirements, this expression
- * is returned. In each other case irn is returned unmodified.
- *
- * @param irn       The Firm node to inspect.
- * @return          A replacement expression for irn.
- */
-FIRM_API ir_node *arch_dep_replace_div_by_const(ir_node *irn);
-
-/**
- * Replaces Mods with Shifts and Add/Subs and Mulh.
- * This function is driven by the 3 parameters:
- * - allow_mulhu
- * - allow_mulhs
- * - max_bits_for_mulh
- *
- * If irn is a Mod with a Const, the constant is inspected if it meets the
- * requirements of the variables stated above. If a Shl/Add/Sub/Mulh
- * sequence can be generated that meets these requirements, this expression
- * is returned. In each other case irn is returned unmodified.
- *
- * @param irn       The Firm node to inspect.
- * @return          A replacement expression for irn.
- */
-FIRM_API ir_node *arch_dep_replace_mod_by_const(ir_node *irn);
-
 /** @} */
 
 #include "end.h"

ir/be/amd64/bearch_amd64.c

@@ -23,6 +23,7 @@
 #include "be_t.h"
 #include "debug.h"
 #include "panic.h"
+#include "irarch_t.h"
 #include "ircons_t.h"
 #include "irdump.h"
 #include "irgmod.h"

ir/be/arm/bearch_arm.c

@@ -11,6 +11,7 @@
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
 
+#include "irarch_t.h"
 #include "irgwalk.h"
 #include "irprog_t.h"
 #include "ircons.h"

ir/be/ia32/ia32_architecture.h

@@ -11,7 +11,7 @@
 #ifndef FIRM_BE_IA32_ARCHITECTURE_H
 #define FIRM_BE_IA32_ARCHITECTURE_H
 
-#include "irarch.h"
+#include "irarch_t.h"
 
 typedef struct {
 	/** optimize for size */

ir/be/sparc/bearch_sparc.c

@@ -11,6 +11,7 @@
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
 
+#include "irarch_t.h"
 #include "irgwalk.h"
 #include "irprog.h"
 #include "ircons_t.h"

ir/ir/irarch.c

@@ -29,7 +29,7 @@
 #include "irflag_t.h"
 #include "irhooks.h"
 #include "ircons.h"
-#include "irarch.h"
+#include "irarch_t.h"
 #include "irflag.h"
 #include "be.h"
 #include "panic.h"

ir/ir/irarch_t.h

+/*
+ * This file is part of libFirm.
+ * Copyright (C) 2014 Karlsruhe Institute of Technology
+ */
+
+/**
+ * @file
+ * @brief  Some machine dependent optimizations.
+ * @author Sebastian Hack
+ */
+#ifndef FIRM_IR_IRARCH_T_H
+#define FIRM_IR_IRARCH_T_H
+
+#include "irarch.h"
+
+/**
+ * The Multiplication replacement can consist of the following instructions.
+ */
+typedef enum insn_kind {
+	LEA,   /**< the LEA instruction */
+	SHIFT, /**< the SHIFT instruction */
+	SUB,   /**< the SUB instruction */
+	ADD,   /**< the ADD instruction */
+	ZERO,  /**< creates a ZERO constant */
+	MUL,   /**< the original MUL instruction */
+	ROOT   /**< the ROOT value that is multiplied */
+} insn_kind;
+
+/**
+ * A Callback for evaluating the costs of an instruction.
+ *
+ * @param kind   the instruction
+ * @param mode   the mode of the instruction
+ * @param tv     for MUL instruction, the multiplication constant
+ *
+ * @return the costs of this instruction
+ */
+typedef int (*evaluate_costs_func)(insn_kind kind, const ir_mode *mode, ir_tarval *tv);
+
+/**
+ * A parameter structure that drives the machine dependent Firm
+ * optimizations.
+ */
+struct ir_settings_arch_dep_t {
+	/* Mul optimization */
+	unsigned also_use_subs : 1;    /**< Use also Subs when resolving Muls to shifts */
+	unsigned maximum_shifts;       /**< The maximum number of shifts that shall be inserted for a mul. */
+	unsigned highest_shift_amount; /**< The highest shift amount you want to
+	                                    tolerate. Muls which would require a higher
+	                                    shift constant are left. */
+	evaluate_costs_func evaluate;  /**< Evaluate the costs of a generated instruction. */
+
+	/* Div/Mod optimization */
+	unsigned allow_mulhs   : 1;    /**< Use the Mulhs operation for division by constant */
+	unsigned allow_mulhu   : 1;    /**< Use the Mulhu operation for division by constant */
+	unsigned max_bits_for_mulh;    /**< Maximum number of bits the Mulh operation can take.
+	                                    Modes with higher amount of bits will use Mulh */
+};
+
+/**
+ * A factory function, that provides architecture parameters for
+ * machine dependent optimizations.
+ */
+typedef const ir_settings_arch_dep_t *(*arch_dep_params_factory_t)(void);
+
+/**
+ * Replaces Muls with Lea/Shifts/Add/Subs if these
+ * have smaller costs than the original multiplication.
+ *
+ * @param irn       The Firm node to inspect.
+ * @return          A replacement expression for irn.
+ */
+ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn);
+
+/**
+ * Replaces Divs with Shifts and Add/Subs and Mulh.
+ * This function is driven by the 3 parameters:
+ * - allow_mulhu
+ * - allow_mulhs
+ * - max_bits_for_mulh
+ *
+ * If irn is a Div with a Const, the constant is inspected if it meets the
+ * requirements of the variables stated above. If a Shl/Add/Sub/Mulh
+ * sequence can be generated that meets these requirements, this expression
+ * is returned. In each other case irn is returned unmodified.
+ *
+ * @param irn       The Firm node to inspect.
+ * @return          A replacement expression for irn.
+ */
+ir_node *arch_dep_replace_div_by_const(ir_node *irn);
+
+/**
+ * Replaces Mods with Shifts and Add/Subs and Mulh.
+ * This function is driven by the 3 parameters:
+ * - allow_mulhu
+ * - allow_mulhs
+ * - max_bits_for_mulh
+ *
+ * If irn is a Mod with a Const, the constant is inspected if it meets the
+ * requirements of the variables stated above. If a Shl/Add/Sub/Mulh
+ * sequence can be generated that meets these requirements, this expression
+ * is returned. In each other case irn is returned unmodified.
+ *
+ * @param irn       The Firm node to inspect.
+ * @return          A replacement expression for irn.
+ */
+ir_node *arch_dep_replace_mod_by_const(ir_node *irn);
+
+#endif

ir/ir/iropt.c

@@ -27,7 +27,7 @@
 #include "iropt_dbg.h"
 #include "irflag_t.h"
 #include "irhooks.h"
-#include "irarch.h"
+#include "irarch_t.h"
 #include "hashptr.h"
 #include "irtools.h"
 #include "irhooks.h"