Author: jbevain
Date: 2007-08-28 11:05:19 -0400 (Tue, 28 Aug 2007)
New Revision: 84956
Modified:
trunk/mcs/class/Mono.Cecil/ChangeLog
trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs
trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/SymbolStoreHelper.cs
trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs
Log:
2007-08-28 Jb Evain <[EMAIL PROTECTED]>
* Mono.Cecil.Cil/CodeWriter.cs
Mono.Cecil/ReflectionWriter.cs
Mono.Cecil.Cil/SymbolStoreHelper.cs
Mono.Cecil.Signatures/SignatureWriter.cs:
Generate proper variables signatures for symbols
stores.
Modified: trunk/mcs/class/Mono.Cecil/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Cecil/ChangeLog 2007-08-28 14:35:10 UTC (rev
84955)
+++ trunk/mcs/class/Mono.Cecil/ChangeLog 2007-08-28 15:05:19 UTC (rev
84956)
@@ -1,3 +1,12 @@
+2007-08-28 Jb Evain <[EMAIL PROTECTED]>
+
+ * Mono.Cecil.Cil/CodeWriter.cs
+ Mono.Cecil/ReflectionWriter.cs
+ Mono.Cecil.Cil/SymbolStoreHelper.cs
+ Mono.Cecil.Signatures/SignatureWriter.cs:
+ Generate proper variables signatures for symbols
+ stores.
+
2007-08-19 Jb Evain <[EMAIL PROTECTED]>
* Mono.Cecil.Cil/CodeReader.cs:
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs 2007-08-28
14:35:10 UTC (rev 84955)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionWriter.cs 2007-08-28
15:05:19 UTC (rev 84956)
@@ -1503,10 +1503,9 @@
return signatures;
}
- byte [] GetVariableSig (VariableDefinition definition)
+ byte [] GetVariableSig (VariableDefinition var)
{
- return m_sigWriter.CompressFieldSig (
- GetFieldSig (new FieldReference (string.Empty,
definition.VariableType)));
+ return m_sigWriter.CompressLocalVar
(m_codeWriter.GetLocalVariableSig (var));
}
}
}
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs 2007-08-28
14:35:10 UTC (rev 84955)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs 2007-08-28
15:05:19 UTC (rev 84956)
@@ -420,32 +420,38 @@
(int) (m_binaryWriter.BaseStream.Position -
pos));
}
- LocalVarSig GetLocalVarSig (VariableDefinitionCollection vars)
+ public LocalVarSig.LocalVariable GetLocalVariableSig
(VariableDefinition var)
{
+ LocalVarSig.LocalVariable lv = new
LocalVarSig.LocalVariable ();
+ TypeReference type = var.VariableType;
+
+ lv.CustomMods = m_reflectWriter.GetCustomMods (type);
+
+ if (type is PinnedType) {
+ lv.Constraint |= Constraint.Pinned;
+ type = (type as PinnedType).ElementType;
+ }
+
+ if (type is ReferenceType) {
+ lv.ByRef = true;
+ type = (type as ReferenceType).ElementType;
+ }
+
+ lv.Type = m_reflectWriter.GetSigType (type);
+
+ return lv;
+ }
+
+ public LocalVarSig GetLocalVarSig (VariableDefinitionCollection
vars)
+ {
LocalVarSig lvs = new LocalVarSig ();
lvs.CallingConvention |= 0x7;
lvs.Count = vars.Count;
lvs.LocalVariables = new LocalVarSig.LocalVariable
[lvs.Count];
for (int i = 0; i < lvs.Count; i++) {
- LocalVarSig.LocalVariable lv = new
LocalVarSig.LocalVariable ();
- TypeReference type = vars [i].VariableType;
+ lvs.LocalVariables [i] = GetLocalVariableSig
(vars [i]);
+ }
- lv.CustomMods = m_reflectWriter.GetCustomMods
(type);
-
- if (type is PinnedType) {
- lv.Constraint |= Constraint.Pinned;
- type = (type as PinnedType).ElementType;
- }
-
- if (type is ReferenceType) {
- lv.ByRef = true;
- type = (type as
ReferenceType).ElementType;
- }
-
- lv.Type = m_reflectWriter.GetSigType (type);
-
- lvs.LocalVariables [i] = lv;
- }
return lvs;
}
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/SymbolStoreHelper.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/SymbolStoreHelper.cs
2007-08-28 14:35:10 UTC (rev 84955)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Cil/SymbolStoreHelper.cs
2007-08-28 15:05:19 UTC (rev 84956)
@@ -29,7 +29,6 @@
namespace Mono.Cecil.Cil {
using System;
- using System.IO;
using SR = System.Reflection;
class SymbolStoreHelper {
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
2007-08-28 14:35:10 UTC (rev 84955)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
2007-08-28 15:05:19 UTC (rev 84956)
@@ -124,6 +124,13 @@
return m_sigWriter.ToArray ();
}
+ public byte [] CompressLocalVar (LocalVarSig.LocalVariable var)
+ {
+ m_sigWriter.Empty ();
+ Write (var);
+ return m_sigWriter.ToArray ();
+ }
+
void CompressCustomAttribute (CustomAttrib ca, MethodReference
ctor, MemoryBinaryWriter writer)
{
m_sigWriter.Empty ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches