File: 2001_pulley-interpreter.patch

package info (click to toggle)
rust-wasmtime 28.0.1%2Bdfsg-3
  • links: PTS, VCS
  • area: main
  • in suites: forky
  • size: 54,120 kB
  • sloc: ansic: 4,071; sh: 567; javascript: 548; cpp: 280; asm: 175; ml: 96; makefile: 55
file content (220 lines) | stat: -rw-r--r-- 8,377 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
Description: avoid unstable crate pulley-interpreter
 The workspace crate pulley-interpreter fails to install:
 no matching package named `pulley-interpreter` found
Author: Jonas Smedegaard <dr@jones.dk>
Forwarded: not-needed
Last-Update: 2025-10-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/cranelift/codegen/Cargo.toml
+++ b/cranelift/codegen/Cargo.toml
@@ -16,10 +16,6 @@
 [lints]
 workspace = true
 
-[package.metadata.docs.rs]
-# Ask Cargo to build docs with the feature `all-arch`
-features = ["all-arch"]
-
 [dependencies]
 anyhow = { workspace = true, optional = true, features = ['std'] }
 bumpalo = "3"
@@ -34,7 +30,6 @@
 log = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
-pulley-interpreter = { workspace = true, optional = true }
 postcard = { workspace = true, optional = true }
 gimli = { workspace = true, features = ["write", "std"], optional = true }
 smallvec = { workspace = true }
@@ -86,18 +81,10 @@
 arm64 = []
 s390x = []
 riscv64 = []
-pulley = ["dep:pulley-interpreter", "pulley-interpreter/encode", "pulley-interpreter/disas"]
 # Enable the ISA target for the host machine
 host-arch = []
 
-# Option to enable all architectures.
-all-arch = [
-    "all-native-arch",
-    "pulley",
-]
-
 # Option to enable all architectures that correspond to an actual native target
-# (that is, exclude Pulley).
 all-native-arch = [
     "x86",
     "arm64",
--- a/cranelift/codegen/src/isa/mod.rs
+++ b/cranelift/codegen/src/isa/mod.rs
@@ -75,13 +75,6 @@
 #[cfg(feature = "s390x")]
 mod s390x;
 
-#[cfg(feature = "pulley")]
-mod pulley32;
-#[cfg(feature = "pulley")]
-mod pulley64;
-#[cfg(feature = "pulley")]
-mod pulley_shared;
-
 pub mod unwind;
 
 mod call_conv;
@@ -112,8 +105,6 @@
         Architecture::Aarch64 { .. } => isa_builder!(aarch64, (feature = "arm64"), triple),
         Architecture::S390x { .. } => isa_builder!(s390x, (feature = "s390x"), triple),
         Architecture::Riscv64 { .. } => isa_builder!(riscv64, (feature = "riscv64"), triple),
-        Architecture::Pulley32 => isa_builder!(pulley32, (feature = "pulley"), triple),
-        Architecture::Pulley64 => isa_builder!(pulley64, (feature = "pulley"), triple),
         _ => Err(LookupError::Unsupported),
     }
 }
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,7 +85,7 @@
 
 [dev-dependencies]
 # depend again on wasmtime to activate its default features for tests
-wasmtime = { workspace = true, features = ['default', 'winch', 'pulley', 'all-arch', 'call-hook', 'memory-protection-keys', 'signals-based-traps'] }
+wasmtime = { workspace = true, features = ['default', 'winch', 'call-hook', 'memory-protection-keys', 'signals-based-traps'] }
 env_logger = { workspace = true }
 log = { workspace = true }
 tempfile = { workspace = true }
@@ -117,7 +117,6 @@
 capstone = { workspace = true }
 object = { workspace = true, features = ['std'] }
 wasmtime-test-macros = { path = "crates/test-macros" }
-pulley-interpreter = { workspace = true, features = ["disas"] }
 wasmtime-wast-util = { path = 'crates/wast-util' }
 wasm-encoder = { workspace = true }
 
@@ -228,9 +227,6 @@
 wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=28.0.1" }
 test-programs-artifacts = { path = 'crates/test-programs/artifacts' }
 
-pulley-interpreter = { path = 'pulley', version = "=28.0.1" }
-pulley-interpreter-fuzz = { path = 'pulley/fuzz' }
-
 cranelift-codegen = { path = "cranelift/codegen", version = "0.115.1", default-features = false, features = ["std", "unwind"] }
 cranelift-frontend = { path = "cranelift/frontend", version = "0.115.1" }
 cranelift-entity = { path = "cranelift/entity", version = "0.115.1" }
@@ -405,9 +401,7 @@
 # Off-by-default features
 #
 # These features are off-by-default but may optionally be enabled.
-all-arch = ["wasmtime/all-arch"]
 winch = ["wasmtime/winch"]
-pulley = ["wasmtime/pulley"]
 wmemcheck = ["wasmtime/wmemcheck"]
 trace-log = ["wasmtime/trace-log"]
 memory-protection-keys = ["wasmtime-cli-flags/memory-protection-keys"]
--- a/cranelift/filetests/Cargo.toml
+++ b/cranelift/filetests/Cargo.toml
@@ -36,4 +36,3 @@
 serde_derive = { workspace = true }
 cranelift.workspace = true
 smallvec = { workspace = true }
-pulley-interpreter = { workspace = true, features = ["disas", "std"] }
--- a/crates/cranelift/Cargo.toml
+++ b/crates/cranelift/Cargo.toml
@@ -32,12 +32,9 @@
 cfg-if = { workspace = true }
 wasmtime-versioned-export-macros = { workspace = true }
 itertools = ">= 0.12, <= 0.13"
-pulley-interpreter = { workspace = true, optional = true }
 
 [features]
-all-arch = ["cranelift-codegen/all-arch"]
 host-arch = ["cranelift-codegen/host-arch"]
-pulley = ["cranelift-codegen/pulley", "dep:pulley-interpreter"]
 trace-log = ["cranelift-codegen/trace-log"]
 component-model = ["wasmtime-environ/component-model"]
 incremental-cache = ["cranelift-codegen/incremental-cache"]
--- a/crates/wasmtime/Cargo.toml
+++ b/crates/wasmtime/Cargo.toml
@@ -30,7 +30,6 @@
 wasmtime-slab = { workspace = true, optional = true }
 wasmtime-versioned-export-macros = { workspace = true }
 wasmtime-wmemcheck = { workspace = true, optional = true }
-pulley-interpreter = { workspace = true, optional = true }
 target-lexicon = { workspace = true }
 wasmparser = { workspace = true }
 wasm-encoder = { workspace = true, optional = true }
@@ -151,13 +150,6 @@
 # and shouldn't be used in production applications.
 winch = ["dep:wasmtime-winch", "std"]
 
-# Enables support for Pulley, the WebAssembly interpreter. When paired with the
-# `cranelift` feature, the compiler backends for the `pulley32` and `pulley64`
-# targets will be available. When paired with the `runtime` feature, the Pulley
-# interpreter will be built into the runtime and you can interpret WebAssembly
-# modules that have been compiled to Pulley bytecode.
-pulley = ["dep:pulley-interpreter", "wasmtime-cranelift?/pulley"]
-
 # Enables support for incremental compilation cache to be enabled in `Config`.
 incremental-cache = ["wasmtime-cranelift?/incremental-cache", "std"]
 
@@ -194,11 +186,6 @@
   "signals-based-traps", # pooling allocation always uses mmap at this time
 ]
 
-# Enables support for all architectures in Cranelift, allowing
-# cross-compilation using the `wasmtime` crate's API, notably the
-# `Engine::precompile_module` function.
-all-arch = ["wasmtime-cranelift?/all-arch", "wasmtime-winch?/all-arch", "pulley"]
-
 # Enables in-progress support for the component model. Note that this feature is
 # in-progress, buggy, and incomplete. This is primarily here for internal
 # testing purposes.
@@ -247,7 +234,6 @@
   "dep:psm",
   "dep:rustix",
   "rustix/mm",
-  "pulley-interpreter?/interp",
 ]
 
 # Enable support for garbage collection-related things.
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -22,7 +22,6 @@
 cranelift-control = { workspace = true }
 libfuzzer-sys = { workspace = true, features = ["arbitrary-derive"] }
 target-lexicon = { workspace = true }
-pulley-interpreter-fuzz = { workspace = true }
 smallvec = { workspace = true }
 wasmparser = { workspace = true }
 wasmtime = { workspace = true, features = ["winch"] }
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -50,17 +50,14 @@
 # Note that this just enables `trace-log` for `clif-util` and doesn't turn it on
 # for all of Cranelift, which would be bad.
 regalloc2 = { workspace = true, features = ["trace-log"] }
-pulley-interpreter = { workspace = true, optional = true }
 
 [features]
 default = [
     "disas",
-    "cranelift-codegen/all-arch",
+    "cranelift-codegen/all-native-arch",
     "cranelift-codegen/trace-log",
     "souper-harvest",
 ]
 disas = ["capstone"]
 souper-harvest = ["cranelift-codegen/souper-harvest", "rayon"]
-all-arch = ["cranelift-codegen/all-arch"]
 all-native-arch = ["cranelift-codegen/all-native-arch"]
-pulley = ['cranelift-codegen/pulley', 'dep:pulley-interpreter']
--- a/cranelift/isle/veri/veri_engine/Cargo.toml
+++ b/cranelift/isle/veri/veri_engine/Cargo.toml
@@ -18,7 +18,7 @@
 
 [dependencies]
 cranelift-isle = { path = "../../isle" }
-cranelift-codegen = { path = "../../../codegen", features = ["all-arch"] }
+cranelift-codegen = { path = "../../../codegen", features = ["all-native-arch"] }
 cranelift-codegen-meta = { path = "../../../codegen/meta" }
 veri_ir = { path = "../veri_ir" }
 easy-smt = "0.2.2"