riscv · aswaterman · Nov 12, 2024 · Nov 7, 2024 · Nov 8, 2024 · Nov 9, 2024
diff --git a/Makefile b/Makefile
@@ -4,12 +4,8 @@ PK_H := ../riscv-pk/machine/encoding.h
 ENV_H := ../riscv-tests/env/encoding.h
 OPENOCD_H := ../riscv-openocd/src/target/riscv/encoding.h
 INSTALL_HEADER_FILES := $(ISASIM_H) $(PK_H) $(ENV_H) $(OPENOCD_H)
+PSEUDO_FLAG := $(if $(PSEUDO),-pseudo,)
 
-ifdef PSEUDO
-  PSEUDO_FLAG := -pseudo
-else
-  PSEUDO_FLAG :=
-endif
 
 default: everything
 

diff --git a/rv32_c → extensions/rv32_c b/rv32_c → extensions/rv32_c
diff --git a/rv32_c_f → extensions/rv32_c_f b/rv32_c_f → extensions/rv32_c_f
diff --git a/rv32_d_zfa → extensions/rv32_d_zfa b/rv32_d_zfa → extensions/rv32_d_zfa
diff --git a/rv32_i → extensions/rv32_i b/rv32_i → extensions/rv32_i
diff --git a/rv32_zbb → extensions/rv32_zbb b/rv32_zbb → extensions/rv32_zbb
diff --git a/rv32_zbkb → extensions/rv32_zbkb b/rv32_zbkb → extensions/rv32_zbkb
diff --git a/rv32_zbs → extensions/rv32_zbs b/rv32_zbs → extensions/rv32_zbs
diff --git a/rv32_zicntr → extensions/rv32_zicntr b/rv32_zicntr → extensions/rv32_zicntr
diff --git a/rv32_zk → extensions/rv32_zk b/rv32_zk → extensions/rv32_zk
diff --git a/rv32_zkn → extensions/rv32_zkn b/rv32_zkn → extensions/rv32_zkn
diff --git a/rv32_zknd → extensions/rv32_zknd b/rv32_zknd → extensions/rv32_zknd
diff --git a/rv32_zkne → extensions/rv32_zkne b/rv32_zkne → extensions/rv32_zkne
diff --git a/rv32_zknh → extensions/rv32_zknh b/rv32_zknh → extensions/rv32_zknh
diff --git a/rv32_zks → extensions/rv32_zks b/rv32_zks → extensions/rv32_zks
diff --git a/rv64_a → extensions/rv64_a b/rv64_a → extensions/rv64_a
diff --git a/rv64_c → extensions/rv64_c b/rv64_c → extensions/rv64_c
diff --git a/rv64_d → extensions/rv64_d b/rv64_d → extensions/rv64_d
diff --git a/rv64_f → extensions/rv64_f b/rv64_f → extensions/rv64_f
diff --git a/rv64_h → extensions/rv64_h b/rv64_h → extensions/rv64_h
diff --git a/rv64_i → extensions/rv64_i b/rv64_i → extensions/rv64_i
diff --git a/rv64_m → extensions/rv64_m b/rv64_m → extensions/rv64_m
diff --git a/rv64_q → extensions/rv64_q b/rv64_q → extensions/rv64_q
diff --git a/rv64_q_zfa → extensions/rv64_q_zfa b/rv64_q_zfa → extensions/rv64_q_zfa
diff --git a/rv64_zacas → extensions/rv64_zacas b/rv64_zacas → extensions/rv64_zacas
diff --git a/rv64_zba → extensions/rv64_zba b/rv64_zba → extensions/rv64_zba
diff --git a/rv64_zbb → extensions/rv64_zbb b/rv64_zbb → extensions/rv64_zbb
diff --git a/rv64_zbkb → extensions/rv64_zbkb b/rv64_zbkb → extensions/rv64_zbkb
diff --git a/rv64_zbs → extensions/rv64_zbs b/rv64_zbs → extensions/rv64_zbs
diff --git a/rv64_zcb → extensions/rv64_zcb b/rv64_zcb → extensions/rv64_zcb
diff --git a/rv64_zfh → extensions/rv64_zfh b/rv64_zfh → extensions/rv64_zfh
diff --git a/rv64_zk → extensions/rv64_zk b/rv64_zk → extensions/rv64_zk
diff --git a/rv64_zkn → extensions/rv64_zkn b/rv64_zkn → extensions/rv64_zkn
diff --git a/rv64_zknd → extensions/rv64_zknd b/rv64_zknd → extensions/rv64_zknd
diff --git a/rv64_zkne → extensions/rv64_zkne b/rv64_zkne → extensions/rv64_zkne
diff --git a/rv64_zknh → extensions/rv64_zknh b/rv64_zknh → extensions/rv64_zknh
diff --git a/rv64_zks → extensions/rv64_zks b/rv64_zks → extensions/rv64_zks
diff --git a/rv_a → extensions/rv_a b/rv_a → extensions/rv_a
diff --git a/rv_c → extensions/rv_c b/rv_c → extensions/rv_c
diff --git a/rv_c_d → extensions/rv_c_d b/rv_c_d → extensions/rv_c_d
diff --git a/rv_c_zihintntl → extensions/rv_c_zihintntl b/rv_c_zihintntl → extensions/rv_c_zihintntl
diff --git a/rv_d → extensions/rv_d b/rv_d → extensions/rv_d
diff --git a/rv_d_zfa → extensions/rv_d_zfa b/rv_d_zfa → extensions/rv_d_zfa
diff --git a/rv_d_zfh → extensions/rv_d_zfh b/rv_d_zfh → extensions/rv_d_zfh
diff --git a/rv_f → extensions/rv_f b/rv_f → extensions/rv_f
diff --git a/rv_f_zfa → extensions/rv_f_zfa b/rv_f_zfa → extensions/rv_f_zfa
diff --git a/rv_h → extensions/rv_h b/rv_h → extensions/rv_h
diff --git a/rv_i → extensions/rv_i b/rv_i → extensions/rv_i
diff --git a/rv_m → extensions/rv_m b/rv_m → extensions/rv_m
diff --git a/rv_q → extensions/rv_q b/rv_q → extensions/rv_q
diff --git a/rv_q_zfa → extensions/rv_q_zfa b/rv_q_zfa → extensions/rv_q_zfa
diff --git a/rv_q_zfh → extensions/rv_q_zfh b/rv_q_zfh → extensions/rv_q_zfh
diff --git a/rv_s → extensions/rv_s b/rv_s → extensions/rv_s
diff --git a/rv_sdext → extensions/rv_sdext b/rv_sdext → extensions/rv_sdext
diff --git a/rv_svinval → extensions/rv_svinval b/rv_svinval → extensions/rv_svinval
diff --git a/rv_svinval_h → extensions/rv_svinval_h b/rv_svinval_h → extensions/rv_svinval_h
diff --git a/rv_system → extensions/rv_system b/rv_system → extensions/rv_system
diff --git a/rv_v → extensions/rv_v b/rv_v → extensions/rv_v
diff --git a/rv_v_aliases → extensions/rv_v_aliases b/rv_v_aliases → extensions/rv_v_aliases
diff --git a/rv_zabha → extensions/rv_zabha b/rv_zabha → extensions/rv_zabha
diff --git a/rv_zacas → extensions/rv_zacas b/rv_zacas → extensions/rv_zacas
diff --git a/rv_zawrs → extensions/rv_zawrs b/rv_zawrs → extensions/rv_zawrs
diff --git a/rv_zba → extensions/rv_zba b/rv_zba → extensions/rv_zba
diff --git a/rv_zbb → extensions/rv_zbb b/rv_zbb → extensions/rv_zbb
diff --git a/rv_zbc → extensions/rv_zbc b/rv_zbc → extensions/rv_zbc
diff --git a/rv_zbkb → extensions/rv_zbkb b/rv_zbkb → extensions/rv_zbkb
diff --git a/rv_zbkc → extensions/rv_zbkc b/rv_zbkc → extensions/rv_zbkc
diff --git a/rv_zbkx → extensions/rv_zbkx b/rv_zbkx → extensions/rv_zbkx
diff --git a/rv_zbs → extensions/rv_zbs b/rv_zbs → extensions/rv_zbs
diff --git a/rv_zcb → extensions/rv_zcb b/rv_zcb → extensions/rv_zcb
diff --git a/rv_zcmop → extensions/rv_zcmop b/rv_zcmop → extensions/rv_zcmop
diff --git a/rv_zcmp → extensions/rv_zcmp b/rv_zcmp → extensions/rv_zcmp
diff --git a/rv_zcmt → extensions/rv_zcmt b/rv_zcmt → extensions/rv_zcmt
diff --git a/rv_zfh → extensions/rv_zfh b/rv_zfh → extensions/rv_zfh
diff --git a/rv_zfh_zfa → extensions/rv_zfh_zfa b/rv_zfh_zfa → extensions/rv_zfh_zfa
diff --git a/rv_zicbo → extensions/rv_zicbo b/rv_zicbo → extensions/rv_zicbo
diff --git a/rv_zicntr → extensions/rv_zicntr b/rv_zicntr → extensions/rv_zicntr
diff --git a/rv_zicond → extensions/rv_zicond b/rv_zicond → extensions/rv_zicond
diff --git a/rv_zicsr → extensions/rv_zicsr b/rv_zicsr → extensions/rv_zicsr
diff --git a/rv_zifencei → extensions/rv_zifencei b/rv_zifencei → extensions/rv_zifencei
diff --git a/rv_zihintntl → extensions/rv_zihintntl b/rv_zihintntl → extensions/rv_zihintntl
diff --git a/rv_zimop → extensions/rv_zimop b/rv_zimop → extensions/rv_zimop
diff --git a/rv_zk → extensions/rv_zk b/rv_zk → extensions/rv_zk
diff --git a/rv_zkn → extensions/rv_zkn b/rv_zkn → extensions/rv_zkn
diff --git a/rv_zknh → extensions/rv_zknh b/rv_zknh → extensions/rv_zknh
diff --git a/rv_zks → extensions/rv_zks b/rv_zks → extensions/rv_zks
diff --git a/rv_zksed → extensions/rv_zksed b/rv_zksed → extensions/rv_zksed
diff --git a/rv_zksh → extensions/rv_zksh b/rv_zksh → extensions/rv_zksh
diff --git a/rv_zvbb → extensions/rv_zvbb b/rv_zvbb → extensions/rv_zvbb
diff --git a/rv_zvbc → extensions/rv_zvbc b/rv_zvbc → extensions/rv_zvbc
diff --git a/rv_zvkg → extensions/rv_zvkg b/rv_zvkg → extensions/rv_zvkg
diff --git a/rv_zvkn → extensions/rv_zvkn b/rv_zvkn → extensions/rv_zvkn
diff --git a/rv_zvkned → extensions/rv_zvkned b/rv_zvkned → extensions/rv_zvkned
diff --git a/rv_zvknha → extensions/rv_zvknha b/rv_zvknha → extensions/rv_zvknha
diff --git a/rv_zvknhb → extensions/rv_zvknhb b/rv_zvknhb → extensions/rv_zvknhb
diff --git a/rv_zvks → extensions/rv_zvks b/rv_zvks → extensions/rv_zvks
diff --git a/rv_zvksed → extensions/rv_zvksed b/rv_zvksed → extensions/rv_zvksed
diff --git a/rv_zvksh → extensions/rv_zvksh b/rv_zvksh → extensions/rv_zvksh
diff --git a/unratified/rv64_zbp → extensions/unratified/rv64_zbp b/unratified/rv64_zbp → extensions/unratified/rv64_zbp
diff --git a/unratified/rv_c_zicfiss → extensions/unratified/rv_c_zicfiss b/unratified/rv_c_zicfiss → extensions/unratified/rv_c_zicfiss
diff --git a/unratified/rv_smdbltrp → extensions/unratified/rv_smdbltrp b/unratified/rv_smdbltrp → extensions/unratified/rv_smdbltrp
diff --git a/unratified/rv_smrnmi → extensions/unratified/rv_smrnmi b/unratified/rv_smrnmi → extensions/unratified/rv_smrnmi
diff --git a/unratified/rv_zalasr → extensions/unratified/rv_zalasr b/unratified/rv_zalasr → extensions/unratified/rv_zalasr
diff --git a/unratified/rv_zbp → extensions/unratified/rv_zbp b/unratified/rv_zbp → extensions/unratified/rv_zbp
diff --git a/unratified/rv_zfbfmin → extensions/unratified/rv_zfbfmin b/unratified/rv_zfbfmin → extensions/unratified/rv_zfbfmin
diff --git a/unratified/rv_zicfilp → extensions/unratified/rv_zicfilp b/unratified/rv_zicfilp → extensions/unratified/rv_zicfilp
diff --git a/unratified/rv_zicfiss → extensions/unratified/rv_zicfiss b/unratified/rv_zicfiss → extensions/unratified/rv_zicfiss
diff --git a/unratified/rv_zvfbfmin → extensions/unratified/rv_zvfbfmin b/unratified/rv_zvfbfmin → extensions/unratified/rv_zvfbfmin
diff --git a/unratified/rv_zvfbfwma → extensions/unratified/rv_zvfbfwma b/unratified/rv_zvfbfwma → extensions/unratified/rv_zvfbfwma
diff --git a/shared_utils.py b/shared_utils.py
@@ -457,7 +457,7 @@
         logging.debug(f"Processing pseudo line: {line}")
         ext, orig_inst, pseudo_inst, line_content = pseudo_regex.findall(line)[0]
         ext_file = find_extension_file(ext, opcodes_dir)
-
+        # print("ext_file",ext_file)
         validate_instruction_in_extension(orig_inst, ext_file, file_name, pseudo_inst)
 
         name, single_dict = process_enc_line(f"{pseudo_inst} {line_content}", file_name)
@@ -514,6 +514,7 @@
         ext_file = f"{opcodes_dir}/unratified/{ext}"
         if not os.path.exists(ext_file):
             log_and_exit(f"Extension {ext} not found.")
+    # print(ext_file)
     return ext_file
 
 
@@ -574,7 +575,7 @@
     if include_pseudo_ops is None:
         include_pseudo_ops = []
 
-    opcodes_dir = os.path.dirname(os.path.realpath(__file__))
+    opcodes_dir = os.path.dirname(os.path.realpath(__file__)) + "/extensions"
     instr_dict: InstrDict = {}
 
     file_names = [
@@ -603,6 +604,7 @@
         )
 
     logging.debug("Collecting imported instructions")
+
     for file_name in file_names:
         logging.debug(f"Parsing File: {file_name} for imported instructions")
         lines = read_lines(file_name)