diff options
| author | Scott Beamer <sbeamer@ucsc.edu> | 2020-05-18 15:41:32 -0700 |
|---|---|---|
| committer | Chih-Min Chao <chihmin.chao@sifive.com> | 2020-05-19 19:57:16 -0700 |
| commit | 8f36ccccd3341e490b987eaecef6794c95c4fe9a (patch) | |
| tree | 60fdfd1e8b7796d1a5f19891f4fa4d6c2a10576b /riscv | |
| parent | 4061ee6e184dab1e39c7448c248aa8f74b3f150b (diff) | |
| download | spike-8f36ccccd3341e490b987eaecef6794c95c4fe9a.zip spike-8f36ccccd3341e490b987eaecef6794c95c4fe9a.tar.gz spike-8f36ccccd3341e490b987eaecef6794c95c4fe9a.tar.bz2 | |
fix clang compile error wthin FDT parsing
Diffstat (limited to 'riscv')
| -rw-r--r-- | riscv/dts.cc | 8 | ||||
| -rw-r--r-- | riscv/dts.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/riscv/dts.cc b/riscv/dts.cc index c12ff06..6a38ba0 100644 --- a/riscv/dts.cc +++ b/riscv/dts.cc @@ -170,7 +170,7 @@ std::string dts_compile(const std::string& dts) } -static int fdt_get_node_addr_size(void *fdt, int node, unsigned long *addr, +static int fdt_get_node_addr_size(void *fdt, int node, reg_t *addr, unsigned long *size, const char *field) { int parent, len, i; @@ -214,7 +214,7 @@ static int fdt_get_node_addr_size(void *fdt, int node, unsigned long *addr, return 0; } -int fdt_parse_clint(void *fdt, unsigned long *clint_addr, +int fdt_parse_clint(void *fdt, reg_t *clint_addr, const char *compatible) { int nodeoffset, rc; @@ -230,7 +230,7 @@ int fdt_parse_clint(void *fdt, unsigned long *clint_addr, return 0; } -int fdt_parse_pmp_num(void *fdt, unsigned long *pmp_num, const char *compatible) +int fdt_parse_pmp_num(void *fdt, reg_t *pmp_num, const char *compatible) { int nodeoffset, rc; @@ -246,7 +246,7 @@ int fdt_parse_pmp_num(void *fdt, unsigned long *pmp_num, const char *compatible) return 0; } -int fdt_parse_pmp_alignment(void *fdt, unsigned long *pmp_align, +int fdt_parse_pmp_alignment(void *fdt, reg_t *pmp_align, const char *compatible) { int nodeoffset, rc; diff --git a/riscv/dts.h b/riscv/dts.h index 08d8f9d..1c3f701 100644 --- a/riscv/dts.h +++ b/riscv/dts.h @@ -13,10 +13,10 @@ std::string make_dts(size_t insns_per_rtc_tick, size_t cpu_hz, std::string dts_compile(const std::string& dts); -int fdt_parse_clint(void *fdt, unsigned long *clint_addr, +int fdt_parse_clint(void *fdt, reg_t *clint_addr, const char *compatible); -int fdt_parse_pmp_num(void *fdt, unsigned long *pmp_num, +int fdt_parse_pmp_num(void *fdt, reg_t *pmp_num, const char *compatible); -int fdt_parse_pmp_alignment(void *fdt, unsigned long *pmp_align, +int fdt_parse_pmp_alignment(void *fdt, reg_t *pmp_align, const char *compatible); #endif |