diff --git a/pdm.lock b/pdm.lock
index 8cd1b03..9c74b4c 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -5,14 +5,14 @@
 groups = ["default", "test"]
 strategy = ["cross_platform", "inherit_metadata"]
 lock_version = "4.4.1"
-content_hash = "sha256:a2045d2d1cfea5a39175b6aaf796d0f773e0133d3f1def90068e14b9076db405"
+content_hash = "sha256:c0b4cc02ad5de08e8aca180b155fe220439a3994e7dea702dd3e8ba518c78083"
 
 [[package]]
 name = "amaranth"
-version = "0.5.0.dev134"
+version = "0.5.0.dev277"
 requires_python = "~=3.8"
 git = "https://github.com/amaranth-lang/amaranth"
-revision = "f8e2d26b8f366fe88980f485c03873b2e897bb6a"
+revision = "9201cc3179d53c9fcfb6443e571533d64dbdd417"
 summary = "Amaranth hardware definition language"
 groups = ["default"]
 dependencies = [
@@ -35,10 +35,10 @@ dependencies = [
 
 [[package]]
 name = "amaranth-orchard"
-version = "0.1.dev36"
+version = "0.1.dev37"
 requires_python = "~=3.8"
 git = "https://github.com/ChipFlow/amaranth-orchard"
-revision = "241647733629d5cf84a2af6f7be6f2bb7d59246b"
+revision = "62d64c6a1f5f341a556bf13b2e3d4ed7534b9d0b"
 summary = "curated collection of Amaranth cores"
 groups = ["default"]
 dependencies = [
@@ -72,8 +72,8 @@ dependencies = [
 [[package]]
 name = "amaranth-vexriscv"
 version = "0.0.0"
-requires_python = ">=3.7,<4.0"
-git = "https://gitlab.com/ChipFlow/amaranth-vexriscv"
+requires_python = "<4.0,>=3.7"
+git = "https://github.com/ChipFlow/amaranth-vexriscv"
 revision = "69952405c4147758bd20175eec2a36a9afe41c2a"
 summary = "Prebuilt VexRiscv (currently ASIC-optimised configs) and Amaranth Integration"
 groups = ["default"]
@@ -191,10 +191,10 @@ files = [
 
 [[package]]
 name = "chipflow-lib"
-version = "0.1.1.dev93"
+version = "0.1.1.dev97"
 requires_python = "~=3.8"
 git = "https://github.com/ChipFlow/chipflow-lib"
-revision = "3f05968c33ad81707f464a1ec3d569b68efb4235"
+revision = "6e9f5c30c6ae99105fbe6279eef13e084a5abc4e"
 summary = "ChipFlow common tools."
 groups = ["default"]
 dependencies = [
@@ -209,7 +209,7 @@ dependencies = [
     "tomli~=2.0.1",
     "yowasp-nextpnr-ecp5==0.7.0.11.post528.dev0",
     "yowasp-runtime",
-    "yowasp-yosys==0.38.0.92.post687.dev0",
+    "yowasp-yosys==0.39.0.0.post694",
 ]
 
 [[package]]
@@ -454,13 +454,13 @@ files = [
 
 [[package]]
 name = "pluggy"
-version = "1.4.0"
+version = "1.5.0"
 requires_python = ">=3.8"
 summary = "plugin and hook calling mechanisms for python"
 groups = ["test"]
 files = [
-    {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"},
-    {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"},
+    {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"},
+    {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"},
 ]
 
 [[package]]
@@ -506,7 +506,7 @@ files = [
 
 [[package]]
 name = "pytest"
-version = "8.0.2"
+version = "8.2.0"
 requires_python = ">=3.8"
 summary = "pytest: simple powerful testing with Python"
 groups = ["test"]
@@ -515,12 +515,12 @@ dependencies = [
     "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"",
     "iniconfig",
     "packaging",
-    "pluggy<2.0,>=1.3.0",
-    "tomli>=1.0.0; python_version < \"3.11\"",
+    "pluggy<2.0,>=1.5",
+    "tomli>=1; python_version < \"3.11\"",
 ]
 files = [
-    {file = "pytest-8.0.2-py3-none-any.whl", hash = "sha256:edfaaef32ce5172d5466b5127b42e0d6d35ebbe4453f0e3505d96afd93f6b096"},
-    {file = "pytest-8.0.2.tar.gz", hash = "sha256:d4051d623a2e0b7e51960ba963193b09ce6daeb9759a451844a21e4ddedfc1bd"},
+    {file = "pytest-8.2.0-py3-none-any.whl", hash = "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233"},
+    {file = "pytest-8.2.0.tar.gz", hash = "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f"},
 ]
 
 [[package]]
@@ -617,7 +617,7 @@ files = [
 
 [[package]]
 name = "yowasp-yosys"
-version = "0.38.0.92.post687.dev0"
+version = "0.39.0.0.post694"
 summary = "Yosys Open SYnthesis Suite"
 groups = ["default"]
 dependencies = [
@@ -626,7 +626,7 @@ dependencies = [
     "yowasp-runtime~=1.12",
 ]
 files = [
-    {file = "yowasp_yosys-0.38.0.92.post687.dev0-py3-none-any.whl", hash = "sha256:a5e82ac9bfc5a1c5bc5c675fb14db36e0826e2040ee5f34b71785350768dffa2"},
+    {file = "yowasp_yosys-0.39.0.0.post694-py3-none-any.whl", hash = "sha256:f4eaaa60a00dda98adf4eb393592615981184f3c10fe159453c58bc30869b8ae"},
 ]
 
 [[package]]
@@ -642,6 +642,7 @@ files = [
     {file = "ziglang-0.11.0-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:45e8116428267e20529b9ee43a7e7364791c1a092845d2143b248a1dbf6760b0"},
     {file = "ziglang-0.11.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:d6372bada34714a5395539cc4d76e9cc6062739cee5ce9949a250f7c525ceb94"},
     {file = "ziglang-0.11.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:5fe81f91fd872fc32ed0f82807df6c680a82cbea56a9f24f818e9da299049022"},
+    {file = "ziglang-0.11.0-py3-none-win32.whl", hash = "sha256:97ac4312a358d2a4ba2c153fdb1827caf6bc158501a468ebd6a554b50edee42e"},
     {file = "ziglang-0.11.0-py3-none-win_amd64.whl", hash = "sha256:a7edc7020e7ffbbb3af3a40c17a9bda65d5a65132ff933e153ffa80d8f5ad731"},
 ]
 
diff --git a/pyproject.toml b/pyproject.toml
index f6597b1..9cbffd2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ license = {file = "LICENSE.md"}
 
 requires-python = "~=3.8"
 dependencies = [
-  "amaranth-vexriscv @ git+https://gitlab.com/ChipFlow/amaranth-vexriscv",
+  "amaranth-vexriscv @ git+https://github.com/ChipFlow/amaranth-vexriscv",
   "chipflow-lib @ git+https://github.com/ChipFlow/chipflow-lib",
   "ziglang==0.11.0",
 ]