MSVC tooling updates (capstone-engine#1651)

* Update solution, remove non-existent test_basic * Add property sheet to set platform toolset correctly * use property sheet in all projects * cast explicitly to avoid warnings * make property sheet optional * Conflcting options "Edit and continue" and "optref" caused warnings Co-authored-by: Hauke Mönck <>
ngzhian · Mar 7, 2021 · c59d62f · c59d62f
1 parent 63accbd
commit c59d62f
Show file tree

Hide file tree

Showing 21 changed files with 3,316 additions and 3,270 deletions.
diff --git a/arch/Sparc/SparcInstPrinter.c b/arch/Sparc/SparcInstPrinter.c
@@ -218,7 +218,7 @@ static void printOperand(MCInst *MI, int opNum, SStream *O)
 			case SP_BPFCCA:
 			case SP_BPFCCANT:
 			case SP_BPFCCNT:
-				Imm = SignExtend32(Imm, 19);
+				Imm = SignExtend32((uint32_t)Imm, 19);
 				Imm = MI->address + Imm * 4;
 				break;
 
@@ -229,7 +229,7 @@ static void printOperand(MCInst *MI, int opNum, SStream *O)
 			case SP_BCONDA:
 			case SP_FBCOND:
 			case SP_FBCONDA:
-				Imm = SignExtend32(Imm, 22);
+				Imm = SignExtend32((uint32_t)Imm, 22);
 				Imm = MI->address + Imm * 4;
 				break;
 
@@ -258,16 +258,16 @@ static void printOperand(MCInst *MI, int opNum, SStream *O)
 			case SP_BPZapt:
 			case SP_BPZnapn:
 			case SP_BPZnapt:
-				Imm = SignExtend32(Imm, 16);
+				Imm = SignExtend32((uint32_t)Imm, 16);
 				Imm = MI->address + Imm * 4;
 				break;
 		}
-		
+
 		printInt64(O, Imm);
 
 		if (MI->csh->detail) {
 			if (MI->csh->doing_mem) {
-				MI->flat_insn->detail->sparc.operands[MI->flat_insn->detail->sparc.op_count].mem.disp = Imm;
+				MI->flat_insn->detail->sparc.operands[MI->flat_insn->detail->sparc.op_count].mem.disp = (uint32_t)Imm;
 			} else {
 				MI->flat_insn->detail->sparc.operands[MI->flat_insn->detail->sparc.op_count].type = SPARC_OP_IMM;
 				MI->flat_insn->detail->sparc.operands[MI->flat_insn->detail->sparc.op_count].imm = Imm;

diff --git a/arch/SystemZ/SystemZInstPrinter.c b/arch/SystemZ/SystemZInstPrinter.c
@@ -386,16 +386,16 @@ static void printBDRAddrOperand(MCInst *MI, int OpNum, SStream *O)
 		SStream_concat(O, "%"PRIu64, Disp);
 
 	SStream_concat0(O, "(");
-	SStream_concat(O, "%%%s", getRegisterName(Length));
+	SStream_concat(O, "%%%s", getRegisterName((unsigned int)Length));
 
 	if (Base)
 		SStream_concat(O, ", %%%s", getRegisterName(Base));
 	SStream_concat0(O, ")");
 
 	if (MI->csh->detail) {
 		MI->flat_insn->detail->sysz.operands[MI->flat_insn->detail->sysz.op_count].type = SYSZ_OP_MEM;
-		MI->flat_insn->detail->sysz.operands[MI->flat_insn->detail->sysz.op_count].mem.base = (uint8_t)SystemZ_map_register(Base);
-		MI->flat_insn->detail->sysz.operands[MI->flat_insn->detail->sysz.op_count].mem.length = (uint8_t)SystemZ_map_register(Length);
+		MI->flat_insn->detail->sysz.operands[MI->flat_insn->detail->sysz.op_count].mem.base = (uint8_t)SystemZ_map_register((unsigned int)Base);
+		MI->flat_insn->detail->sysz.operands[MI->flat_insn->detail->sysz.op_count].mem.length = (uint8_t)SystemZ_map_register((unsigned int)Length);
 		MI->flat_insn->detail->sysz.operands[MI->flat_insn->detail->sysz.op_count].mem.disp = (int64_t)Disp;
 		MI->flat_insn->detail->sysz.op_count++;
 	}

diff --git a/msvc/capstone.sln b/msvc/capstone.sln
diff --git a/msvc/capstone_dll/capstone_dll.vcxproj b/msvc/capstone_dll/capstone_dll.vcxproj
diff --git a/msvc/capstone_static/capstone_static.vcxproj b/msvc/capstone_static/capstone_static.vcxproj
diff --git a/msvc/capstone_static_winkernel/capstone_static_winkernel.vcxproj b/msvc/capstone_static_winkernel/capstone_static_winkernel.vcxproj
diff --git a/msvc/cstool/cstool.vcxproj b/msvc/cstool/cstool.vcxproj
diff --git a/msvc/test_arm/test_arm.vcxproj b/msvc/test_arm/test_arm.vcxproj
diff --git a/msvc/test_arm64/test_arm64.vcxproj b/msvc/test_arm64/test_arm64.vcxproj
diff --git a/msvc/test_customized_mnem/test_customized_mnem.vcxproj b/msvc/test_customized_mnem/test_customized_mnem.vcxproj
diff --git a/msvc/test_detail/test_detail.vcxproj b/msvc/test_detail/test_detail.vcxproj
diff --git a/msvc/test_iter/test_iter.vcxproj b/msvc/test_iter/test_iter.vcxproj
diff --git a/msvc/test_m68k/test_m68k.vcxproj b/msvc/test_m68k/test_m68k.vcxproj
diff --git a/msvc/test_mips/test_mips.vcxproj b/msvc/test_mips/test_mips.vcxproj
diff --git a/msvc/test_ppc/test_ppc.vcxproj b/msvc/test_ppc/test_ppc.vcxproj
diff --git a/msvc/test_skipdata/test_skipdata.vcxproj b/msvc/test_skipdata/test_skipdata.vcxproj
diff --git a/msvc/test_sparc/test_sparc.vcxproj b/msvc/test_sparc/test_sparc.vcxproj
diff --git a/msvc/test_systemz/test_systemz.vcxproj b/msvc/test_systemz/test_systemz.vcxproj
diff --git a/msvc/test_winkernel/test_winkernel.vcxproj b/msvc/test_winkernel/test_winkernel.vcxproj
diff --git a/msvc/test_x86/test_x86.vcxproj b/msvc/test_x86/test_x86.vcxproj
diff --git a/msvc/test_xcore/test_xcore.vcxproj b/msvc/test_xcore/test_xcore.vcxproj