fix things

.build_number

@@ -1 +1 @@
-1594
+1595

src/libtriton/CMakeLists.txt

@@ -32,6 +32,10 @@ set(LIBTRITON_SOURCE_FILES
     arch/memoryAccess.cpp
     arch/operandWrapper.cpp
     arch/register.cpp
+    arch/riscv/riscv32Cpu.cpp
+    arch/riscv/riscv64Cpu.cpp
+    arch/riscv/riscvSemantics.cpp
+    arch/riscv/riscvSpecifications.cpp
     arch/x86/x8664Cpu.cpp
     arch/x86/x86Cpu.cpp
     arch/x86/x86Semantics.cpp
@@ -88,6 +92,12 @@ set(LIBTRITON_HEADER_FILES
     includes/triton/astRepresentation.hpp
     includes/triton/astRepresentationInterface.hpp
     includes/triton/astSmtRepresentation.hpp
+    includes/triton/riscv32.spec
+    includes/triton/riscv32Cpu.hpp
+    includes/triton/riscv64.spec
+    includes/triton/riscv64Cpu.hpp
+    includes/triton/riscvSemantics.hpp
+    includes/triton/riscvSpecifications.hpp
     includes/triton/basicBlock.hpp
     includes/triton/bitsVector.hpp
     includes/triton/bitwuzlaSolver.hpp
@@ -147,22 +157,6 @@ set(LIBTRITON_HEADER_FILES
     includes/triton/z3ToTriton.hpp
 )
 
-# Add riscv source and header files
-list(APPEND LIBTRITON_SOURCE_FILES
-    arch/riscv/riscv32Cpu.cpp
-    arch/riscv/riscv64Cpu.cpp
-    arch/riscv/riscvSemantics.cpp
-    arch/riscv/riscvSpecifications.cpp
-)
-list(APPEND LIBTRITON_HEADER_FILES
-    includes/triton/riscv32.spec
-    includes/triton/riscv64.spec
-    includes/triton/riscv32Cpu.hpp
-    includes/triton/riscv64Cpu.hpp
-    includes/triton/riscvSemantics.hpp
-    includes/triton/riscvSpecifications.hpp
-)
-
 # Define all resource files
 set(LIBTRITON_RESOURCE_FILES
     includes/triton/version.hpp.in

src/libtriton/arch/architecture.cpp

@@ -53,12 +53,12 @@ namespace triton {
     void Architecture::setArchitecture(triton::arch::architecture_e arch) {
       /* Allocate and init the good arch */
       switch (arch) {
-        case triton::arch::ARCH_X86_64:  this->cpu.reset(new(std::nothrow) triton::arch::x86::x8664Cpu(this->callbacks));            break;
-        case triton::arch::ARCH_X86:     this->cpu.reset(new(std::nothrow) triton::arch::x86::x86Cpu(this->callbacks));              break;
         case triton::arch::ARCH_AARCH64: this->cpu.reset(new(std::nothrow) triton::arch::arm::aarch64::AArch64Cpu(this->callbacks)); break;
         case triton::arch::ARCH_ARM32:   this->cpu.reset(new(std::nothrow) triton::arch::arm::arm32::Arm32Cpu(this->callbacks));     break;
-        case triton::arch::ARCH_RV64:    this->cpu.reset(new(std::nothrow) triton::arch::riscv::riscv64Cpu(this->callbacks));        break;
         case triton::arch::ARCH_RV32:    this->cpu.reset(new(std::nothrow) triton::arch::riscv::riscv32Cpu(this->callbacks));        break;
+        case triton::arch::ARCH_RV64:    this->cpu.reset(new(std::nothrow) triton::arch::riscv::riscv64Cpu(this->callbacks));        break;
+        case triton::arch::ARCH_X86:     this->cpu.reset(new(std::nothrow) triton::arch::x86::x86Cpu(this->callbacks));              break;
+        case triton::arch::ARCH_X86_64:  this->cpu.reset(new(std::nothrow) triton::arch::x86::x8664Cpu(this->callbacks));            break;
         default:
           throw triton::exceptions::Architecture("Architecture::setArchitecture(): Architecture not supported.");
       }

src/libtriton/arch/irBuilder.cpp

@@ -43,8 +43,8 @@ namespace triton {
       this->taintEngine          = taintEngine;
       this->aarch64Isa           = new(std::nothrow) triton::arch::arm::aarch64::AArch64Semantics(architecture, symbolicEngine, taintEngine, astCtxt);
       this->arm32Isa             = new(std::nothrow) triton::arch::arm::arm32::Arm32Semantics(architecture, symbolicEngine, taintEngine, astCtxt);
-      this->x86Isa               = new(std::nothrow) triton::arch::x86::x86Semantics(architecture, symbolicEngine, taintEngine, modes, astCtxt);
       this->riscvIsa             = new(std::nothrow) triton::arch::riscv::riscvSemantics(architecture, symbolicEngine, taintEngine, modes, astCtxt);
+      this->x86Isa               = new(std::nothrow) triton::arch::x86::x86Semantics(architecture, symbolicEngine, taintEngine, modes, astCtxt);
 
       if (this->x86Isa == nullptr || this->aarch64Isa == nullptr || this->arm32Isa == nullptr
         || this->riscvIsa == nullptr
@@ -56,8 +56,8 @@ namespace triton {
     IrBuilder::~IrBuilder() {
       delete this->aarch64Isa;
       delete this->arm32Isa;
-      delete this->x86Isa;
       delete this->riscvIsa;
+      delete this->x86Isa;
     }