diff --git a/source2/Build/Cosmos.Build.Common/BuildProperties.cs b/source2/Build/Cosmos.Build.Common/BuildProperties.cs
index d5ac79b53..b1841acb7 100644
--- a/source2/Build/Cosmos.Build.Common/BuildProperties.cs
+++ b/source2/Build/Cosmos.Build.Common/BuildProperties.cs
@@ -7,68 +7,81 @@ namespace Cosmos.Build.Common {
public class BuildProperties : PropertiesBase {
// Profile
+ public const string ProfileString = "Profile";
public Profile Profile {
- get { return GetProperty("Profile", Profile.VMware); }
- set { SetProperty("Profile", value); }
+ get { return GetProperty(ProfileString, Profile.VMware); }
+ set { SetProperty(ProfileString, value); }
}
// Deployment
+ public const string DeploymentString = "Deployment";
public Deployment Deployment {
- get { return GetProperty("Deployment", Deployment.ISO); }
- set { SetProperty("Deployment", value); }
+ get { return GetProperty(DeploymentString, Deployment.ISO); }
+ set { SetProperty(DeploymentString, value); }
}
// Launch
+ public const string LaunchString = "Launch";
public Launch Launch {
- get { return GetProperty("Launch", Launch.VMware); }
- set { SetProperty("Launch", value); }
+ get { return GetProperty(LaunchString, Launch.VMware); }
+ set { SetProperty(LaunchString, value); }
}
// Debug
+ public const string DebugEnabledString = "DebugEnabled";
public bool DebugEnabled {
- get { return GetProperty("DebugEnabled", true); }
- set { SetProperty("DebugEnabled", value); }
+ get { return GetProperty(DebugEnabledString, true); }
+ set { SetProperty(DebugEnabledString, value); }
}
+ public const string DebugModeString = "DebugMode";
public DebugMode DebugMode {
- get { return GetProperty("DebugMode", DebugMode.Source); }
- set { SetProperty("DebugMode", value); }
+ get { return GetProperty(DebugModeString, DebugMode.Source); }
+ set { SetProperty(DebugModeString, value); }
}
+ public const string IgnoreDebugStubAttributeString = "IgnoreDebugStubAttribute";
public bool IgnoreDebugStubAttribute {
- get { return GetProperty("IgnoreDebugStubAttribute", false); }
- set { SetProperty("IgnoreDebugStubAttribute", value); }
+ get { return GetProperty(IgnoreDebugStubAttributeString, false); }
+ set { SetProperty(IgnoreDebugStubAttributeString, value); }
}
// VMware
+ public const string VMwareEditionString = "VMwareEdition";
public VMwareEdition VMwareEdition {
- get { return GetProperty("VMwareEdition", VMwareEdition.Player); }
- set { SetProperty("VMwareEdition", value); }
+ get { return GetProperty(VMwareEditionString, VMwareEdition.Player); }
+ set { SetProperty(VMwareEditionString, value); }
}
+ public const string OutputPathString = "OutputPath";
public String OutputPath {
- get { return GetProperty("OutputPath"); }
- set { SetProperty("OutputPath", value); }
+ get { return GetProperty(OutputPathString); }
+ set { SetProperty(OutputPathString, value); }
}
+ public const string FrameworkString = "Framework";
public Framework Framework {
- get { return GetProperty("Framework", Common.Framework.MicrosoftNET); }
- set { SetProperty("Framework", value); }
+ get { return GetProperty(FrameworkString, Common.Framework.MicrosoftNET); }
+ set { SetProperty(FrameworkString, value); }
}
+ public const string UseInternalAssemblerString = "UseInternalAssembler";
public Boolean UseInternalAssembler {
- get { return GetProperty("UseInternalAssembler", false); }
- set { SetProperty("UseInternalAssembler", value); }
+ get { return GetProperty(UseInternalAssemblerString, false); }
+ set { SetProperty(UseInternalAssemblerString, value); }
}
+ public const string TraceAssembliesString = "TraceAssemblies";
public TraceAssemblies TraceAssemblies {
- get { return GetProperty("TraceAssemblies", TraceAssemblies.User); }
- set { SetProperty("TraceAssemblies", value); }
+ get { return GetProperty(TraceAssembliesString, TraceAssemblies.User); }
+ set { SetProperty(TraceAssembliesString, value); }
}
+ public const string EnableGDBString = "EnableGDB";
public Boolean EnableGDB {
- get { return GetProperty("EnableGDB", false); }
- set { SetProperty("EnableGDB", value); }
+ get { return GetProperty(EnableGDBString, false); }
+ set { SetProperty(EnableGDBString, value); }
}
+ public const string StartCosmosGDBString = "StartCosmosGDB";
public bool StartCosmosGDB {
- get { return GetProperty("StartCosmosGDB", false); }
- set { SetProperty("StartCosmosGDB", value); }
+ get { return GetProperty(StartCosmosGDBString, false); }
+ set { SetProperty(StartCosmosGDBString, value); }
}
}
}
\ No newline at end of file
diff --git a/source2/Demos/Guess/Guess.Cosmos b/source2/Demos/Guess/Guess.Cosmos
index 5bc3f1783..fabfbd398 100644
--- a/source2/Demos/Guess/Guess.Cosmos
+++ b/source2/Demos/Guess/Guess.Cosmos
@@ -14,7 +14,7 @@
SAK
- VMware
+ USB
true
bin\Debug\
MicrosoftNET
@@ -33,7 +33,7 @@
True
- VMware
+ USB
true
bin\Debug\
MicrosoftNET
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.X86/AppAssembler.cs b/source2/IL2CPU/Cosmos.IL2CPU.X86/AppAssembler.cs
index b9a5cd395..717320b94 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.X86/AppAssembler.cs
+++ b/source2/IL2CPU/Cosmos.IL2CPU.X86/AppAssembler.cs
@@ -87,6 +87,7 @@ namespace Cosmos.IL2CPU.X86 {
new Push { DestinationReg = Registers.EBP };
new Mov { DestinationReg = Registers.EBP, SourceReg = Registers.ESP };
new Call { DestinationLabel = InitVMTCodeLabel };
+ CosmosAssembler.WriteDebugVideo("Initializing string IDs.");
new Call { DestinationLabel = InitStringIDsLabel };
// we now need to do "newobj" on the entry point, and after that, call .Start on it
diff --git a/source2/Kernel/System/Cosmos.System/Kernel.cs b/source2/Kernel/System/Cosmos.System/Kernel.cs
index 97db51c67..daf296d79 100644
--- a/source2/Kernel/System/Cosmos.System/Kernel.cs
+++ b/source2/Kernel/System/Cosmos.System/Kernel.cs
@@ -31,10 +31,12 @@ namespace Cosmos.System {
}
BeforeRun();
+
while (!mStopped) {
- Network.NetworkStack.Update();
- Run();
+ Network.NetworkStack.Update();
+ Run();
}
+
AfterRun();
bool xTest = 1 != 3;
while (xTest) {