source/Cosmos.Build.Windows/DebugConnector.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 namespace Cosmos.Build.Windows {
     public abstract class DebugConnector {

source/Cosmos.Build.Windows/DebugConnectorStream.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Windows.Threading;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 namespace Cosmos.Build.Windows {
     public abstract class DebugConnectorStream : DebugConnector {

source/Cosmos.Build.Windows/DebugWindow.xaml.cs

@@ -15,7 +15,7 @@ using System.Windows.Shapes;
 using System.Windows.Threading;
 using System.IO;
 using Indy.IL2CPU;
-using Cosmos.IL2CPU.Debug;
+using Cosmos.Debug;
 
 namespace Cosmos.Build.Windows {
     public partial class DebugWindow : Window {

source/IL2CPU/Cosmos.IL2CPU.Debug/Cosmos.Debug.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cosmos.IL2CPU.Debug</RootNamespace>
-    <AssemblyName>Cosmos.IL2CPU.Debug</AssemblyName>
+    <RootNamespace>Cosmos.Debug</RootNamespace>
+    <AssemblyName>Cosmos.Debug</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>

source/IL2CPU/Cosmos.IL2CPU.Debug/Enums.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Cosmos.IL2CPU.Debug {
+namespace Cosmos.Debug {
     // Type of message sent to client debugger
     public enum MsgType { TracePoint = 1, Message = 2, BreakPoint = 3, Error = 4 }
     // These commands come from the client debugger to OS

source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj

@@ -53,292 +53,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="186-188AndUp\Bound.cs" />
-    <Compile Include="186-188AndUp\EnterStackFrame.cs" />
-    <Compile Include="186-188AndUp\InPortToString.cs" />
-    <Compile Include="186-188AndUp\LeaveStackFrame.cs" />
-    <Compile Include="186-188AndUp\OutStringToPort.cs" />
-    <Compile Include="186-188AndUp\PopAll.cs" />
-    <Compile Include="186-188AndUp\PushAll.cs" />
-    <Compile Include="286AndUp\AdjustRPL.cs" />
-    <Compile Include="286AndUp\ClrTaskSwitchFlag.cs" />
-    <Compile Include="286AndUp\Lgdt.cs" />
-    <Compile Include="286AndUp\Lidt.cs" />
-    <Compile Include="286AndUp\LoadAR.cs" />
-    <Compile Include="286AndUp\LoadGDT.cs" />
-    <Compile Include="286AndUp\LoadLDT.cs" />
-    <Compile Include="286AndUp\LoadMSW.cs" />
-    <Compile Include="286AndUp\LoadSegLimit.cs" />
-    <Compile Include="286AndUp\StoreGDT.cs" />
-    <Compile Include="286AndUp\StoreIDT.cs" />
-    <Compile Include="286AndUp\StoreLDT.cs" />
-    <Compile Include="286AndUp\StoreMSW.cs" />
-    <Compile Include="286AndUp\StoreTR.cs" />
-    <Compile Include="286AndUp\VerifySegForReading.cs" />
-    <Compile Include="286AndUp\VerifySegForWriting.cs" />
-    <Compile Include="286Exclusive\LoadAll.cs" />
-    <Compile Include="386AndUp\BitScanForward.cs" />
-    <Compile Include="386AndUp\BitScanReverse.cs" />
-    <Compile Include="386AndUp\BitTest.cs" />
-    <Compile Include="386AndUp\BitTestAndCompl.cs" />
-    <Compile Include="386AndUp\BitTestAndReset.cs" />
-    <Compile Include="386AndUp\BitTestAndSet.cs" />
-    <Compile Include="386AndUp\CmpStringDoubleW.cs" />
-    <Compile Include="386AndUp\DoubleWToQuadW.cs" />
-    <Compile Include="386AndUp\InvokeICE.cs" />
-    <Compile Include="386AndUp\WToDoubleW.cs" />
-    <Compile Include="386Exclusive\LoadAllD.cs" />
-    <Compile Include="3DNow!2\FloatToInt16.cs" />
-    <Compile Include="3DNow!2\Geode\Reciprocal.cs" />
-    <Compile Include="3DNow!2\Geode\ReciprocalSQRT.cs" />
-    <Compile Include="3DNow!2\Int16ToFloat.cs" />
-    <Compile Include="3DNow!2\InvertBottomTopAndStore.cs" />
-    <Compile Include="486AndUp\ByteSwap.cs" />
-    <Compile Include="486AndUp\CmpAndXchg.cs" />
-    <Compile Include="486AndUp\InvalidateCache.cs" />
-    <Compile Include="486AndUp\InvalidateTLBEntry.cs" />
-    <Compile Include="486AndUp\WBAndInvalidateCache.cs" />
-    <Compile Include="486AndUp\XchgAndAdd.cs" />
-    <Compile Include="8086Exclusive\PopCS.cs" />
-    <Compile Include="AAA.cs" />
-    <Compile Include="AAD.cs" />
-    <Compile Include="AAM.cs" />
-    <Compile Include="AAS.cs" />
-    <Compile Include="Add.cs" />
-    <Compile Include="AddWithCarry.cs" />
-    <Compile Include="AMD-MMX\MaskedMoveNotTemp.cs" />
-    <Compile Include="AMD-MMX\MoveNotTemp.cs" />
-    <Compile Include="AMD-MMX\PrefetchFullCache.cs" />
-    <Compile Include="AMD-MMX\PrefetchL1L2Cache.cs" />
-    <Compile Include="AMD-MMX\PrefetchL2Cache.cs" />
-    <Compile Include="AMD-MMX\PrefetchMultiProc.cs" />
-    <Compile Include="AMD-MMX\PrefetchNoCache.cs" />
-    <Compile Include="And.cs" />
-    <Compile Include="Assembler.cs" />
-    <Compile Include="CmpByteString.cs" />
-    <Compile Include="CmpWordString.cs" />
-    <Compile Include="EffectAddr.cs" />
-    <Compile Include="JumpOnGreater.cs" />
-    <Compile Include="K6-2AndUp\SysCall.cs" />
-    <Compile Include="K6-2AndUp\SysReturn.cs" />
-    <Compile Include="LoadESWithPointer.cs" />
-    <Compile Include="FlagIntoAH.cs" />
-    <Compile Include="LoadByte.cs" />
-    <Compile Include="LoadWord.cs" />
-    <Compile Include="Lock.cs" />
-    <Compile Include="LoopAlways.cs" />
-    <Compile Include="LoopBase.cs" />
-    <Compile Include="LoopIfEqual.cs" />
-    <Compile Include="LoopIfNotEqual.cs" />
-    <Compile Include="LoopIfNotZero.cs" />
-    <Compile Include="LoopIfZero.cs" />
-    <Compile Include="MoveSB.cs" />
-    <Compile Include="MoveSW.cs" />
-    <Compile Include="LoadPointerDS.cs" />
-    <Compile Include="PentiumAndUp\CmpAndXchg8B.cs" />
-    <Compile Include="PentiumAndUp\ReadMSR.cs" />
-    <Compile Include="PentiumAndUp\ReadTimeStampCounter.cs" />
-    <Compile Include="PentiumAndUp\WriteMSR.cs" />
-    <Compile Include="PentiumMMXAndUp\ReadPerfCounter.cs" />
-    <Compile Include="Popd.cs" />
-    <Compile Include="Pushd.cs" />
-    <Compile Include="Repeat.cs" />
-    <Compile Include="RepeatBase.cs" />
-    <Compile Include="RepeatIfEqual.cs" />
-    <Compile Include="RepeatIfNotEqual.cs" />
-    <Compile Include="RepeatIfNotZero.cs" />
-    <Compile Include="RepeatIfZero.cs" />
-    <Compile Include="RepeatMovsb.cs" />
-    <Compile Include="RepeatStosb.cs" />
-    <Compile Include="RepeatStosd.cs" />
-    <Compile Include="ReturnNear.cs" />
-    <Compile Include="SetALByCarry.cs" />
-    <Compile Include="SpecialDebug\Break.cs" />
-    <Compile Include="ConvByteToWord.cs" />
-    <Compile Include="Call.cs" />
-    <Compile Include="ClrDirFlag.cs" />
-    <Compile Include="ClrInterruptFlag.cs" />
-    <Compile Include="ClrCarryFlag.cs" />
-    <Compile Include="CmpMem.cs" />
-    <Compile Include="CmpWord.cs" />
-    <Compile Include="CmpWordInString.cs" />
-    <Compile Include="486AndUp\CmpXchg.cs" />
-    <Compile Include="Compare.cs" />
-    <Compile Include="ConditionalMove.cs" />
-    <Compile Include="Condition.cs" />
-    <Compile Include="JumpIfECXZero.cs" />
-    <Compile Include="DAA.cs" />
-    <Compile Include="DAS.cs" />
-    <Compile Include="SetDirectionFlag.cs" />
-    <Compile Include="Escape.cs" />
-    <Compile Include="Exchange.cs" />
-    <Compile Include="486AndUp\CpuId.cs" />
-    <Compile Include="Halt.cs" />
-    <Compile Include="IMultiply.cs" />
-    <Compile Include="InterruptIfOverflow.cs" />
-    <Compile Include="InvCarryFlag.cs" />
-    <Compile Include="JumpIfCXIs0.cs" />
-    <Compile Include="JumpIfECXIs0.cs" />
-    <Compile Include="JumpIfEvenParity.cs" />
-    <Compile Include="JumpIfNotAbove.cs" />
-    <Compile Include="JumpIfNotAboveOrEqual.cs" />
-    <Compile Include="JumpIfNotBelow.cs" />
-    <Compile Include="JumpIfNotBelowOrEqual.cs" />
-    <Compile Include="JumpIfNotGreater.cs" />
-    <Compile Include="JumpIfNotGreaterOrEqual.cs" />
-    <Compile Include="JumpIfNotLess.cs" />
-    <Compile Include="JumpIfNotLessOrEqual.cs" />
-    <Compile Include="JumpIfNotOverflow.cs" />
-    <Compile Include="JumpIfNotParity.cs" />
-    <Compile Include="JumpIfNotSign.cs" />
-    <Compile Include="JumpIfOddParity.cs" />
-    <Compile Include="JumpIfOverflow.cs" />
-    <Compile Include="JumpIfSign.cs" />
-    <Compile Include="286AndUp\LoadTR.cs" />
-    <Compile Include="MMX\EmptyMMXState.cs" />
-    <Compile Include="MMX\MoveDouble.cs" />
-    <Compile Include="MMX\MoveQuad.cs" />
-    <Compile Include="MMX\And.cs" />
-    <Compile Include="MMX\Nand.cs" />
-    <Compile Include="MMX\Or.cs" />
-    <Compile Include="MMX\ShiftQuadLeft.cs" />
-    <Compile Include="MMX\ShiftQuadRight.cs" />
-    <Compile Include="MMX\ShiftWordLeft.cs" />
-    <Compile Include="MMX\ShiftWordRight.cs" />
-    <Compile Include="MMX\XOr.cs" />
-    <Compile Include="386AndUp\Popfd.cs" />
-    <Compile Include="RotateThroughCarryRight.cs" />
-    <Compile Include="SpecialDebug\DebugStub.cs" />
-    <Compile Include="Dec.cs" />
-    <Compile Include="IDivide.cs" />
-    <Compile Include="InByte.cs" />
-    <Compile Include="Inc.cs" />
-    <Compile Include="InDWord.cs" />
-    <Compile Include="InWord.cs" />
-    <Compile Include="InterruptReturn.cs" />
-    <Compile Include="JumpIfAbove.cs" />
-    <Compile Include="JumpIfAboveOrEqual.cs" />
-    <Compile Include="JumpIfBelow.cs" />
-    <Compile Include="JumpIfBelowOrEqual.cs" />
-    <Compile Include="JumpIfCarry.cs" />
-    <Compile Include="JumpIfGreaterOrEqual.cs" />
-    <Compile Include="JumpIfNotZero.cs" />
-    <Compile Include="386AndUp\MoveAndSignExtend.cs" />
-    <Compile Include="386AndUp\MoveAndZeroExtend.cs" />
-    <Compile Include="Out.cs" />
-    <Compile Include="386AndUp\Popad.cs" />
-    <Compile Include="386AndUp\Pushad.cs" />
-    <Compile Include="RotateThroughCarryLeft.cs" />
-    <Compile Include="SetCarryFlag.cs" />
-    <Compile Include="ShiftAritLeft.cs" />
-    <Compile Include="ShiftAritRight.cs" />
-    <Compile Include="386AndUp\SignExtendAX.cs" />
-    <Compile Include="SingleWordToDouble.cs" />
-    <Compile Include="SetInterruptFlag.cs" />
-    <Compile Include="SSE4a\ExtractQ.cs" />
-    <Compile Include="SSE4a\InsertQ.cs" />
-    <Compile Include="SSE4a\LeadingZeroCount.cs" />
-    <Compile Include="SSE4a\MoveNTSD.cs" />
-    <Compile Include="SSE4a\MoveNTSS.cs" />
-    <Compile Include="SSE4a\PopulationCount.cs" />
-    <Compile Include="SSE4dot2\CRC32.cs" />
-    <Compile Include="SSE4dot2\PCMPESTRI.cs" />
-    <Compile Include="SSE4dot2\PCMPESTRM.cs" />
-    <Compile Include="SSE4dot2\PCMPGTQ.cs" />
-    <Compile Include="SSE4dot2\PCMPISTRI.cs" />
-    <Compile Include="SSE4dot2\PCMPISTRM.cs" />
-    <Compile Include="SSE4dot2\PopulationCount.cs" />
-    <Compile Include="SSEAndMMX2\AddPS.cs" />
-    <Compile Include="SSEAndMMX2\AddSS.cs" />
-    <Compile Include="SSEAndMMX2\CmpOrdSS.cs" />
-    <Compile Include="SSEAndMMX2\CmpPS.cs" />
-    <Compile Include="SSEAndMMX2\CmpSS.cs" />
-    <Compile Include="SSEAndMMX2\CmpUnordSS.cs" />
-    <Compile Include="SSEAndMMX2\DividePS.cs" />
-    <Compile Include="SSEAndMMX2\DivideSS.cs" />
-    <Compile Include="SSEAndMMX2\FXSave.cs" />
-    <Compile Include="SSEAndMMX2\FXStore.cs" />
-    <Compile Include="SSEAndMMX2\MaxPS.cs" />
-    <Compile Include="SSEAndMMX2\MaxSS.cs" />
-    <Compile Include="SSEAndMMX2\MinPS.cs" />
-    <Compile Include="SSEAndMMX2\MinSS.cs" />
-    <Compile Include="SSEAndMMX2\MoveAPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveHLPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveHPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveLHPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveLPS.cs" />
-    <Compile Include="SSEAndMMX2\MoveSS.cs" />
-    <Compile Include="SSEAndMMX2\MoveUPS.cs" />
-    <Compile Include="SSEAndMMX2\MultiplyPS.cs" />
-    <Compile Include="SSEAndMMX2\MultiplySS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalPS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalSQRTPS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalSQRTSS.cs" />
-    <Compile Include="SSEAndMMX2\ReciprocalSS.cs" />
-    <Compile Include="SSEAndMMX2\ShufflePS.cs" />
-    <Compile Include="SSEAndMMX2\SQRTPS.cs" />
-    <Compile Include="SSEAndMMX2\SQRTSS.cs" />
-    <Compile Include="SSEAndMMX2\SubPS.cs" />
-    <Compile Include="SSEAndMMX2\SubSS.cs" />
-    <Compile Include="SSEAndMMX2\UnpackAndILeaveHPS.cs" />
-    <Compile Include="SSEAndMMX2\UnpackAndILeaveLPS.cs" />
-    <Compile Include="StoreSD.cs" />
-    <Compile Include="StoreWordInString.cs" />
-    <Compile Include="JumpIfNotCarry.cs" />
-    <Compile Include="Interrupt.cs" />
-    <Compile Include="JumpBase.cs" />
-    <Compile Include="Not.cs" />
-    <Compile Include="386AndUp\Pushfd.cs" />
-    <Compile Include="Registers.cs" />
-    <Compile Include="ShiftLeft.cs" />
-    <Compile Include="Divide.cs" />
-    <Compile Include="Instruction.cs" />
-    <Compile Include="JumpAlways.cs" />
-    <Compile Include="JumpIfEqual.cs" />
-    <Compile Include="JumpIfGreater.cs" />
-    <Compile Include="JumpIfGreaterOrEquals.cs" />
-    <Compile Include="JumpIfLess.cs" />
-    <Compile Include="JumpIfLessOrEqual.cs" />
-    <Compile Include="JumpIfNotEquals.cs" />
-    <Compile Include="JumpIfZero.cs" />
-    <Compile Include="Move.cs" />
-    <Compile Include="Multiply.cs" />
-    <Compile Include="Neg.cs" />
-    <Compile Include="Noop.cs" />
-    <Compile Include="Or.cs" />
-    <Compile Include="Pop.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Push.cs" />
-    <Compile Include="Return.cs" />
-    <Compile Include="ShiftRight.cs" />
-    <Compile Include="StoreByteInString.cs" />
-    <Compile Include="Sub.cs" />
-    <Compile Include="SubWithCarry.cs" />
-    <Compile Include="Test.cs" />
-    <Compile Include="Wait.cs" />
-    <Compile Include="XLAT.cs" />
-    <Compile Include="Xor.cs" />
-    <Compile Include="X\MemoryAction.cs" />
-    <Compile Include="X\AddressIndirect.cs" />
-    <Compile Include="X\AddressDirect.cs" />
-    <Compile Include="X\Math.cs" />
-    <Compile Include="X\Memory.cs" />
-    <Compile Include="X\Address.cs" />
-    <Compile Include="X\Ports.cs" />
-    <Compile Include="X\PortNumber.cs" />
-    <Compile Include="X\Register.cs" />
-    <Compile Include="X\Register08.cs" />
-    <Compile Include="X\Register16.cs" />
-    <Compile Include="X\Register32.cs" />
-    <Compile Include="X\RegisterAL.cs" />
-    <Compile Include="X\RegisterDX.cs" />
-    <Compile Include="X\RegisterEAX.cs" />
-    <Compile Include="X\RegisterEBP.cs" />
-    <Compile Include="X\RegisterECX.cs" />
-    <Compile Include="X\RegisterEDX.cs" />
-    <Compile Include="X\RegisterESI.cs" />
-    <Compile Include="X\RegisterESP.cs" />
-    <Compile Include="X\Y86.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IL2CPU\Cosmos.IL2CPU.Debug\Cosmos.Debug.csproj">

source/Indy.IL2CPU.Assembler/Indy.IL2CPU.Assembler.csproj

@@ -51,19 +51,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Assembler.cs" />
-    <Compile Include="Comment.cs" />
-    <Compile Include="DataMember.cs" />
-    <Compile Include="RawAssembler.cs" />
-    <Compile Include="ImportMember.cs" />
-    <Compile Include="ImportMethodMember.cs" />
-    <Compile Include="Instruction.cs" />
-    <Compile Include="Label.cs" />
-    <Compile Include="Literal.cs" />
-    <Compile Include="OpCodeAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReaderWriterLocker.cs" />
-    <Compile Include="StackContent.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Cosmos.snk" />