Merge pull request #635 from visitorckw/fix-plic

jserv · web-flow · commit 3a168b7ceabb · 2025-12-13T16:35:28.000+08:00
Fix PLIC priority tie-breaking to favor lowest ID
diff --git a/src/devices/plic.c b/src/devices/plic.c
@@ -44,7 +44,7 @@ uint32_t plic_read(plic_t *plic, const uint32_t addr)
         {
             uint32_t intr_candidate = plic->ip & plic->ie;
             if (intr_candidate) {
-                plic_read_val = ilog2(intr_candidate);
+                plic_read_val = rv_ctz(intr_candidate);
                 plic->ip &= ~(1U << (plic_read_val));
             }
             break;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ uint32_t plic_read(plic_t *plic, const uint32_t addr)`
`44`	`44`	`{`
`45`	`45`	`uint32_t intr_candidate = plic->ip & plic->ie;`
`46`	`46`	`if (intr_candidate) {`
`47`		`- plic_read_val = ilog2(intr_candidate);`
	`47`	`+ plic_read_val = rv_ctz(intr_candidate);`
`48`	`48`	`plic->ip &= ~(1U << (plic_read_val));`
`49`	`49`	`}`
`50`	`50`	`break;`