Merge pull request #2 from Klamath233/master

Update to Xcode 10, Hopper SDK v4.5.11 and eliminate compiler warnings.
makigumo · Sep 23, 2019 · 5db4393 · 5db4393
2 parents 1d15477 + cbdf177
commit 5db4393
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 Build
 DerivedData
-
+.DS_STORE
+*xcworkspace*
diff --git a/HopperSDK b/HopperSDK
diff --git a/RISCV.xcodeproj/project.pbxproj b/RISCV.xcodeproj/project.pbxproj
@@ -125,7 +125,7 @@
 		376CF6911DF38E7000020F20 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Makigumo;
 				TargetAttributes = {
 					376CF6991DF38E7000020F20 = {
@@ -140,10 +140,11 @@
 			};
 			buildConfigurationList = 376CF6941DF38E7000020F20 /* Build configuration list for PBXProject "RISCV" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 376CF6901DF38E7000020F20;
 			productRefGroup = 376CF69B1DF38E7000020F20 /* Products */;
@@ -216,20 +217,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -263,20 +273,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

diff --git a/RISCV.xcodeproj/xcshareddata/xcschemes/RISCV.xcscheme b/RISCV.xcodeproj/xcshareddata/xcschemes/RISCV.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RISCV.xcodeproj/xcshareddata/xcschemes/RISCVTests.xcscheme b/RISCV.xcodeproj/xcshareddata/xcschemes/RISCVTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RISCV/RISCVCPU.h b/RISCV/RISCVCPU.h
@@ -116,7 +116,7 @@ static inline DisasmOperandType getCsrMask() {
     return REG_MASK(RegClass_RISCV_CSR, 0);
 }
 
-static NSString *getCsrName(uint64_t csr) {
+__unused static NSString *getCsrName(uint64_t csr) {
     switch (csr) {
         case 0x000: return @"ustatus";
         case 0x001: return @"flags";
@@ -349,7 +349,7 @@ static NSString *getCsrName(uint64_t csr) {
         case 0xf14: return @"mhartid";
 
         default:
-            return [NSString stringWithFormat:@"csr_0x%x", csr];
+            return [NSString stringWithFormat:@"csr_0x%llx", csr];
     }
 }
 

diff --git a/RISCV/RISCVCPU.m b/RISCV/RISCVCPU.m
@@ -35,7 +35,7 @@ + (int)sdkVersion {
     return HOPPER_CURRENT_SDK_VERSION;
 }
 
-- (HopperUUID *)pluginUUID {
+- (NSObject<HPHopperUUID> *)pluginUUID {
     return [_services UUIDWithString:@"BB67F523-0244-4FBD-8842-ADFE624FB826"];
 }
 
@@ -251,4 +251,13 @@ - (BOOL)canDecompileProceduresForCPUFamily:(NSString *)family andSubFamily:(NSSt
     return NO;
 }
 
+- (int)integerWidthInBitsForCPUFamily:(nullable NSString *)family andSubFamily:(nullable NSString *)subFamily {
+    if ([family isEqualToString:@"RISCV"]) {
+        if ([subFamily isEqualToString:@"riscv32"]) return 32;
+        if ([subFamily isEqualToString:@"riscv64"]) return 64;
+    }
+    return 0;
+}
+
+
 @end
diff --git a/RISCV/RISCVCtx.h b/RISCV/RISCVCtx.h
@@ -66,7 +66,7 @@ extern NSString *getCsrName(uint64_t csr);
 #define DISASM_OPERAND_ROUNDING_MODE    0x0001000000000000llu
 #define DISASM_OPERAND_FENCE    0x0002000000000000llu
 
-typedef enum INSN_TYPE {
+enum INSN_TYPE {
     ITYPE,
     RTYPE,
     UTYPE,
@@ -75,15 +75,15 @@ typedef enum INSN_TYPE {
     UJTYPE
 };
 
-typedef struct itype_insn {
+struct itype_insn {
     uint8_t opcode; /* bits 6..0 */
     uint8_t reg_dest; /* bits 11..7 */
     uint8_t funct3; /* bits 14..12 */
     uint8_t reg_src1; /* bits 19..15 */
     uint16_t imm; /* bits 31..20 */
 };
 
-typedef struct rtype_insn {
+struct rtype_insn {
     uint8_t opcode; /* bits 6..0 */
     uint8_t reg_dest; /* bits 11..7 */
     uint8_t funct3; /* bits 14..12 */
@@ -92,21 +92,21 @@ typedef struct rtype_insn {
     uint8_t funct7; /* bits 31..25 */
 };
 
-typedef struct stype_insn {
+struct stype_insn {
     uint8_t opcode; /* bits 6..0 */
     uint8_t funct3; /* bits 14..12 */
     uint8_t reg_src1; /* bits 19..15 */
     uint8_t reg_src2; /* bits 31..20 */
     uint16_t imm; /* bits 31..25 11..7 */
 };
 
-typedef struct utype_insn {
+struct utype_insn {
     uint8_t opcode; /* bits 6..0 */
     uint8_t reg_dest; /* bits 11..7 */
     uint16_t imm; /* bits 31..12 */
 };
 
-typedef struct insn {
+struct insn {
     uint8_t opcode;
     enum INSN_TYPE type;
     union {
@@ -117,14 +117,14 @@ typedef struct insn {
     };
 };
 
-typedef enum FpuFormat {
+enum FpuFormat {
     FPU_FMT_SINGLE = 0b00,
     FPU_FMT_DOUBLE = 0b01,
     FPU_FMT_INVALID = 0b10,
     FPU_FMT_QUAD = 0b11,
 };
 
-typedef enum FpuRoundingMode {
+enum FpuRoundingMode {
     FPU_RM_RNE = 0b000,
     FPU_RM_RTZ = 0b001,
     FPU_RM_RDN = 0b010,
@@ -449,4 +449,4 @@ static inline NSString *getRoundingModeName(enum FpuRoundingMode rm) {
         default:
             return @"invalid/reserved";
     }
-}
+}
diff --git a/RISCV/RISCVCtx.m b/RISCV/RISCVCtx.m
@@ -1540,6 +1540,9 @@ - (int)disassembleSingleInstruction:(DisasmStruct *)disasm usingProcessorMode:(N
                 case FPU_FMT_QUAD:
                     populateFp_R4(disasm, insncode, "fmadd.q");
                     break;
+                case FPU_FMT_INVALID:
+                    /* Break to return DISASM_UNKNOWN_OPCODE */
+                    break;
             }
             break;
 
@@ -1554,6 +1557,9 @@ - (int)disassembleSingleInstruction:(DisasmStruct *)disasm usingProcessorMode:(N
                 case FPU_FMT_QUAD:
                     populateFp_R4(disasm, insncode, "fmsub.q");
                     break;
+                case FPU_FMT_INVALID:
+                    /* Break to return DISASM_UNKNOWN_OPCODE */
+                    break;
             }
             break;
 
@@ -1568,6 +1574,9 @@ - (int)disassembleSingleInstruction:(DisasmStruct *)disasm usingProcessorMode:(N
                 case FPU_FMT_QUAD:
                     populateFp_R4(disasm, insncode, "fnmadd.q");
                     break;
+                case FPU_FMT_INVALID:
+                    /* Break to return DISASM_UNKNOWN_OPCODE */
+                    break;
             }
             break;
 
@@ -1582,6 +1591,9 @@ - (int)disassembleSingleInstruction:(DisasmStruct *)disasm usingProcessorMode:(N
                 case FPU_FMT_QUAD:
                     populateFp_R4(disasm, insncode, "fnmsub.q");
                     break;
+                case FPU_FMT_INVALID:
+                    /* Break to return DISASM_UNKNOWN_OPCODE */
+                    break;
             }
             break;
 
@@ -1800,7 +1812,7 @@ static inline int regIndexFromType(uint64_t type) {
 - (void)buildAddress:(DisasmStruct *)disasm
             withInsn:(const struct insn *)in {
     // fetch previous instruction
-    uint32_t prev = [_file readUInt32AtVirtualAddress:disasm->virtualAddr - 4];
+    __unused uint32_t prev = [_file readUInt32AtVirtualAddress:disasm->virtualAddr - 4];
     struct insn *prevIn = 0;//getInsn(prev);
     if (prevIn && prevIn->opcode == 0b001111 /* LUI */ &&
             prevIn->itype.reg_dest == in->itype.reg_src1) {