Merge pull request #586 from tcal-x/unsafe-fomu

(VexRiscv) Don't implement HW to catch illegal instructions.
google · May 14, 2022 · ff990f7 · ff990f7
2 parents 70a980c + 5124d7d
commit ff990f7
Show file tree

Hide file tree

Showing 5 changed files with 677 additions and 1,054 deletions.
diff --git a/common/src/main.c b/common/src/main.c
@@ -65,7 +65,8 @@ static struct Menu MENU = {
         MENU_ITEM('8', "SPI Flash Debugging", spiflash_menu),
 #endif
 #ifdef CONFIG_CPU_DIV_UNIMPLEMENTED
-        MENU_ITEM('I', "Illegal Instruction Tests", do_instruction_tests),
+        MENU_ITEM('I', "Illegal Instruction Tests (these *WILL* hang on Fomu!)",
+                  do_instruction_tests),
 #endif
 #ifdef CSR_VIDEO_FRAMEBUFFER_BASE
         MENU_ITEM('9', "Framebuffer Debugging", framebuffer_menu),

diff --git a/soc/vexriscv/Makefile b/soc/vexriscv/Makefile
@@ -57,7 +57,7 @@ VexRiscv_SlimPerfCfuDebug.v: $(SRC) Makefile
 	sbt compile "runMain vexriscv.GenCoreDefault --dCacheSize 4096 --iCacheSize 2048 --csrPluginConfig all -d --cfu true --perfCSRs 8 --outputFile VexRiscv_SlimPerfCfuDebug"
 
 VexRiscv_Fomu.v: $(SRC) Makefile
-	sbt compile "runMain vexriscv.GenCoreDefault --safe false --iCacheSize 2048 --dCacheSize 0 --csrPluginConfig mcycle --mulDiv true --singleCycleShift true --singleCycleMulDiv true --bypass false --prediction none --hardwareDiv false --outputFile VexRiscv_Fomu"
+	sbt compile "runMain vexriscv.GenCoreDefault --safe false --iCacheSize 2048 --dCacheSize 0 --csrPluginConfig mcycle --mulDiv true --singleCycleShift false --singleCycleMulDiv true --bypass false --prediction none --hardwareDiv false --outputFile VexRiscv_Fomu"
 
 VexRiscv_FomuCfu.v: $(SRC) Makefile
-	sbt compile "runMain vexriscv.GenCoreDefault --safe false --cfu true --iCacheSize 2048 --dCacheSize 0 --csrPluginConfig mcycle --mulDiv true --singleCycleShift true --singleCycleMulDiv true --bypass false --prediction none --hardwareDiv false --outputFile VexRiscv_FomuCfu"
+	sbt compile "runMain vexriscv.GenCoreDefault --safe false --cfu true --iCacheSize 2048 --dCacheSize 0 --csrPluginConfig mcycle --mulDiv true --singleCycleShift false --singleCycleMulDiv true --bypass false --prediction none --hardwareDiv false --outputFile VexRiscv_FomuCfu"