diff --git a/Manifest.toml b/Manifest.toml index d9a5843..1f33388 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,22 +1,154 @@ # This file is machine-generated - editing it directly is not advised +[[ArgTools]] +uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" +version = "1.1.1" + +[[Artifacts]] +uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" + +[[Base64]] +uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" + [[CEnum]] git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9" uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" version = "0.4.1" +[[Dates]] +deps = ["Printf"] +uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" + +[[Downloads]] +deps = ["ArgTools", "LibCURL", "NetworkOptions"] +uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" +version = "1.4.0" + +[[InteractiveUtils]] +deps = ["Markdown"] +uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" + +[[JLLWrappers]] +deps = ["Preferences"] +git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.3.0" + [[LLVM]] -deps = ["CEnum", "Libdl", "Printf", "Unicode"] -git-tree-sha1 = "b499c68a45249b0385585c62f4a9b62b5db8e691" +deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"] +git-tree-sha1 = "733abcbdc67337bb6aaf873c6bebbe1e6440a5df" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "3.7.1" +version = "4.1.1" + +[[LLVMExtra_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "b36c0677a0549c7d1dc8719899a4133abbfacf7d" +uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab" +version = "0.0.6+0" + +[[LibCURL]] +deps = ["LibCURL_jll", "MozillaCACerts_jll"] +uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" +version = "0.6.2" + +[[LibCURL_jll]] +deps = ["Artifacts", "JLLWrappers", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Pkg", "Zlib_jll", "nghttp2_jll"] +uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" +version = "7.73.0+4" + +[[LibGit2]] +deps = ["Base64", "NetworkOptions", "Printf", "SHA"] +uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" + +[[LibSSH2_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "MbedTLS_jll", "Pkg"] +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" +version = "1.9.1+2" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +[[Logging]] +uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" + +[[Markdown]] +deps = ["Base64"] +uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" + +[[MbedTLS_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +version = "2.24.0+2" + +[[MozillaCACerts_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +uuid = "14a3606d-f60d-562e-9121-12d972cd8159" +version = "2020.7.22" + +[[NetworkOptions]] +uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" +version = "1.2.0" + +[[Pkg]] +deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +version = "1.6.0" + +[[Preferences]] +deps = ["TOML"] +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +uuid = "21216c6a-2e73-6563-6e65-726566657250" +version = "1.2.2" + [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +[[REPL]] +deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] +uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + +[[Random]] +deps = ["Serialization"] +uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" + +[[SHA]] +uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" + +[[Serialization]] +uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" + +[[Sockets]] +uuid = "6462fe0b-24de-5631-8697-dd941f90decc" + +[[TOML]] +deps = ["Dates"] +uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" +version = "1.0.0" + +[[Tar]] +deps = ["ArgTools", "SHA"] +uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" +version = "1.9.1" + +[[UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" + +[[Zlib_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +uuid = "83775a58-1f1d-513f-b197-d71354ab007a" +version = "1.2.12+1" + +[[nghttp2_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" +version = "1.41.0+1" + +[[p7zip_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" +version = "16.2.1+1" diff --git a/Project.toml b/Project.toml index ff31494..0d2b515 100644 --- a/Project.toml +++ b/Project.toml @@ -8,7 +8,7 @@ LLVM = "929cbde3-209d-540e-8aea-75f648917ca0" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" [compat] -LLVM = "3.7" +LLVM = "4" julia = "1.6" [extras] diff --git a/src/UProbes.jl b/src/UProbes.jl index 0f74b34..83b1df7 100644 --- a/src/UProbes.jl +++ b/src/UProbes.jl @@ -122,8 +122,8 @@ _.stapsdt.base: .space 1 .endif """ - LLVM.Interop.JuliaContext() do ctx - mod = LLVM.Module("uprobe_$(provider)_$(name)", ctx) + LLVM.Interop.Context() do ctx + mod = LLVM.Module("uprobe_$(provider)_$(name)"; ctx) # Create semaphore variable int16_t = LLVM.Int16Type(ctx) @@ -139,8 +139,8 @@ _.stapsdt.base: .space 1 initializer!(gdb_unhappy, ConstantInt(int16_t, 0)) # create function that will do a call to nop assembly - rettyp = convert(LLVMType, Nothing, ctx) - argtyp = LLVMType[convert.(Ref(LLVMType), args, Ref(ctx))...] + rettyp = convert(LLVMType, Nothing; ctx) + argtyp = LLVMType[convert.(Ref(LLVMType), args; ctx)...] ft = LLVM.FunctionType(rettyp, argtyp) f = LLVM.Function(mod, string("__uprobe_", provider, "_", name), ft) @@ -150,7 +150,7 @@ _.stapsdt.base: .space 1 # generate IR Builder(ctx) do builder - entry = BasicBlock(f, "entry", ctx) + entry = BasicBlock(f, "entry"; ctx) position!(builder, entry) val = call!(builder, inline_asm, collect(parameters(f))) @@ -160,7 +160,7 @@ _.stapsdt.base: .space 1 triple = LLVM.triple() target = LLVM.Target(; triple=triple) objfile = tempname() - TargetMachine(target, triple, "", "", LLVM.API.LLVMCodeGenLevelDefault, LLVM.API.LLVMRelocPIC) do tm + TargetMachine(target, triple, "", ""; reloc=LLVM.API.LLVMRelocPIC) do tm LLVM.emit(tm, mod, LLVM.API.LLVMObjectFile, objfile) end