diff options
| author | Jerry Zhao <jerryz123@berkeley.edu> | 2024-09-14 01:11:30 -0700 |
|---|---|---|
| committer | Jerry Zhao <jerryz123@berkeley.edu> | 2024-09-14 01:11:30 -0700 |
| commit | d90e6df9c3a489a7cd0e8c9b02379e8fd3de3a38 (patch) | |
| tree | 71f774d06d99845779908e66c5dad850c60fda5d | |
| parent | 2e816f23cba244abe9201ba22dc2b4a891e63264 (diff) | |
| download | riscv-isa-sim-d90e6df9c3a489a7cd0e8c9b02379e8fd3de3a38.zip riscv-isa-sim-d90e6df9c3a489a7cd0e8c9b02379e8fd3de3a38.tar.gz riscv-isa-sim-d90e6df9c3a489a7cd0e8c9b02379e8fd3de3a38.tar.bz2 | |
Remove --with-isa compile-time option
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | riscv/platform.h | 1 | ||||
| -rw-r--r-- | riscv/riscv.ac | 6 | ||||
| -rw-r--r-- | spike_dasm/spike-dasm.cc | 1 | ||||
| -rw-r--r-- | spike_main/spike-log-parser.cc | 1 |
6 files changed, 3 insertions, 26 deletions
diff --git a/config.h.in b/config.h.in index aef3596..f709876 100644 --- a/config.h.in +++ b/config.h.in @@ -6,9 +6,6 @@ /* Define if subproject MCPPBS_SPROJ_NORM is enabled */ #undef CUSTOMEXT_ENABLED -/* Default value for --isa switch */ -#undef DEFAULT_ISA - /* Default value for --priv switch */ #undef DEFAULT_PRIV @@ -737,7 +737,6 @@ with_boost with_boost_libdir with_boost_asio with_boost_regex -with_isa with_priv with_target enable_dual_endian @@ -1403,8 +1402,6 @@ Optional Packages: use the Regex library from boost - it is possible to specify a certain library for the linker e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 - --with-isa=RV64IMAFDC_zicntr_zihpm - Sets the default RISC-V ISA --with-priv=MSU Sets the default RISC-V privilege modes supported --with-target=riscv64-unknown-elf Sets the default target config @@ -6562,20 +6559,6 @@ fi -# Check whether --with-isa was given. -if test ${with_isa+y} -then : - withval=$with_isa; -printf "%s\n" "#define DEFAULT_ISA \"$withval\"" >>confdefs.h - -else $as_nop - -printf "%s\n" "#define DEFAULT_ISA \"RV64IMAFDC_zicntr_zihpm\"" >>confdefs.h - -fi - - - # Check whether --with-priv was given. if test ${with_priv+y} then : diff --git a/riscv/platform.h b/riscv/platform.h index 7fffdc8..19813ce 100644 --- a/riscv/platform.h +++ b/riscv/platform.h @@ -4,6 +4,7 @@ #define DEFAULT_KERNEL_BOOTARGS "console=ttyS0 earlycon" #define DEFAULT_RSTVEC 0x00001000 +#define DEFAULT_ISA "rv64imafdc_zicntr_zihpm" #define CLINT_BASE 0x02000000 #define CLINT_SIZE 0x000c0000 #define PLIC_BASE 0x0c000000 diff --git a/riscv/riscv.ac b/riscv/riscv.ac index 378fd10..81ff73d 100644 --- a/riscv/riscv.ac +++ b/riscv/riscv.ac @@ -8,12 +8,6 @@ AC_CHECK_LIB([boost_system], [main], [], []) AC_CHECK_LIB([boost_regex], [main], [], []) -AC_ARG_WITH(isa, - [AS_HELP_STRING([--with-isa=RV64IMAFDC_zicntr_zihpm], - [Sets the default RISC-V ISA])], - AC_DEFINE_UNQUOTED([DEFAULT_ISA], "$withval", [Default value for --isa switch]), - AC_DEFINE_UNQUOTED([DEFAULT_ISA], "RV64IMAFDC_zicntr_zihpm", [Default value for --isa switch])) - AC_ARG_WITH(priv, [AS_HELP_STRING([--with-priv=MSU], [Sets the default RISC-V privilege modes supported])], diff --git a/spike_dasm/spike-dasm.cc b/spike_dasm/spike-dasm.cc index 3e42df5..8acf3ba 100644 --- a/spike_dasm/spike-dasm.cc +++ b/spike_dasm/spike-dasm.cc @@ -9,6 +9,7 @@ #include "config.h" #include "disasm.h" #include "extension.h" +#include "platform.h" #include <iostream> #include <string> #include <cstdint> diff --git a/spike_main/spike-log-parser.cc b/spike_main/spike-log-parser.cc index 55ff999..3b9692b 100644 --- a/spike_main/spike-log-parser.cc +++ b/spike_main/spike-log-parser.cc @@ -14,6 +14,7 @@ #include "disasm.h" #include "extension.h" +#include "platform.h" using namespace std; |