diff options
| author | Xiang W <[email protected]> | 2019-11-27 14:16:52 +0800 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2019-11-27 12:10:33 +0530 |
| commit | 813f7f4c250af9f7c9546f64778e9b35bb7d7dcb (patch) | |
| tree | a5427f70be98c3eed5349e74716c68f2244d69d4 | |
| parent | ab14f94a8ca3acf1b746b854612f44b7f432a522 (diff) | |
lib: Add error detection for misa_extension
Add assertions for misa_extension to prevent incoming illegal
characters.
Signed-off-by: Xiang Wang <[email protected]>
Reviewed-by: Anup Patel <[email protected]>
| -rw-r--r-- | include/sbi/riscv_asm.h | 14 | ||||
| -rw-r--r-- | lib/sbi/riscv_asm.c | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/include/sbi/riscv_asm.h b/include/sbi/riscv_asm.h index 04502e1f..c3d5985e 100644 --- a/include/sbi/riscv_asm.h +++ b/include/sbi/riscv_asm.h @@ -159,8 +159,16 @@ void csr_write_num(int csr_num, unsigned long val); __asm__ __volatile__("wfi" ::: "memory"); \ } while (0) -/* Determine CPU extension, return non-zero support */ -int misa_extension(char ext); + +/* determine CPU extension, return non-zero support */ +int misa_extension_imp(char ext); + +#define misa_extension(c)\ +({\ + _Static_assert(((c >= 'A') && (c <= 'Z')),\ + "The parameter of misa_extension must be [A-Z]");\ + misa_extension_imp(c);\ +}) /* Get MXL field of misa, return -1 on error */ int misa_xlen(void); @@ -170,7 +178,7 @@ static inline void misa_string(char *out, unsigned int out_sz) unsigned long i; for (i = 0; i < 26; i++) { - if (misa_extension('A' + i)) { + if (misa_extension_imp('A' + i)) { *out = 'A' + i; out++; } diff --git a/lib/sbi/riscv_asm.c b/lib/sbi/riscv_asm.c index d16e32a8..7b612d4b 100644 --- a/lib/sbi/riscv_asm.c +++ b/lib/sbi/riscv_asm.c @@ -12,7 +12,8 @@ #include <sbi/sbi_error.h> #include <sbi/sbi_platform.h> -int misa_extension(char ext) +/* determine CPU extension, return non-zero support */ +int misa_extension_imp(char ext) { unsigned long misa = csr_read(CSR_MISA); |