summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1995-11-06 11:04:55 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1995-11-06 11:04:55 +0000
commitbd6a78bbe50613d69fa4eb033e96a576510fa8dc (patch)
treeee8466f8b721d3e5f9537f0bcc0f34bd18a58e03
parent9ab1523e8877324470f1e76eca786081fae36b94 (diff)
asmlink: balayage des fichiers dans le mauvais ordre.
emit_alpha: typo dans un nom d'instruction. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@402 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--asmcomp/asmlink.ml4
-rw-r--r--asmcomp/emit_alpha.mlp2
2 files changed, 3 insertions, 3 deletions
diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml
index c700194c9..fad0775b3 100644
--- a/asmcomp/asmlink.ml
+++ b/asmcomp/asmlink.ml
@@ -79,7 +79,7 @@ let add_required (name, crc) =
let remove_required name =
missing_globals := StringSet.remove name !missing_globals
-let scan_file tolink obj_name =
+let scan_file obj_name tolink =
let file_name =
try
find_in_path !load_path obj_name
@@ -196,7 +196,7 @@ let object_file_name name =
let link objfiles =
let objfiles = "stdlib.cmxa" :: (objfiles @ ["std_exit.cmx"]) in
- let units_tolink = List.fold_left scan_file [] (List.rev objfiles) in
+ let units_tolink = List.fold_right scan_file objfiles [] in
if not (StringSet.is_empty !missing_globals) then
raise(Error(Missing_implementations(StringSet.elements !missing_globals)));
let startup = temp_file "camlstartup" ".s" in
diff --git a/asmcomp/emit_alpha.mlp b/asmcomp/emit_alpha.mlp
index 05e2686ec..c3ad6da27 100644
--- a/asmcomp/emit_alpha.mlp
+++ b/asmcomp/emit_alpha.mlp
@@ -411,7 +411,7 @@ let emit_instr i =
` subq $25, {emit_int n}, $24\n`;
` cmovge {emit_reg i.arg.(0)}, $25, $24\n`;
` cmoveq $25, $25, $24\n`;
- ` move $24, {emit_reg i.res.(0)}\n`
+ ` mov $24, {emit_reg i.res.(0)}\n`
| Lop(Iintop_imm(Icomp cmp, n)) ->
let (comp, test) = name_for_int_comparison cmp in
` {emit_string comp} {emit_reg i.arg.(0)}, {emit_int n}, {emit_reg i.res.(0)}\n`;