Permalink
Browse files

- Fixed build?

  • Loading branch information...
1 parent cfd1545 commit 9c3f85c9ad6a0bcfe783f91f8a78efd0ab8e344f @soywiz soywiz committed Jul 17, 2012
@@ -181,8 +181,8 @@ public void j()
//FieldBuilder.SetValue(null, 1);
//MipsMethodEmiter.ILGenerator.Emit(OpCodes.Callvirt);
-
- SafeILGenerator.Return();
+
+ SafeILGenerator.Return(typeof(void));
}
/// <summary>
@@ -204,7 +204,7 @@ public void jr()
{
MipsMethodEmiter.LoadGPR_Unsigned(RS);
});
- SafeILGenerator.Return();
+ SafeILGenerator.Return(typeof(void));
}
public event Action<uint> AnalyzePCEvent;
@@ -153,7 +153,7 @@ public MipsMethodEmiter(CpuProcessor Processor, uint PC, bool DoDebug = false, b
public Action<CpuThreadState> CreateDelegate()
{
- SafeILGenerator.Return();
+ SafeILGenerator.Return(typeof(void));
try
{
@@ -132,7 +132,7 @@ static public void GenerateSwitchCode(SafeILGenerator SafeILGenerator, IEnumerab
}
);
- SafeILGenerator.Return();
+ SafeILGenerator.Return(typeof(void));
#else
foreach (var MaskGroup in MaskGroups.Select(MaskGroup => MaskGroup.ToArray()))
{
@@ -42,7 +42,7 @@ protected VertexReaderDynarec(SafeILGenerator SafeILGenerator, VertexTypeStruct
this.VertexInfoArgument = SafeILGenerator.DeclareArgument(typeof(VertexInfo*), 0);
this.IndexArgument = SafeILGenerator.DeclareArgument(typeof(int), 0);
this.CountArgument = SafeILGenerator.DeclareArgument(typeof(int), 0);
- this.LocalColor = SafeILGenerator.DeclareLocal<uint>("LocalColor");
+ this.LocalColor = SafeILGenerator.DeclareLocal<uint>("LocalColor", false);
}
private void AlignTo(int Alignment)
@@ -218,7 +218,7 @@ private void GenerateCode()
Console.Error.WriteLine("Get:{0}, Calculated:{1}", Offset, VertexType.GetVertexSize());
Debug.Assert(Offset == VertexType.GetVertexSize());
- SafeILGenerator.Return();
+ SafeILGenerator.Return(typeof(void));
//Console.Error.WriteLine(DynamicMethod.GetMethodBody().GetILAsByteArray());
}
}
@@ -172,19 +172,22 @@ public void PendingOpcodes()
throw (new NotImplementedException());
}
- public LocalBuilder DeclareLocal(Type Type, string Name = "")
+ public LocalBuilder DeclareLocal(Type Type, string Name = "", bool UseSymbolicInformation = true)
{
var LocalBuilder = __ILGenerator.DeclareLocal(Type);
if (Name != null && Name != "")
{
- LocalBuilder.SetLocalSymInfo(Name);
+ if (UseSymbolicInformation)
+ {
+ LocalBuilder.SetLocalSymInfo(Name);
+ }
}
return LocalBuilder;
}
- public LocalBuilder DeclareLocal<TType>(string Name = "")
+ public LocalBuilder DeclareLocal<TType>(string Name = "", bool UseSymbolicInformation = true)
{
- return DeclareLocal(typeof(TType), Name);
+ return DeclareLocal(typeof(TType), Name, UseSymbolicInformation);
}
public void CheckAndFinalize()
@@ -405,7 +405,7 @@ public void Switch(Dictionary<int, SafeLabel> Labels, SafeLabel DefaultLabel)
{
#if true
// SwitchReferenceValue = <expression>
- var SwitchReferenceValue = DeclareLocal<int>("SwitchReferenceValue");
+ var SwitchReferenceValue = DeclareLocal<int>("SwitchReferenceValue", false);
StoreLocal(SwitchReferenceValue);
foreach (var Pair in Labels)

0 comments on commit 9c3f85c

Please sign in to comment.