orcc: code cleanup

diff --git a/tools/orcc.c b/tools/orcc.c
index 7b5f878..e2e71c4 100644 (file)
--- a/tools/orcc.c
+++ b/tools/orcc.c
@@ -43,8 +43,6 @@ main (int argc, char *argv[])
   fprintf(output, "/* autogenerated from %s */\n", filename);
   fprintf(output, "\n");
   fprintf(output, "#include <orc/orc.h>\n");
-  fprintf(output, "#include <stdio.h>\n");
-  fprintf(output, "#include <stdlib.h>\n");
   fprintf(output, "\n");
   fprintf(output, "\n");
   print_defines (output);
@@ -60,8 +58,6 @@ main (int argc, char *argv[])
   fprintf(output, "\n");
   fprintf(output, "/* autogenerated from %s */\n", filename);
   fprintf(output, "\n");
-  //fprintf(output, "#include <orc/orc.h>\n");
-  //fprintf(output, "\n");
   fprintf(output, "#ifndef _ORC_OUT_H_\n");
   fprintf(output, "#define _ORC_OUT_H_\n");
   fprintf(output, "\n");
@@ -327,7 +323,7 @@ output_code (OrcProgram *p, FILE *output)
   fprintf(output, "\n");
   fprintf(output, "{\n");
   fprintf(output, "  static int p_inited = 0;\n");
-  fprintf(output, "  static OrcProgram *p = NULL;\n");
+  fprintf(output, "  static OrcProgram *p = 0;\n");
   fprintf(output, "  OrcExecutor _ex, *ex = &_ex;\n");
   fprintf(output, "\n");
   fprintf(output, "  if (!p_inited) {\n");
@@ -414,20 +410,12 @@ output_code (OrcProgram *p, FILE *output)
 
   fprintf(output, "\n");
   fprintf(output, "      result = orc_program_compile (p);\n");
-#if 0
-  /* don't care.  we have a backup function */
-  fprintf(output, "      if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL (result)) {\n");
-  fprintf(output, "        abort ();\n");
-  fprintf(output, "      }\n");
-#endif
   fprintf(output, "    }\n");
   fprintf(output, "    p_inited = TRUE;\n");
   fprintf(output, "    orc_once_mutex_unlock ();\n");
   fprintf(output, "  }\n");
   fprintf(output, "\n");
-  //fprintf(output, "  orc_executor_set_program (ex, p);\n");
   fprintf(output, "  ex->program = p;\n");
-  //fprintf(output, "  orc_executor_set_n (ex, n);\n");
   if (p->constant_n) {
     fprintf(output, "  ex->n = %d;\n", p->constant_n);
   } else {
@@ -443,8 +431,6 @@ output_code (OrcProgram *p, FILE *output)
   for(i=0;i<4;i++){
     var = &p->vars[ORC_VAR_D1 + i];
     if (var->size) {
-      //fprintf(output, "  orc_executor_set_array (ex, %s, %s);\n",
-      //    enumnames[ORC_VAR_D1 + i], varnames[ORC_VAR_D1 + i]);
       fprintf(output, "  ex->arrays[%s] = %s;\n",
           enumnames[ORC_VAR_D1 + i], varnames[ORC_VAR_D1 + i]);
     }
@@ -452,8 +438,6 @@ output_code (OrcProgram *p, FILE *output)
   for(i=0;i<8;i++){
     var = &p->vars[ORC_VAR_S1 + i];
     if (var->size) {
-      //fprintf(output, "  orc_executor_set_array (ex, %s, %s);\n",
-      //    enumnames[ORC_VAR_S1 + i], varnames[ORC_VAR_S1 + i]);
       fprintf(output, "  ex->arrays[%s] = %s;\n",
           enumnames[ORC_VAR_S1 + i], varnames[ORC_VAR_S1 + i]);
     }
@@ -461,15 +445,12 @@ output_code (OrcProgram *p, FILE *output)
   for(i=0;i<8;i++){
     var = &p->vars[ORC_VAR_P1 + i];
     if (var->size) {
-      //fprintf(output, "  orc_executor_set_param (ex, %s, %s);\n",
-      //    enumnames[ORC_VAR_P1 + i], varnames[ORC_VAR_P1 + i]);
       fprintf(output, "  ex->params[%s] = %s;\n",
           enumnames[ORC_VAR_P1 + i], varnames[ORC_VAR_P1 + i]);
     }
   }
   fprintf(output, "\n");
   fprintf(output, "  orc_executor_run (ex);\n");
-  //fprintf(output, "  ((void (*)(OrcExecutor *))ex->program->code_exec)(ex);\n");
   for(i=0;i<4;i++){
     var = &p->vars[ORC_VAR_A1 + i];
     if (var->size) {