Skip to content
Permalink
Browse files

Debugger: Update to latest armips.

Reduces warning noise now that it's included in the build.
  • Loading branch information...
unknownbrackets committed Jun 17, 2018
1 parent c7baed2 commit 4a92db4cd65dfe7ac87fe35cc4cfd9fb79d82d5b
Showing with 45 additions and 12 deletions.
  1. +4 −1 android/jni/Android.mk
  2. +1 −1 ext/armips
  3. +8 −2 ext/cmake/armips/CMakeLists.txt
  4. +8 −2 ext/libarmips.vcxproj
  5. +24 −6 ext/libarmips.vcxproj.filters
@@ -421,14 +421,17 @@ 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 \
$(SRC)/ext/armips/Archs/ARM/ThumbOpcodes.cpp \
$(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 \
Submodule armips updated 76 files
+9 −3 Archs/ARM/Arm.cpp
+2 −4 Archs/ARM/Arm.h
+13 −1 Archs/ARM/ArmElfRelocator.cpp
+6 −1 Archs/ARM/ArmElfRelocator.h
+26 −0 Archs/ARM/ArmExpressionFunctions.cpp
+3 −0 Archs/ARM/ArmExpressionFunctions.h
+1 −1 Archs/ARM/ArmOpcodes.cpp
+2 −2 Archs/ARM/ArmParser.cpp
+1 −1 Archs/ARM/ThumbOpcodes.cpp
+2 −2 Archs/Architecture.cpp
+10 −6 Archs/Architecture.h
+3 −0 Archs/MIPS/CMipsInstruction.cpp
+4 −0 Archs/MIPS/CMipsInstruction.h
+10 −104 Archs/MIPS/Mips.cpp
+2 −25 Archs/MIPS/Mips.h
+2 −2 Archs/MIPS/MipsElfFile.cpp
+101 −0 Archs/MIPS/MipsElfRelocator.cpp
+27 −0 Archs/MIPS/MipsElfRelocator.h
+30 −0 Archs/MIPS/MipsExpressionFunctions.cpp
+3 −0 Archs/MIPS/MipsExpressionFunctions.h
+1 −1 Archs/MIPS/MipsMacros.cpp
+29 −20 Archs/MIPS/MipsOpcodes.cpp
+13 −12 Archs/MIPS/MipsOpcodes.h
+80 −2 Archs/MIPS/MipsParser.cpp
+3 −0 Archs/MIPS/MipsParser.h
+2 −2 Archs/MIPS/PsxRelocator.cpp
+2 −2 Archs/MIPS/PsxRelocator.h
+12 −2 CMakeLists.txt
+2 −2 Commands/CAssemblerLabel.cpp
+8 −2 Commands/CDirectiveArea.cpp
+2 −2 Commands/CDirectiveArea.h
+5 −5 Commands/CDirectiveConditional.cpp
+5 −5 Commands/CDirectiveData.cpp
+2 −2 Commands/CDirectiveFile.h
+1 −1 Core/Assembler.cpp
+2 −2 Core/Assembler.h
+87 −87 Core/ELF/ElfFile.cpp
+9 −5 Core/ELF/ElfFile.h
+43 −20 Core/ELF/ElfRelocator.cpp
+7 −3 Core/ELF/ElfRelocator.h
+2 −7 Core/ELF/ElfTypes.h
+27 −30 Core/Expression.cpp
+8 −8 Core/Expression.h
+2 −37 Core/ExpressionFunctions.cpp
+9 −2 Core/ExpressionFunctions.h
+8 −8 Core/FileManager.cpp
+1 −3 Core/FileManager.h
+1 −1 Core/SymbolData.cpp
+4 −4 Core/SymbolTable.cpp
+2 −2 Core/SymbolTable.h
+10 −3 Main/Tests.cpp
+4 −0 Main/Tests.h
+1 −1 Parser/ExpressionParser.cpp
+20 −0 Parser/Parser.cpp
+30 −18 Parser/Tokenizer.cpp
+15 −3 Readme.md
+4 −6 Tests/Conditions/Conditions.asm
+7 −7 Tests/Core/ExpressionFunctions/expected.txt
+0 −2 Tests/Core/Expressions/Expressions.asm
+10 −10 Util/ByteArray.cpp
+11 −8 Util/ByteArray.h
+7 −7 Util/FileClasses.cpp
+2 −2 Util/FileClasses.h
+3 −3 Util/Util.cpp
+196 −0 ext/tinyformat/.travis.yml
+41 −0 ext/tinyformat/CMakeLists.txt
+2 −2 ext/tinyformat/Makefile
+0 −12 ext/tinyformat/Makefile.nmake
+452 −0 ext/tinyformat/README.md
+0 −448 ext/tinyformat/README.rst
+52 −0 ext/tinyformat/appveyor.yml
+44 −34 ext/tinyformat/tinyformat.h
+17 −4 ext/tinyformat/tinyformat_test.cpp
+9 −3 libarmips.vcxproj
+23 −5 libarmips.vcxproj.filters
+1 −0 stdafx.h
@@ -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
@@ -234,16 +234,19 @@
<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" />
<ClCompile Include="armips\Archs\ARM\ThumbOpcodes.cpp" />
<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,16 +290,19 @@
<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" />
<ClInclude Include="armips\Archs\ARM\ThumbOpcodes.h" />
<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" />
@@ -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>

0 comments on commit 4a92db4

Please sign in to comment.
You can’t perform that action at this time.