Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

riscv_asm.h: Use CSR_<FOO> instead of <foo> for csr_read()

Browse Source 
Some toolchains might not have all the CSRs available (as seen with
GCC 7.2). So, instead use the defined CSR_ values.

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2019-02-03 18:49:20 -08:00
committed by Anup Patel
parent 30dfdf6e0e
commit c0addfe751
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/sbi/riscv_asm.h
View File

@@ -10,6 +10,8 @@
#ifndef __RISCV_ASM_H__
#define __RISCV_ASM_H__
#include <sbi/riscv_encoding.h>
#ifdef __ASSEMBLY__
#define __ASM_STR(x) x
#else
@@ -144,17 +146,17 @@ do { \
static inline int misa_extension(char ext)
{
return csr_read(misa) & (1 << (ext - 'A'));
return csr_read(CSR_MISA) & (1 << (ext - 'A'));
}
static inline int misa_xlen(void)
{
return ((long)csr_read(misa) < 0) ? 64 : 32;
return ((long)csr_read(CSR_MISA) < 0) ? 64 : 32;
}
static inline void misa_string(char *out, unsigned int out_sz)
{
unsigned long i, val = csr_read(misa);
unsigned long i, val = csr_read(CSR_MISA);
for (i = 0; i < 26; i++) {
if (val & (1 << i)) {