Add Unicorn/AVR support.

Signed-off-by: Glenn Baker <[email protected]>

Author: glennsec

CMakeLists.txt

@@ -67,7 +67,7 @@ option(UNICORN_FUZZ "Enable fuzzing" OFF)
 option(UNICORN_LOGGING "Enable logging" OFF)
 option(UNICORN_BUILD_TESTS "Build unicorn tests" ${PROJECT_IS_TOP_LEVEL})
 option(UNICORN_INSTALL "Enable unicorn installation" ${PROJECT_IS_TOP_LEVEL})
-set(UNICORN_ARCH "x86;arm;aarch64;riscv;mips;sparc;m68k;ppc;s390x;tricore" CACHE STRING "Enabled unicorn architectures")
+set(UNICORN_ARCH "x86;arm;aarch64;riscv;mips;sparc;m68k;ppc;s390x;tricore;avr" CACHE STRING "Enabled unicorn architectures")
 option(UNICORN_TRACER "Trace unicorn execution" OFF)
 
 foreach(ARCH_LOOP ${UNICORN_ARCH})
@@ -254,6 +254,11 @@ else()
                 set(UNICORN_TARGET_ARCH "tricore")
                 break()
             endif()
+            string(FIND ${UC_COMPILER_MACRO} "__AVR__" UC_RET)
+            if (${UC_RET} GREATER_EQUAL "0")
+                set(UNICORN_TARGET_ARCH "avr")
+                break()
+            endif()
             message(FATAL_ERROR "Unknown host compiler: ${CMAKE_C_COMPILER}.")
         endwhile(TRUE)
     endif()
@@ -289,6 +294,9 @@ else()
     if (UNICORN_HAS_TRICORE)
         set (EXTRA_CFLAGS "${EXTRA_CFLAGS}-DUNICORN_HAS_TRICORE ")
     endif()
+    if (UNICORN_HAS_AVR)
+        set (EXTRA_CFLAGS "${EXTRA_CFLAGS}-DUNICORN_HAS_AVR ")
+    endif()
 
     set(EXTRA_CFLAGS "${EXTRA_CFLAGS}-fPIC")
     if(ANDROID_ABI)
@@ -340,6 +348,9 @@ else()
     if (UNICORN_HAS_TRICORE)
         set (TARGET_LIST "${TARGET_LIST}tricore-softmmu, ")
     endif()
+    if (UNICORN_HAS_AVR)
+        set (TARGET_LIST "${TARGET_LIST}avr-softmmu, ")
+    endif()
     set(TARGET_LIST "${TARGET_LIST} ")
 
     # GEN config-host.mak & target directories
@@ -437,6 +448,12 @@ else()
             OUTPUT_FILE ${CMAKE_BINARY_DIR}/tricore-softmmu/config-target.h
         )
     endif()
+    if (UNICORN_HAS_AVR)
+        execute_process(COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/qemu/scripts/create_config
+            INPUT_FILE ${CMAKE_BINARY_DIR}/avr-softmmu/config-target.mak
+            OUTPUT_FILE ${CMAKE_BINARY_DIR}/avr-softmmu/config-target.h
+        )
+    endif()
     add_compile_options(
         ${UNICORN_CFLAGS}
         -I${CMAKE_CURRENT_SOURCE_DIR}/qemu/tcg/${UNICORN_TARGET_ARCH}
@@ -1135,6 +1152,34 @@ endif()
 endif()
 
 
+if (UNICORN_HAS_AVR)
+add_library(avr-softmmu STATIC
+    ${UNICORN_ARCH_COMMON}
+
+    qemu/target/avr/cpu.c
+    qemu/target/avr/helper.c
+    qemu/target/avr/translate.c
+    qemu/target/avr/unicorn.c
+)
+
+if(MSVC)
+    target_compile_options(avr-softmmu PRIVATE
+        -DNEED_CPU_H
+        /FIavr.h
+        /I${CMAKE_CURRENT_SOURCE_DIR}/msvc/avr-softmmu
+        /I${CMAKE_CURRENT_SOURCE_DIR}/qemu/target/avr
+    )
+else()
+    target_compile_options(avr-softmmu PRIVATE
+        -DNEED_CPU_H
+        -include avr.h
+        -I${CMAKE_BINARY_DIR}/avr-softmmu
+        -I${CMAKE_CURRENT_SOURCE_DIR}/qemu/target/avr
+    )
+endif()
+endif()
+
+
 set(UNICORN_SRCS
     uc.c
 
@@ -1309,6 +1354,11 @@ if (UNICORN_HAS_TRICORE)
     target_link_libraries(tricore-softmmu unicorn-common)
     set(UNICORN_TEST_FILE ${UNICORN_TEST_FILE} test_tricore)
 endif()
+if (UNICORN_HAS_AVR)
+    set(UNICORN_COMPILE_OPTIONS ${UNICORN_COMPILE_OPTIONS} -DUNICORN_HAS_AVR)
+    set(UNICORN_LINK_LIBRARIES ${UNICORN_LINK_LIBRARIES} avr-softmmu)
+    target_link_libraries(avr-softmmu unicorn-common)
+endif()
 
 # Extra tests
 set(UNICORN_TEST_FILE ${UNICORN_TEST_FILE} test_mem)

include/uc_priv.h

@@ -35,6 +35,7 @@
     (UC_MODE_RISCV32 | UC_MODE_RISCV64 | UC_MODE_LITTLE_ENDIAN)
 #define UC_MODE_S390X_MASK (UC_MODE_BIG_ENDIAN)
 #define UC_MODE_TRICORE_MASK (UC_MODE_LITTLE_ENDIAN)
+#define UC_MODE_AVR_MASK (UC_MODE_LITTLE_ENDIAN)
 
 #define ARR_SIZE(a) (sizeof(a) / sizeof(a[0]))
 

include/unicorn/avr.h

@@ -0,0 +1,90 @@
+/* This file is released under LGPL2.
+   See COPYING.LGPL2 in root directory for more details
+*/
+
+/*
+   Created for Unicorn Engine by Glenn Baker <[email protected]>, 2024
+*/
+
+#ifndef UNICORN_AVR_H
+#define UNICORN_AVR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4201)
+#endif
+
+//> AVR CPU
+typedef enum uc_cpu_avr {
+    UC_CPU_AVR_AVR5 = 5,
+    UC_CPU_AVR_AVR51 = 51,
+    UC_CPU_AVR_AVR6 = 6,
+} uc_cpu_avr;
+
+//> AVR registers
+typedef enum uc_avr_reg {
+    UC_AVR_REG_INVALID = 0,
+
+    // General purpose registers (GPR)
+    UC_AVR_REG_R0 = 1,
+    UC_AVR_REG_R1,
+    UC_AVR_REG_R2,
+    UC_AVR_REG_R3,
+    UC_AVR_REG_R4,
+    UC_AVR_REG_R5,
+    UC_AVR_REG_R6,
+    UC_AVR_REG_R7,
+    UC_AVR_REG_R8,
+    UC_AVR_REG_R9,
+    UC_AVR_REG_R10,
+    UC_AVR_REG_R11,
+    UC_AVR_REG_R12,
+    UC_AVR_REG_R13,
+    UC_AVR_REG_R14,
+    UC_AVR_REG_R15,
+    UC_AVR_REG_R16,
+    UC_AVR_REG_R17,
+    UC_AVR_REG_R18,
+    UC_AVR_REG_R19,
+    UC_AVR_REG_R20,
+    UC_AVR_REG_R21,
+    UC_AVR_REG_R22,
+    UC_AVR_REG_R23,
+    UC_AVR_REG_R24,
+    UC_AVR_REG_R25,
+    UC_AVR_REG_R26,
+    UC_AVR_REG_R27,
+    UC_AVR_REG_R28,
+    UC_AVR_REG_R29,
+    UC_AVR_REG_R30,
+    UC_AVR_REG_R31,
+
+    UC_AVR_REG_PC,
+    UC_AVR_REG_SP,
+
+    UC_AVR_REG_RAMPD = UC_AVR_REG_PC + 16 + 8,
+    UC_AVR_REG_RAMPX,
+    UC_AVR_REG_RAMPY,
+    UC_AVR_REG_RAMPZ,
+    UC_AVR_REG_EIND,
+    UC_AVR_REG_SPL,
+    UC_AVR_REG_SPH,
+    UC_AVR_REG_SREG,
+
+    //> Alias registers
+    UC_AVR_REG_Xhi = UC_AVR_REG_R27,
+    UC_AVR_REG_Xlo = UC_AVR_REG_R26,
+    UC_AVR_REG_Yhi = UC_AVR_REG_R29,
+    UC_AVR_REG_Ylo = UC_AVR_REG_R28,
+    UC_AVR_REG_Zhi = UC_AVR_REG_R31,
+    UC_AVR_REG_Zlo = UC_AVR_REG_R30,
+} uc_avr_reg;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UNICORN_AVR_H */

include/unicorn/unicorn.h

@@ -36,6 +36,7 @@ typedef size_t uc_hook;
 #include "riscv.h"
 #include "s390x.h"
 #include "tricore.h"
+#include "avr.h"
 
 #ifdef __GNUC__
 #define DEFAULT_VISIBILITY __attribute__((visibility("default")))
@@ -106,6 +107,7 @@ typedef enum uc_arch {
     UC_ARCH_RISCV,   // RISCV architecture
     UC_ARCH_S390X,   // S390X architecture
     UC_ARCH_TRICORE, // TriCore architecture
+    UC_ARCH_AVR,     // AVR architecture
     UC_ARCH_MAX,
 } uc_arch;
 

qemu/configure

@@ -491,6 +491,8 @@ elif check_define __aarch64__ ; then
   cpu="aarch64"
 elif check_define __tricore__ ; then
   cpu="tricore"
+elif check_define __AVR__ ; then
+  cpu="avr"
 else
   cpu=$(uname -m)
 fi
@@ -534,6 +536,10 @@ case "$cpu" in
     cpu="tricore"
     supported_cpu="yes"
   ;;
+  avr)
+    cpu="avr"
+    supported_cpu="yes"
+  ;;
   *)
     # This will result in either an error or falling back to TCI later
     ARCH=unknown
@@ -859,7 +865,7 @@ default_target_list="aarch64-softmmu \
     arm-softmmu m68k-softmmu mips64el-softmmu mips64-softmmu mipsel-softmmu \
     mips-softmmu ppc64-softmmu ppc-softmmu sparc64-softmmu sparc-softmmu \
     x86_64-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu \
-    tricore-softmmu"
+    tricore-softmmu avr-softmmu"
 
 if test x"$show_help" = x"yes" ; then
 cat << EOF
@@ -2789,6 +2795,10 @@ case "$target_name" in
     TARGET_ARCH=tricore
     TARGET_BASE_ARCH=tricore
   ;;
+  avr)
+    TARGET_ARCH=avr
+    TARGET_BASE_ARCH=avr
+  ;;
   unicore32)
   ;;
   xtensa|xtensaeb)