This commit is contained in:
kudzu_cp 2012-06-29 05:06:35 +00:00
parent afb80d7cd4
commit 0790ed2cd9
4 changed files with 46 additions and 30 deletions

View file

@ -7,68 +7,81 @@ namespace Cosmos.Build.Common {
public class BuildProperties : PropertiesBase { public class BuildProperties : PropertiesBase {
// Profile // Profile
public const string ProfileString = "Profile";
public Profile Profile { public Profile Profile {
get { return GetProperty("Profile", Profile.VMware); } get { return GetProperty(ProfileString, Profile.VMware); }
set { SetProperty("Profile", value); } set { SetProperty(ProfileString, value); }
} }
// Deployment // Deployment
public const string DeploymentString = "Deployment";
public Deployment Deployment { public Deployment Deployment {
get { return GetProperty("Deployment", Deployment.ISO); } get { return GetProperty(DeploymentString, Deployment.ISO); }
set { SetProperty("Deployment", value); } set { SetProperty(DeploymentString, value); }
} }
// Launch // Launch
public const string LaunchString = "Launch";
public Launch Launch { public Launch Launch {
get { return GetProperty("Launch", Launch.VMware); } get { return GetProperty(LaunchString, Launch.VMware); }
set { SetProperty("Launch", value); } set { SetProperty(LaunchString, value); }
} }
// Debug // Debug
public const string DebugEnabledString = "DebugEnabled";
public bool DebugEnabled { public bool DebugEnabled {
get { return GetProperty("DebugEnabled", true); } get { return GetProperty(DebugEnabledString, true); }
set { SetProperty("DebugEnabled", value); } set { SetProperty(DebugEnabledString, value); }
} }
public const string DebugModeString = "DebugMode";
public DebugMode DebugMode { public DebugMode DebugMode {
get { return GetProperty("DebugMode", DebugMode.Source); } get { return GetProperty(DebugModeString, DebugMode.Source); }
set { SetProperty("DebugMode", value); } set { SetProperty(DebugModeString, value); }
} }
public const string IgnoreDebugStubAttributeString = "IgnoreDebugStubAttribute";
public bool IgnoreDebugStubAttribute { public bool IgnoreDebugStubAttribute {
get { return GetProperty("IgnoreDebugStubAttribute", false); } get { return GetProperty(IgnoreDebugStubAttributeString, false); }
set { SetProperty("IgnoreDebugStubAttribute", value); } set { SetProperty(IgnoreDebugStubAttributeString, value); }
} }
// VMware // VMware
public const string VMwareEditionString = "VMwareEdition";
public VMwareEdition VMwareEdition { public VMwareEdition VMwareEdition {
get { return GetProperty("VMwareEdition", VMwareEdition.Player); } get { return GetProperty(VMwareEditionString, VMwareEdition.Player); }
set { SetProperty("VMwareEdition", value); } set { SetProperty(VMwareEditionString, value); }
} }
public const string OutputPathString = "OutputPath";
public String OutputPath { public String OutputPath {
get { return GetProperty("OutputPath"); } get { return GetProperty(OutputPathString); }
set { SetProperty("OutputPath", value); } set { SetProperty(OutputPathString, value); }
} }
public const string FrameworkString = "Framework";
public Framework Framework { public Framework Framework {
get { return GetProperty("Framework", Common.Framework.MicrosoftNET); } get { return GetProperty(FrameworkString, Common.Framework.MicrosoftNET); }
set { SetProperty("Framework", value); } set { SetProperty(FrameworkString, value); }
} }
public const string UseInternalAssemblerString = "UseInternalAssembler";
public Boolean UseInternalAssembler { public Boolean UseInternalAssembler {
get { return GetProperty("UseInternalAssembler", false); } get { return GetProperty(UseInternalAssemblerString, false); }
set { SetProperty("UseInternalAssembler", value); } set { SetProperty(UseInternalAssemblerString, value); }
} }
public const string TraceAssembliesString = "TraceAssemblies";
public TraceAssemblies TraceAssemblies { public TraceAssemblies TraceAssemblies {
get { return GetProperty("TraceAssemblies", TraceAssemblies.User); } get { return GetProperty(TraceAssembliesString, TraceAssemblies.User); }
set { SetProperty("TraceAssemblies", value); } set { SetProperty(TraceAssembliesString, value); }
} }
public const string EnableGDBString = "EnableGDB";
public Boolean EnableGDB { public Boolean EnableGDB {
get { return GetProperty("EnableGDB", false); } get { return GetProperty(EnableGDBString, false); }
set { SetProperty("EnableGDB", value); } set { SetProperty(EnableGDBString, value); }
} }
public const string StartCosmosGDBString = "StartCosmosGDB";
public bool StartCosmosGDB { public bool StartCosmosGDB {
get { return GetProperty("StartCosmosGDB", false); } get { return GetProperty(StartCosmosGDBString, false); }
set { SetProperty("StartCosmosGDB", value); } set { SetProperty(StartCosmosGDBString, value); }
} }
} }
} }

View file

@ -14,7 +14,7 @@
<SccLocalPath>SAK</SccLocalPath> <SccLocalPath>SAK</SccLocalPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile> <Profile>USB</Profile>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<Framework>MicrosoftNET</Framework> <Framework>MicrosoftNET</Framework>
@ -33,7 +33,7 @@
<DebugEnabled>True</DebugEnabled> <DebugEnabled>True</DebugEnabled>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Profile>VMware</Profile> <Profile>USB</Profile>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<Framework>MicrosoftNET</Framework> <Framework>MicrosoftNET</Framework>

View file

@ -87,6 +87,7 @@ namespace Cosmos.IL2CPU.X86 {
new Push { DestinationReg = Registers.EBP }; new Push { DestinationReg = Registers.EBP };
new Mov { DestinationReg = Registers.EBP, SourceReg = Registers.ESP }; new Mov { DestinationReg = Registers.EBP, SourceReg = Registers.ESP };
new Call { DestinationLabel = InitVMTCodeLabel }; new Call { DestinationLabel = InitVMTCodeLabel };
CosmosAssembler.WriteDebugVideo("Initializing string IDs.");
new Call { DestinationLabel = InitStringIDsLabel }; new Call { DestinationLabel = InitStringIDsLabel };
// we now need to do "newobj" on the entry point, and after that, call .Start on it // we now need to do "newobj" on the entry point, and after that, call .Start on it

View file

@ -31,10 +31,12 @@ namespace Cosmos.System {
} }
BeforeRun(); BeforeRun();
while (!mStopped) { while (!mStopped) {
Network.NetworkStack.Update(); Network.NetworkStack.Update();
Run(); Run();
} }
AfterRun(); AfterRun();
bool xTest = 1 != 3; bool xTest = 1 != 3;
while (xTest) { while (xTest) {