WIP - Method Scanner (#584)

mosa · Feb 3, 2019 · 30f4fd1 · 30f4fd1
1 parent a4bf9f2
commit 30f4fd1
Show file tree

Hide file tree

Showing 54 changed files with 1,185 additions and 591 deletions.
diff --git a/Source/MOSA.sln b/Source/MOSA.sln
diff --git a/Source/Mosa.Compiler.Framework/BaseCodeEmitter.cs b/Source/Mosa.Compiler.Framework/BaseCodeEmitter.cs
@@ -246,7 +246,7 @@ public void EmitRelative32(Operand symbolOperand)
 				LinkType.RelativeOffset,
 				PatchType.I4,
 				MethodName,
-				(int)CodeStream.Position,
+				CodeStream.Position,
 				symbolOperand.Name,
 				-4
 			);
@@ -258,7 +258,7 @@ public void EmitRelative64(Operand symbolOperand)
 				LinkType.RelativeOffset,
 				PatchType.I8,
 				MethodName,
-				(int)CodeStream.Position,
+				CodeStream.Position,
 				symbolOperand.Name,
 				-8
 			);

diff --git a/Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs b/Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs
@@ -656,7 +656,7 @@ protected TraceLog CreateTraceLog(int traceLevel = 0)
 		{
 			bool active = IsTraceable(traceLevel);
 
-			var traceLog = new TraceLog(TraceType.DebugTrace, MethodCompiler.Method, FormattedStageName, active);
+			var traceLog = new TraceLog(TraceType.MethodDebug, MethodCompiler.Method, FormattedStageName, active);
 
 			if (active)
 				traceLogs.Add(traceLog);
@@ -673,7 +673,7 @@ public TraceLog CreateTraceLog(int traceLevel, string section)
 		{
 			bool active = IsTraceable(traceLevel);
 
-			var traceLog = new TraceLog(TraceType.DebugTrace, MethodCompiler.Method, FormattedStageName, section, active);
+			var traceLog = new TraceLog(TraceType.MethodDebug, MethodCompiler.Method, FormattedStageName, section, active);
 
 			if (active)
 				traceLogs.Add(traceLog);

diff --git a/Source/Mosa.Compiler.Framework/Compiler.cs b/Source/Mosa.Compiler.Framework/Compiler.cs
@@ -272,7 +272,7 @@ public void CompileMethod(MosaMethod method, BasicBlocks basicBlocks, int thread
 			methodCompiler.Compile();
 
 			NewCompilerTraceEvent(CompilerEvent.CompiledMethod, method.FullName, threadID);
-			CompilerTrace.TraceListener.OnMethodcompiled(method);
+			CompilerTrace.TraceListener.OnMethodCompiled(method);
 		}
 
 		private MethodCompiler GetMethodCompiler(MosaMethod method, BasicBlocks basicBlocks, int threadID = 0)
@@ -457,6 +457,8 @@ internal void PostCompile()
 				NewCompilerTraceEvent(CompilerEvent.PostCompileStageEnd, stage.Name);
 			}
 
+			MethodScanner.Complete();
+
 			// Sum up the counters
 			foreach (var methodData in CompilerData.MethodData)
 			{

diff --git a/Source/Mosa.Compiler.Framework/CompilerStages/DebugFileGenerationStage.cs b/Source/Mosa.Compiler.Framework/CompilerStages/DebugFileGenerationStage.cs
@@ -13,8 +13,6 @@ public sealed class DebugFileGenerationStage : BaseCompilerStage
 	{
 		#region Data Members
 
-		public string DebugFile { get; set; }
-
 		/// <summary>
 		/// Holds the text writer used to emit the map file.
 		/// </summary>
@@ -24,17 +22,12 @@ public sealed class DebugFileGenerationStage : BaseCompilerStage
 
 		#endregion Data Members
 
-		protected override void Setup()
-		{
-			DebugFile = CompilerOptions.DebugFile;
-		}
-
 		protected override void RunPostCompile()
 		{
-			if (string.IsNullOrEmpty(DebugFile))
+			if (string.IsNullOrEmpty(CompilerOptions.DebugFile))
 				return;
 
-			using (writer = new StreamWriter(DebugFile))
+			using (writer = new StreamWriter(CompilerOptions.DebugFile))
 			{
 				EmitSections();
 				EmitSymbols();

diff --git a/Source/Mosa.Compiler.Framework/CompilerStages/LinkerFinalizationStage.cs b/Source/Mosa.Compiler.Framework/CompilerStages/LinkerFinalizationStage.cs
@@ -1,5 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
+using Mosa.Compiler.Framework.Linker;
 using System.IO;
 
 namespace Mosa.Compiler.Framework.CompilerStages
@@ -21,6 +22,11 @@ protected override void RunPostCompile()
 			{
 				Linker.Emit(file);
 			}
+
+			Compiler.GlobalCounters.Update("Linker.Text", (int)Linker.LinkerSections[(int)SectionKind.Text].Size);
+			Compiler.GlobalCounters.Update("Linker.Data", (int)Linker.LinkerSections[(int)SectionKind.Data].Size);
+			Compiler.GlobalCounters.Update("Linker.ROData", (int)Linker.LinkerSections[(int)SectionKind.ROData].Size);
+			Compiler.GlobalCounters.Update("Linker.BSS", (int)Linker.LinkerSections[(int)SectionKind.BSS].Size);
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/CompilerStages/MapFileGenerationStage.cs b/Source/Mosa.Compiler.Framework/CompilerStages/MapFileGenerationStage.cs
@@ -14,8 +14,6 @@ public sealed class MapFileGenerationStage : BaseCompilerStage
 	{
 		#region Data Members
 
-		public string MapFile { get; set; }
-
 		/// <summary>
 		/// Holds the text writer used to emit the map file.
 		/// </summary>
@@ -25,15 +23,14 @@ public sealed class MapFileGenerationStage : BaseCompilerStage
 
 		protected override void Setup()
 		{
-			MapFile = CompilerOptions.MapFile;
 		}
 
 		protected override void RunPostCompile()
 		{
-			if (string.IsNullOrEmpty(MapFile))
+			if (string.IsNullOrEmpty(CompilerOptions.MapFile))
 				return;
 
-			using (writer = new StreamWriter(MapFile))
+			using (writer = new StreamWriter(CompilerOptions.MapFile))
 			{
 				// Emit map file header
 				writer.WriteLine(CompilerOptions.OutputFile);