Merge pull request #3261 from diffblue/riscv64

add riscv64 architecture

Author: Daniel Kroening

src/util/config.cpp

@@ -399,6 +399,32 @@ void configt::ansi_ct::set_arch_spec_mips(const irep_idt &subarch)
   }
 }
 
+void configt::ansi_ct::set_arch_spec_riscv64()
+{
+  set_LP64();
+  endianness = endiannesst::IS_LITTLE_ENDIAN;
+  long_double_width = 16 * 8;
+  char_is_unsigned = true;
+  NULL_is_zero = true;
+
+  switch(mode)
+  {
+  case flavourt::GCC:
+    defines.push_back("__riscv");
+    break;
+
+  case flavourt::VISUAL_STUDIO:
+  case flavourt::CLANG:
+  case flavourt::CODEWARRIOR:
+  case flavourt::ARM:
+  case flavourt::ANSI:
+    break;
+
+  case flavourt::NONE:
+    UNREACHABLE;
+  }
+}
+
 void configt::ansi_ct::set_arch_spec_s390()
 {
   set_ILP32();
@@ -706,6 +732,8 @@ void configt::set_arch(const irep_idt &arch)
           arch=="ppc64" ||
           arch=="ppc64le")
     ansi_c.set_arch_spec_power(arch);
+  else if(arch == "riscv64")
+    ansi_c.set_arch_spec_riscv64();
   else if(arch=="sparc" ||
           arch=="sparc64")
     ansi_c.set_arch_spec_sparc(arch);
@@ -1236,86 +1264,90 @@ std::string configt::object_bits_info()
     ")";
 }
 
+// clang-format off
 irep_idt configt::this_architecture()
 {
   irep_idt this_arch;
 
   // following http://wiki.debian.org/ArchitectureSpecificsMemo
 
   #ifdef __alpha__
-  this_arch="alpha";
+  this_arch = "alpha";
   #elif defined(__armel__)
-  this_arch="armel";
+  this_arch = "armel";
   #elif defined(__aarch64__)
-  this_arch="arm64";
+  this_arch = "arm64";
   #elif defined(__arm__)
     #ifdef __ARM_PCS_VFP
-    this_arch="armhf"; // variant of arm with hard float
+    this_arch = "armhf"; // variant of arm with hard float
     #else
-    this_arch="arm";
+    this_arch = "arm";
     #endif
   #elif defined(__mipsel__)
     #if _MIPS_SIM==_ABIO32
-    this_arch="mipsel";
+    this_arch = "mipsel";
     #elif _MIPS_SIM==_ABIN32
-    this_arch="mipsn32el";
+    this_arch = "mipsn32el";
     #else
-    this_arch="mips64el";
+    this_arch = "mips64el";
     #endif
   #elif defined(__mips__)
     #if _MIPS_SIM==_ABIO32
-    this_arch="mips";
+    this_arch = "mips";
     #elif _MIPS_SIM==_ABIN32
-    this_arch="mipsn32";
+    this_arch = "mipsn32";
     #else
-    this_arch="mips64";
+    this_arch = "mips64";
     #endif
   #elif defined(__powerpc__)
     #if defined(__ppc64__) || defined(__PPC64__) || \
         defined(__powerpc64__) || defined(__POWERPC64__)
       #ifdef __LITTLE_ENDIAN__
-      this_arch="ppc64le";
+      this_arch = "ppc64le";
       #else
-      this_arch="ppc64";
+      this_arch = "ppc64";
       #endif
     #else
-    this_arch="powerpc";
+    this_arch = "powerpc";
     #endif
+  #elif defined(__riscv)
+    this_arch = "riscv64";
   #elif defined(__sparc__)
     #ifdef __arch64__
-    this_arch="sparc64";
+      this_arch = "sparc64";
     #else
-    this_arch="sparc";
+      this_arch = "sparc";
     #endif
   #elif defined(__ia64__)
-  this_arch="ia64";
+    this_arch = "ia64";
   #elif defined(__s390x__)
-  this_arch="s390x";
+    this_arch = "s390x";
   #elif defined(__s390__)
-  this_arch="s390";
+    this_arch = "s390";
   #elif defined(__x86_64__)
     #ifdef __ILP32__
-    this_arch="x32"; // variant of x86_64 with 32-bit pointers
+      this_arch = "x32"; // variant of x86_64 with 32-bit pointers
     #else
-    this_arch="x86_64";
+      this_arch = "x86_64";
     #endif
   #elif defined(__i386__)
-  this_arch="i386";
+    this_arch = "i386";
   #elif defined(_WIN64)
-  this_arch="x86_64";
+    this_arch = "x86_64";
   #elif defined(_WIN32)
-  this_arch="i386";
+    this_arch = "i386";
   #elif defined(__hppa__)
-  this_arch="hppa";
+    this_arch = "hppa";
   #elif defined(__sh__)
-  this_arch="sh4";
+    this_arch = "sh4";
   #else
-  // something new and unknown!
-  this_arch="unknown";
+    // something new and unknown!
+    this_arch = "unknown";
   #endif
 
   return this_arch;
 }
+// clang-format on
 
 void configt::set_classpath(const std::string &cp)
 {

src/util/config.h

@@ -92,6 +92,7 @@ class configt
     void set_arch_spec_arm(const irep_idt &subarch);
     void set_arch_spec_alpha();
     void set_arch_spec_mips(const irep_idt &subarch);
+    void set_arch_spec_riscv64();
     void set_arch_spec_s390();
     void set_arch_spec_s390x();
     void set_arch_spec_sparc(const irep_idt &subarch);