add ARM support for libtcg

Signed-off-by: chaojixx <wpz5080@psu.edu>

Author: weizhou-chaojixx

CMakeLists.txt

@@ -75,10 +75,15 @@ message(STATUS "WITH_GUEST: ${WITH_GUEST}")
 if(WITH_GUEST MATCHES "i386")
     set(TARGET_LONG_BITS "32")
     set(TARGET_INSN_START_EXTRA_WORDS "1")
+    set(TARGET_I386 "1")
 elseif(WITH_GUEST MATCHES "x86_64")
     set(TARGET_LONG_BITS "64")
     set(TARGET_INSN_START_EXTRA_WORDS "1")
     set(TARGET_X86_64 "1")
+elseif(WITH_GUEST MATCHES "arm")
+    set(TARGET_LONG_BITS "32")
+    set(TARGET_INSN_START_EXTRA_WORDS "2")
+    set(TARGET_ARM "1")
 else()
     message(FATAL_ERROR "Incorrect target ${WITH_GUEST}")
 endif()

include/tcg/helper.h

@@ -16,17 +16,17 @@ DEF_HELPER_3(sar_cc, i32, env, i32, i32)
 DEF_HELPER_3(ror_cc, i32, env, i32, i32)
 
 DEF_HELPER_1(clz, i32, i32)
-DEF_HELPER_1(sxtb16, i32, i32)
-DEF_HELPER_1(uxtb16, i32, i32)
+DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32)
+DEF_HELPER_FLAGS_1(uxtb16, TCG_CALL_NO_RWG_SE, i32, i32)
 
 DEF_HELPER_2(add_setq, i32, i32, i32)
 DEF_HELPER_2(add_saturate, i32, i32, i32)
 DEF_HELPER_2(sub_saturate, i32, i32, i32)
 DEF_HELPER_2(add_usaturate, i32, i32, i32)
 DEF_HELPER_2(sub_usaturate, i32, i32, i32)
 DEF_HELPER_1(double_saturate, i32, s32)
-DEF_HELPER_2(sdiv, s32, s32, s32)
-DEF_HELPER_2(udiv, i32, i32, i32)
+DEF_HELPER_FLAGS_2(sdiv, TCG_CALL_NO_RWG_SE, s32, s32, s32)
+DEF_HELPER_FLAGS_2(udiv, TCG_CALL_NO_RWG_SE, i32, i32, i32)
 DEF_HELPER_1(rbit, i32, i32)
 DEF_HELPER_1(abs, i32, i32)
 

include/tcg/tcg-llvm.h

@@ -140,8 +140,9 @@ class TCGLLVMTranslator {
     // in order to simplify instruction insertion.
     llvm::Instruction *m_noop;
     llvm::Value *m_eip;
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
     llvm::Value *m_ccop;
-
+#endif
     static unsigned m_eip_last_gep_index;
 
     typedef llvm::DenseMap<std::pair<unsigned, unsigned>, llvm::Instruction *> GepMap;

include/tcg/tcg.h

@@ -44,7 +44,15 @@ extern "C" {
 
 #define QEMU_BUILD_BUG_ON(x)
 
+#if defined(TARGET_ARM)
+/* The ARM MMU allows 1k pages. */
+/* ??? Linux doesn't actually use these, and they're deprecated in recent
+   architecture revisions. Maybe a configure option to disable them. */
+#define TARGET_PAGE_BITS 10
+#else
 #define TARGET_PAGE_BITS 12
+#endif
+
 #define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)
 #define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1)
 
@@ -120,11 +128,17 @@ typedef struct TranslationBlock TranslationBlock;
 /* typedef struct ZMMReg ZMMReg;
 
 typedef union XMMReg XMMReg;*/
-
+#if defined(TARGET_ARM)
+#define CPUArchState struct CPUARMState
+#define CPUState struct CPUARMState
+struct CPUARMState;
+typedef struct CPUARMState CPUARMState;
+#else
 #define CPUArchState struct CPUX86State
 #define CPUState struct CPUX86State
 struct CPUX86State;
 typedef struct CPUX86State CPUX86State;
+#endif
 
 extern FILE *logfile;
 
@@ -849,9 +863,12 @@ struct TCGContext {
     uintptr_t env_ptr;
     unsigned env_offset_eip;
     unsigned env_sizeof_eip;
+#ifndef TARGET_ARM
     unsigned env_offset_ccop;
     unsigned env_sizeof_ccop;
     unsigned env_offset_df;
+#endif
+
     unsigned env_offset_tlb[3]; // Max 3 mem index
 
     unsigned tlbe_size;

src/CMakeLists.txt

@@ -41,7 +41,11 @@ endif (WITH_SYMBEX_MP)
 
 if (TARGET_X86_64)
     set (COMMON_FLAGS "${COMMON_FLAGS} -DTARGET_X86_64")
-endif (TARGET_X86_64)
+elseif (TARGET_I386)
+	set (COMMON_FLAGS "${COMMON_FLAGS} -DTARGET_I386")
+elseif (TARGET_ARM)
+	set (COMMON_FLAGS "${COMMON_FLAGS} -DTARGET_ARM")
+endif ()
 
 if (TARGET_LONG_BITS)
     set (COMMON_FLAGS "${COMMON_FLAGS} -DTARGET_LONG_BITS=${TARGET_LONG_BITS}")

src/tcg-llvm.cpp

@@ -68,8 +68,10 @@ typedef uint32_t target_ulong;
 typedef uint64_t target_ulong;
 #endif
 
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
 // XXX: hack
 #define CC_OP_DYNAMIC 0
+#endif
 
 extern "C" {
 // TODO: get rid of this global var
@@ -101,8 +103,9 @@ TCGLLVMTranslator::TCGLLVMTranslator(const std::string &bitcodeLibraryPath, std:
     m_cpuType = NULL;
     m_cpuState = NULL;
     m_eip = NULL;
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
     m_ccop = NULL;
-
+#endif
     initializeNativeCpuState();
     initializeHelpers();
 }
@@ -188,8 +191,13 @@ uint64_t TCGLLVMTranslator::toInteger(llvm::Value *v) const {
 #ifdef CONFIG_SYMBEX
 
 void TCGLLVMTranslator::initializeNativeCpuState() {
+#ifdef TARGET_ARM
+    m_cpuType = m_module->getTypeByName("struct.CPUARMState");
+    assert(m_cpuType && "Could not find CPUARMState in LLVM bitcode");
+#else
     m_cpuType = m_module->getTypeByName("struct.CPUX86State");
     assert(m_cpuType && "Could not find CPUX86State in LLVM bitcode");
+#endif
 }
 
 void TCGLLVMTranslator::initializeHelpers() {
@@ -426,8 +434,9 @@ void TCGLLVMTranslator::loadNativeCpuState(Function *f) {
     m_noop = m_builder.Insert(add);
 
     m_eip = generateCpuStatePtr(m_tcgContext->env_offset_eip, m_tcgContext->env_sizeof_eip);
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
     m_ccop = generateCpuStatePtr(m_tcgContext->env_offset_ccop, m_tcgContext->env_sizeof_ccop);
-
+#endif
     if (m_eip_last_gep_index == 0) {
         SmallVector<Value *, 3> gepElements;
         bool ok = getCpuFieldGepIndexes(m_tcgContext->env_offset_eip, sizeof(target_ulong), gepElements);
@@ -1167,23 +1176,25 @@ Function *TCGLLVMTranslator::generateCode(TCGContext *s, TranslationBlock *tb) {
             case INDEX_op_insn_start: {
                 assert(TARGET_INSN_START_WORDS == 2);
                 uint64_t curpc = op->args[0] - tb->cs_base;
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
                 uint64_t cc_op = op->args[1];
-
+#endif
                 Value *valueToStore = handleSymbolicPcAssignment(ConstantInt::get(wordType(), curpc));
 
                 TCGArg args[3];
                 args[0] = 0; // Unused
                 args[1] = temp_arg(&m_tcgContext->temps[0]);
                 args[2] = m_tcgContext->env_offset_eip;
                 generateQemuCpuStore(args, m_tcgContext->env_sizeof_eip * 8, valueToStore);
-
+#if defined(TARGET_I386) || defined(TARGET_X86_64)
                 if (cc_op != CC_OP_DYNAMIC) {
                     args[0] = 0; // Unused
                     args[1] = temp_arg(&m_tcgContext->temps[0]);
                     args[2] = m_tcgContext->env_offset_ccop;
                     valueToStore = ConstantInt::get(wordType(m_tcgContext->env_sizeof_ccop * 8), cc_op);
                     generateQemuCpuStore(args, m_tcgContext->env_sizeof_ccop * 8, valueToStore);
                 }
+#endif
             } break;
 #endif