From 9171a3de35df1fdcb1db95de785fed5ce9a0d239 Mon Sep 17 00:00:00 2001 From: Matthijs ter Woord Date: Thu, 23 Jul 2015 11:58:30 -0400 Subject: [PATCH] . --- Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs | 6 +++--- source/Cosmos.IL2CPU/AppAssembler.cs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs index a4a0ea786..ca54385ba 100644 --- a/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs +++ b/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs @@ -19,11 +19,11 @@ namespace Cosmos.TestRunner.Core // if you're working on the compiler (or other lower parts), you can choose to run the compiler in process // 1 thing to keep in mind though, is that this only works with 1 kernel at a time! - engine.RunIL2CPUInProcess = false; + engine.RunIL2CPUInProcess = true; - engine.AddKernel(typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.Kernel).Assembly.Location); + //engine.AddKernel(typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel.Kernel).Assembly.Location); engine.AddKernel(typeof(SimpleStructsAndArraysTest.Kernel).Assembly.Location); - engine.AddKernel(typeof(VGACompilerCrash.Kernel).Assembly.Location); + //engine.AddKernel(typeof(VGACompilerCrash.Kernel).Assembly.Location); // known bugs, therefor disabled for now: diff --git a/source/Cosmos.IL2CPU/AppAssembler.cs b/source/Cosmos.IL2CPU/AppAssembler.cs index 9ba6e52d2..6712f7857 100644 --- a/source/Cosmos.IL2CPU/AppAssembler.cs +++ b/source/Cosmos.IL2CPU/AppAssembler.cs @@ -1416,6 +1416,7 @@ namespace Cosmos.IL2CPU string xLabel = TmpPosLabel(aMethod, aOpCode); Assembler.CurrentIlLabel = xLabel; new Cosmos.Assembler.Label(xLabel); + if (aMethod.MethodBase.DeclaringType != typeof(VTablesImpl)) { Assembler.EmitAsmLabels = false;