Merge pull request #315 from gsomlo/gls-csr-assert

soc_core: additional CSR safety assertions
This commit is contained in:
enjoy-digital 2019-12-13 21:57:14 +01:00 committed by GitHub
commit 8b6f9e0a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -137,7 +137,7 @@ class SoCCore(Module):
self.integrated_sram_size = integrated_sram_size
self.integrated_main_ram_size = integrated_main_ram_size
assert csr_data_width in [8, 32, 64]
assert csr_data_width in [8, 16, 32]
self.csr_data_width = csr_data_width
self.csr_address_width = csr_address_width
@ -257,6 +257,7 @@ class SoCCore(Module):
csr_alignment = max(csr_alignment, self.cpu.data_width)
self.config["CSR_DATA_WIDTH"] = csr_data_width
self.config["CSR_ALIGNMENT"] = csr_alignment
assert csr_data_width <= csr_alignment
self.csr_data_width = csr_data_width
self.csr_alignment = csr_alignment
if with_wishbone: