From 8f46a28436f8874a23c721fc336bbd0285642643 Mon Sep 17 00:00:00 2001
From: jmonesti <github@monestier.me>
Date: Wed, 4 May 2022 12:25:57 +0200
Subject: Linking spike_dasm misses libriscv.a dependance (#986)

Whereas spike-dasm.cc now instanciates an isa_parser_t,
the dependance on libriscv.a has become unconditional.
---
 spike_dasm/spike_dasm.mk.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spike_dasm')

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 \
-- 
cgit v1.1


From d2020b3256cf9a832cbbfe7a32c5753abe75cb7d Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Mon, 6 Jun 2022 20:35:35 -0700
Subject: Zero-extend instructions in spike-dasm

...since we no longer rely on their being sign-extended.
---
 spike_dasm/spike-dasm.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'spike_dasm')

diff --git a/spike_dasm/spike-dasm.cc b/spike_dasm/spike-dasm.cc
index c4fc840..8c85ef1 100644
--- a/spike_dasm/spike-dasm.cc
+++ b/spike_dasm/spike-dasm.cc
@@ -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();
-- 
cgit v1.1


From a51e44ed228e48fc1dbf24ec7dc23cbd61a7874a Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Thu, 22 Sep 2022 17:28:53 -0700
Subject: Fix or work around other unused-parameter warnings in ancillary
 programs

---
 spike_dasm/spike-dasm.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spike_dasm')

diff --git a/spike_dasm/spike-dasm.cc b/spike_dasm/spike-dasm.cc
index 8c85ef1..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;
-- 
cgit v1.1