Fixed some warnings

asmjit · Feb 19, 2017 · 1e47f79 · 1e47f79
1 parent 9ceb071
commit 1e47f79
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,17 +6,36 @@ if(NOT CMAKE_PROJECT_NAME OR "${CMAKE_PROJECT_NAME}" STREQUAL "asmjit")
   project(asmjit C CXX)
 endif()
 
+if (NOT DEFINED ASMJIT_EMBED)
+  set(ASMJIT_EMBED FALSE)
+endif()
+
+if (NOT DEFINED ASMJIT_STATIC)
+  set(ASMJIT_STATIC ${ASMJIT_EMBED})
+endif()
+
+if (NOT DEFINED ASMJIT_BUILD_ARM)
+  set(ASMJIT_BUILD_ARM FALSE)
+endif()
+
+if (NOT DEFINED ASMJIT_BUILD_X86)
+  set(ASMJIT_BUILD_X86 FALSE)
+endif()
+
+if (NOT DEFINED ASMJIT_BUILD_TEST)
+  set(ASMJIT_BUILD_TEST FALSE)
+endif()
+
 # =============================================================================
 # [AsmJit - Configuration]
 # =============================================================================
 
 set(ASMJIT_DIR        "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location of 'asmjit'")
-
-set(ASMJIT_EMBED      FALSE CACHE BOOLEAN "Embed 'asmjit' library (no targets)")
-set(ASMJIT_STATIC     FALSE CACHE BOOLEAN "Build 'asmjit' library as static")
-set(ASMJIT_BUILD_ARM  FALSE CACHE BOOLEAN "Build ARM32/ARM64 backends")
-set(ASMJIT_BUILD_X86  FALSE CACHE BOOLEAN "Build X86/X64 backends")
-set(ASMJIT_BUILD_TEST FALSE CACHE BOOLEAN "Build 'asmjit_test' applications")
+set(ASMJIT_EMBED      ${ASMJIT_EMBED}             CACHE BOOLEAN "Embed 'asmjit' library (no targets)")
+set(ASMJIT_STATIC     ${ASMJIT_STATIC}            CACHE BOOLEAN "Build 'asmjit' library as static")
+set(ASMJIT_BUILD_ARM  ${ASMJIT_BUILD_ARM}         CACHE BOOLEAN "Build ARM32/ARM64 backends")
+set(ASMJIT_BUILD_X86  ${ASMJIT_BUILD_X86}         CACHE BOOLEAN "Build X86/X64 backends")
+set(ASMJIT_BUILD_TEST ${ASMJIT_BUILD_TEST}        CACHE BOOLEAN "Build 'asmjit_test' applications")
 
 # =============================================================================
 # [AsmJit - Project]

diff --git a/src/asmjit/base/func.cpp b/src/asmjit/base/func.cpp
@@ -64,7 +64,7 @@ ASMJIT_FAVOR_SIZE Error FuncDetail::init(const FuncSignature& sign) {
   uint32_t deabstractDelta = TypeId::deabstractDeltaOfSize(gpSize);
 
   const uint8_t* args = sign.getArgs();
-  for (uint32_t i = 0; i < static_cast<int32_t>(argCount); i++) {
+  for (uint32_t i = 0; i < argCount; i++) {
     Value& arg = _args[i];
     arg.initTypeId(TypeId::deabstract(args[i], deabstractDelta));
   }

diff --git a/src/asmjit/base/regalloc.cpp b/src/asmjit/base/regalloc.cpp
@@ -248,9 +248,6 @@ Error RAPass::resolveCellOffsets() {
   RACell* varCell = _memVarCells;
   RACell* stackCell = _memStackCells;
 
-  uint32_t stackAlignment = 0;
-  if (stackCell) stackAlignment = stackCell->alignment;
-
   uint32_t pos64 = 0;
   uint32_t pos32 = pos64 + _mem64ByteVarsUsed * 64;
   uint32_t pos16 = pos32 + _mem32ByteVarsUsed * 32;

diff --git a/src/asmjit/x86/x86logging.cpp b/src/asmjit/x86/x86logging.cpp
@@ -584,8 +584,6 @@ ASMJIT_FAVOR_SIZE Error X86Logging::formatInstruction(
   const Operand_& opExtra,
   const Operand_* opArray, uint32_t opCount) noexcept {
 
-  bool opExtraDone = false;
-
   // Format instruction options and instruction mnemonic.
   if (instId < X86Inst::_kIdCount) {
     const X86Inst& instInfo = X86Inst::getInst(instId);
@@ -608,7 +606,6 @@ ASMJIT_FAVOR_SIZE Error X86Logging::formatInstruction(
         ASMJIT_PROPAGATE(sb.appendChar('{'));
         ASMJIT_PROPAGATE(formatOperand(sb, logOptions, emitter, archType, opExtra));
         ASMJIT_PROPAGATE(sb.appendString("} "));
-        opExtraDone = true;
       }
     }
 
@@ -658,10 +655,9 @@ ASMJIT_FAVOR_SIZE Error X86Logging::formatInstruction(
 
     // Support AVX-512 {k}{z}.
     if (i == 0) {
-      const uint32_t kExtMsk =
-        X86Inst::kOptionOpExtra |
-        X86Inst::kOptionRep     |
-        X86Inst::kOptionRepnz   ;
+      const uint32_t kExtMsk = X86Inst::kOptionOpExtra |
+                               X86Inst::kOptionRep     |
+                               X86Inst::kOptionRepnz   ;
 
       if ((options & kExtMsk) == X86Inst::kOptionOpExtra) {
         ASMJIT_PROPAGATE(sb.appendString(" {"));