Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1938 from motec-research/guard_access_function 

soc/export: add guard for access_functions
This commit is contained in:
AndrewD 2024-04-26 12:06:49 +10:00 committed by GitHub
parent b6bfe42b6b 7481b1e161
commit bd4ca4371d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex/soc/integration/export.py
View File

@ -187,7 +187,12 @@ def get_soc_header(constants, with_access_functions=True):
if with_access_functions: if with_access_functions:
r += "\n#ifndef __ASSEMBLER__\n" r += "\n#ifndef __ASSEMBLER__\n"
r += "#ifndef LITEX_ACCESS_FUNCTIONS\n"
r += "#define LITEX_ACCESS_FUNCTIONS 1\n"
r += "#endif\n"
r += "#if LITEX_ACCESS_FUNCTIONS\n"
r += funcs r += funcs
r += "#endif // !LITEX_ACCESS_FUNCTIONS\n"
r += "#endif // !__ASSEMBLER__\n" r += "#endif // !__ASSEMBLER__\n"
r += "\n#endif\n" r += "\n#endif\n"
@ -223,6 +228,7 @@ def _get_rw_functions_c(reg_name, reg_base, nwords, busword, alignment, read_onl
stride = alignment//8; stride = alignment//8;
if with_access_functions: if with_access_functions:
r += "\n#if LITEX_ACCESS_FUNCTIONS\n"
r += f"static inline {ctype} {reg_name}_read(void) {{\n" r += f"static inline {ctype} {reg_name}_read(void) {{\n"
if nwords > 1: if nwords > 1:
r += f"\t{ctype} r = csr_read_simple({_get_csr_addr(csr_base, reg_base, with_csr_base_define)});\n" r += f"\t{ctype} r = csr_read_simple({_get_csr_addr(csr_base, reg_base, with_csr_base_define)});\n"
@ -243,6 +249,7 @@ def _get_rw_functions_c(reg_name, reg_base, nwords, busword, alignment, read_onl
v_shift = "v" v_shift = "v"
r += f"\tcsr_write_simple({v_shift}, {_get_csr_addr(csr_base, reg_base+sub*stride, with_csr_base_define)});\n" r += f"\tcsr_write_simple({v_shift}, {_get_csr_addr(csr_base, reg_base+sub*stride, with_csr_base_define)});\n"
r += "}\n" r += "}\n"
r += "#endif // !LITEX_ACCESS_FUNCTIONS\n\n"
return r return r
@ -250,14 +257,21 @@ def get_csr_header(regions, constants, csr_base=None, with_csr_base_define=True,
alignment = constants.get("CONFIG_CSR_ALIGNMENT", 32) alignment = constants.get("CONFIG_CSR_ALIGNMENT", 32)
r = generated_banner("//") r = generated_banner("//")
if with_access_functions: # FIXME if with_access_functions: # FIXME
r += "#ifndef LITEX_ACCESS_FUNCTIONS\n"
r += "#define LITEX_ACCESS_FUNCTIONS 1\n"
r += "#endif // !LITEX_ACCESS_FUNCTIONS\n\n"
r += "#if LITEX_ACCESS_FUNCTIONS\n"
r += "#include <generated/soc.h>\n" r += "#include <generated/soc.h>\n"
r += "#endif // LITEX_ACCESS_FUNCTIONS\n\n"
r += "#ifndef __GENERATED_CSR_H\n#define __GENERATED_CSR_H\n" r += "#ifndef __GENERATED_CSR_H\n#define __GENERATED_CSR_H\n"
if with_access_functions: if with_access_functions:
r += "#if LITEX_ACCESS_FUNCTIONS\n"
r += "#include <stdint.h>\n" r += "#include <stdint.h>\n"
r += "#include <system.h>\n" r += "#include <system.h>\n"
r += "#ifndef CSR_ACCESSORS_DEFINED\n" r += "#ifndef CSR_ACCESSORS_DEFINED\n"
r += "#include <hw/common.h>\n" r += "#include <hw/common.h>\n"
r += "#endif /* ! CSR_ACCESSORS_DEFINED */\n" r += "#endif /* ! CSR_ACCESSORS_DEFINED */\n"
r += "#endif // LITEX_ACCESS_FUNCTIONS\n\n"
_csr_base = regions[next(iter(regions))].origin _csr_base = regions[next(iter(regions))].origin
csr_base = csr_base if csr_base is not None else _csr_base csr_base = csr_base if csr_base is not None else _csr_base
if with_csr_base_define: if with_csr_base_define:
@ -291,6 +305,7 @@ def get_csr_header(regions, constants, csr_base=None, with_csr_base_define=True,
r += f"#define CSR_{name.upper()}_{csr.name.upper()}_{field.name.upper()}_OFFSET {offset}\n" r += f"#define CSR_{name.upper()}_{csr.name.upper()}_{field.name.upper()}_OFFSET {offset}\n"
r += f"#define CSR_{name.upper()}_{csr.name.upper()}_{field.name.upper()}_SIZE {size}\n" r += f"#define CSR_{name.upper()}_{csr.name.upper()}_{field.name.upper()}_SIZE {size}\n"
if with_access_functions and csr.size <= 32: # FIXME: Implement extract/read functions for csr.size > 32-bit. if with_access_functions and csr.size <= 32: # FIXME: Implement extract/read functions for csr.size > 32-bit.
r += "\n#if LITEX_ACCESS_FUNCTIONS\n"
reg_name = name + "_" + csr.name.lower() reg_name = name + "_" + csr.name.lower()
field_name = reg_name + "_" + field.name.lower() field_name = reg_name + "_" + field.name.lower()
r += "static inline uint32_t " + field_name + "_extract(uint32_t oldword) {\n" r += "static inline uint32_t " + field_name + "_extract(uint32_t oldword) {\n"
@ -309,6 +324,7 @@ def get_csr_header(regions, constants, csr_base=None, with_csr_base_define=True,
r += "\tuint32_t newword = " + field_name + "_replace(oldword, plain_value);\n" r += "\tuint32_t newword = " + field_name + "_replace(oldword, plain_value);\n"
r += "\t" + reg_name + "_write(newword);\n" r += "\t" + reg_name + "_write(newword);\n"
r += "}\n" r += "}\n"
r += "#endif // !LITEX_ACCESS_FUNCTIONS\n\n"
r += "\n#endif\n" r += "\n#endif\n"
return r return r