dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Works again.

Browse source
This commit is contained in:
mterwoord_cp 2010-08-05 16:56:09 +00:00
parent aee6b8d3bf
commit 3bcdcf5fea
6 changed files with 106 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Build/VSIP/install.bat
View file

@ -36,6 +36,11 @@ xcopy /Y ..\..\source\Cosmos\Cosmos.Sys.Plugs\bin\Debug\Cosmos.Sys.Plugs.* .
xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* . xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* .
xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* .
xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip .
REM splitup compiler:
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler\bin\debug\Cosmos.Compiler.Assembler.* .
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler.X86\bin\debug\Cosmos.Compiler.Assembler.X86.* .
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.DebugStub\bin\debug\Cosmos.Compiler.DebugStub.* .
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.XSharp\bin\debug\Cosmos.Compiler.XSharp.* .
echo . echo .
echo . echo .

6
Setup2/BuildUserKit.bat
View file

@ -36,6 +36,11 @@ xcopy /Y ..\..\source\Cosmos\Cosmos.Sys.Plugs\bin\Debug\Cosmos.Sys.Plugs.* .
xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* . xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* .
xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* .
xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip .
REM splitup compiler:
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler\bin\debug\Cosmos.Compiler.Assembler.* .
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler.X86\bin\debug\Cosmos.Compiler.Assembler.X86.* .
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.DebugStub\bin\debug\Cosmos.Compiler.DebugStub.* .
xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.XSharp\bin\debug\Cosmos.Compiler.XSharp.* .
echo . echo .
echo . echo .
@ -47,3 +52,4 @@ IF EXIST "C:\Program Files\Inno Setup 5\ISCC.exe" (
) ELSE ( ) ELSE (
"C:\Program Files (x86)\Inno Setup 5\ISCC" /Q ..\..\Setup2\Cosmos.iss /dBuildConfiguration=Userkit "C:\Program Files (x86)\Inno Setup 5\ISCC" /Q ..\..\Setup2\Cosmos.iss /dBuildConfiguration=Userkit
) )
cd ..\..\Setup2

1
Setup2/Cosmos.iss
View file

@ -147,6 +147,7 @@ Source: .\source\Cosmos.ico; DestDir: {app}; Flags: ignoreversion uninsremoverea
Source: .\Build\ISO\isolinux.*; DestDir: {app}\Build\ISO Source: .\Build\ISO\isolinux.*; DestDir: {app}\Build\ISO
Source: .\Build\ISO\mboot.c32; DestDir: {app}\Build\ISO Source: .\Build\ISO\mboot.c32; DestDir: {app}\Build\ISO
[Registry] [Registry]
Root: HKLM; Subkey: Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\Cosmos; ValueType: none; Flags: uninsdeletekey Root: HKLM; Subkey: Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\Cosmos; ValueType: none; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\Cosmos; ValueType: string; ValueName: ; ValueData: {app}\Kernel\; Flags: uninsdeletekey Root: HKLM; Subkey: Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\Cosmos; ValueType: string; ValueName: ; ValueData: {app}\Kernel\; Flags: uninsdeletekey

162
source/Cosmos.sln
View file

@ -142,7 +142,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Compiler.Assembler.X
EndProject EndProject
Global Global
GlobalSection(TeamFoundationVersionControl) = preSolution GlobalSection(TeamFoundationVersionControl) = preSolution
SccNumberOfProjects = 34 SccNumberOfProjects = 37
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccTeamFoundationServer = https://tfs.codeplex.com/tfs/TFS04 SccTeamFoundationServer = https://tfs.codeplex.com/tfs/TFS04
SccLocalPath0 = . SccLocalPath0 = .
@ -198,103 +198,99 @@ Global
SccProjectTopLevelParentUniqueName13 = Cosmos.sln SccProjectTopLevelParentUniqueName13 = Cosmos.sln
SccProjectName13 = ../source2/IL2PCU/Cosmos.IL2CPU SccProjectName13 = ../source2/IL2PCU/Cosmos.IL2CPU
SccLocalPath13 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU SccLocalPath13 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU
SccProjectUniqueName14 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Profiler\\Cosmos.IL2CPU.Profiler.csproj SccProjectUniqueName14 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86\\Cosmos.IL2CPU.X86.csproj
SccProjectTopLevelParentUniqueName14 = Cosmos.sln SccProjectTopLevelParentUniqueName14 = Cosmos.sln
SccProjectName14 = ../source2/IL2PCU/Cosmos.IL2CPU.Profiler SccProjectName14 = ../source2/IL2PCU/Cosmos.IL2CPU.X86
SccLocalPath14 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Profiler SccLocalPath14 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86
SccProjectUniqueName15 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86\\Cosmos.IL2CPU.X86.csproj SccProjectUniqueName15 = Cosmos.Hardware.SMBIOS\\Cosmos.Hardware.SMBIOS.csproj
SccProjectTopLevelParentUniqueName15 = Cosmos.sln SccProjectTopLevelParentUniqueName15 = Cosmos.sln
SccProjectName15 = ../source2/IL2PCU/Cosmos.IL2CPU.X86 SccProjectName15 = Cosmos.Hardware.SMBIOS
SccLocalPath15 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86 SccLocalPath15 = Cosmos.Hardware.SMBIOS
SccProjectUniqueName16 = Cosmos.Hardware.SMBIOS\\Cosmos.Hardware.SMBIOS.csproj SccProjectUniqueName16 = ..\\source2\\Users\\Gero\u0020Landmann\\Cosmos.Assembler.X86.Gero\\Cosmos.Assembler.X86.Gero.csproj
SccProjectTopLevelParentUniqueName16 = Cosmos.sln SccProjectTopLevelParentUniqueName16 = Cosmos.sln
SccProjectName16 = Cosmos.Hardware.SMBIOS SccProjectName16 = ../source2/Users/Gero\u0020Landmann/Cosmos.Assembler.X86.Gero
SccLocalPath16 = Cosmos.Hardware.SMBIOS SccLocalPath16 = ..\\source2\\Users\\Gero\u0020Landmann\\Cosmos.Assembler.X86.Gero
SccProjectUniqueName17 = ..\\source2\\Users\\Gero\u0020Landmann\\Cosmos.Assembler.X86.Gero\\Cosmos.Assembler.X86.Gero.csproj SccProjectUniqueName17 = ..\\source2\\Debug\\Cosmos.Debug.HostProcess\\Cosmos.Debug.HostProcess.csproj
SccProjectTopLevelParentUniqueName17 = Cosmos.sln SccProjectTopLevelParentUniqueName17 = Cosmos.sln
SccProjectName17 = ../source2/Users/Gero\u0020Landmann/Cosmos.Assembler.X86.Gero SccProjectName17 = ../source2/Debug/Cosmos.Debug.HostProcess
SccLocalPath17 = ..\\source2\\Users\\Gero\u0020Landmann\\Cosmos.Assembler.X86.Gero SccLocalPath17 = ..\\source2\\Debug\\Cosmos.Debug.HostProcess
SccProjectUniqueName18 = ..\\source2\\Debug\\Cosmos.Debug.HostProcess\\Cosmos.Debug.HostProcess.csproj SccProjectUniqueName18 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86.Tests\\Cosmos.IL2CPU.X86.Tests.csproj
SccProjectTopLevelParentUniqueName18 = Cosmos.sln SccProjectTopLevelParentUniqueName18 = Cosmos.sln
SccProjectName18 = ../source2/Debug/Cosmos.Debug.HostProcess SccProjectName18 = ../source2/IL2PCU/Cosmos.IL2CPU.X86.Tests
SccLocalPath18 = ..\\source2\\Debug\\Cosmos.Debug.HostProcess SccLocalPath18 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86.Tests
SccProjectUniqueName19 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86.Tests\\Cosmos.IL2CPU.X86.Tests.csproj SccProjectUniqueName19 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj
SccProjectTopLevelParentUniqueName19 = Cosmos.sln SccProjectTopLevelParentUniqueName19 = Cosmos.sln
SccProjectName19 = ../source2/IL2PCU/Cosmos.IL2CPU.X86.Tests SccProjectName19 = ../source2/IL2PCU/Cosmos.IL2CPU.Plugs
SccLocalPath19 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86.Tests SccLocalPath19 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Plugs
SccProjectUniqueName20 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj SccProjectUniqueName20 = ..\\source2\\Debug\\Cosmos.Debug.GDB\\Cosmos.Debug.GDB.csproj
SccProjectTopLevelParentUniqueName20 = Cosmos.sln SccProjectTopLevelParentUniqueName20 = Cosmos.sln
SccProjectName20 = ../source2/IL2PCU/Cosmos.IL2CPU.Plugs SccProjectName20 = ../source2/Debug/Cosmos.Debug.GDB
SccLocalPath20 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Plugs SccLocalPath20 = ..\\source2\\Debug\\Cosmos.Debug.GDB
SccProjectUniqueName21 = ..\\source2\\Debug\\Cosmos.Debug.GDB\\Cosmos.Debug.GDB.csproj SccProjectUniqueName21 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\IRs\\EcmaCil\\EcmaCil.csproj
SccProjectTopLevelParentUniqueName21 = Cosmos.sln SccProjectTopLevelParentUniqueName21 = Cosmos.sln
SccProjectName21 = ../source2/Debug/Cosmos.Debug.GDB SccProjectName21 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/IRs/EcmaCil
SccLocalPath21 = ..\\source2\\Debug\\Cosmos.Debug.GDB SccLocalPath21 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\IRs\\EcmaCil
SccProjectUniqueName22 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\IRs\\EcmaCil\\EcmaCil.csproj SccProjectUniqueName22 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\UtilityClasses\\UtilityClasses.csproj
SccProjectTopLevelParentUniqueName22 = Cosmos.sln SccProjectTopLevelParentUniqueName22 = Cosmos.sln
SccProjectName22 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/IRs/EcmaCil SccProjectName22 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/UtilityClasses
SccLocalPath22 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\IRs\\EcmaCil SccLocalPath22 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\UtilityClasses
SccProjectUniqueName23 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\UtilityClasses\\UtilityClasses.csproj SccProjectUniqueName23 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil\\ReflectionToEcmaCil.csproj
SccProjectTopLevelParentUniqueName23 = Cosmos.sln SccProjectTopLevelParentUniqueName23 = Cosmos.sln
SccProjectName23 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/UtilityClasses SccProjectName23 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/ReflectionToEcmaCil
SccLocalPath23 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\UtilityClasses SccLocalPath23 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil
SccProjectUniqueName24 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil\\ReflectionToEcmaCil.csproj SccProjectUniqueName24 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil.Tests\\ReflectionToEcmaCil.Tests.csproj
SccProjectTopLevelParentUniqueName24 = Cosmos.sln SccProjectTopLevelParentUniqueName24 = Cosmos.sln
SccProjectName24 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/ReflectionToEcmaCil SccProjectName24 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/ReflectionToEcmaCil.Tests
SccLocalPath24 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil SccLocalPath24 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil.Tests
SccProjectUniqueName25 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil.Tests\\ReflectionToEcmaCil.Tests.csproj SccProjectUniqueName25 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\TestApp\\TestApp.csproj
SccProjectTopLevelParentUniqueName25 = Cosmos.sln SccProjectTopLevelParentUniqueName25 = Cosmos.sln
SccProjectName25 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/ReflectionToEcmaCil.Tests SccProjectName25 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/TestApp
SccLocalPath25 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\ReflectionToEcmaCil.Tests SccLocalPath25 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\TestApp
SccProjectUniqueName26 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\TestApp\\TestApp.csproj SccProjectUniqueName26 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleMethodsTest\\SimpleMethodsTest.csproj
SccProjectTopLevelParentUniqueName26 = Cosmos.sln SccProjectTopLevelParentUniqueName26 = Cosmos.sln
SccProjectName26 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/TestApp SccProjectName26 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/FileToEcmaCilTests/SimpleMethodsTest
SccLocalPath26 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\TestApp SccLocalPath26 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleMethodsTest
SccProjectUniqueName27 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleMethodsTest\\SimpleMethodsTest.csproj SccProjectUniqueName27 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClassTest\\SimpleClassTest.csproj
SccProjectTopLevelParentUniqueName27 = Cosmos.sln SccProjectTopLevelParentUniqueName27 = Cosmos.sln
SccProjectName27 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/FileToEcmaCilTests/SimpleMethodsTest SccProjectName27 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/FileToEcmaCilTests/SimpleClassTest
SccLocalPath27 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleMethodsTest SccLocalPath27 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClassTest
SccProjectUniqueName28 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClassTest\\SimpleClassTest.csproj SccProjectUniqueName28 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClass2Test\\SimpleClass2Test.csproj
SccProjectTopLevelParentUniqueName28 = Cosmos.sln SccProjectTopLevelParentUniqueName28 = Cosmos.sln
SccProjectName28 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/FileToEcmaCilTests/SimpleClassTest SccProjectName28 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/FileToEcmaCilTests/SimpleClass2Test
SccLocalPath28 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClassTest SccLocalPath28 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClass2Test
SccProjectUniqueName29 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClass2Test\\SimpleClass2Test.csproj SccProjectUniqueName29 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Debug\\Cosmos.Compiler.Debug.csproj
SccProjectTopLevelParentUniqueName29 = Cosmos.sln SccProjectTopLevelParentUniqueName29 = Cosmos.sln
SccProjectName29 = ../source2/Users/Matthijs\u0020ter\u0020Woord/Testing/FileToEcmaCilTests/SimpleClass2Test SccProjectName29 = ../source2/IL2PCU/Cosmos.IL2CPU.Debug
SccLocalPath29 = ..\\source2\\Users\\Matthijs\u0020ter\u0020Woord\\Testing\\FileToEcmaCilTests\\SimpleClass2Test SccLocalPath29 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Debug
SccProjectUniqueName30 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Debug\\Cosmos.Compiler.Debug.csproj SccProjectUniqueName30 = ..\\source2\\Users\\Kudzu\\Breakpoints\\Breakpoints.Cosmos
SccProjectTopLevelParentUniqueName30 = Cosmos.sln SccProjectTopLevelParentUniqueName30 = Cosmos.sln
SccProjectName30 = ../source2/IL2PCU/Cosmos.IL2CPU.Debug SccProjectName30 = ../source2/Users/Kudzu/Breakpoints
SccLocalPath30 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Debug SccLocalPath30 = ..\\source2\\Users\\Kudzu\\Breakpoints
SccProjectUniqueName31 = ..\\source2\\Users\\Kudzu\\Breakpoints\\Breakpoints.Cosmos SccWebProject31 = true
SccProjectTopLevelParentUniqueName31 = Cosmos.sln SccProjectUniqueName31 = ..\\Docs
SccProjectName31 = ../source2/Users/Kudzu/Breakpoints SccProjectName31 = ../Docs
SccLocalPath31 = ..\\source2\\Users\\Kudzu\\Breakpoints SccLocalPath31 = ..\\Docs
SccWebProject32 = true SccProjectEnlistmentChoice31 = 2
SccProjectUniqueName32 = ..\\Docs SccProjectUniqueName32 = ..\\source2\\Compiler\\Cosmos.Compiler.XSharp\\Cosmos.Compiler.XSharp.csproj
SccProjectName32 = ../Docs SccProjectTopLevelParentUniqueName32 = Cosmos.sln
SccLocalPath32 = ..\\Docs SccProjectName32 = ../source2/Compiler/Cosmos.Compiler.XSharp
SccProjectEnlistmentChoice32 = 2 SccLocalPath32 = ..\\source2\\Compiler\\Cosmos.Compiler.XSharp
SccProjectUniqueName33 = ..\\source2\\Compiler\\Cosmos.Compiler.XSharp\\Cosmos.Compiler.XSharp.csproj SccProjectUniqueName33 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Compiler.DebugStub.csproj
SccProjectTopLevelParentUniqueName33 = Cosmos.sln SccProjectTopLevelParentUniqueName33 = Cosmos.sln
SccProjectName33 = ../source2/Compiler/Cosmos.Compiler.XSharp SccProjectName33 = ../source2/Compiler/Cosmos.Compiler.DebugStub
SccLocalPath33 = ..\\source2\\Compiler\\Cosmos.Compiler.XSharp SccLocalPath33 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub
SccProjectUniqueName34 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Compiler.DebugStub.csproj SccProjectUniqueName34 = ..\\source2\\Compiler\\Cosmos.Compiler.IL2CPU\\Cosmos.Compiler.IL2CPU.csproj
SccProjectTopLevelParentUniqueName34 = Cosmos.sln SccProjectTopLevelParentUniqueName34 = Cosmos.sln
SccProjectName34 = ../source2/Compiler/Cosmos.Compiler.DebugStub SccProjectName34 = ../source2/Compiler/Cosmos.Compiler.IL2CPU
SccLocalPath34 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub SccLocalPath34 = ..\\source2\\Compiler\\Cosmos.Compiler.IL2CPU
SccProjectUniqueName35 = ..\\source2\\Compiler\\Cosmos.Compiler.IL2CPU\\Cosmos.Compiler.IL2CPU.csproj SccProjectUniqueName35 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler\\Cosmos.Compiler.Assembler.csproj
SccProjectTopLevelParentUniqueName35 = Cosmos.sln SccProjectTopLevelParentUniqueName35 = Cosmos.sln
SccProjectName35 = ../source2/Compiler/Cosmos.Compiler.IL2CPU SccProjectName35 = ../source2/Compiler/Cosmos.Compiler.Assembler
SccLocalPath35 = ..\\source2\\Compiler\\Cosmos.Compiler.IL2CPU SccLocalPath35 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler
SccProjectUniqueName36 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler\\Cosmos.Compiler.Assembler.csproj SccProjectUniqueName36 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86\\Cosmos.Compiler.Assembler.X86.csproj
SccProjectTopLevelParentUniqueName36 = Cosmos.sln SccProjectTopLevelParentUniqueName36 = Cosmos.sln
SccProjectName36 = ../source2/Compiler/Cosmos.Compiler.Assembler SccProjectName36 = ../source2/Compiler/Cosmos.Compiler.Assembler.X86
SccLocalPath36 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler SccLocalPath36 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86
SccProjectUniqueName37 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86\\Cosmos.Compiler.Assembler.X86.csproj
SccProjectTopLevelParentUniqueName37 = Cosmos.sln
SccProjectName37 = ../source2/Compiler/Cosmos.Compiler.Assembler.X86
SccLocalPath37 = ..\\source2\\Compiler\\Cosmos.Compiler.Assembler.X86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Bootstrap|Any CPU = Bootstrap|Any CPU Bootstrap|Any CPU = Bootstrap|Any CPU
@ -645,7 +641,8 @@ Global
{3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Release|x86.ActiveCfg = Release|Any CPU {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Release|x86.ActiveCfg = Release|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|Any CPU.Build.0 = Release|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|Any CPU.Build.0 = Release|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|x86.ActiveCfg = Release|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|x86.ActiveCfg = Debug|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Bootstrap|x86.Build.0 = Debug|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Debug|Any CPU.Build.0 = Debug|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Debug|Any CPU.Build.0 = Debug|Any CPU
{453F2952-FD48-477F-889B-B3C6963C9850}.Debug|x86.ActiveCfg = Debug|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Debug|x86.ActiveCfg = Debug|Any CPU
@ -655,7 +652,8 @@ Global
{453F2952-FD48-477F-889B-B3C6963C9850}.Release|x86.ActiveCfg = Release|Any CPU {453F2952-FD48-477F-889B-B3C6963C9850}.Release|x86.ActiveCfg = Release|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|Any CPU.Build.0 = Release|Any CPU {A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|Any CPU.Build.0 = Release|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|x86.ActiveCfg = Release|Any CPU {A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|x86.ActiveCfg = Debug|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Bootstrap|x86.Build.0 = Debug|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Debug|x86.ActiveCfg = Debug|Any CPU {A7F3F078-CF99-4018-9A35-2D6DC9517ADB}.Debug|x86.ActiveCfg = Debug|Any CPU
@ -675,7 +673,8 @@ Global
{1B74876C-5ED7-4D2C-98A3-EEBA124F9D9C}.Release|x86.ActiveCfg = Release|Any CPU {1B74876C-5ED7-4D2C-98A3-EEBA124F9D9C}.Release|x86.ActiveCfg = Release|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|Any CPU.Build.0 = Release|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|Any CPU.Build.0 = Release|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|x86.ActiveCfg = Release|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|x86.ActiveCfg = Debug|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Bootstrap|x86.Build.0 = Debug|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Debug|x86.ActiveCfg = Debug|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Debug|x86.ActiveCfg = Debug|Any CPU
@ -685,7 +684,8 @@ Global
{1116130E-28E0-428A-A597-F4B3B676C0CA}.Release|x86.ActiveCfg = Release|Any CPU {1116130E-28E0-428A-A597-F4B3B676C0CA}.Release|x86.ActiveCfg = Release|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|Any CPU.Build.0 = Release|Any CPU {94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|Any CPU.Build.0 = Release|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|x86.ActiveCfg = Release|Any CPU {94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|x86.ActiveCfg = Debug|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Bootstrap|x86.Build.0 = Debug|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94D079E4-3C66-486A-8407-EA6EC049FF53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Debug|Any CPU.Build.0 = Debug|Any CPU {94D079E4-3C66-486A-8407-EA6EC049FF53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94D079E4-3C66-486A-8407-EA6EC049FF53}.Debug|x86.ActiveCfg = Debug|Any CPU {94D079E4-3C66-486A-8407-EA6EC049FF53}.Debug|x86.ActiveCfg = Debug|Any CPU

12
source2/Compiler/Cosmos.Compiler.Assembler/Instruction.cs
View file

@ -26,6 +26,12 @@ namespace Cosmos.Compiler.Assembler
public Instruction( Assembler aAssembler ) public Instruction( Assembler aAssembler )
{ {
aAssembler.Add( this ); aAssembler.Add( this );
var xAttribs = GetType().GetCustomAttributes(typeof(OpCodeAttribute), false);
if (xAttribs != null && xAttribs.Length > 0)
{
var xAttrib = (OpCodeAttribute)xAttribs[0];
mMnemonic = xAttrib.Mnemonic;
}
} }
public Instruction( bool aAddToAssembler ) public Instruction( bool aAddToAssembler )
@ -34,6 +40,12 @@ namespace Cosmos.Compiler.Assembler
{ {
Assembler.CurrentInstance.Add( this ); Assembler.CurrentInstance.Add( this );
} }
var xAttribs = GetType().GetCustomAttributes(typeof(OpCodeAttribute), false);
if (xAttribs != null && xAttribs.Length > 0)
{
var xAttrib = (OpCodeAttribute)xAttribs[0];
mMnemonic = xAttrib.Mnemonic;
}
} }
public override ulong? ActualAddress public override ulong? ActualAddress

2
source2/IL2PCU/Cosmos.IL2CPU/AppAssembler.cs
View file

@ -203,7 +203,7 @@ namespace Cosmos.IL2CPU
{ {
var xOpCode = (ushort)xAttrib.OpCode; var xOpCode = (ushort)xAttrib.OpCode;
var xCtor = xType.GetConstructor(new Type[] { typeof(Assembler) }); var xCtor = xType.GetConstructor(new Type[] { typeof(Assembler) });
var xILOp = (ILOp)xCtor.Invoke(new Object[] { this }); var xILOp = (ILOp)xCtor.Invoke(new Object[] { Assembler });
if (xOpCode <= 0xFF) if (xOpCode <= 0xFF)
{ {
mILOpsLo[xOpCode] = xILOp; mILOpsLo[xOpCode] = xILOp;