dranke/microw8
1
0
Fork 0
mirror of https://github.com/exoticorn/microw8.git synced 2026-01-20 19:26:43 +01:00
Code Issues Projects Releases Wiki Activity

optimize hline function, update wasmtime

Browse Source
This commit is contained in:
Dennis Ranke
2022-06-12 14:28:01 +02:00
parent e0450c9039
commit caeaa82787
12 changed files with 845 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
Cargo.lock generated
View File

@@ -26,6 +26,17 @@ dependencies = [
"const-random", "const-random",
] ]
[[package]]
name = "ahash"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
"getrandom",
"once_cell",
"version_check",
]
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.18" version = "0.7.18"
@@ -120,7 +131,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"miniz_oxide", "miniz_oxide",
"object", "object 0.27.1",
"rustc-demangle", "rustc-demangle",
] ]
@@ -294,7 +305,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d02796e4586c6c41aeb68eae9bfb4558a522c35f1430c14b40136c3706e09e4" checksum = "8d02796e4586c6c41aeb68eae9bfb4558a522c35f1430c14b40136c3706e09e4"
dependencies = [ dependencies = [
"ahash", "ahash 0.3.8",
] ]
[[package]] [[package]]
@@ -434,18 +445,18 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-bforest" name = "cranelift-bforest"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" checksum = "2fa7c3188913c2d11a361e0431e135742372a2709a99b103e79758e11a0a797e"
dependencies = [ dependencies = [
"cranelift-entity", "cranelift-entity",
] ]
[[package]] [[package]]
name = "cranelift-codegen" name = "cranelift-codegen"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" checksum = "29285f70fd396a8f64455a15a6e1d390322e4a5f5186de513141313211b0a23e"
dependencies = [ dependencies = [
"cranelift-bforest", "cranelift-bforest",
"cranelift-codegen-meta", "cranelift-codegen-meta",
@@ -453,40 +464,40 @@ dependencies = [
"cranelift-entity", "cranelift-entity",
"gimli", "gimli",
"log", "log",
"regalloc", "regalloc2",
"smallvec", "smallvec",
"target-lexicon", "target-lexicon",
] ]
[[package]] [[package]]
name = "cranelift-codegen-meta" name = "cranelift-codegen-meta"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" checksum = "057eac2f202ec95aebfd8d495e88560ac085f6a415b3c6c28529dc5eb116a141"
dependencies = [ dependencies = [
"cranelift-codegen-shared", "cranelift-codegen-shared",
] ]
[[package]] [[package]]
name = "cranelift-codegen-shared" name = "cranelift-codegen-shared"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" checksum = "75d93869efd18874a9341cfd8ad66bcb08164e86357a694a0e939d29e87410b9"
[[package]] [[package]]
name = "cranelift-entity" name = "cranelift-entity"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" checksum = "7e34bd7a1fefa902c90a921b36323f17a398b788fa56a75f07a29d83b6e28808"
dependencies = [ dependencies = [
"serde", "serde",
] ]
[[package]] [[package]]
name = "cranelift-frontend" name = "cranelift-frontend"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" checksum = "457018dd2d6ee300953978f63215b5edf3ae42dbdf8c7c038972f10394599f72"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"log", "log",
@@ -496,9 +507,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-native" name = "cranelift-native"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" checksum = "bba027cc41bf1d0eee2ddf16caba2ee1be682d0214520fff0129d2c6557fda89"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"libc", "libc",
@@ -507,9 +518,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-wasm" name = "cranelift-wasm"
version = "0.82.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" checksum = "9b17639ced10b9916c9be120d38c872ea4f9888aa09248568b10056ef0559bfa"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"cranelift-entity", "cranelift-entity",
@@ -517,7 +528,7 @@ dependencies = [
"itertools", "itertools",
"log", "log",
"smallvec", "smallvec",
"wasmparser 0.83.0", "wasmparser 0.84.0",
"wasmtime-types", "wasmtime-types",
] ]
@@ -599,7 +610,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]] [[package]]
name = "curlywas" name = "curlywas"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/exoticorn/curlywas.git?rev=0a0d90c#0a0d90c8013f1d7856a9b71a19d3d006300f31f9" source = "git+https://github.com/exoticorn/curlywas.git?rev=0e7ea50#0e7ea508cd0e76836283ae68a44c9097df83c8ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ariadne", "ariadne",
@@ -888,6 +899,15 @@ dependencies = [
"slab", "slab",
] ]
[[package]]
name = "fxhash"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
dependencies = [
"byteorder",
]
[[package]] [[package]]
name = "generic-array" name = "generic-array"
version = "0.14.5" version = "0.14.5"
@@ -950,6 +970,9 @@ name = "hashbrown"
version = "0.11.2" version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
dependencies = [
"ahash 0.7.6",
]
[[package]] [[package]]
name = "headers" name = "headers"
@@ -1653,8 +1676,18 @@ name = "object"
version = "0.27.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
dependencies = [
"memchr",
]
[[package]]
name = "object"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"hashbrown",
"indexmap", "indexmap",
"memchr", "memchr",
] ]
@@ -1985,13 +2018,14 @@ dependencies = [
] ]
[[package]] [[package]]
name = "regalloc" name = "regalloc2"
version = "0.0.34" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" checksum = "904196c12c9f55d3aea578613219f493ced8e05b3d0c6a42d11cb4142d8b4879"
dependencies = [ dependencies = [
"fxhash",
"log", "log",
"rustc-hash", "slice-group-by",
"smallvec", "smallvec",
] ]
@@ -2073,9 +2107,9 @@ dependencies = [
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.33.3" version = "0.33.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9466f25b92a648960ac1042fd3baa6b0bf285e60f754d7e5070770c813a177a" checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"errno", "errno",
@@ -2253,6 +2287,12 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
[[package]]
name = "slice-group-by"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]] [[package]]
name = "smallvec" name = "smallvec"
version = "1.8.0" version = "1.8.0"
@@ -2844,6 +2884,15 @@ dependencies = [
"leb128", "leb128",
] ]
[[package]]
name = "wasm-encoder"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f0c17267a5ffd6ae3d897589460e21db1673c84fb7016b909c9691369a75ea"
dependencies = [
"leb128",
]
[[package]] [[package]]
name = "wasmparser" name = "wasmparser"
version = "0.77.0" version = "0.77.0"
@@ -2863,10 +2912,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
[[package]] [[package]]
name = "wasmtime" name = "wasmparser"
version = "0.35.3" version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" checksum = "77dc97c22bb5ce49a47b745bed8812d30206eff5ef3af31424f2c1820c0974b2"
dependencies = [
"indexmap",
]
[[package]]
name = "wasmtime"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfdd1101bdfa0414a19018ec0a091951a20b695d4d04f858d49f6c4cc53cd8dd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -2877,7 +2935,7 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",
"object", "object 0.28.4",
"once_cell", "once_cell",
"paste", "paste",
"psm", "psm",
@@ -2885,7 +2943,7 @@ dependencies = [
"region", "region",
"serde", "serde",
"target-lexicon", "target-lexicon",
"wasmparser 0.83.0", "wasmparser 0.84.0",
"wasmtime-cache", "wasmtime-cache",
"wasmtime-cranelift", "wasmtime-cranelift",
"wasmtime-environ", "wasmtime-environ",
@@ -2898,9 +2956,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-cache" name = "wasmtime-cache"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" checksum = "79da81ed0724392948ad7a0fb5088ff1bd15fa937356c8c037c6b1c8b5473cde"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@@ -2918,9 +2976,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-cranelift" name = "wasmtime-cranelift"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" checksum = "16e78edcfb0daa9a9579ac379d00e2d5a5b2a60c0d653c8c95e8412f2166acb9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cranelift-codegen", "cranelift-codegen",
@@ -2931,18 +2989,18 @@ dependencies = [
"gimli", "gimli",
"log", "log",
"more-asserts", "more-asserts",
"object", "object 0.28.4",
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasmparser 0.83.0", "wasmparser 0.84.0",
"wasmtime-environ", "wasmtime-environ",
] ]
[[package]] [[package]]
name = "wasmtime-environ" name = "wasmtime-environ"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" checksum = "4201389132ec467981980549574b33fc70d493b40f2c045c8ce5c7b54fbad97e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cranelift-entity", "cranelift-entity",
@@ -2950,19 +3008,19 @@ dependencies = [
"indexmap", "indexmap",
"log", "log",
"more-asserts", "more-asserts",
"object", "object 0.28.4",
"serde", "serde",
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasmparser 0.83.0", "wasmparser 0.84.0",
"wasmtime-types", "wasmtime-types",
] ]
[[package]] [[package]]
name = "wasmtime-fiber" name = "wasmtime-fiber"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbaaa38c3b48822ab27044e1d4a25a1052157de4c8f27574cb00167e127e320f" checksum = "9ba6777a84b44f9a384b5c9d511ae3d86534438b7e25d928b8e8e858ecad5df2"
dependencies = [ dependencies = [
"cc", "cc",
"rustix", "rustix",
@@ -2971,9 +3029,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-jit" name = "wasmtime-jit"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" checksum = "1587ca7752d00862faa540d00fd28e5ccf1ac61ba19756449193f1153cb2b127"
dependencies = [ dependencies = [
"addr2line", "addr2line",
"anyhow", "anyhow",
@@ -2983,7 +3041,7 @@ dependencies = [
"gimli", "gimli",
"ittapi-rs", "ittapi-rs",
"log", "log",
"object", "object 0.28.4",
"region", "region",
"rustc-demangle", "rustc-demangle",
"rustix", "rustix",
@@ -2998,20 +3056,20 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-jit-debug" name = "wasmtime-jit-debug"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" checksum = "b27233ab6c8934b23171c64f215f902ef19d18c1712b46a0674286d1ef28d5dd"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"object", "object 0.28.4",
"rustix", "rustix",
] ]
[[package]] [[package]]
name = "wasmtime-runtime" name = "wasmtime-runtime"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" checksum = "47d3b0b8f13db47db59d616e498fe45295819d04a55f9921af29561827bdb816"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backtrace", "backtrace",
@@ -3036,32 +3094,33 @@ dependencies = [
[[package]] [[package]]
name = "wasmtime-types" name = "wasmtime-types"
version = "0.35.3" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" checksum = "1630d9dca185299bec7f557a7e73b28742fe5590caf19df001422282a0a98ad1"
dependencies = [ dependencies = [
"cranelift-entity", "cranelift-entity",
"serde", "serde",
"thiserror", "thiserror",
"wasmparser 0.83.0", "wasmparser 0.84.0",
] ]
[[package]] [[package]]
name = "wast" name = "wast"
version = "39.0.0" version = "42.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9bbbd53432b267421186feee3e52436531fa69a7cfee9403f5204352df3dd05" checksum = "badcb03f976f983ff0daf294da9697be659442f61e6b0942bb37a2b6cbfe9dd4"
dependencies = [ dependencies = [
"leb128", "leb128",
"memchr", "memchr",
"unicode-width", "unicode-width",
"wasm-encoder 0.13.0",
] ]
[[package]] [[package]]
name = "wat" name = "wat"
version = "1.0.41" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab98ed25494f97c69f28758617f27c3e92e5336040b5c3a14634f2dd3fe61830" checksum = "b92f20b742ac527066c8414bc0637352661b68cab07ef42586cefaba71c965cf"
dependencies = [ dependencies = [
"wast", "wast",
] ]
@@ -3208,18 +3267,18 @@ checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
[[package]] [[package]]
name = "zstd" name = "zstd"
version = "0.10.0+zstd.1.5.2" version = "0.11.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
dependencies = [ dependencies = [
"zstd-safe", "zstd-safe",
] ]
[[package]] [[package]]
name = "zstd-safe" name = "zstd-safe"
version = "4.1.4+zstd.1.5.2" version = "5.0.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee" checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
dependencies = [ dependencies = [
"libc", "libc",
"zstd-sys", "zstd-sys",
@@ -3227,9 +3286,9 @@ dependencies = [
[[package]] [[package]]
name = "zstd-sys" name = "zstd-sys"
version = "1.6.3+zstd.1.5.2" version = "2.0.1+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",

4
Cargo.toml
View File

@@ -11,12 +11,12 @@ native = ["wasmtime", "minifb", "cpal", "rubato", "winapi" ]
browser = ["warp", "tokio", "tokio-stream", "webbrowser"] browser = ["warp", "tokio", "tokio-stream", "webbrowser"]
[dependencies] [dependencies]
wasmtime = { version = "0.35.3", optional = true } wasmtime = { version = "0.37.0", optional = true }
anyhow = "1" anyhow = "1"
minifb = { version = "0.22", default-features = false, features = ["x11"], optional = true } minifb = { version = "0.22", default-features = false, features = ["x11"], optional = true }
notify = "4" notify = "4"
pico-args = "0.4" pico-args = "0.4"
curlywas = { git = "https://github.com/exoticorn/curlywas.git", rev = "0a0d90c" } curlywas = { git = "https://github.com/exoticorn/curlywas.git", rev = "0e7ea50" }
wat = "1" wat = "1"
uw8-tool = { path = "uw8-tool" } uw8-tool = { path = "uw8-tool" }
same-file = "1" same-file = "1"

2
platform/Cargo.lock generated
View File

@@ -146,7 +146,7 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]] [[package]]
name = "curlywas" name = "curlywas"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/exoticorn/curlywas.git?rev=0a0d90c#0a0d90c8013f1d7856a9b71a19d3d006300f31f9" source = "git+https://github.com/exoticorn/curlywas.git?rev=0e7ea50#0e7ea508cd0e76836283ae68a44c9097df83c8ac"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ariadne", "ariadne",

2
platform/Cargo.toml
View File

@@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
curlywas = { git="https://github.com/exoticorn/curlywas.git", rev="0a0d90c" } curlywas = { git="https://github.com/exoticorn/curlywas.git", rev="0e7ea50" }
uw8-tool = { path="../uw8-tool" } uw8-tool = { path="../uw8-tool" }
anyhow = "1" anyhow = "1"
lodepng = "3.4" lodepng = "3.4"

BIN
platform/bin/platform.uw8
View File

Binary file not shown.

83
platform/src/platform.cwa
View File

@@ -62,11 +62,7 @@ export fn cls(col: i32) {
textCursorX = 0; textCursorX = 0;
textCursorY = 0; textCursorY = 0;
outputChannel = 0; outputChannel = 0;
col = (col & 255) * 0x1010101; memory.fill(120, col, 320*240);
loop pixels {
i!120 = col;
branch_if (i := i + 4) < 320*240: pixels;
}
} }
export fn setPixel(x: i32, y: i32, col: i32) { export fn setPixel(x: i32, y: i32, col: i32) {
@@ -90,12 +86,70 @@ fn clamp(v: i32, min: i32, max: i32) -> i32 {
export fn hline(x1: i32, x2: i32, y: i32, col: i32) { export fn hline(x1: i32, x2: i32, y: i32, col: i32) {
x1 = clamp(x1, 0, 320); x1 = clamp(x1, 0, 320);
x2 = clamp(x2, 0, 320); x2 = clamp(x2, 0, 320);
if x1 < x2 & y #< 240 { if y #>= 240 {
return;
}
let word_start = (x1 + 3) & -4;
let word_end = x2 & -4;
if word_end > word_start {
col = (col & 255) * 0x1010101;
let ptr = y * 320 + x1;
let end = ptr + word_start - x1;
if ptr + 2 <= end {
ptr?120 = col;
ptr?121 = col;
ptr += 2;
}
if ptr < end {
ptr?120 = col;
ptr += 1;
}
end += word_end - word_start;
loop words {
if ptr + 16 <= end {
ptr!120 = col;
ptr!124 = col;
ptr!128 = col;
ptr!132 = col;
ptr += 16;
branch words;
}
if ptr + 8 <= end {
ptr!120 = col;
ptr!124 = col;
ptr += 8;
}
if ptr < end {
ptr!120 = col;
ptr += 4;
}
}
end += x2 - word_end;
if ptr + 2 <= end {
ptr?120 = col;
ptr?121 = col;
ptr += 2;
}
if ptr < end {
ptr?120 = col;
}
} else {
let ptr = y * 320 + x1; let ptr = y * 320 + x1;
let end = ptr + x2 - x1; let end = ptr + x2 - x1;
loop pixels { if ptr + 4 <= end {
ptr?120 = col;
ptr?121 = col;
ptr?122 = col;
ptr?123 = col;
ptr += 4;
}
if ptr + 2 <= end {
ptr?120 = col;
ptr?121 = col;
ptr += 2;
}
if ptr < end {
ptr?120 = col; ptr?120 = col;
branch_if (ptr := ptr + 1) < end: pixels;
} }
} }
} }
@@ -548,13 +602,6 @@ export fn endFrame() {
68!4 = 68!0; 68!4 = 68!0;
} }
fn memclr(base: i32, size: i32) {
loop bytes {
(base + (size := size - 1))?0 = 0;
branch_if size: bytes;
}
}
start fn setup() { start fn setup() {
let i: i32 = 12*16*3-1; let i: i32 = 12*16*3-1;
let avg: f32; let avg: f32;
@@ -587,9 +634,9 @@ start fn setup() {
branch_if (i := i - 1) >= 0: expand_sweetie; branch_if (i := i - 1) >= 0: expand_sweetie;
} }
memclr(0, 64); memory.fill(0, 0, 64);
memclr(112, 8); memory.fill(112, 0, 8);
memclr(0x14000, 0x2c000); memory.fill(0x14000, 0, 0x2c000);
cls(0); cls(0);

3
src/lib.rs
View File

@@ -14,9 +14,6 @@ use anyhow::Result;
pub trait Runtime { pub trait Runtime {
fn is_open(&self) -> bool; fn is_open(&self) -> bool;
fn set_timeout(&mut self, _timeout: u32) {
eprintln!("Warning: runtime doesn't support timeout");
}
fn load(&mut self, module_data: &[u8]) -> Result<()>; fn load(&mut self, module_data: &[u8]) -> Result<()>;
fn run_frame(&mut self) -> Result<()>; fn run_frame(&mut self) -> Result<()>;
} }

7
src/main.rs
View File

@@ -52,6 +52,7 @@ fn main() -> Result<()> {
#[cfg(any(feature = "native", feature = "browser"))] #[cfg(any(feature = "native", feature = "browser"))]
fn run(mut args: Arguments) -> Result<()> { fn run(mut args: Arguments) -> Result<()> {
let watch_mode = args.contains(["-w", "--watch"]); let watch_mode = args.contains(["-w", "--watch"]);
#[allow(unused)]
let timeout: Option<u32> = args.opt_value_from_str(["-t", "--timeout"])?; let timeout: Option<u32> = args.opt_value_from_str(["-t", "--timeout"])?;
let mut config = Config::default(); let mut config = Config::default();
@@ -92,7 +93,7 @@ fn run(mut args: Arguments) -> Result<()> {
unimplemented!(); unimplemented!();
#[cfg(feature = "native")] #[cfg(feature = "native")]
{ {
let mut microw8 = MicroW8::new()?; let mut microw8 = MicroW8::new(timeout)?;
if disable_audio { if disable_audio {
microw8.disable_audio(); microw8.disable_audio();
} }
@@ -105,10 +106,6 @@ fn run(mut args: Arguments) -> Result<()> {
Box::new(RunWebServer::new()) Box::new(RunWebServer::new())
}; };
if let Some(timeout) = timeout {
runtime.set_timeout(timeout);
}
let mut first_run = true; let mut first_run = true;
while runtime.is_open() { while runtime.is_open() {

2
src/run-web.html
View File

File diff suppressed because one or more lines are too long

47
src/run_native.rs
View File

@@ -52,17 +52,23 @@ impl Drop for UW8Instance {
} }
struct UW8WatchDog { struct UW8WatchDog {
interupt: wasmtime::InterruptHandle, engine: Engine,
timeout: u32,
stop: bool, stop: bool,
} }
impl MicroW8 { impl MicroW8 {
pub fn new() -> Result<MicroW8> { pub fn new(timeout: Option<u32>) -> Result<MicroW8> {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
unsafe { winapi::um::timeapi::timeBeginPeriod(1); } unsafe {
winapi::um::timeapi::timeBeginPeriod(1);
}
let engine = wasmtime::Engine::new(wasmtime::Config::new().interruptable(true))?; let mut config = wasmtime::Config::new();
config.cranelift_opt_level(wasmtime::OptLevel::Speed);
if timeout.is_some() {
config.epoch_interruption(true);
}
let engine = wasmtime::Engine::new(&config)?;
let loader_module = let loader_module =
wasmtime::Module::new(&engine, include_bytes!("../platform/bin/loader.wasm"))?; wasmtime::Module::new(&engine, include_bytes!("../platform/bin/loader.wasm"))?;
@@ -81,7 +87,7 @@ impl MicroW8 {
window, window,
window_buffer: vec![0u32; 320 * 240], window_buffer: vec![0u32; 320 * 240],
instance: None, instance: None,
timeout: 30, timeout: timeout.unwrap_or(0),
disable_audio: false, disable_audio: false,
}) })
} }
@@ -103,14 +109,11 @@ impl super::Runtime for MicroW8 {
self.window.is_open() && !self.window.is_key_down(Key::Escape) self.window.is_open() && !self.window.is_key_down(Key::Escape)
} }
fn set_timeout(&mut self, timeout: u32) {
self.timeout = timeout;
}
fn load(&mut self, module_data: &[u8]) -> Result<()> { fn load(&mut self, module_data: &[u8]) -> Result<()> {
self.reset(); self.reset();
let mut store = wasmtime::Store::new(&self.engine, ()); let mut store = wasmtime::Store::new(&self.engine, ());
store.set_epoch_deadline(60);
let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?; let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
@@ -136,8 +139,7 @@ impl super::Runtime for MicroW8 {
let platform_instance = instantiate_platform(&mut linker, &mut store, &platform_module)?; let platform_instance = instantiate_platform(&mut linker, &mut store, &platform_module)?;
let watchdog = Arc::new(Mutex::new(UW8WatchDog { let watchdog = Arc::new(Mutex::new(UW8WatchDog {
interupt: store.interrupt_handle()?, engine: self.engine.clone(),
timeout: self.timeout,
stop: false, stop: false,
})); }));
@@ -145,16 +147,11 @@ impl super::Runtime for MicroW8 {
let watchdog = watchdog.clone(); let watchdog = watchdog.clone();
thread::spawn(move || loop { thread::spawn(move || loop {
thread::sleep(Duration::from_millis(17)); thread::sleep(Duration::from_millis(17));
if let Ok(mut watchdog) = watchdog.lock() { if let Ok(watchdog) = watchdog.lock() {
if watchdog.stop { if watchdog.stop {
break; break;
} }
if watchdog.timeout > 0 { watchdog.engine.increment_epoch();
watchdog.timeout -= 1;
if watchdog.timeout == 0 {
watchdog.interupt.interrupt();
}
}
} else { } else {
break; break;
} }
@@ -162,9 +159,6 @@ impl super::Runtime for MicroW8 {
} }
let instance = linker.instantiate(&mut store, &module)?; let instance = linker.instantiate(&mut store, &module)?;
if let Ok(mut watchdog) = watchdog.lock() {
watchdog.timeout = 0;
}
let end_frame = platform_instance.get_typed_func::<(), (), _>(&mut store, "endFrame")?; let end_frame = platform_instance.get_typed_func::<(), (), _>(&mut store, "endFrame")?;
let update = instance.get_typed_func::<(), (), _>(&mut store, "upd").ok(); let update = instance.get_typed_func::<(), (), _>(&mut store, "upd").ok();
@@ -232,15 +226,10 @@ impl super::Runtime for MicroW8 {
mem[68..72].copy_from_slice(&gamepad.to_le_bytes()); mem[68..72].copy_from_slice(&gamepad.to_le_bytes());
} }
if let Ok(mut watchdog) = instance.watchdog.lock() { instance.store.set_epoch_deadline(self.timeout as u64);
watchdog.timeout = self.timeout;
}
if let Some(ref update) = instance.update { if let Some(ref update) = instance.update {
result = update.call(&mut instance.store, ()); result = update.call(&mut instance.store, ());
} }
if let Ok(mut watchdog) = instance.watchdog.lock() {
watchdog.timeout = 0;
}
instance.end_frame.call(&mut instance.store, ())?; instance.end_frame.call(&mut instance.store, ())?;
let memory = instance.memory.data(&instance.store); let memory = instance.memory.data(&instance.store);
@@ -357,6 +346,7 @@ fn init_sound(
module: &wasmtime::Module, module: &wasmtime::Module,
) -> Result<Uw8Sound> { ) -> Result<Uw8Sound> {
let mut store = wasmtime::Store::new(engine, ()); let mut store = wasmtime::Store::new(engine, ());
store.set_epoch_deadline(60);
let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?; let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
@@ -450,6 +440,7 @@ fn init_sound(
} }
while !outer_buffer.is_empty() { while !outer_buffer.is_empty() {
store.set_epoch_deadline(30);
while pending_updates while pending_updates
.first() .first()
.into_iter() .into_iter()

2
uw8-tool/src/pack.rs
View File

@@ -962,6 +962,8 @@ fn remap_function(
De::I64TruncSatF32U => En::I64TruncSatF32U, De::I64TruncSatF32U => En::I64TruncSatF32U,
De::I64TruncSatF64S => En::I64TruncSatF64S, De::I64TruncSatF64S => En::I64TruncSatF64S,
De::I64TruncSatF64U => En::I64TruncSatF64U, De::I64TruncSatF64U => En::I64TruncSatF64U,
De::MemoryCopy { src, dst } => En::MemoryCopy { src, dst },
De::MemoryFill { mem } => En::MemoryFill(mem),
other => bail!("Unsupported instruction {:?}", other), other => bail!("Unsupported instruction {:?}", other),
}); });
} }

1158
web/yarn.lock
View File

File diff suppressed because it is too large Load Diff