Skip to content

Commit 2c8ca6e

Browse files
authored
Merge pull request #72 from JuliaDebug/teh/more_28
More like #28
2 parents 6b78715 + 3ab4639 commit 2c8ca6e

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version = "0.1.1"
44

55
[deps]
66
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
7+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
78
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
89

910
[extras]

src/JuliaInterpreter.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ using Core: CodeInfo, SSAValue, SlotNumber, TypeMapEntry, SimpleVector, LineInfo
66
GeneratedFunctionStub, MethodInstance, NewvarNode, TypeName
77

88
using UUIDs
9+
# The following are for circumventing #28, memcpy invalid instruction error,
10+
# in Base and stdlib
11+
using Random.DSFMT
12+
using InteractiveUtils
913

1014
export @enter, @make_stack, @interpret, Compiled, JuliaStackFrame
1115

@@ -1065,6 +1069,11 @@ function set_compiled_methods()
10651069
push!(compiled_methods, which(vcat, (Vector,)))
10661070
push!(compiled_methods, first(methods(Base._getindex_ra)))
10671071
push!(compiled_methods, first(methods(Base._setindex_ra!)))
1072+
push!(compiled_methods, which(Base.decompose, (BigFloat,)))
1073+
push!(compiled_methods, @eval DSFMT which(dsfmt_jump, (DSFMT_state, GF2X)))
1074+
if Sys.iswindows()
1075+
push!(compiled_methods, which(InteractiveUtils.clipboard, (AbstractString,)))
1076+
end
10681077
end
10691078

10701079
function __init__()

test/juliatests.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,17 @@ function test_path(test)
2929
end
3030

3131
nstmts = 10^4 # very quick, aborts a lot
32+
outputfile = "results.md"
3233
i = 1
3334
while i <= length(ARGS)
3435
global i
3536
a = ARGS[i]
3637
if a == "--nstmts"
3738
global nstmts = parse(Int, ARGS[i+1])
3839
deleteat!(ARGS, i:i+1)
40+
elseif a == "--output"
41+
global outputfile = ARGS[i+1]
42+
deleteat!(ARGS, i:i+1)
3943
else
4044
i += 1
4145
end
@@ -136,7 +140,7 @@ move_to_node1("Distributed")
136140
foreach(wait, all_tasks)
137141
end
138142

139-
open("results.md", "w") do io
143+
open(outputfile, "w") do io
140144
versioninfo(io)
141145
println(io, "Test run at: ", now())
142146
println(io)

0 commit comments

Comments
 (0)