Skip to content
Sign up
This repository

public / dolphin Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #151 from lioncash/rename-assemble-disassemble 

Rename assemble.cpp/.h and disassemble.cpp./.h
  • Loading branch information...
commit 84b4f9862ff7e2154fec61b258a6364c1c29aaec 2 parents d71aef8 + e9d1796
Pierre Bourdon authored

Showing 12 changed files with 24 additions and 24 deletions. Show Diff Stats Hide Diff Stats

  1. 4  Source/Core/Core/CMakeLists.txt
  2. 8  Source/Core/Core/Core.vcxproj
  3. 16  Source/Core/Core/Core.vcxproj.filters
  4. 4  Source/Core/Core/DSP/{assemble.cpp → DSPAssembler.cpp}
  5. 2  Source/Core/Core/DSP/{assemble.h → DSPAssembler.h}
  6. 4  Source/Core/Core/DSP/DSPCodeUtil.cpp
  7. 2  Source/Core/Core/DSP/{disassemble.cpp → DSPDisassembler.cpp}
  8. 0  Source/Core/Core/DSP/{disassemble.h → DSPDisassembler.h}
  9. 2  Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
  10. 2  Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
  11. 2  Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp
  12. 2  Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
4  Source/Core/Core/CMakeLists.txt
View 
@@ -26,8 +26,8 @@ set(SRCS	ActionReplay.cpp
26 26 
 			Debugger/Debugger_SymbolMap.cpp
27 27 
 			Debugger/Dump.cpp
28 28 
 			Debugger/PPCDebugInterface.cpp
29   
-			DSP/assemble.cpp
30   
-			DSP/disassemble.cpp
  29 
+			DSP/DSPAssembler.cpp
  30 
+			DSP/DSPDisassembler.cpp
31 31 
 			DSP/DSPAccelerator.cpp
32 32 
 			DSP/DSPIntCCUtil.cpp
33 33 
 			DSP/DSPIntExtOps.cpp
8  Source/Core/Core/Core.vcxproj
View 
@@ -60,8 +60,8 @@
60 60 
     <ClCompile Include="Debugger\Dump.cpp" />
61 61 
     <ClCompile Include="Debugger\PPCDebugInterface.cpp" />
62 62 
     <ClCompile Include="DSPEmulator.cpp" />
63   
-    <ClCompile Include="DSP\assemble.cpp" />
64   
-    <ClCompile Include="DSP\disassemble.cpp" />
  63 
+    <ClCompile Include="DSP\DSPAssembler.cpp" />
  64 
+    <ClCompile Include="DSP\DSPDisassembler.cpp" />
65 65 
     <ClCompile Include="DSP\DSPAccelerator.cpp" />
66 66 
     <ClCompile Include="DSP\DSPAnalyzer.cpp" />
67 67 
     <ClCompile Include="DSP\DSPCodeUtil.cpp" />
 
@@ -265,8 +265,8 @@
265 265 
     <ClInclude Include="Debugger\GCELF.h" />
266 266 
     <ClInclude Include="Debugger\PPCDebugInterface.h" />
267 267 
     <ClInclude Include="DSPEmulator.h" />
268   
-    <ClInclude Include="DSP\assemble.h" />
269   
-    <ClInclude Include="DSP\disassemble.h" />
  268 
+    <ClInclude Include="DSP\DSPAssembler.h" />
  269 
+    <ClInclude Include="DSP\DSPDisassembler.h" />
270 270 
     <ClInclude Include="DSP\DSPAccelerator.h" />
271 271 
     <ClInclude Include="DSP\DSPAnalyzer.h" />
272 272 
     <ClInclude Include="DSP\DSPBreakpoints.h" />
16  Source/Core/Core/Core.vcxproj.filters
View 
@@ -509,10 +509,7 @@
509 509 
     <ClCompile Include="HW\SystemTimers.cpp">
510 510 
       <Filter>HW %28Flipper/Hollywood%29</Filter>
511 511 
     </ClCompile>
512   
-    <ClCompile Include="DSP\assemble.cpp">
513   
-      <Filter>DSPCore</Filter>
514   
-    </ClCompile>
515   
-    <ClCompile Include="DSP\disassemble.cpp">
  512 
+    <ClCompile Include="DSP\DSPAssembler.cpp">
516 513 
       <Filter>DSPCore</Filter>
517 514 
     </ClCompile>
518 515 
     <ClCompile Include="DSP\DSPAccelerator.cpp">
 
@@ -527,6 +524,9 @@
527 524 
     <ClCompile Include="DSP\DSPCore.cpp">
528 525 
       <Filter>DSPCore</Filter>
529 526 
     </ClCompile>
  527 
+    <ClCompile Include="DSP\DSPDisassembler.cpp">
  528 
+      <Filter>DSPCore</Filter>
  529 
+    </ClCompile>
530 530 
     <ClCompile Include="DSPEmulator.cpp">
531 531 
       <Filter>DSPCore</Filter>
532 532 
     </ClCompile>
 
@@ -1038,10 +1038,7 @@
1038 1038 
     <ClInclude Include="HW\SystemTimers.h">
1039 1039 
       <Filter>HW %28Flipper/Hollywood%29</Filter>
1040 1040 
     </ClInclude>
1041   
-    <ClInclude Include="DSP\assemble.h">
1042   
-      <Filter>DSPCore</Filter>
1043   
-    </ClInclude>
1044   
-    <ClInclude Include="DSP\disassemble.h">
  1041 
+    <ClInclude Include="DSP\DSPAssembler.h">
1045 1042 
       <Filter>DSPCore</Filter>
1046 1043 
     </ClInclude>
1047 1044 
     <ClInclude Include="DSP\DSPAccelerator.h">
 
@@ -1062,6 +1059,9 @@
1062 1059 
     <ClInclude Include="DSP\DSPCore.h">
1063 1060 
       <Filter>DSPCore</Filter>
1064 1061 
     </ClInclude>
  1062 
+    <ClInclude Include="DSP\DSPDisassembler.h">
  1063 
+      <Filter>DSPCore</Filter>
  1064 
+    </ClInclude>
1065 1065 
     <ClInclude Include="DSPEmulator.h">
1066 1066 
       <Filter>DSPCore</Filter>
1067 1067 
     </ClInclude>
4  Source/Core/Core/DSP/assemble.cpp → Source/Core/Core/DSP/DSPAssembler.cpp
View 
@@ -46,8 +46,8 @@
46 46 
 #include "Common/Common.h"
47 47 
 #include "Common/FileUtil.h"
48 48
49   
-#include "Core/DSP/assemble.h"
50   
-#include "Core/DSP/disassemble.h"
  49 
+#include "Core/DSP/DSPAssembler.h"
  50 
+#include "Core/DSP/DSPDisassembler.h"
51 51 
 #include "Core/DSP/DSPInterpreter.h"
52 52 
 #include "Core/DSP/DSPTables.h"
53 53
2  Source/Core/Core/DSP/assemble.h → Source/Core/Core/DSP/DSPAssembler.h
View 
@@ -29,7 +29,7 @@
29 29
30 30 
 #include "Common/Common.h"
31 31
32   
-#include "Core/DSP/disassemble.h"
  32 
+#include "Core/DSP/DSPDisassembler.h"
33 33 
 #include "Core/DSP/DSPTables.h"
34 34 
 #include "Core/DSP/LabelMap.h"
35 35
4  Source/Core/Core/DSP/DSPCodeUtil.cpp
View 
@@ -9,9 +9,9 @@
9 9 
 #include "Common/FileUtil.h"
10 10 
 #include "Common/StringUtil.h"
11 11
12   
-#include "Core/DSP/assemble.h"
13   
-#include "Core/DSP/disassemble.h"
  12 
+#include "Core/DSP/DSPAssembler.h"
14 13 
 #include "Core/DSP/DSPCodeUtil.h"
  14 
+#include "Core/DSP/DSPDisassembler.h"
15 15
16 16 
 bool Assemble(const char *text, std::vector<u16> &code, bool force)
17 17 
 {
2  Source/Core/Core/DSP/disassemble.cpp → Source/Core/Core/DSP/DSPDisassembler.cpp
View 
@@ -29,7 +29,7 @@
29 29 
 #include "Common/Common.h"
30 30 
 #include "Common/FileUtil.h"
31 31
32   
-#include "Core/DSP/disassemble.h"
  32 
+#include "Core/DSP/DSPDisassembler.h"
33 33 
 #include "Core/DSP/DSPTables.h"
34 34
35 35 
 #ifdef _MSC_VER
0  Source/Core/Core/DSP/disassemble.h → Source/Core/Core/DSP/DSPDisassembler.h
View
File renamed without changes
2  Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
View 
@@ -2,8 +2,8 @@
2 2 
 // Licensed under GPLv2
3 3 
 // Refer to the license.txt file included.
4 4
5   
-#include "Core/DSP/disassemble.h"
6 5 
 #include "Core/DSP/DSPCore.h"
  6 
+#include "Core/DSP/DSPDisassembler.h"
7 7 
 #include "Core/DSP/DSPMemoryMap.h"
8 8 
 #include "Core/HW/DSPLLE/DSPDebugInterface.h"
9 9 
 #include "Core/HW/DSPLLE/DSPSymbols.h"
2  Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View 
@@ -17,8 +17,8 @@
17 17 
 #include "Core/ConfigManager.h"
18 18 
 #include "Core/Core.h"
19 19 
 #include "Core/Host.h"
20   
-#include "Core/DSP/disassemble.h"
21 20 
 #include "Core/DSP/DSPCore.h"
  21 
+#include "Core/DSP/DSPDisassembler.h"
22 22 
 #include "Core/DSP/DSPHost.h"
23 23 
 #include "Core/DSP/DSPHWInterface.h"
24 24 
 #include "Core/DSP/DSPInterpreter.h"
2  Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp
View 
@@ -12,9 +12,9 @@
12 12 
 #include "Common/Common.h"
13 13 
 #include "Common/FileUtil.h"
14 14
15   
-#include "Core/DSP/disassemble.h"
16 15 
 #include "Core/DSP/DSPCodeUtil.h"
17 16 
 #include "Core/DSP/DSPCore.h"
  17 
+#include "Core/DSP/DSPDisassembler.h"
18 18 
 #include "Core/DSP/DSPInterpreter.h"
19 19 
 #include "Core/HW/DSPLLE/DSPLLEGlobals.h"
20 20 
 #include "Core/HW/DSPLLE/DSPLLETools.h"
2  Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
View 
@@ -10,8 +10,8 @@
10 10 
 #include "Common/FileUtil.h"
11 11 
 #include "Common/StringUtil.h"
12 12
13   
-#include "Core/DSP/disassemble.h"
14 13 
 #include "Core/DSP/DSPCore.h"
  14 
+#include "Core/DSP/DSPDisassembler.h"
15 15 
 #include "Core/HW/DSPLLE/DSPSymbols.h"
16 16
17 17 
 namespace DSPSymbols {

0 notes on commit 84b4f98

Please sign in to comment.
Something went wrong with that request. Please try again.