summaryrefslogtreecommitdiff
path: root/asmcomp/amd64/proc.ml
diff options
context:
space:
mode:
authorNick Barnes <nick@tarides.com>2023-05-02 21:16:12 +0100
committerNick Barnes <nick@tarides.com>2023-05-02 21:16:12 +0100
commitd3a5c923939a1fc03cc14c005d61210d8c3bd546 (patch)
tree5459de2b7b6cbaa1167d18224f1ea5d256e2f3f7 /asmcomp/amd64/proc.ml
parentad111da274b58d82249f92b8c79ee252bf25525b (diff)
parent23dab79a4e42856aa33816b9c79c3d4d79959cb9 (diff)
downloadocaml-d3a5c923939a1fc03cc14c005d61210d8c3bd546.tar.gz
Merge branch 'trunk' into nick-get-copy
Diffstat (limited to 'asmcomp/amd64/proc.ml')
-rw-r--r--asmcomp/amd64/proc.ml8
1 files changed, 4 insertions, 4 deletions
diff --git a/asmcomp/amd64/proc.ml b/asmcomp/amd64/proc.ml
index 56377b322c..cd50cba52b 100644
--- a/asmcomp/amd64/proc.ml
+++ b/asmcomp/amd64/proc.ml
@@ -235,7 +235,7 @@ let win64_float_external_arguments =
let win64_loc_external_arguments arg =
let loc = Array.make (Array.length arg) Reg.dummy in
let reg = ref 0
- and ofs = ref 32 in
+ and ofs = ref 0 in
for i = 0 to Array.length arg - 1 do
match arg.(i) with
| Val | Int | Addr as ty ->
@@ -291,12 +291,12 @@ let destroyed_at_c_call =
by the code sequence used for C calls in emit.mlp, so it
is marked as destroyed. *)
if win64 then
- (* Win64: rbx, rsi, rdi, r12-r15, xmm6-xmm15 preserved *)
+ (* Win64: rsi, rdi, r12-r15, xmm6-xmm15 preserved *)
Array.of_list(List.map phys_reg
- [0;4;5;6;7;10;11;12;
+ [0;1;4;5;6;7;10;11;12;
100;101;102;103;104;105])
else
- (* Unix: rbx, r12-r15 preserved *)
+ (* Unix: r12-r15 preserved *)
Array.of_list(List.map phys_reg
[0;1;2;3;4;5;6;7;10;11;
100;101;102;103;104;105;106;107;