breakasm refuck

ogamespec · Sep 9, 2023 · 5620281 · 5620281
1 parent 7bc1dc4
commit 5620281
Show file tree

Hide file tree

Showing 19 changed files with 732 additions and 687 deletions.
diff --git a/Breaknes/BreaksCore/CoreApi.cpp b/Breaknes/BreaksCore/CoreApi.cpp
@@ -5,9 +5,9 @@ Breaknes::Board* board = nullptr;
 extern "C"
 {
 #ifdef _WIN32
-	DLL_EXPORT int Assemble(char* str, uint8_t* buffer)
+	DLL_EXPORT int Assemble(char* str, char *source_name, uint8_t* buffer)
 	{
-		return assemble(str, buffer);
+		return assemble(str, source_name, buffer);
 	}
 #endif
 

diff --git a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj
@@ -19,8 +19,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASM.cpp" />
-    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASMOPS.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asm.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmexpr.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmops.cpp" />
     <ClCompile Include="..\..\AbstractBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoardDebug.cpp" />
@@ -45,8 +46,9 @@
     <ClCompile Include="..\..\SignalDefs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASM.h" />
-    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASMOPS.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asm.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmexpr.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmops.h" />
     <ClInclude Include="..\..\AbstractBoard.h" />
     <ClInclude Include="..\..\APUPlayerBoard.h" />
     <ClInclude Include="..\..\BoardFactory.h" />

diff --git a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj.filters b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Breakasm">
+      <UniqueIdentifier>{e4e69843-2c65-42d3-843f-5b956f5045d1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\dllmain.cpp">
@@ -45,12 +48,6 @@
     <ClCompile Include="..\..\APUPlayerBoardDebug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\PPUPlayerBoard.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -72,6 +69,15 @@
     <ClCompile Include="..\..\RegDumpEmitter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asm.cpp">
+      <Filter>Breakasm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmexpr.cpp">
+      <Filter>Breakasm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmops.cpp">
+      <Filter>Breakasm</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\FamicomBoard.h">
@@ -98,12 +104,6 @@
     <ClInclude Include="..\..\APUPlayerBoard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\PPUPlayerBoard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -119,6 +119,15 @@
     <ClInclude Include="..\..\RegDumpEmitter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asm.h">
+      <Filter>Breakasm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmexpr.h">
+      <Filter>Breakasm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmops.h">
+      <Filter>Breakasm</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Readme.md" />

diff --git a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj
@@ -19,8 +19,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASM.cpp" />
-    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASMOPS.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asm.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmexpr.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmops.cpp" />
     <ClCompile Include="..\..\AbstractBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoardDebug.cpp" />
@@ -44,8 +45,9 @@
     <ClCompile Include="..\..\SignalDefs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASM.h" />
-    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASMOPS.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asm.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmexpr.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmops.h" />
     <ClInclude Include="..\..\AbstractBoard.h" />
     <ClInclude Include="..\..\APUPlayerBoard.h" />
     <ClInclude Include="..\..\BoardFactory.h" />

diff --git a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj.filters b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Breakasm">
+      <UniqueIdentifier>{f0945310-014f-439c-b125-26ed5dac2f8e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\FamicomBoard.cpp">
@@ -42,12 +45,6 @@
     <ClCompile Include="..\..\APUPlayerBoardDebug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\PPUPlayerBoard.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -69,6 +66,15 @@
     <ClCompile Include="..\..\RegDumpEmitter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asm.cpp">
+      <Filter>Breakasm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmexpr.cpp">
+      <Filter>Breakasm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\asmops.cpp">
+      <Filter>Breakasm</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\FamicomBoard.h">
@@ -95,12 +101,6 @@
     <ClInclude Include="..\..\APUPlayerBoard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\PPUPlayerBoard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -116,6 +116,15 @@
     <ClInclude Include="..\..\RegDumpEmitter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asm.h">
+      <Filter>Breakasm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmexpr.h">
+      <Filter>Breakasm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\asmops.h">
+      <Filter>Breakasm</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Readme.md" />

diff --git a/Breaknes/BreaksCore/pch.h b/Breaknes/BreaksCore/pch.h
@@ -11,8 +11,9 @@
 #include <Windows.h>
 #endif
 
-#include "../../Tools/Breakasm/ASM.h"
-#include "../../Tools/Breakasm/ASMOPS.h"
+#include "../../Tools/Breakasm/asm.h"
+#include "../../Tools/Breakasm/asmops.h"
+#include "../../Tools/Breakasm/asmexpr.h"
 
 // Very basic
 

diff --git a/Common/SharpTools/BreaksCoreInterop.cs b/Common/SharpTools/BreaksCoreInterop.cs
@@ -1,13 +1,12 @@
-using System;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using static SharpTools.CoreDebug;
 
 namespace SharpTools
 {
 	public class BreaksCore
 	{
 		[DllImport("BreaksCore.dll", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Assemble(string text, byte[] buffer);
+		public static extern int Assemble(string text, string source_name, byte[] buffer);
 
 		[DllImport("BreaksCore.dll", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void CreateBoard(string boardName, string apu, string ppu, string p1);

diff --git a/Tools/Breakasm/CMakeLists.txt b/Tools/Breakasm/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CMAKE_BUILD_TYPE Release)
 
 add_executable (breakasm 
 	main.cpp 
-	ASM.cpp
-	ASMOPS.cpp
+	asm.cpp
+	asmops.cpp
+	asmexpr.cpp
 )
diff --git a/Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj b/Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj
@@ -19,20 +19,25 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\ASM.cpp" />
-    <ClCompile Include="..\..\ASMOPS.cpp" />
+    <ClCompile Include="..\..\asm.cpp" />
+    <ClCompile Include="..\..\asmexpr.cpp" />
+    <ClCompile Include="..\..\asmops.cpp" />
     <ClCompile Include="..\..\main.cpp" />
     <ClCompile Include="..\..\pch.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\ASM.h" />
-    <ClInclude Include="..\..\ASMOPS.h" />
+    <ClInclude Include="..\..\asm.h" />
+    <ClInclude Include="..\..\asmexpr.h" />
+    <ClInclude Include="..\..\asmops.h" />
     <ClInclude Include="..\..\pch.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Readme.md" />
     <None Include="..\..\ReadmeRus.md" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\CMakeLists.txt" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>

diff --git a/Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj.filters b/Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj.filters
@@ -15,32 +15,41 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\ASM.cpp">
+    <ClCompile Include="..\..\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ASMOPS.cpp">
+    <ClCompile Include="..\..\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\pch.cpp">
+    <ClCompile Include="..\..\asm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\main.cpp">
+    <ClCompile Include="..\..\asmops.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\asmexpr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\ASM.h">
+    <ClInclude Include="..\..\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\pch.h">
+    <ClInclude Include="..\..\asm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\asmops.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ASMOPS.h">
+    <ClInclude Include="..\..\asmexpr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Readme.md" />
     <None Include="..\..\ReadmeRus.md" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\CMakeLists.txt" />
+  </ItemGroup>
 </Project>