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

Browse source
This commit is contained in:
kudzu_cp 2008-04-27 01:12:06 +00:00
parent 8b07d5daac
commit f95db75e67
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/Cosmos.Build.Windows/DebugWindow.xaml
View file

@ -29,6 +29,7 @@
<Button Name="butnTest">Test</Button> <Button Name="butnTest">Test</Button>
</ToolBar> </ToolBar>
</ToolBarTray> </ToolBarTray>
<Label Name="lablSourceFilename" DockPanel.Dock="Top"></Label>
<FlowDocumentScrollViewer Name="fdsvSource" /> <FlowDocumentScrollViewer Name="fdsvSource" />
</DockPanel> </DockPanel>
</DockPanel> </DockPanel>

1
source/Cosmos.Build.Windows/DebugWindow.xaml.cs
View file

@ -77,6 +77,7 @@ namespace Cosmos.Build.Windows {
public void LoadSourceFile(string aPathname) { public void LoadSourceFile(string aPathname) {
var xSourceCode = System.IO.File.ReadAllLines(aPathname); var xSourceCode = System.IO.File.ReadAllLines(aPathname);
lablSourceFilename.Content = System.IO.Path.GetFileName(aPathname);
var xPara = new Paragraph(); var xPara = new Paragraph();
mLines.Clear(); mLines.Clear();
fdsvSource.Document = new FlowDocument(); fdsvSource.Document = new FlowDocument();

14
source/Cosmos/Cosmos.Hardware/PC/Global.cs
View file

@ -23,14 +23,20 @@ namespace Cosmos.Hardware.PC {
HW.PC.Bus.PCIBus.Init(); HW.PC.Bus.PCIBus.Init();
// end partially new // end partially new
if (!noATA) HW.Storage.ATA.Initialize(Sleep); if (!noATA) {
if (!noATAOld) HW.Storage.ATAOld.Initialize(Sleep); HW.Storage.ATA.Initialize(Sleep);
}
if (!noATAOld) {
HW.Storage.ATAOld.Initialize(Sleep);
}
HW.CPU.CreateIDT(); HW.CPU.CreateIDT();
// end old ----------------- // end old -----------------
// MTW new // MTW new
if (!noATA2) HW.Storage.ATA2.ATA.Initialize(Sleep); if (!noATA2) {
HW.Storage.ATA2.ATA.Initialize(Sleep);
}
// MTW new end // MTW new end
HW.Device.Add(new Bus.CPU.Keyboard()); HW.Device.Add(new Bus.CPU.Keyboard());
@ -47,7 +53,7 @@ namespace Cosmos.Hardware.PC {
} }
private static void Tick(object aSender, EventArgs aEventArgs) { private static void Tick(object aSender, EventArgs aEventArgs) {
TickCount += 1; TickCount++;
} }
//TODO: Change this to use an x86 Op or something so it doesnt //TODO: Change this to use an x86 Op or something so it doesnt

2
source/Indy.IL2CPU.Assembler.X86/Assembler.cs
View file

@ -184,8 +184,8 @@ namespace Indy.IL2CPU.Assembler.X86 {
new Ret(); new Ret();
} }
} }
}
aOutputWriter.WriteLine(xAsm.GetContents()); aOutputWriter.WriteLine(xAsm.GetContents());
}
} }
protected override void EmitDataSectionHeader(string aGroup, TextWriter aOutputWriter) { protected override void EmitDataSectionHeader(string aGroup, TextWriter aOutputWriter) {