Merge branch 'OpenXiangShan:master' into master

OpenXiangShan · Sep 22, 2023 · 3039733 · 3039733
2 parents e25fee4 + ff208f4
commit 3039733
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -99,6 +99,7 @@ jobs:
       - name: Build NEMU with H extension as difftest ref
         run: |
           make riscv64-rvh-ref_defconfig
+          make -j
           make clean-all
       - name: Run Xvisor
         run: |

diff --git a/src/isa/riscv64/instr/priv/decode.h b/src/isa/riscv64/instr/priv/decode.h
@@ -87,7 +87,7 @@ def_THelper(system) {
 #endif //CONFIG_RVH
 #endif
 
-#if defined(CONFIG_RVH) && (!defined(CONFIG_DEBUG))
+#if defined(CONFIG_RVH) && !defined(CONFIG_DEBUG) && !defined(CONFIG_SHARE)
 def_THelper(system) {
   def_INSTR_IDTAB("0110??0 ????? ????? 100 ????? 11100 ??", I     , hload);
   def_INSTR_IDTAB("0110??1 ????? ????? 100 00000 11100 ??", R     , hstore);