Skip to content

Commit

Permalink
allow to specify config parametes on register map (#45, rggen/rggen#221)
Browse files Browse the repository at this point in the history
  • Loading branch information
taichi-ishitani authored Jan 21, 2025
1 parent 54a2400 commit f5d2fae
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ jobs:
run: |
${RGGEN_ROOT}/rggen-devtools/bin/checkout.rb
- name: Checkout stdgems-version gem
uses: actions/checkout@v4
with:
repository: taichi-ishitani/stdgems-version
path: stdgems-version
fetch-depth: 0
submodules: true

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ group :rggen do
gem_patched 'facets'
gem_patched 'rubyzip'
end

for_ci do
gem_bundled 'racc'
end
4 changes: 2 additions & 2 deletions spec/rggen/markdown/register/markdown_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
end

before(:all) do
RgGen.enable(:global, [:bus_width, :address_width, :enable_wide_register])
RgGen.enable(:register_block, [:name, :byte_size])
RgGen.enable(:global, [:address_width, :enable_wide_register])
RgGen.enable(:register_block, [:name, :byte_size, :bus_width])
RgGen.enable(:register_file, [:name, :offset_address, :size, :comment])
RgGen.enable(:register, [:name, :offset_address, :size, :type, :comment])
RgGen.enable(:register, :type, [:external, :indirect])
Expand Down
2 changes: 1 addition & 1 deletion spec/rggen/markdown/register_block/markdown_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
end

let(:register_map) do
file_0 = ['block_0.rb', 'block_0.toml', 'block_0.xlsx', 'block_0.yml'].sample
file_0 = ['block_0.rb', 'block_0.toml', 'block_0.yml'].sample
file_1 = ['block_1.rb', 'block_1.toml', 'block_1.yml'].sample
path = [file_0, file_1].map { |file| File.join(RGGEN_SAMPLE_DIRECTORY, file) }
build_register_map_factory(RgGen.builder, false).create(configuration, path)
Expand Down
3 changes: 0 additions & 3 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
require 'rggen/default_register_map'
builder.plugin_manager.activate_plugin_by_name(:'rggen-default-register-map')

require 'rggen/spreadsheet_loader'
builder.plugin_manager.activate_plugin_by_name(:'rggen-spreadsheet-loader')

RSpec.configure do |config|
RgGen::Devtools::SpecHelper.setup(config)
end
Expand Down

0 comments on commit f5d2fae

Please sign in to comment.