From d42ab92e3bef788db53d04c6fed0d1145de0ec24 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Fri, 1 May 2015 19:16:16 +0000
Subject: [PATCH] First fixes to getting it to build
Former-commit-id: c625856fbe157319659be25bbf9037a357d1714b
---
include/base/SMPDataFlowAnalysis.h | 2 +-
src/base/SMPDataFlowAnalysis.cpp | 2 +-
tools/win7_vs_projects/STARS/STARS/STARS.vcxproj | 5 +----
tools/win7_vs_projects/STARS/STARS/STARS.vcxproj.filters | 3 ---
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/include/base/SMPDataFlowAnalysis.h b/include/base/SMPDataFlowAnalysis.h
index cdd60b73..b08bb4ea 100644
--- a/include/base/SMPDataFlowAnalysis.h
+++ b/include/base/SMPDataFlowAnalysis.h
@@ -175,7 +175,7 @@ STARSOpndTypePtr CloneIfSubwordReg(STARSOpndTypePtr CurrOp);
STARSOpndTypePtr CloneIfNecessary(STARSOpndTypePtr CurrOp, bool UseFP);
// Debug: print one operand from an instruction or DEF or USE list.
-void PrintDefUse(ulong feature, int OpNum);
+void PrintDefUse(unsigned long feature, int OpNum);
void PrintSIB(STARSOpndTypePtr Opnd);
void AnnotPrintSIB(STARSOpndTypePtr Opnd, bool HasOffset, FILE *OutFile);
void SPARKAnnotPrintSIB(STARSOpndTypePtr Opnd, bool HasOffset, FILE *OutFile, uint16_t SegReg, bool UseFP);
diff --git a/src/base/SMPDataFlowAnalysis.cpp b/src/base/SMPDataFlowAnalysis.cpp
index 43760e94..391b4295 100644
--- a/src/base/SMPDataFlowAnalysis.cpp
+++ b/src/base/SMPDataFlowAnalysis.cpp
@@ -676,7 +676,7 @@ STARSOpndTypePtr CloneIfNecessary(STARSOpndTypePtr CurrOp, bool UseFP) {
} // end of CloneIfNecessary()
// DEBUG Print DEF and/or USE for an operand.
-void PrintDefUse(ulong feature, int OpNum) {
+void PrintDefUse(unsigned long feature, int OpNum) {
// CF_ macros number the operands from 1 to 6, while OpNum
// is a 0 to 5 index into the insn_t.Operands[] array.
// OpNum == -1 is a signal that this is a DEF or USE or VarKillSet etc.
diff --git a/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj b/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj
index e6a49cb6..55bcd139 100755
--- a/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj
+++ b/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj
@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..\..\idaproCur_sdk\include;$(SolutionDir)\..\..\..\include;$(SolutionDir)\..\..\..\include\abstract;$(SolutionDir)\..\..\..\include\ida</IncludePath>
+ <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..\..\idaproCur_sdk\include;$(SolutionDir)\..\..\..\include;$(SolutionDir)\..\..\..\include\interfaces;$(SolutionDir)\..\..\..\include\base</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@@ -78,9 +78,6 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
- <ItemGroup>
- <Text Include="ReadMe.txt" />
- </ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\base\ProfilerInformation.cpp" />
<ClCompile Include="..\..\..\..\src\base\SMPBasicBlock.cpp" />
diff --git a/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj.filters b/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj.filters
index d89318b7..f4d4ca97 100755
--- a/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj.filters
+++ b/tools/win7_vs_projects/STARS/STARS/STARS.vcxproj.filters
@@ -14,9 +14,6 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
- <ItemGroup>
- <Text Include="ReadMe.txt" />
- </ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\base\ProfilerInformation.cpp">
<Filter>Source Files</Filter>
--
GitLab