Repository navigation
Commit 1d75035
committed
[wasm] Split CoreCLR thunks by target OS (browser vs wasi)
Browser and WASI CoreLib expose different sets of P/Invokes and UCO
callbacks:
* WASI CoreLib pulls in the Unix Interop.Libraries.cs path, so it
references Sys (sockets, fcntl, host entry, etc.) symbols that
browser CoreLib does not.
* Browser CoreLib references JS-interop pinvokes/callbacks
(SystemJS_*, SystemInteropJS_*, JavaScriptExports.*) that WASI
does not.
A single generated callhelpers-{pinvoke,reverse,interp-to-managed}.cpp
cannot be correct for both. Split the checked-in baseline copies into
src/coreclr/vm/wasm/{browser,wasi}/ and pick the appropriate subdir
in vm/CMakeLists.txt based on CLR_CMAKE_TARGET_WASI.
Also parameterize the WasmAppBuilder.CoreCLR generator with a TargetOS
property (default "browser" to preserve existing behavior). The
generator now filters DllImport and UnmanagedCallersOnly methods by
the target's [SupportedOSPlatform] / [UnsupportedOSPlatform] attributes
so a future regen against a wasi build naturally drops browser-only
entries and vice-versa. BrowserWasmApp.CoreCLR.targets explicitly
passes TargetOS="browser".1 parent 1dd8f87 commit 1d75035
11 files changed
Lines changed: 4806 additions & 17 deletions
File tree
- src
- coreclr/vm
- wasm
- browser
- wasi
- mono/browser/build
- tasks/WasmAppBuilder/coreclr
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
954 | 954 | | |
955 | 955 | | |
956 | 956 | | |
| 957 | + | |
| 958 | + | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
957 | 962 | | |
958 | | - | |
959 | | - | |
| 963 | + | |
| 964 | + | |
960 | 965 | | |
961 | 966 | | |
962 | 967 | | |
963 | | - | |
| 968 | + | |
964 | 969 | | |
965 | 970 | | |
966 | 971 | | |
| |||
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
428 | 428 | | |
429 | 429 | | |
430 | 430 | | |
| 431 | + | |
431 | 432 | | |
432 | 433 | | |
433 | 434 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| |||
67 | 69 | | |
68 | 70 | | |
69 | 71 | | |
70 | | - | |
| 72 | + | |
71 | 73 | | |
72 | 74 | | |
73 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
| 65 | + | |
65 | 66 | | |
66 | 67 | | |
67 | | - | |
| 68 | + | |
68 | 69 | | |
69 | 70 | | |
| 71 | + | |
70 | 72 | | |
71 | 73 | | |
72 | 74 | | |
| |||
104 | 106 | | |
105 | 107 | | |
106 | 108 | | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
107 | 112 | | |
108 | 113 | | |
109 | 114 | | |
| |||
126 | 131 | | |
127 | 132 | | |
128 | 133 | | |
129 | | - | |
| 134 | + | |
130 | 135 | | |
131 | 136 | | |
132 | 137 | | |
| |||
213 | 218 | | |
214 | 219 | | |
215 | 220 | | |
216 | | - | |
| 221 | + | |
217 | 222 | | |
218 | 223 | | |
219 | 224 | | |
220 | 225 | | |
221 | | - | |
| 226 | + | |
222 | 227 | | |
223 | 228 | | |
224 | 229 | | |
225 | | - | |
| 230 | + | |
226 | 231 | | |
227 | 232 | | |
228 | 233 | | |
229 | 234 | | |
230 | 235 | | |
231 | 236 | | |
232 | | - | |
| 237 | + | |
233 | 238 | | |
234 | 239 | | |
235 | 240 | | |
| |||
238 | 243 | | |
239 | 244 | | |
240 | 245 | | |
241 | | - | |
242 | | - | |
| 246 | + | |
| 247 | + | |
243 | 248 | | |
244 | 249 | | |
245 | 250 | | |
| |||
248 | 253 | | |
249 | 254 | | |
250 | 255 | | |
251 | | - | |
| 256 | + | |
252 | 257 | | |
253 | 258 | | |
254 | | - | |
| 259 | + | |
255 | 260 | | |
256 | 261 | | |
257 | 262 | | |
| |||
0 commit comments