Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Debugger: Update to latest armips.

Browse source 
Reduces warning noise now that it's included in the build.
This commit is contained in:
Unknown W. Brackets 2018-06-17 10:50:11 -07:00
parent c7baed26db
commit 4a92db4cd6
5 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/jni/Android.mk
View file

@ -421,7 +421,8 @@ LIBARMIPS_FILES := \
$(SRC)/ext/armips/Archs/ARM/Arm.cpp \
$(SRC)/ext/armips/Archs/ARM/ArmOpcodes.cpp \
$(SRC)/ext/armips/Archs/ARM/ArmParser.cpp \
$(SRC)/ext/armips/Archs/ARM/ArmRelocator.cpp \
$(SRC)/ext/armips/Archs/ARM/ArmElfRelocator.cpp \
$(SRC)/ext/armips/Archs/ARM/ArmExpressionFunctions.cpp \
$(SRC)/ext/armips/Archs/ARM/CArmInstruction.cpp \
$(SRC)/ext/armips/Archs/ARM/CThumbInstruction.cpp \
$(SRC)/ext/armips/Archs/ARM/Pool.cpp \
@ -429,6 +430,8 @@ LIBARMIPS_FILES := \
$(SRC)/ext/armips/Archs/MIPS/CMipsInstruction.cpp \
$(SRC)/ext/armips/Archs/MIPS/Mips.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsElfFile.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsElfRelocator.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsExpressionFunctions.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsMacros.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsOpcodes.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsParser.cpp \

2
ext/armips

@ -1 +1 @@
Subproject commit 8b4cadaf62d7de42d374056fc6aafc555f2bc7dc
Subproject commit 3a55cf3600d6f328ae0897699ac06818af2905a4

10
ext/cmake/armips/CMakeLists.txt
View file

@ -78,8 +78,10 @@ add_library(armips
${ARMIPS_PATH}/Archs/ARM/ArmOpcodes.h
${ARMIPS_PATH}/Archs/ARM/ArmParser.cpp
${ARMIPS_PATH}/Archs/ARM/ArmParser.h
${ARMIPS_PATH}/Archs/ARM/ArmRelocator.cpp
${ARMIPS_PATH}/Archs/ARM/ArmRelocator.h
${ARMIPS_PATH}/Archs/ARM/ArmElfRelocator.cpp
${ARMIPS_PATH}/Archs/ARM/ArmElfRelocator.h
${ARMIPS_PATH}/Archs/ARM/ArmExpressionFunctions.cpp
${ARMIPS_PATH}/Archs/ARM/ArmExpressionFunctions.h
${ARMIPS_PATH}/Archs/ARM/CArmInstruction.cpp
${ARMIPS_PATH}/Archs/ARM/CArmInstruction.h
${ARMIPS_PATH}/Archs/ARM/CThumbInstruction.cpp
@ -95,6 +97,10 @@ add_library(armips
${ARMIPS_PATH}/Archs/MIPS/Mips.h
${ARMIPS_PATH}/Archs/MIPS/MipsElfFile.cpp
${ARMIPS_PATH}/Archs/MIPS/MipsElfFile.h
${ARMIPS_PATH}/Archs/MIPS/MipsElfRelocator.cpp
${ARMIPS_PATH}/Archs/MIPS/MipsElfRelocator.h
${ARMIPS_PATH}/Archs/MIPS/MipsExpressionFunctions.cpp
${ARMIPS_PATH}/Archs/MIPS/MipsExpressionFunctions.h
${ARMIPS_PATH}/Archs/MIPS/MipsMacros.cpp
${ARMIPS_PATH}/Archs/MIPS/MipsMacros.h
${ARMIPS_PATH}/Archs/MIPS/MipsOpcodes.cpp

10
ext/libarmips.vcxproj
View file

@ -234,9 +234,10 @@
<ItemGroup>
<ClCompile Include="armips\Archs\Architecture.cpp" />
<ClCompile Include="armips\Archs\ARM\Arm.cpp" />
<ClCompile Include="armips\Archs\ARM\ArmElfRelocator.cpp" />
<ClCompile Include="armips\Archs\ARM\ArmExpressionFunctions.cpp" />
<ClCompile Include="armips\Archs\ARM\ArmOpcodes.cpp" />
<ClCompile Include="armips\Archs\ARM\ArmParser.cpp" />
<ClCompile Include="armips\Archs\ARM\ArmRelocator.cpp" />
<ClCompile Include="armips\Archs\ARM\CArmInstruction.cpp" />
<ClCompile Include="armips\Archs\ARM\CThumbInstruction.cpp" />
<ClCompile Include="armips\Archs\ARM\Pool.cpp" />
@ -244,6 +245,8 @@
<ClCompile Include="armips\Archs\MIPS\CMipsInstruction.cpp" />
<ClCompile Include="armips\Archs\MIPS\Mips.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsElfFile.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsElfRelocator.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsExpressionFunctions.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsMacros.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsOpcodes.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsParser.cpp" />
@ -287,9 +290,10 @@
<ItemGroup>
<ClInclude Include="armips\Archs\Architecture.h" />
<ClInclude Include="armips\Archs\ARM\Arm.h" />
<ClInclude Include="armips\Archs\ARM\ArmElfRelocator.h" />
<ClInclude Include="armips\Archs\ARM\ArmExpressionFunctions.h" />
<ClInclude Include="armips\Archs\ARM\ArmOpcodes.h" />
<ClInclude Include="armips\Archs\ARM\ArmParser.h" />
<ClInclude Include="armips\Archs\ARM\ArmRelocator.h" />
<ClInclude Include="armips\Archs\ARM\CArmInstruction.h" />
<ClInclude Include="armips\Archs\ARM\CThumbInstruction.h" />
<ClInclude Include="armips\Archs\ARM\Pool.h" />
@ -297,6 +301,8 @@
<ClInclude Include="armips\Archs\MIPS\CMipsInstruction.h" />
<ClInclude Include="armips\Archs\MIPS\Mips.h" />
<ClInclude Include="armips\Archs\MIPS\MipsElfFile.h" />
<ClInclude Include="armips\Archs\MIPS\MipsElfRelocator.h" />
<ClInclude Include="armips\Archs\MIPS\MipsExpressionFunctions.h" />
<ClInclude Include="armips\Archs\MIPS\MipsMacros.h" />
<ClInclude Include="armips\Archs\MIPS\MipsOpcodes.h" />
<ClInclude Include="armips\Archs\MIPS\MipsParser.h" />

30
ext/libarmips.vcxproj.filters
View file

@ -42,9 +42,6 @@
<ClCompile Include="armips\Archs\ARM\ArmOpcodes.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\ARM\ArmRelocator.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\ARM\CArmInstruction.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
@ -163,6 +160,18 @@
<ClCompile Include="armips\Core\ExpressionFunctions.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\ARM\ArmElfRelocator.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\MIPS\MipsElfRelocator.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\ARM\ArmExpressionFunctions.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\MIPS\MipsExpressionFunctions.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="armips\Archs\Architecture.h">
@ -174,9 +183,6 @@
<ClInclude Include="armips\Archs\ARM\ArmOpcodes.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\ARM\ArmRelocator.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\ARM\CArmInstruction.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
@ -301,5 +307,17 @@
<ClInclude Include="armips\Core\ExpressionFunctions.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\ARM\ArmElfRelocator.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\MIPS\MipsElfRelocator.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\ARM\ArmExpressionFunctions.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\MIPS\MipsExpressionFunctions.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
</ItemGroup>
</Project>