summaryrefslogtreecommitdiff
path: root/asmcomp/amd64
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2010-01-22 12:48:24 +0000
committerDamien Doligez <damien.doligez-inria.fr>2010-01-22 12:48:24 +0000
commit04b1656222698bd7e92f213e9a718b7a4185643a (patch)
tree6186d1ba1e00adb1232908f95cb92c299902a943 /asmcomp/amd64
parentbdc0fadee2dc9669818955486b4c3497016edda5 (diff)
downloadocaml-04b1656222698bd7e92f213e9a718b7a4185643a.tar.gz
clean up spaces and tabs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'asmcomp/amd64')
-rw-r--r--asmcomp/amd64/emit.mlp3
-rw-r--r--asmcomp/amd64/emit_nt.mlp20
-rw-r--r--asmcomp/amd64/proc.ml14
-rw-r--r--asmcomp/amd64/proc_nt.ml16
4 files changed, 26 insertions, 27 deletions
diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
index 950748d6e2..b1f886da9c 100644
--- a/asmcomp/amd64/emit.mlp
+++ b/asmcomp/amd64/emit.mlp
@@ -60,7 +60,7 @@ let slot_offset loc cl =
(* Symbols *)
let emit_symbol s =
- if macosx then emit_string "_";
+ if macosx then emit_string "_";
Emitaux.emit_symbol '$' s
let emit_call s =
@@ -791,4 +791,3 @@ let end_assembly() =
if Config.system = "linux" then
(* Mark stack as non-executable, PR#4564 *)
` .section .note.GNU-stack,\"\",%progbits\n`
-
diff --git a/asmcomp/amd64/emit_nt.mlp b/asmcomp/amd64/emit_nt.mlp
index 71b71157b8..23c5b34ec3 100644
--- a/asmcomp/amd64/emit_nt.mlp
+++ b/asmcomp/amd64/emit_nt.mlp
@@ -39,10 +39,10 @@ let frame_required () =
let frame_size () = (* includes return address *)
if frame_required() then begin
- let sz =
+ let sz =
(!stack_offset + 8 * (num_stack_slots.(0) + num_stack_slots.(1)) + 8)
in Misc.align sz 16
- end else
+ end else
!stack_offset + 8
let slot_offset loc cl =
@@ -63,7 +63,7 @@ let emit_int32 n = emit_printf "0%lxh" n
let emit_symbol s =
Emitaux.emit_symbol '$' s
-(* Record symbols used and defined - at the end generate extern for those
+(* Record symbols used and defined - at the end generate extern for those
used but not defined *)
let symbols_defined = ref StringSet.empty
@@ -84,11 +84,11 @@ let emit_label lbl =
let emit_align n =
` ALIGN {emit_int n}\n`
-
+
let emit_Llabel fallthrough lbl =
if not fallthrough && !fastcode_flag then emit_align 4;
emit_label lbl
-
+
(* Output a pseudo-register *)
let emit_reg = function
@@ -106,13 +106,13 @@ let emit_reg = function
(* Output a reference to the lower 8, 16 or 32 bits of a register *)
let reg_low_8_name =
- [| "al"; "bl"; "dil"; "sil"; "dl"; "cl"; "r8b"; "r9b";
+ [| "al"; "bl"; "dil"; "sil"; "dl"; "cl"; "r8b"; "r9b";
"r10b"; "r11b"; "bpl"; "r12b"; "r13b" |]
let reg_low_16_name =
- [| "ax"; "bx"; "di"; "si"; "dx"; "cx"; "r8w"; "r9w";
+ [| "ax"; "bx"; "di"; "si"; "dx"; "cx"; "r8w"; "r9w";
"r10w"; "r11w"; "bp"; "r12w"; "r13w" |]
let reg_low_32_name =
- [| "eax"; "ebx"; "edi"; "esi"; "edx"; "ecx"; "r8d"; "r9d";
+ [| "eax"; "ebx"; "edi"; "esi"; "edx"; "ecx"; "r8d"; "r9d";
"r10d"; "r11d"; "ebp"; "r12d"; "r13d" |]
let emit_subreg tbl pref r =
@@ -253,7 +253,7 @@ let name_for_cond_branch = function
| Iunsigned Ceq -> "e" | Iunsigned Cne -> "ne"
| Iunsigned Cle -> "be" | Iunsigned Cgt -> "a"
| Iunsigned Clt -> "b" | Iunsigned Cge -> "ae"
-
+
(* Output an = 0 or <> 0 test. *)
let output_test_zero arg =
@@ -544,7 +544,7 @@ let emit_instr fallthrough i =
` cmp {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`;
let b = name_for_cond_branch cmp in
` j{emit_string b} {emit_label lbl}\n`
- | Iinttest_imm((Isigned Ceq | Isigned Cne |
+ | Iinttest_imm((Isigned Ceq | Isigned Cne |
Iunsigned Ceq | Iunsigned Cne) as cmp, 0) ->
output_test_zero i.arg.(0);
let b = name_for_cond_branch cmp in
diff --git a/asmcomp/amd64/proc.ml b/asmcomp/amd64/proc.ml
index c0807b88d4..4ba0d5c3ec 100644
--- a/asmcomp/amd64/proc.ml
+++ b/asmcomp/amd64/proc.ml
@@ -31,24 +31,24 @@ open Mach
rcx 5
r8 6
r9 7
- r10 8
- r11 9
+ r10 8
+ r11 9
rbp 10
- r12 11
- r13 12
+ r12 11
+ r13 12
r14 trap pointer
r15 allocation pointer
-
+
xmm0 - xmm15 100 - 115 xmm0 - xmm9: Caml function arguments
xmm0 - xmm7: C function arguments
xmm0: Caml and C function results *)
let int_reg_name =
- [| "%rax"; "%rbx"; "%rdi"; "%rsi"; "%rdx"; "%rcx"; "%r8"; "%r9";
+ [| "%rax"; "%rbx"; "%rdi"; "%rsi"; "%rdx"; "%rcx"; "%r8"; "%r9";
"%r10"; "%r11"; "%rbp"; "%r12"; "%r13" |]
let float_reg_name =
- [| "%xmm0"; "%xmm1"; "%xmm2"; "%xmm3"; "%xmm4"; "%xmm5"; "%xmm6"; "%xmm7";
+ [| "%xmm0"; "%xmm1"; "%xmm2"; "%xmm3"; "%xmm4"; "%xmm5"; "%xmm6"; "%xmm7";
"%xmm8"; "%xmm9"; "%xmm10"; "%xmm11";
"%xmm12"; "%xmm13"; "%xmm14"; "%xmm15" |]
diff --git a/asmcomp/amd64/proc_nt.ml b/asmcomp/amd64/proc_nt.ml
index 05ce517dd7..5c90e4f52e 100644
--- a/asmcomp/amd64/proc_nt.ml
+++ b/asmcomp/amd64/proc_nt.ml
@@ -31,25 +31,25 @@ open Mach
rcx 5
r8 6
r9 7
- r10 8
- r11 9
+ r10 8
+ r11 9
rbp 10
- r12 11
- r13 12
+ r12 11
+ r13 12
r14 trap pointer
r15 allocation pointer
-
+
xmm0 - xmm15 100 - 115 xmm0 - xmm9: Caml function arguments
xmm0 - xmm3: C function arguments
xmm0: Caml and C function results
xmm6-xmm15 are preserved by C *)
let int_reg_name =
- [| "rax"; "rbx"; "rdi"; "rsi"; "rdx"; "rcx"; "r8"; "r9";
+ [| "rax"; "rbx"; "rdi"; "rsi"; "rdx"; "rcx"; "r8"; "r9";
"r10"; "r11"; "rbp"; "r12"; "r13" |]
let float_reg_name =
- [| "xmm0"; "xmm1"; "xmm2"; "xmm3"; "xmm4"; "xmm5"; "xmm6"; "xmm7";
+ [| "xmm0"; "xmm1"; "xmm2"; "xmm3"; "xmm4"; "xmm5"; "xmm6"; "xmm7";
"xmm8"; "xmm9"; "xmm10"; "xmm11"; "xmm12"; "xmm13"; "xmm14"; "xmm15" |]
let num_register_classes = 2
@@ -229,5 +229,5 @@ let contains_calls = ref false
let assemble_file infile outfile =
Ccomp.command (Config.asm ^
- Filename.quote outfile ^ " " ^
+ Filename.quote outfile ^ " " ^
Filename.quote infile ^ "> NUL")