From f82e54124345f348abaa80ec82d67528a9a8f774 Mon Sep 17 00:00:00 2001
From: Weiwei Li <liweiwei@iscas.ac.cn>
Date: Sun, 17 Jul 2022 09:46:09 +0800
Subject: remove unnecessary ifdef for RISCV_ENABLE_DUAL_ENDIAN

the default target endian is always little endian:
- mmu::is_target_big_endian() return false
- sim_t::get_target_endianness() return memif_endianness_little
when RISCV_ENABLE_DUAL_ENDIAN  macro is undefined
---
 fesvr/htif.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'fesvr/htif.h')

diff --git a/fesvr/htif.h b/fesvr/htif.h
index 3cee25f..ca5b362 100644
--- a/fesvr/htif.h
+++ b/fesvr/htif.h
@@ -31,26 +31,18 @@ class htif_t : public chunked_memif_t
 
   template<typename T> inline T from_target(target_endian<T> n) const
   {
-#ifdef RISCV_ENABLE_DUAL_ENDIAN
     memif_endianness_t endianness = get_target_endianness();
     assert(endianness == memif_endianness_little || endianness == memif_endianness_big);
 
     return endianness == memif_endianness_big? n.from_be() : n.from_le();
-#else
-    return n.from_le();
-#endif
   }
 
   template<typename T> inline target_endian<T> to_target(T n) const
   {
-#ifdef RISCV_ENABLE_DUAL_ENDIAN
     memif_endianness_t endianness = get_target_endianness();
     assert(endianness == memif_endianness_little || endianness == memif_endianness_big);
 
     return endianness == memif_endianness_big? target_endian<T>::to_be(n) : target_endian<T>::to_le(n);
-#else
-    return target_endian<T>::to_le(n);
-#endif
   }
 
  protected:
-- 
cgit v1.1


From dfd191367991cb157b53767dcc05824c826b5abd Mon Sep 17 00:00:00 2001
From: Iman Hosseini <hosseini.iman@yahoo.com>
Date: Tue, 20 Sep 2022 00:05:00 -0400
Subject: detects the loading of isa-incompatible (i.e. 32 bit code to 64bit
 HART) code and emits an error message to help avoid unintentionally loading
 wrong elf.

---
 fesvr/htif.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'fesvr/htif.h')

diff --git a/fesvr/htif.h b/fesvr/htif.h
index ca5b362..cf8b2d5 100644
--- a/fesvr/htif.h
+++ b/fesvr/htif.h
@@ -26,7 +26,7 @@ class htif_t : public chunked_memif_t
   int run();
   bool done();
   int exit_code();
-
+  void set_expected_xlen(unsigned int m) { expected_xlen = m; }
   virtual memif_t& memif() { return mem; }
 
   template<typename T> inline T from_target(target_endian<T> n) const
@@ -74,7 +74,7 @@ class htif_t : public chunked_memif_t
   void parse_arguments(int argc, char ** argv);
   void register_devices();
   void usage(const char * program_name);
-
+  unsigned int expected_xlen = 0;
   memif_t mem;
   reg_t entry;
   bool writezeros;
-- 
cgit v1.1


From f8752d8feea04303d5f3bdeabce8864b3b2430ed Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Thu, 22 Sep 2022 17:29:50 -0700
Subject: Suppress several unused-parameter warnings in fesvr

---
 fesvr/htif.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fesvr/htif.h')

diff --git a/fesvr/htif.h b/fesvr/htif.h
index cf8b2d5..5767e31 100644
--- a/fesvr/htif.h
+++ b/fesvr/htif.h
@@ -65,7 +65,7 @@ class htif_t : public chunked_memif_t
 
   // indicates that the initial program load can skip writing this address
   // range to memory, because it has already been loaded through a sideband
-  virtual bool is_address_preloaded(addr_t taddr, size_t len) { return false; }
+  virtual bool is_address_preloaded(addr_t, size_t) { return false; }
 
   // Given an address, return symbol from addr2symbol map
   const char* get_symbol(uint64_t addr);
-- 
cgit v1.1