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

More Exceptions support

Browse source
This commit is contained in:
mterwoord_cp 2008-01-09 07:02:11 +00:00
parent f505fb3b59
commit 9507e22f8e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/Cosmos.Build.Windows/Builder.cs
View file

@ -8,7 +8,8 @@ using System.Text;
namespace Cosmos.Build.Windows {
public class Builder {
//TODO: Fix this - config file? Package format?
protected const string mCosmosPath = @"s:\source\il2cpu\";
//protected const string mCosmosPath = @"s:\source\il2cpu\";
protected const string mCosmosPath = @"D:\dotnet\IL2ASM\repos\";
protected string mBuildPath;
public Builder() {

4
source/Cosmos/Cosmos.Shell.Console/Commands/MatthijsCommand.cs
View file

@ -28,9 +28,7 @@ namespace Cosmos.Shell.Console.Commands {
} catch (Exception E){
System.Console.WriteLine("Error Occurred while executing Command!");
System.Console.Write("Details: ");
System.Diagnostics.Debugger.Break();
string xMessage = E.Message;
System.Console.Write(E.Message);
System.Console.WriteLine(E.Message);
}
}

3
source/Indy.IL2CPU.IL.X86/Op.cs
View file

@ -4,6 +4,7 @@ using Indy.IL2CPU.Assembler;
using Indy.IL2CPU.Assembler.X86;
using CPUx86 = Indy.IL2CPU.Assembler.X86;
using Instruction = Mono.Cecil.Cil.Instruction;
using Mono.Cecil.Cil;
namespace Indy.IL2CPU.IL.X86 {
public abstract class Op: IL.Op {
@ -15,7 +16,7 @@ namespace Indy.IL2CPU.IL.X86 {
// System.Diagnostics.Debugger.Break();
//}
if (aMethodInfo != null && aMethodInfo.CurrentHandler != null) {
mNeedsExceptionPush = (aMethodInfo.CurrentHandler.HandlerStart != null && aMethodInfo.CurrentHandler.HandlerStart.Offset == aInstruction.Offset) || (aMethodInfo.CurrentHandler.FilterStart != null && aMethodInfo.CurrentHandler.FilterStart.Offset == aInstruction.Offset);
mNeedsExceptionPush = ((aMethodInfo.CurrentHandler.HandlerStart != null && aMethodInfo.CurrentHandler.HandlerStart.Offset == aInstruction.Offset) || (aMethodInfo.CurrentHandler.FilterStart != null && aMethodInfo.CurrentHandler.FilterStart.Offset == aInstruction.Offset)) && (aMethodInfo.CurrentHandler.Type == ExceptionHandlerType.Catch);
mNeedsExceptionClear = (aMethodInfo.CurrentHandler.HandlerEnd != null && aMethodInfo.CurrentHandler.HandlerEnd.Offset == (aInstruction.Offset + 1)) || (aMethodInfo.CurrentHandler.FilterEnd != null && aMethodInfo.CurrentHandler.FilterEnd.Offset == (aInstruction.Offset + 1));
}
}