compiler: Fix calculation of max var size

diff --git a/orc/orccompiler.c b/orc/orccompiler.c
index 7f44de0..a07acdc 100644 (file)
--- a/orc/orccompiler.c
+++ b/orc/orccompiler.c
@@ -257,11 +257,11 @@ orc_program_compile_full (OrcProgram *program, OrcTarget *target,
     compiler->valid_regs[i] = 1;
   }
 
-  compiler->target->compiler_init (compiler);
-
   orc_compiler_check_sizes (compiler);
   if (compiler->error) goto error;
 
+  compiler->target->compiler_init (compiler);
+
   orc_compiler_rewrite_insns (compiler);
   if (compiler->error) goto error;
 
@@ -393,6 +393,7 @@ orc_compiler_check_sizes (OrcCompiler *compiler)
 {
   int i;
   int j;
+  int max_size = 1;
 
   for(i=0;i<compiler->n_insns;i++) {
     OrcInstruction *insn = compiler->insns + i;
@@ -415,6 +416,7 @@ orc_compiler_check_sizes (OrcCompiler *compiler)
         compiler->result = ORC_COMPILE_RESULT_UNKNOWN_PARSE;
         return;
       }
+      max_size = MAX(max_size, multiplier * opcode->dest_size[j]);
     }
     for(j=0;j<ORC_STATIC_OPCODE_N_SRC;j++){
       if (opcode->src_size[j] == 0) continue;
@@ -436,6 +438,7 @@ orc_compiler_check_sizes (OrcCompiler *compiler)
         compiler->result = ORC_COMPILE_RESULT_UNKNOWN_PARSE;
         return;
       }
+      max_size = MAX(max_size, multiplier * opcode->src_size[j]);
     }
     if (opcode->flags & ORC_STATIC_OPCODE_SCALAR &&
         opcode->src_size[1] == 0 &&
@@ -447,6 +450,7 @@ orc_compiler_check_sizes (OrcCompiler *compiler)
       return;
     }
   }
+  compiler->max_var_size = max_size;
 }
 
 static OrcStaticOpcode *

diff --git a/orc/orcprogram-c64x-c.c b/orc/orcprogram-c64x-c.c
index 2728203..de66a18 100644 (file)
--- a/orc/orcprogram-c64x-c.c
+++ b/orc/orcprogram-c64x-c.c
@@ -221,7 +221,7 @@ orc_compiler_c64x_c_assemble (OrcCompiler *compiler)
 
   align_var = get_align_var (compiler);
 
-  switch (orc_program_get_max_var_size (compiler->program)) {
+  switch (compiler->max_var_size) {
     case 1:
       loop_shift = 2;
       break;
@@ -232,8 +232,7 @@ orc_compiler_c64x_c_assemble (OrcCompiler *compiler)
       loop_shift = 0;
       break;
     default:
-      ORC_ERROR("unhandled max var size %d",
-          orc_program_get_max_var_size (compiler->program));
+      ORC_ERROR("unhandled max var size %d", compiler->max_var_size);
       break;
   }
 

diff --git a/orc/orcprogram-mmx.c b/orc/orcprogram-mmx.c
index 02ae462..e6dbd07 100644 (file)
--- a/orc/orcprogram-mmx.c
+++ b/orc/orcprogram-mmx.c
@@ -217,7 +217,7 @@ orc_compiler_mmx_init (OrcCompiler *compiler)
   compiler->valid_regs[compiler->gp_tmpreg] = 0;
   compiler->valid_regs[compiler->exec_reg] = 0;
 
-  switch (orc_program_get_max_var_size (compiler->program)) {
+  switch (compiler->max_var_size) {
     case 1:
       compiler->loop_shift = 4;
       break;
@@ -231,8 +231,7 @@ orc_compiler_mmx_init (OrcCompiler *compiler)
       compiler->loop_shift = 1;
       break;
     default:
-      ORC_ERROR("unhandled max var size %d",
-          orc_program_get_max_var_size (compiler->program));
+      ORC_ERROR("unhandled max var size %d", compiler->max_var_size);
       break;
   }
 #ifdef MMX

diff --git a/orc/orcprogram-neon.c b/orc/orcprogram-neon.c
index c77b1d5..6da9083 100644 (file)
--- a/orc/orcprogram-neon.c
+++ b/orc/orcprogram-neon.c
@@ -159,7 +159,7 @@ orc_compiler_neon_init (OrcCompiler *compiler)
   compiler->valid_regs[compiler->tmpreg] = 0;
 
   loop_shift = 0;
-  switch (orc_program_get_max_var_size (compiler->program)) {
+  switch (compiler->max_var_size) {
     case 1:
       compiler->loop_shift = 4;
       break;
@@ -173,8 +173,7 @@ orc_compiler_neon_init (OrcCompiler *compiler)
       compiler->loop_shift = 1;
       break;
     default:
-      ORC_ERROR("unhandled max var size %d",
-          orc_program_get_max_var_size (compiler->program));
+      ORC_ERROR("unhandled max var size %d", compiler->max_var_size);
       break;
   }
 

diff --git a/orc/orcprogram-sse.c b/orc/orcprogram-sse.c
index f4d85cb..d22c846 100644 (file)
--- a/orc/orcprogram-sse.c
+++ b/orc/orcprogram-sse.c
@@ -217,7 +217,7 @@ orc_compiler_sse_init (OrcCompiler *compiler)
   compiler->valid_regs[compiler->gp_tmpreg] = 0;
   compiler->valid_regs[compiler->exec_reg] = 0;
 
-  switch (orc_program_get_max_var_size (compiler->program)) {
+  switch (compiler->max_var_size) {
     case 1:
       compiler->loop_shift = 4;
       break;
@@ -231,8 +231,7 @@ orc_compiler_sse_init (OrcCompiler *compiler)
       compiler->loop_shift = 1;
       break;
     default:
-      ORC_ERROR("unhandled max var size %d",
-          orc_program_get_max_var_size (compiler->program));
+      ORC_ERROR("unhandled max var size %d", compiler->max_var_size);
       break;
   }
 #ifdef MMX

diff --git a/orc/orcprogram.c b/orc/orcprogram.c
index cf7b531..fd7d32d 100644 (file)
--- a/orc/orcprogram.c
+++ b/orc/orcprogram.c
@@ -843,31 +843,6 @@ orc_program_get_asm_code (OrcProgram *program)
 }
 
 /**
- * orc_program_get_max_var_size:
- * @program: a pointer to an OrcProgram structure
- *
- * Returns the size of the largest variable used in the program.
- * 
- * Returns: the number of bytes
- */
-int
-orc_program_get_max_var_size (OrcProgram *program)
-{
-  int i;
-  int max;
-
-  max = 0;
-  for(i=0;i<ORC_N_VARIABLES;i++){
-    if (program->vars[i].size &&
-        program->vars[i].vartype != ORC_VAR_TYPE_ACCUMULATOR) {
-      max = MAX(max, program->vars[i].size);
-    }
-  }
-
-  return max;
-}
-
-/**
  * orc_program_get_max_array_size:
  * @program: a pointer to an OrcProgram structure
  *

diff --git a/orc/orcprogram.h b/orc/orcprogram.h
index 14a6949..09fbdcd 100644 (file)
--- a/orc/orcprogram.h
+++ b/orc/orcprogram.h
@@ -481,6 +481,7 @@ struct _OrcCompiler {
   int max_used_temp_reg;
 
   int insn_shift; /* used when emitting rules */
+  int max_var_size; /* size of largest var */
 };
 
 #define ORC_SRC_ARG(p,i,n) ((p)->vars[(i)->src_args[(n)]].alloc)
@@ -741,7 +742,6 @@ void orc_compiler_append_code (OrcCompiler *p, const char *fmt, ...)
  
 void orc_target_register (OrcTarget *target);
 OrcTarget *orc_target_get_by_name (const char *target_name);
-int orc_program_get_max_var_size (OrcProgram *program);
 int orc_program_get_max_array_size (OrcProgram *program);
 int orc_program_get_max_accumulator_size (OrcProgram *program);