aboutsummaryrefslogtreecommitdiff
path: root/spike_dasm
diff options
context:
space:
mode:
Diffstat (limited to 'spike_dasm')
-rw-r--r--spike_dasm/spike-dasm.cc8
-rw-r--r--spike_dasm/spike_dasm.mk.in2
2 files changed, 3 insertions, 7 deletions
diff --git a/spike_dasm/spike-dasm.cc b/spike_dasm/spike-dasm.cc
index c4fc840..62e7212 100644
--- a/spike_dasm/spike-dasm.cc
+++ b/spike_dasm/spike-dasm.cc
@@ -14,7 +14,7 @@
#include <fesvr/option_parser.h>
using namespace std;
-int main(int argc, char** argv)
+int main(int UNUSED argc, char** argv)
{
string s;
const char* isa = DEFAULT_ISA;
@@ -50,14 +50,10 @@ int main(int argc, char** argv)
continue;
char* endp;
- int64_t bits = strtoull(&s[pos], &endp, 16);
+ insn_bits_t bits = strtoull(&s[pos], &endp, 16);
if (*endp != ')')
continue;
- size_t nbits = 4 * (endp - &s[pos]);
- if (nbits < 64)
- bits = bits << (64 - nbits) >> (64 - nbits);
-
string dis = disassembler->disassemble(bits);
s = s.substr(0, start) + dis + s.substr(endp - &s[0] + 1);
pos = start + dis.length();
diff --git a/spike_dasm/spike_dasm.mk.in b/spike_dasm/spike_dasm.mk.in
index 0233e62..1003a79 100644
--- a/spike_dasm/spike_dasm.mk.in
+++ b/spike_dasm/spike_dasm.mk.in
@@ -1,7 +1,7 @@
spike_dasm_subproject_deps = \
disasm \
softfloat \
- $(if $(HAVE_DLOPEN),riscv,) \
+ riscv \
spike_dasm_srcs = \
spike_dasm_option_parser.cc \