diff options
| -rw-r--r-- | README.win32 | 4 | ||||
| -rw-r--r-- | asmcomp/amd64/emit.mlp | 39 | ||||
| -rw-r--r-- | asmcomp/x86_gas.ml | 8 | ||||
| -rw-r--r-- | asmcomp/x86_proc.ml | 6 | ||||
| -rw-r--r-- | asmcomp/x86_proc.mli | 1 |
5 files changed, 21 insertions, 37 deletions
diff --git a/README.win32 b/README.win32 index acb4b6128..111c9a107 100644 --- a/README.win32 +++ b/README.win32 @@ -75,7 +75,7 @@ THIRD-PARTY SOFTWARE: http://www.microsoft.com/downloads/en/default.aspx under the name "Microsoft Windows 7 SDK". -[2] flexdll version 0.34 or later. +[2] flexdll version 0.31 or later. Can be downloaded from http://alain.frisch.fr/flexdll.html RECOMPILATION FROM THE SOURCES: @@ -362,7 +362,7 @@ THIRD-PARTY SOFTWARE: http://www.microsoft.com/downloads/en/default.aspx under the name "Microsoft Windows 7 SDK". -[2] flexdll version 0.34 or later. +[2] flexdll version 0.31 or later. Can be downloaded from http://alain.frisch.fr/flexdll.html diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp index 94470e242..8f10ae91f 100644 --- a/asmcomp/amd64/emit.mlp +++ b/asmcomp/amd64/emit.mlp @@ -100,35 +100,27 @@ let symbols_used = ref StringSet.empty let add_def_symbol s = symbols_defined := StringSet.add s !symbols_defined let add_used_symbol s = symbols_used := StringSet.add s !symbols_used -let windows = - match system with - | S_mingw64 | S_cygwin | S_win64 -> true - | _ -> false - -let mem__imp s = - let imps = "__flimp_" ^ s in - add_used_symbol imps; - mem64_rip QWORD (emit_symbol imps) - let rel_plt s = - if windows && !Clflags.dlcode then - mem__imp s - else - let use_plt = - match system with - | S_macosx | S_mingw64 | S_cygwin | S_win64 -> false - | _ -> !Clflags.dlcode - in - sym (if use_plt then emit_symbol s ^ "@PLT" else emit_symbol s) + let use_plt = + match system with + | S_macosx | S_mingw64 | S_cygwin | S_win64 -> false + | _ -> !Clflags.dlcode + in + sym (if use_plt then emit_symbol s ^ "@PLT" else emit_symbol s) let emit_call s = I.call (rel_plt s) let emit_jump s = I.jmp (rel_plt s) +let windows = + match system with + | S_mingw64 | S_cygwin | S_win64 -> true + | _ -> false + let load_symbol_addr s arg = if !Clflags.dlcode && not windows then I.mov (mem64_rip QWORD (emit_symbol s ^ "@GOTPCREL")) arg - else if !pic_code && not (windows && !Clflags.dlcode) then + else if !pic_code then I.lea (mem64_rip NONE (emit_symbol s)) arg else I.mov (sym (emit_symbol s)) arg @@ -537,7 +529,7 @@ let emit_instr fallthrough i = let lbl_redo = new_label() in def_label lbl_redo; I.sub (int n) r15; - if !Clflags.dlcode then begin + if !Clflags.dlcode && system <> S_win64 then begin load_symbol_addr "caml_young_limit" rax; I.cmp (mem64 QWORD 0 RAX) r15; end else @@ -848,6 +840,8 @@ let begin_assembly() = D.extrn "caml_young_ptr" QWORD; D.extrn "caml_young_limit" QWORD; D.extrn "caml_exception_pointer" QWORD; + D.extrn "caml_absf_mask" QWORD; + D.extrn "caml_negf_mask" QWORD; D.extrn "caml_call_gc" NEAR; D.extrn "caml_c_call" NEAR; D.extrn "caml_allocN" NEAR; @@ -860,12 +854,11 @@ let begin_assembly() = end; - if !Clflags.dlcode then begin + if !Clflags.dlcode && system <> S_win64 then begin (* from amd64.S; could emit these constants on demand *) begin match system with | S_macosx -> D.section ["__TEXT";"__literal16"] None ["16byte_literals"] | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") [] - | S_win64 -> D.data (); | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"] end; D.align 16; diff --git a/asmcomp/x86_gas.ml b/asmcomp/x86_gas.ml index 99e50201e..8739b3be6 100644 --- a/asmcomp/x86_gas.ml +++ b/asmcomp/x86_gas.ml @@ -25,7 +25,7 @@ let opt_displ b displ = else bprintf b "%d" displ let arg_mem b {arch; typ=_; idx; scale; base; sym; displ} = - let string_of_register = + let string_of_register = match arch with | X86 -> string_of_reg32 | X64 -> string_of_reg64 @@ -104,10 +104,10 @@ let i2_ss b s x y = bprintf b "\t%s%s%s\t%a, %a" s (suf x) (suf y) arg x arg y let i1_call_jmp b s = function (* this is the encoding of jump labels: don't use * *) + | Mem64_RIP _ | Mem {arch=X86; idx=_; scale=0; base=None; sym=Some _; _} as x -> i1 b s x - | Reg32 _ | Reg64 _ | Mem _ | Mem64_RIP _ as x -> - bprintf b "\t%s\t*%a" s arg x + | Reg32 _ | Reg64 _ | Mem _ as x -> bprintf b "\t%s\t*%a" s arg x | Sym x -> bprintf b "\t%s\t%s" s x | _ -> assert false @@ -182,8 +182,6 @@ let print_instr b = function | MOV ((Imm n as arg1), (Reg64 _ as arg2)) when not (n <= 0x7FFF_FFFFL && n >= -0x8000_0000L) -> i2 b "movabsq" arg1 arg2 - | MOV ((Sym _ as arg1), (Reg64 _ as arg2)) when windows -> - i2 b "movabsq" arg1 arg2 | MOV (arg1, arg2) -> i2_s b "mov" arg1 arg2 | MOVAPD (arg1, arg2) -> i2 b "movapd" arg1 arg2 | MOVLPD (arg1, arg2) -> i2 b "movlpd" arg1 arg2 diff --git a/asmcomp/x86_proc.ml b/asmcomp/x86_proc.ml index a68958a45..4eec23b2d 100644 --- a/asmcomp/x86_proc.ml +++ b/asmcomp/x86_proc.ml @@ -50,12 +50,6 @@ let system = match Config.system with | _ -> S_unknown -let windows = - match system with - | S_mingw | S_win32 - | S_mingw64 | S_cygwin | S_win64 -> true - | _ -> false - let string_of_string_literal s = let b = Buffer.create (String.length s + 2) in let last_was_escape = ref false in diff --git a/asmcomp/x86_proc.mli b/asmcomp/x86_proc.mli index cce4ffdbd..22506e272 100644 --- a/asmcomp/x86_proc.mli +++ b/asmcomp/x86_proc.mli @@ -75,7 +75,6 @@ type system = val system: system val masm: bool -val windows: bool (** Support for plumbing a binary code emitter *) |