Disable RVC in fixed-size assembly blocks

3 files changed, 44 insertions, 27 deletions

diff --git a/pk/encoding.h b/pk/encoding.h
index d4f08fc..16a7792 100644
--- a/pk/encoding.h
+++ b/pk/encoding.h
@@ -223,26 +223,46 @@
 #define MASK_BNE  0x707f
 #define MATCH_C_ADD 0x1000
 #define MASK_C_ADD  0xf003
-#define MATCH_C_ADD3 0xa000
-#define MASK_C_ADD3  0xe063
 #define MATCH_C_ADDI 0xc002
 #define MASK_C_ADDI  0xe003
-#define MATCH_C_ADDI4SPN 0xa001
+#define MATCH_C_ADDI16SP 0xa002
+#define MASK_C_ADDI16SP  0xef83
+#define MATCH_C_ADDI4SPN 0x8000
 #define MASK_C_ADDI4SPN  0xe003
 #define MATCH_C_ADDIW 0xe002
 #define MASK_C_ADDIW  0xe003
-#define MATCH_C_ADDW 0x9000
+#define MATCH_C_ADDW 0x8001
 #define MASK_C_ADDW  0xf003
-#define MATCH_C_AND3 0xa060
-#define MASK_C_AND3  0xe063
 #define MATCH_C_BEQZ 0x4002
 #define MASK_C_BEQZ  0xe003
 #define MATCH_C_BNEZ 0x6002
 #define MASK_C_BNEZ  0xe003
+#define MATCH_C_EBREAK 0x1000
+#define MASK_C_EBREAK  0xffff
+#define MATCH_C_FLD 0xa000
+#define MASK_C_FLD  0xe003
+#define MATCH_C_FLDSP 0xa001
+#define MASK_C_FLDSP  0xe003
+#define MATCH_C_FLW 0xe000
+#define MASK_C_FLW  0xe003
+#define MATCH_C_FLWSP 0xe001
+#define MASK_C_FLWSP  0xe003
+#define MATCH_C_FSD 0x2000
+#define MASK_C_FSD  0xe003
+#define MATCH_C_FSDSP 0x2001
+#define MASK_C_FSDSP  0xe003
+#define MATCH_C_FSW 0x6000
+#define MASK_C_FSW  0xe003
+#define MATCH_C_FSWSP 0x6001
+#define MASK_C_FSWSP  0xe003
 #define MATCH_C_J 0x2
 #define MASK_C_J  0xe003
 #define MATCH_C_JAL 0x2002
 #define MASK_C_JAL  0xe003
+#define MATCH_C_JALR 0x1000
+#define MASK_C_JALR  0xf07f
+#define MATCH_C_JR 0x0
+#define MASK_C_JR  0xf07f
 #define MATCH_C_LD 0xe000
 #define MASK_C_LD  0xe003
 #define MATCH_C_LDSP 0xe001
@@ -257,24 +277,14 @@
 #define MASK_C_LWSP  0xe003
 #define MATCH_C_MV 0x0
 #define MASK_C_MV  0xf003
-#define MATCH_C_OR3 0xa040
-#define MASK_C_OR3  0xe063
+#define MATCH_C_NOP 0xc002
+#define MASK_C_NOP  0xffff
 #define MATCH_C_SD 0x6000
 #define MASK_C_SD  0xe003
 #define MATCH_C_SDSP 0x6001
 #define MASK_C_SDSP  0xe003
 #define MATCH_C_SLLI 0x1
 #define MASK_C_SLLI  0xe003
-#define MATCH_C_SLLIW 0x8001
-#define MASK_C_SLLIW  0xe003
-#define MATCH_C_SRAI 0x2000
-#define MASK_C_SRAI  0xe003
-#define MATCH_C_SRLI 0x2001
-#define MASK_C_SRLI  0xe003
-#define MATCH_C_SUB 0x8000
-#define MASK_C_SUB  0xf003
-#define MATCH_C_SUB3 0xa020
-#define MASK_C_SUB3  0xe063
 #define MATCH_C_SW 0x4000
 #define MASK_C_SW  0xe003
 #define MATCH_C_SWSP 0x4001
@@ -653,16 +663,26 @@ DECLARE_INSN(blt, MATCH_BLT, MASK_BLT)
 DECLARE_INSN(bltu, MATCH_BLTU, MASK_BLTU)
 DECLARE_INSN(bne, MATCH_BNE, MASK_BNE)
 DECLARE_INSN(c_add, MATCH_C_ADD, MASK_C_ADD)
-DECLARE_INSN(c_add3, MATCH_C_ADD3, MASK_C_ADD3)
 DECLARE_INSN(c_addi, MATCH_C_ADDI, MASK_C_ADDI)
+DECLARE_INSN(c_addi16sp, MATCH_C_ADDI16SP, MASK_C_ADDI16SP)
 DECLARE_INSN(c_addi4spn, MATCH_C_ADDI4SPN, MASK_C_ADDI4SPN)
 DECLARE_INSN(c_addiw, MATCH_C_ADDIW, MASK_C_ADDIW)
 DECLARE_INSN(c_addw, MATCH_C_ADDW, MASK_C_ADDW)
-DECLARE_INSN(c_and3, MATCH_C_AND3, MASK_C_AND3)
 DECLARE_INSN(c_beqz, MATCH_C_BEQZ, MASK_C_BEQZ)
 DECLARE_INSN(c_bnez, MATCH_C_BNEZ, MASK_C_BNEZ)
+DECLARE_INSN(c_ebreak, MATCH_C_EBREAK, MASK_C_EBREAK)
+DECLARE_INSN(c_fld, MATCH_C_FLD, MASK_C_FLD)
+DECLARE_INSN(c_fldsp, MATCH_C_FLDSP, MASK_C_FLDSP)
+DECLARE_INSN(c_flw, MATCH_C_FLW, MASK_C_FLW)
+DECLARE_INSN(c_flwsp, MATCH_C_FLWSP, MASK_C_FLWSP)
+DECLARE_INSN(c_fsd, MATCH_C_FSD, MASK_C_FSD)
+DECLARE_INSN(c_fsdsp, MATCH_C_FSDSP, MASK_C_FSDSP)
+DECLARE_INSN(c_fsw, MATCH_C_FSW, MASK_C_FSW)
+DECLARE_INSN(c_fswsp, MATCH_C_FSWSP, MASK_C_FSWSP)
 DECLARE_INSN(c_j, MATCH_C_J, MASK_C_J)
 DECLARE_INSN(c_jal, MATCH_C_JAL, MASK_C_JAL)
+DECLARE_INSN(c_jalr, MATCH_C_JALR, MASK_C_JALR)
+DECLARE_INSN(c_jr, MATCH_C_JR, MASK_C_JR)
 DECLARE_INSN(c_ld, MATCH_C_LD, MASK_C_LD)
 DECLARE_INSN(c_ldsp, MATCH_C_LDSP, MASK_C_LDSP)
 DECLARE_INSN(c_li, MATCH_C_LI, MASK_C_LI)
@@ -670,15 +690,10 @@ DECLARE_INSN(c_lui, MATCH_C_LUI, MASK_C_LUI)
 DECLARE_INSN(c_lw, MATCH_C_LW, MASK_C_LW)
 DECLARE_INSN(c_lwsp, MATCH_C_LWSP, MASK_C_LWSP)
 DECLARE_INSN(c_mv, MATCH_C_MV, MASK_C_MV)
-DECLARE_INSN(c_or3, MATCH_C_OR3, MASK_C_OR3)
+DECLARE_INSN(c_nop, MATCH_C_NOP, MASK_C_NOP)
 DECLARE_INSN(c_sd, MATCH_C_SD, MASK_C_SD)
 DECLARE_INSN(c_sdsp, MATCH_C_SDSP, MASK_C_SDSP)
 DECLARE_INSN(c_slli, MATCH_C_SLLI, MASK_C_SLLI)
-DECLARE_INSN(c_slliw, MATCH_C_SLLIW, MASK_C_SLLIW)
-DECLARE_INSN(c_srai, MATCH_C_SRAI, MASK_C_SRAI)
-DECLARE_INSN(c_srli, MATCH_C_SRLI, MASK_C_SRLI)
-DECLARE_INSN(c_sub, MATCH_C_SUB, MASK_C_SUB)
-DECLARE_INSN(c_sub3, MATCH_C_SUB3, MASK_C_SUB3)
 DECLARE_INSN(c_sw, MATCH_C_SW, MASK_C_SW)
 DECLARE_INSN(c_swsp, MATCH_C_SWSP, MASK_C_SWSP)
 DECLARE_INSN(csrrc, MATCH_CSRRC, MASK_CSRRC)
diff --git a/pk/fp_asm.S b/pk/fp_asm.S
index 81fe6b2..4b8dce1 100644
--- a/pk/fp_asm.S
+++ b/pk/fp_asm.S
@@ -13,6 +13,7 @@
 #endif
 
   .text
+  .option norvc
   .globl get_f32_reg
   get_f32_reg:
     get_f32(f0)
diff --git a/pk/sbi_entry.S b/pk/sbi_entry.S
index 4fbac8f..8b066d0 100644
--- a/pk/sbi_entry.S
+++ b/pk/sbi_entry.S
@@ -1,7 +1,8 @@
 #include "encoding.h"
 #include "mcall.h"
 
-   .section .sbi,"ax",@progbits
+  .section .sbi,"ax",@progbits
+  .option norvc
   .align RISCV_PGSHIFT
   .globl sbi_base
 sbi_base: