flambda-backend: Fix more warnings (runtime) (#1974)

* Fix more runtime warnings.

* Silence warnings in prims.c.

Author: xclerc

runtime4/Makefile

@@ -234,6 +234,7 @@ prims.c : primitives
 	(echo '#define CAML_INTERNALS'; \
          echo '#include "caml/mlvalues.h"'; \
 	 echo '#include "caml/prims.h"'; \
+   echo '#pragma GCC diagnostic ignored "-Wdeprecated-non-prototype"'; \
 	 sed -e 's/.*/extern value &();/' primitives; \
 	 echo 'c_primitive caml_builtin_cprim[] = {'; \
 	 sed -e 's/.*/  &,/' primitives; \

runtime4/caml/memory.h

@@ -251,7 +251,7 @@ extern void caml_alloc_small_dispatch (intnat wosize, int flags,
   CAML_DEPRECATED("Modify", "caml_modify") \
   caml_modify((fp), (val))
 
-struct caml_local_arenas* caml_get_local_arenas();
+struct caml_local_arenas* caml_get_local_arenas(void);
 void caml_set_local_arenas(struct caml_local_arenas* s);
 
 #endif /* CAML_INTERNALS */

runtime4/instrtrace.c

@@ -38,8 +38,7 @@ intnat caml_icount = 0;
 
 void caml_stop_here () {}
 
-void caml_disasm_instr(pc)
-     code_t pc;
+void caml_disasm_instr(code_t pc)
 {
   int instr = *pc;
   printf("%6ld  %s", (long) (pc - caml_start_code),

runtime4/interp.c

@@ -211,6 +211,13 @@ static intnat caml_bcodcount;
 
 /* The interpreter itself */
 
+typedef value (*primitive_arity_1)(value);
+typedef value (*primitive_arity_2)(value, value);
+typedef value (*primitive_arity_3)(value, value, value);
+typedef value (*primitive_arity_4)(value, value, value, value);
+typedef value (*primitive_arity_5)(value, value, value, value, value);
+typedef value (*primitive_arity_n)(value*, int);
+
 value caml_interprete(code_t prog, asize_t prog_size)
 {
 #ifdef PC_REG
@@ -959,34 +966,34 @@ value caml_interprete(code_t prog, asize_t prog_size)
 
     Instruct(C_CALL1):
       Setup_for_c_call;
-      accu = Primitive(*pc)(accu);
+      accu = ((primitive_arity_1) Primitive(*pc))(accu);
       Restore_after_c_call;
       pc++;
       Next;
     Instruct(C_CALL2):
       Setup_for_c_call;
-      accu = Primitive(*pc)(accu, sp[2]);
+      accu = ((primitive_arity_2) Primitive(*pc))(accu, sp[2]);
       Restore_after_c_call;
       sp += 1;
       pc++;
       Next;
     Instruct(C_CALL3):
       Setup_for_c_call;
-      accu = Primitive(*pc)(accu, sp[2], sp[3]);
+      accu = ((primitive_arity_3)Primitive(*pc))(accu, sp[2], sp[3]);
       Restore_after_c_call;
       sp += 2;
       pc++;
       Next;
     Instruct(C_CALL4):
       Setup_for_c_call;
-      accu = Primitive(*pc)(accu, sp[2], sp[3], sp[4]);
+      accu = ((primitive_arity_4) Primitive(*pc))(accu, sp[2], sp[3], sp[4]);
       Restore_after_c_call;
       sp += 3;
       pc++;
       Next;
     Instruct(C_CALL5):
       Setup_for_c_call;
-      accu = Primitive(*pc)(accu, sp[2], sp[3], sp[4], sp[5]);
+      accu = ((primitive_arity_5) Primitive(*pc))(accu, sp[2], sp[3], sp[4], sp[5]);
       Restore_after_c_call;
       sp += 4;
       pc++;
@@ -995,7 +1002,7 @@ value caml_interprete(code_t prog, asize_t prog_size)
       int nargs = *pc++;
       *--sp = accu;
       Setup_for_c_call;
-      accu = Primitive(*pc)(sp + 2, nargs);
+      accu = ((primitive_arity_n) Primitive(*pc))(sp + 2, nargs);
       Restore_after_c_call;
       sp += nargs;
       pc++;