Brought up-to-date

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9212 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

5 files changed, 42 insertions, 29 deletions

diff --git a/testasmcomp/Makefile b/testasmcomp/Makefile
index a87b934451..01839f9f08 100644
--- a/testasmcomp/Makefile
+++ b/testasmcomp/Makefile
@@ -33,29 +33,45 @@ PROGS=fib.out tak.out quicksort.out quicksort2.out soli.out integr.out \
 
 all: codegen $(PROGS)
 
-INCLUDES=-I ../utils -I ../typing -I ../asmcomp
+INCLUDES=-I ../utils -I ../typing -I ../bytecomp -I ../asmcomp
 
-OTHEROBJS=../utils/misc.cmo ../utils/config.cmo ../utils/tbl.cmo \
-  ../utils/clflags.cmo ../utils/ccomp.cmo \
-  ../utils/config.cmo ../utils/clflags.cmo ../utils/warnings.cmo \
+OTHEROBJS=\
+  ../utils/misc.cmo ../utils/tbl.cmo ../utils/config.cmo \
+  ../utils/clflags.cmo ../utils/terminfo.cmo ../utils/ccomp.cmo ../utils/warnings.cmo \
   ../utils/consistbl.cmo \
-  ../parsing/linenum.cmo ../parsing/location.cmo \
-  ../typing/ident.cmo ../typing/path.cmo ../typing/types.cmo \
-  ../typing/btype.cmo ../typing/subst.cmo ../typing/primitive.cmo \
-  ../typing/predef.cmo ../typing/datarepr.cmo ../typing/env.cmo \
-  ../bytecomp/lambda.cmo ../bytecomp/switch.cmo \
-  ../asmcomp/arch.cmo ../asmcomp/cmm.cmo ../asmcomp/printcmm.cmo \
-  ../asmcomp/clambda.cmo ../asmcomp/compilenv.cmo \
+  ../parsing/linenum.cmo ../parsing/location.cmo ../parsing/longident.cmo \
+  ../parsing/syntaxerr.cmo ../parsing/parser.cmo \
+  ../parsing/lexer.cmo ../parsing/parse.cmo ../parsing/printast.cmo \
+  ../typing/unused_var.cmo ../typing/ident.cmo ../typing/path.cmo \
+  ../typing/primitive.cmo ../typing/types.cmo \
+  ../typing/btype.cmo ../typing/oprint.cmo \
+  ../typing/subst.cmo ../typing/predef.cmo \
+  ../typing/datarepr.cmo ../typing/env.cmo \
+  ../typing/typedtree.cmo ../typing/ctype.cmo \
+  ../typing/printtyp.cmo ../typing/includeclass.cmo \
+  ../typing/mtype.cmo ../typing/includecore.cmo \
+  ../typing/includemod.cmo ../typing/parmatch.cmo \
+  ../typing/typetexp.cmo ../typing/stypes.cmo ../typing/typecore.cmo \
+  ../typing/typedecl.cmo ../typing/typeclass.cmo \
+  ../typing/typemod.cmo \
+  ../bytecomp/lambda.cmo ../bytecomp/printlambda.cmo \
+  ../bytecomp/typeopt.cmo ../bytecomp/switch.cmo ../bytecomp/matching.cmo \
+  ../bytecomp/translobj.cmo ../bytecomp/translcore.cmo \
+  ../bytecomp/translclass.cmo ../bytecomp/translmod.cmo \
+  ../bytecomp/simplif.cmo ../bytecomp/runtimedef.cmo \
+  ../asmcomp/arch.cmo ../asmcomp/debuginfo.cmo \
+  ../asmcomp/cmm.cmo ../asmcomp/printcmm.cmo \
   ../asmcomp/reg.cmo ../asmcomp/mach.cmo ../asmcomp/proc.cmo \
+  ../asmcomp/clambda.cmo ../asmcomp/compilenv.cmo \
   ../asmcomp/closure.cmo ../asmcomp/cmmgen.cmo \
-  ../asmcomp/printmach.cmo \
-  ../asmcomp/selectgen.cmo ../asmcomp/selection.cmo ../asmcomp/comballoc.cmo \
-  ../asmcomp/liveness.cmo ../asmcomp/spill.cmo ../asmcomp/split.cmo \
+  ../asmcomp/printmach.cmo ../asmcomp/selectgen.cmo ../asmcomp/selection.cmo \
+  ../asmcomp/comballoc.cmo ../asmcomp/liveness.cmo \
+  ../asmcomp/spill.cmo ../asmcomp/split.cmo \
   ../asmcomp/interf.cmo ../asmcomp/coloring.cmo \
   ../asmcomp/reloadgen.cmo ../asmcomp/reload.cmo \
-  ../asmcomp/linearize.cmo ../asmcomp/schedgen.cmo ../asmcomp/scheduling.cmo \
-  ../asmcomp/printlinear.cmo ../asmcomp/emitaux.cmo \
-  ../asmcomp/emit.cmo ../asmcomp/asmgen.cmo
+  ../asmcomp/printlinear.cmo ../asmcomp/linearize.cmo \
+  ../asmcomp/schedgen.cmo ../asmcomp/scheduling.cmo \
+  ../asmcomp/emitaux.cmo ../asmcomp/emit.cmo ../asmcomp/asmgen.cmo
 
 OBJS=parsecmmaux.cmo parsecmm.cmo lexcmm.cmo main.cmo
 
diff --git a/testasmcomp/arm.S b/testasmcomp/arm.S
index 196a3f3974..186d706146 100644
--- a/testasmcomp/arm.S
+++ b/testasmcomp/arm.S
@@ -12,12 +12,6 @@
 
 /* $Id$ */
 
-fp      .req    r11
-ip      .req    r12
-sp      .req    r13
-lr      .req    r14
-pc      .req    r15
-
         .text
 
         .global call_gen_code
@@ -43,3 +37,4 @@ call_gen_code:
 caml_c_call:
     @ function to call is in r10
         mov     pc, r10
+
diff --git a/testasmcomp/main.c b/testasmcomp/main.c
index 035572a677..17b27d2c6a 100644
--- a/testasmcomp/main.c
+++ b/testasmcomp/main.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-void caml_array_bound_error(void)
+void caml_ml_array_bound_error(void)
 {
   fprintf(stderr, "Fatal error: out-of-bound access in array or string\n");
   exit(2);
diff --git a/testasmcomp/mainarith.c b/testasmcomp/mainarith.c
index 063e63ae61..853a683ac7 100644
--- a/testasmcomp/mainarith.c
+++ b/testasmcomp/mainarith.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <math.h>
 
-void caml_array_bound_error(void)
+void caml_ml_array_bound_error(void)
 {
   fprintf(stderr, "Fatal error: out-of-bound access in array or string\n");
   exit(2);
diff --git a/testasmcomp/parsecmm.mly b/testasmcomp/parsecmm.mly
index 937b549c92..79b278b052 100644
--- a/testasmcomp/parsecmm.mly
+++ b/testasmcomp/parsecmm.mly
@@ -180,8 +180,10 @@ expr:
   | LBRACKET RBRACKET { Ctuple [] }
   | LPAREN LET letdef sequence RPAREN { make_letdef $3 $4 }
   | LPAREN ASSIGN IDENT expr RPAREN { Cassign(find_ident $3, $4) }
-  | LPAREN APPLY expr exprlist machtype RPAREN { Cop(Capply $5, $3 :: List.rev $4) }
-  | LPAREN EXTCALL STRING exprlist machtype RPAREN { Cop(Cextcall($3, $5, false), List.rev $4) }
+  | LPAREN APPLY expr exprlist machtype RPAREN
+                { Cop(Capply($5, Debuginfo.none), $3 :: List.rev $4) }
+  | LPAREN EXTCALL STRING exprlist machtype RPAREN
+                { Cop(Cextcall($3, $5, false, Debuginfo.none), List.rev $4) }
   | LPAREN SUBF expr RPAREN { Cop(Cnegf, [$3]) }
   | LPAREN SUBF expr expr RPAREN { Cop(Csubf, [$3; $4]) }
   | LPAREN unaryop expr RPAREN { Cop($2, [$3]) }
@@ -246,7 +248,7 @@ unaryop:
   | ALLOC                       { Calloc }
   | FLOATOFINT                  { Cfloatofint }
   | INTOFFLOAT                  { Cintoffloat }
-  | RAISE                       { Craise }
+  | RAISE                       { Craise Debuginfo.none }
   | ABSF                        { Cabsf }
 ;
 binaryop:
@@ -285,7 +287,7 @@ binaryop:
   | LEF                         { Ccmpf Cle }
   | GTF                         { Ccmpf Cgt }
   | GEF                         { Ccmpf Cge }
-  | CHECKBOUND                  { Ccheckbound }
+  | CHECKBOUND                  { Ccheckbound Debuginfo.none }
 ;
 sequence:
     expr sequence               { Csequence($1, $2) }