From 0195de0b66ced15d14faea759458db47506b62d0 Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Sat, 26 Jul 1997 09:01:39 +0000 Subject: MAJ git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1659 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- testasmcomp/Makefile | 17 ++++++++++------- testasmcomp/alpha.S | 17 ++--------------- testasmcomp/main.ml | 2 +- testasmcomp/parsecmm.mly | 2 +- 4 files changed, 14 insertions(+), 24 deletions(-) diff --git a/testasmcomp/Makefile b/testasmcomp/Makefile index 6686239a1c..3e70caaa1e 100644 --- a/testasmcomp/Makefile +++ b/testasmcomp/Makefile @@ -21,21 +21,24 @@ all: codegen $(PROGS) INCLUDES=-I ../utils -I ../typing -I ../asmcomp -OTHEROBJS=../utils/misc.cmo ../utils/tbl.cmo \ +OTHEROBJS=../utils/misc.cmo ../utils/config.cmo ../utils/tbl.cmo \ + ../utils/nativeint.cmo ../utils/clflags.cmo ../utils/ccomp.cmo \ ../utils/config.cmo ../utils/clflags.cmo \ - ../parsing/location.cmo \ + ../parsing/linenum.cmo ../parsing/location.cmo \ ../typing/ident.cmo ../typing/path.cmo ../typing/types.cmo \ - ../typing/subst.cmo ../typing/primitive.cmo \ + ../typing/btype.cmo ../typing/subst.cmo ../typing/primitive.cmo \ ../typing/predef.cmo ../typing/datarepr.cmo ../typing/env.cmo \ ../bytecomp/lambda.cmo \ ../asmcomp/arch.cmo ../asmcomp/cmm.cmo ../asmcomp/printcmm.cmo \ ../asmcomp/clambda.cmo ../asmcomp/compilenv.cmo \ ../asmcomp/reg.cmo ../asmcomp/mach.cmo ../asmcomp/proc.cmo \ ../asmcomp/closure.cmo ../asmcomp/cmmgen.cmo \ - ../asmcomp/printmach.cmo ../asmcomp/selection.cmo ../asmcomp/liveness.cmo \ - ../asmcomp/spill.cmo ../asmcomp/split.cmo \ - ../asmcomp/interf.cmo ../asmcomp/coloring.cmo ../asmcomp/reload.cmo \ - ../asmcomp/linearize.cmo ../asmcomp/scheduling.cmo \ + ../asmcomp/printmach.cmo \ + ../asmcomp/selectgen.cmo ../asmcomp/selection.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 diff --git a/testasmcomp/alpha.S b/testasmcomp/alpha.S index db5a644124..d71dd7e389 100644 --- a/testasmcomp/alpha.S +++ b/testasmcomp/alpha.S @@ -51,7 +51,8 @@ caml_c_call: lda $sp, -16($sp) stq $26, 0($sp) stq $gp, 8($sp) - jsr ($27) + mov $25, $27 + jsr ($25) ldq $26, 0($sp) ldq $gp, 8($sp) lda $sp, 16($sp) @@ -59,17 +60,3 @@ caml_c_call: .end caml_c_call -/* Glue code to jump to array_bound_error after reinitializing $gp */ - - .globl call_array_bound_error - .ent call_array_bound_error - .align 3 -call_array_bound_error: - /* Rebuild $gp */ - br $27, $106 -$106: ldgp $gp, 0($27) - /* Branch to array_bound_error -- never returns */ - jsr array_bound_error - - .end call_array_bound_error - diff --git a/testasmcomp/main.ml b/testasmcomp/main.ml index 78b720834b..a438dc14f8 100644 --- a/testasmcomp/main.ml +++ b/testasmcomp/main.ml @@ -14,7 +14,7 @@ open Clflags let compile_file filename = - Compilenv.reset "test" ""; + Compilenv.reset "test"; Emit.begin_assembly(); let ic = open_in filename in let lb = Lexing.from_channel ic in diff --git a/testasmcomp/parsecmm.mly b/testasmcomp/parsecmm.mly index 31ad14c2f9..0c00ee60e8 100644 --- a/testasmcomp/parsecmm.mly +++ b/testasmcomp/parsecmm.mly @@ -302,7 +302,7 @@ dataitem: | INTCONST COLON { Cdefine_label $1 } | BYTE INTCONST { Cint8 $2 } | HALF INTCONST { Cint16 $2 } - | INT INTCONST { Cint $2 } + | INT INTCONST { Cint(Nativeint.from $2) } | FLOAT FLOATCONST { Cfloat $2 } | ADDR STRING { Csymbol_address $2 } | ADDR INTCONST { Clabel_address $2 } -- cgit v1.2.1