Merge pull request #4 from oakentling/master

Small fixes to config.mk

Author: SamuelRiedel

.editorconfig

@@ -35,4 +35,4 @@ indent_size = unset
 indent_style = unset
 insert_final_newline = false
 max_line_length = 0
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

Makefile

@@ -5,7 +5,7 @@ ALL_REAL_OPCODES := $(ALL_REAL_ILEN32_OPCODES) opcodes-rvc opcodes-rv32c opcodes
 
 # Add your opcodes here
 include config.mk
-MY_OPCODES := $(MEMPOOL_ISA)
+MY_OPCODES ?= $(MEMPOOL_ISA)
 
 ALL_OPCODES := opcodes-pseudo $(ALL_REAL_OPCODES) $(MY_OPCODES) opcodes-rvv-pseudo
 # Opcodes to be discarded

config.mk

@@ -3,13 +3,14 @@
 # RV32IMA := opcodes-rv32i opcodes-rv32m opcodes-rv32a opcodes-system
 
 # Xpulpimg
-RV32XPULPIMG := opcodes-xpulpbr_CUSTOM opcodes-xpulpclip_CUSTOM opcodes-xpulpmacsi_CUSTOM opcodes-xpulpslet_CUSTOM opcodes-xpulpvect_CUSTOM opcodes-xpulpvectshufflepack_CUSTOM opcodes-xpulpminmax_CUSTOM opcodes-xpulphwloop_CUSTOM
+RV32XPULPIMG := opcodes-xpulpabs_CUSTOM opcodes-xpulpbr_CUSTOM opcodes-xpulpclip_CUSTOM opcodes-xpulpmacsi_CUSTOM opcodes-xpulpminmax_CUSTOM opcodes-xpulpslet_CUSTOM opcodes-xpulpvect_CUSTOM opcodes-xpulpvectshufflepack_CUSTOM
 RV32XPULPIMG += opcodes-xpulpbitop_CUSTOM
-# XPULPIMG_OPCODES += opcodes-xpulpbitopsmall_CUSTOM #is a subset of opcodes-xpulpbitop_CUSTOM
+# RV32XPULPIMG += opcodes-xpulpbitopsmall_CUSTOM #is a subset of opcodes-xpulpbitop_CUSTOM
+# RV32XPULPIMG += opcodes-xpulppostmod_CUSTOM #conflict with opcodes-ssr_CUSTOM
 
 # Snitch
 SNITCH_OPCODES := opcodes-dma_CUSTOM opcodes-frep_CUSTOM opcodes-ssr_CUSTOM
 
 # default configurations
-MEMPOOL_ISA := opcodes-frep_CUSTOM $(RV32XPULPIMG) opcodes-rv32d-zfh_DRAFT opcodes-rv32q-zfh_DRAFT opcodes-rv32zfh_DRAFT opcodes-rv64zfh_DRAFT opcodes-sflt_CUSTOM
+MEMPOOL_ISA := opcodes-frep_CUSTOM $(RV32XPULPIMG) opcodes-xpulppostmod_CUSTOM opcodes-rv32d-zfh_DRAFT opcodes-rv32q-zfh_DRAFT opcodes-rv32zfh_DRAFT opcodes-rv64zfh_DRAFT opcodes-sflt_CUSTOM
 SNITCH_ISA := $(RV32XPULPIMG) $(SNITCH_OPCODES) opcodes-sflt_CUSTOM

parse_opcodes

@@ -685,7 +685,7 @@ def make_rust():
   print("#[repr(C)]")
   print("pub enum Csr {")
   for csr in csrs+csrs32:
-    print(f'    {make_camel_case(csr[1])} = 0x{csr[0]:03x},')
+    print("    {} = 0x{:03x},".format(make_camel_case(csr[1]), csr[0]))
   print("}")