Merge origin/dev

README.md

@@ -13,7 +13,7 @@ Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator framew
 
 Unicorn offers some unparalleled features:
 
-- Multi-architecture: ARM, ARM64 (ARMv8), M68K, MIPS, PowerPC, RISCV, SPARC, S390X, TRICORE and X86 (16, 32, 64-bit)
+- Multi-architecture: ARM, ARM64 (ARMv8), M68K, MIPS, PowerPC, RISCV, SPARC, S390X, TriCore and X86 (16, 32, 64-bit)
 - Clean/simple/lightweight/intuitive architecture-neutral API
 - Implemented in pure C language, with bindings for Crystal, Clojure, Visual Basic, Perl, Rust, Ruby, Python, Java, .NET, Go, Delphi/Free Pascal, Haskell, Pharo, and Lua.
 - Native support for Windows & *nix (with Mac OSX, Linux, Android, *BSD & Solaris confirmed)

samples/sample_tricore.c

@@ -78,23 +78,7 @@ static void test_tricore(void)
 
 int main(int argc, char **argv, char **envp)
 {
-    // dynamically load shared library
-#ifdef DYNLOAD
-    if (!uc_dyn_load(NULL, 0)) {
-        printf("Error dynamically loading shared library.\n");
-        printf("Please check that unicorn.dll/unicorn.so is available as well "
-               "as\n");
-        printf("any other dependent dll/so files.\n");
-        printf("The easiest way is to place them in the same directory as this "
-               "app.\n");
-        return 1;
-    }
-#endif
-
     test_tricore();
-#ifdef DYNLOAD
-    uc_dyn_free();
-#endif
 
     return 0;
-}
+}