X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Fbearch_arm.c;h=89e01fa1aa29247780bc026e55b1c0b96bb4d524;hb=3f1d2fb001738ccea94f601a71a21d6dbf8ad8a9;hp=6c32ca00080a6ab3579844d83b2f17df20cf381a;hpb=036ede1b4b7c79dfeb560a0a8a6242ce0b2728bf;p=libfirm

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index 6c32ca000..89e01fa1a 100644
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   The main arm backend driver file.
  * @author  Matthias Braun, Oliver Richter, Tobias Gneist
- * @version $Id$
  */
 #include "config.h"
 
@@ -44,20 +43,19 @@
 #include "array_t.h"
 #include "irtools.h"
 
-#include "../bearch.h"
-#include "../benode.h"
-#include "../belower.h"
-#include "../besched.h"
+#include "bearch.h"
+#include "benode.h"
+#include "belower.h"
+#include "besched.h"
 #include "be.h"
-#include "../bemachine.h"
-#include "../bemodule.h"
-#include "../beirg.h"
-#include "../bespillslots.h"
-#include "../bespillutil.h"
-#include "../begnuas.h"
-#include "../belistsched.h"
-#include "../beflags.h"
-#include "../bestack.h"
+#include "bemodule.h"
+#include "beirg.h"
+#include "bespillslots.h"
+#include "bespillutil.h"
+#include "begnuas.h"
+#include "belistsched.h"
+#include "beflags.h"
+#include "bestack.h"
 
 #include "bearch_arm_t.h"
 
@@ -439,20 +437,21 @@ static arm_isa_t arm_isa_template = {
 /**
  * Initializes the backend ISA and opens the output file.
  */
-static arch_env_t *arm_init(FILE *file_handle)
+static arch_env_t *arm_init(const be_main_env_t *env)
 {
 	arm_isa_t *isa = XMALLOC(arm_isa_t);
 	*isa = arm_isa_template;
 
 	arm_register_init();
 
-	be_emit_init(file_handle);
-
 	arm_create_opcodes(&arm_irn_ops);
 	arm_handle_intrinsics();
 
 	be_gas_emit_types = false;
 
+	be_emit_init(env->file_handle);
+	be_gas_begin_compilation_unit(env);
+
 	return &isa->base;
 }
 
@@ -465,46 +464,12 @@ static void arm_done(void *self)
 {
 	arm_isa_t *isa = (arm_isa_t*)self;
 
-	be_gas_emit_decls(isa->base.main_env);
+	be_gas_end_compilation_unit(isa->base.main_env);
 
 	be_emit_exit();
 	free(self);
 }
 
-/**
- * Get the register class which shall be used to store a value of a given mode.
- * @param self The this pointer.
- * @param mode The mode in question.
- * @return A register class which can hold values of the given mode.
- */
-static const arch_register_class_t *arm_get_reg_class_for_mode(const ir_mode *mode)
-{
-	if (mode_is_float(mode))
-		return &arm_reg_classes[CLASS_arm_fpa];
-	else
-		return &arm_reg_classes[CLASS_arm_gp];
-}
-
-/**
- * Returns the necessary byte alignment for storing a register of given class.
- */
-static int arm_get_reg_class_alignment(const arch_register_class_t *cls)
-{
-	(void) cls;
-	/* ARM is a 32 bit CPU, no need for other alignment */
-	return 4;
-}
-
-/**
- * Return irp irgs in the desired order.
- */
-static ir_graph **arm_get_irg_list(const void *self, ir_graph ***irg_list)
-{
-	(void) self;
-	(void) irg_list;
-	return NULL;
-}
-
 /**
  * Allows or disallows the creation of Psi nodes for the given Phi nodes.
  * @return 1 if allowed, 0 otherwise
@@ -540,7 +505,15 @@ static void arm_lower_for_target(void)
 
 	for (i = 0; i < n_irgs; ++i) {
 		ir_graph *irg = get_irp_irg(i);
-		lower_switch(irg, 4, 256, true);
+		lower_switch(irg, 4, 256, false);
+	}
+
+	for (i = 0; i < n_irgs; ++i) {
+		ir_graph *irg = get_irp_irg(i);
+		/* Turn all small CopyBs into loads/stores and all bigger CopyBs into
+		 * memcpy calls.
+		 * TODO:  These constants need arm-specific tuning. */
+		lower_CopyB(irg, 31, 32, false);
 	}
 }
 
@@ -605,11 +578,8 @@ const arch_isa_if_t arm_isa_if = {
 	arm_lower_for_target,
 	arm_done,
 	NULL,  /* handle_intrinsics */
-	arm_get_reg_class_for_mode,
 	NULL,
-	arm_get_reg_class_alignment,
 	arm_get_libfirm_params,
-	arm_get_irg_list,
 	NULL,               /* mark remat */
 	arm_parse_asm_constraint,
 	arm_is_valid_clobber,