Skip to content

Commit 3d6a7ed

Browse files
authored
fix(ruby): pr #855 needs a few more fixes (#856)
PR #797 refactored a number of things, including encapulating the "Architecture" class in a "Udb" module. `isa_explorer.rb` has a few places where that needs to be accommondated which were missed in #855.
1 parent 149c88c commit 3d6a7ed

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

backends/isa_explorer/isa_explorer.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def presence2char(presence)
2525
end
2626
end
2727

28-
# @param arch [Architecture] The entire RISC-V architecture
28+
# @param arch [Udb::Architecture] The entire RISC-V architecture
2929
# @return [Hash<String,Array<String>] Extension table data
3030
def arch2ext_table(arch)
3131
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Udb::Architecture)
@@ -87,7 +87,7 @@ def arch2ext_table(arch)
8787
return ext_table
8888
end
8989

90-
# @param arch [Architecture] The entire RISC-V architecture
90+
# @param arch [Udb::Architecture] The entire RISC-V architecture
9191
# @return [Hash<String,Array<String>] Instruction table data
9292
sig { params(arch: Udb::Architecture).returns(T::Hash[String, T::Array[String]]) }
9393
def arch2inst_table(arch)
@@ -135,7 +135,7 @@ def arch2inst_table(arch)
135135
return inst_table
136136
end
137137

138-
# @param arch [Architecture] The entire RISC-V architecture
138+
# @param arch [Udb::Architecture] The entire RISC-V architecture
139139
# @return [Hash<String,Array<String>] CSR table data
140140
sig { params(arch: Udb::Architecture).returns(T::Hash[String, T::Array[String]]) }
141141
def arch2csr_table(arch)
@@ -230,7 +230,7 @@ def gen_xlsx_table(table, workbook, worksheet)
230230

231231
# Create ISA Explorer tables as XLSX file.
232232
#
233-
# @param arch [Architecture] The entire RISC-V architecture
233+
# @param arch [Udb::Architecture] The entire RISC-V architecture
234234
# @param output_pname [String] Full absolute pathname to output file
235235
sig { params(arch: Udb::Architecture, output_pname: String).void }
236236
def gen_xlsx(arch, output_pname)
@@ -351,7 +351,7 @@ def gen_js_table(table, div_name, output_pname)
351351

352352
# Create ISA Explorer extension table as JavaScript file.
353353
#
354-
# @param arch [Architecture] The entire RISC-V architecture
354+
# @param arch [Udb::Architecture] The entire RISC-V architecture
355355
# @param output_pname [String] Full absolute pathname to output file
356356
def gen_js_ext_table(arch, output_pname)
357357
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Udb::Architecture)
@@ -367,10 +367,10 @@ def gen_js_ext_table(arch, output_pname)
367367

368368
# Create ISA Explorer instruction table as JavaScript file.
369369
#
370-
# @param arch [Architecture] The entire RISC-V architecture
370+
# @param arch [Udb::Architecture] The entire RISC-V architecture
371371
# @param output_pname [String] Full absolute pathname to output file
372372
def gen_js_inst_table(arch, output_pname)
373-
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Architecture)
373+
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Udb::Architecture)
374374
raise ArgumentError, "output_pname is a #{output_pname.class} class but needs to be String" unless output_pname.is_a?(String)
375375

376376
# Convert arch to inst_table data structure
@@ -383,10 +383,10 @@ def gen_js_inst_table(arch, output_pname)
383383

384384
# Create ISA Explorer CSR table as JavaScript file.
385385
#
386-
# @param arch [Architecture] The entire RISC-V architecture
386+
# @param arch [Udb::Architecture] The entire RISC-V architecture
387387
# @param output_pname [String] Full absolute pathname to output file
388388
def gen_js_csr_table(arch, output_pname)
389-
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Architecture)
389+
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Udb::Architecture)
390390
raise ArgumentError, "output_pname is a #{output_pname.class} class but needs to be String" unless output_pname.is_a?(String)
391391

392392
# Convert arch to csr_table data structure
@@ -397,10 +397,10 @@ def gen_js_csr_table(arch, output_pname)
397397
gen_js_table(csr_table, "csr_table", output_pname)
398398
end
399399

400-
# param [Architecture] arch
400+
# param [Udb::Architecture] arch
401401
# return [Array<ProfileRelease>] Nice list of profile release to use in a nice order
402402
def get_sorted_profile_releases(arch)
403-
raise ArgumentError, "arch is a #{arch.class} class but needs to be Architecture" unless arch.is_a?(Udb::Architecture)
403+
raise ArgumentError, "arch is a #{arch.class} class but needs to be Udb::Architecture" unless arch.is_a?(Udb::Architecture)
404404

405405
# Get array of profile releases and sort by name
406406
sorted_profile_releases = arch.profile_releases.sort_by(&:name)

0 commit comments

Comments
 (0)