Author: ankit
Date: 2005-04-18 00:17:27 -0400 (Mon, 18 Apr 2005)
New Revision: 43182
Modified:
trunk/mcs/class/PEAPI/ChangeLog
trunk/mcs/class/PEAPI/PEAPI.cs
trunk/mcs/class/PEAPI/README.txt
trunk/mcs/ilasm/codegen/ChangeLog
trunk/mcs/ilasm/codegen/CodeGen.cs
trunk/mcs/ilasm/parser/ChangeLog
trunk/mcs/ilasm/parser/ILParser.jay
Log:
In class/PEAPI:
2005-04-18 Ankit Jain <[EMAIL PROTECTED]>
* PEAPI.cs (ManifestResource.InitResource): New. Used by constructors
to initialize the resource.
(ManifestResource.ctor): New. Constructor to accept resource as a
byte array.
(ManifestResource.ctor): New. Constructor to accept an object of self.
(ManifestResource.BuildTables): Update.
(MetaData.AddResource): New. Add the resource to the list, adjust
resourcesSize.
(MetaData.WriteResource): New. Write resources to the FileImage.
(PEFile.AddExternalManagedResource): New. Add a new resource.
(PEFile.GetResource): New. Get resource by name.
(PEFile.GetResources): New. Get array of resources.
In ilasm/codegen:
2005-04-18 Ankit Jain <[EMAIL PROTECTED]>
* CodeGen.cs (CodeGen.AddManifestResource): Add a
ManifestResource to manifestResources ArrayList.
(CodeGen.Write): Add all resources to the pefile.
In ilasm/parser:
2005-04-18 Ankit Jain <[EMAIL PROTECTED]>
* ILParser.jay (manifestres_head): Read resource file and
add ManifestResource with CodeGen.
(manres_attr): Set visibility flag of the resource.
Modified: trunk/mcs/class/PEAPI/ChangeLog
===================================================================
--- trunk/mcs/class/PEAPI/ChangeLog 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/class/PEAPI/ChangeLog 2005-04-18 04:17:27 UTC (rev 43182)
@@ -1,3 +1,18 @@
+2005-04-18 Ankit Jain <[EMAIL PROTECTED]>
+
+ * PEAPI.cs (ManifestResource.InitResource): New. Used by constructors
+ to initialize the resource.
+ (ManifestResource.ctor): New. Constructor to accept resource as a
+ byte array.
+ (ManifestResource.ctor): New. Constructor to accept an object of self.
+ (ManifestResource.BuildTables): Update.
+ (MetaData.AddResource): New. Add the resource to the list, adjust
+ resourcesSize.
+ (MetaData.WriteResource): New. Write resources to the FileImage.
+ (PEFile.AddExternalManagedResource): New. Add a new resource.
+ (PEFile.GetResource): New. Get resource by name.
+ (PEFile.GetResources): New. Get array of resources.
+
2005-04-12 Ankit Jain <[EMAIL PROTECTED]>
* PEAPI.cs (CustomAttribute.ctor): Dont throw
Modified: trunk/mcs/class/PEAPI/PEAPI.cs
===================================================================
--- trunk/mcs/class/PEAPI/PEAPI.cs 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/class/PEAPI/PEAPI.cs 2005-04-18 04:17:27 UTC (rev 43182)
@@ -3348,6 +3348,7 @@
uint entryPointOffset, entryPointPadding, imageSize, headerSize,
headerPadding, entryPointToken = 0;
uint relocOffset, relocRVA, relocSize, relocPadding, relocTide,
hintNameTableOffset;
uint metaDataOffset, runtimeEngineOffset, initDataSize = 0,
importTablePadding;
+ uint resourcesSize, resourcesOffset;
uint strongNameSigOffset;
uint importTableOffset, importLookupTableOffset, totalImportTableSize;
MetaData metaData;
@@ -3406,14 +3407,16 @@
// Console.WriteLine("Code starts at " + metaDataOffset);
metaDataOffset += metaData.CodeSize();
// resourcesStart =
+ resourcesOffset = metaDataOffset + metaData.Size ();
+ resourcesSize = metaData.GetResourcesSize ();
if (reserveStrongNameSignatureSpace) {
- strongNameSigOffset = metaDataOffset + metaData.Size();
+ strongNameSigOffset = resourcesOffset + resourcesSize;
// fixUps = RVA for vtable
importTableOffset = strongNameSigOffset + StrongNameSignatureSize;
} else {
strongNameSigOffset = 0;
// fixUps = RVA for vtable
- importTableOffset = metaDataOffset + metaData.Size();
+ importTableOffset = resourcesOffset + resourcesSize;
}
importTablePadding = NumToAlign(importTableOffset,16);
importTableOffset += importTablePadding;
@@ -3557,6 +3560,7 @@
largeUS = metaData.LargeUSIndex();
largeBlob = metaData.LargeBlobIndex();
metaData.WriteMetaData(this);
+ metaData.WriteResources (this);
if (reserveStrongNameSignatureSpace) {
WriteZeros(StrongNameSignatureSize);
}
@@ -3575,7 +3579,12 @@
Write(metaData.Size());
Write(runtimeFlags);
Write(entryPointToken);
- WriteZeros(8); // Resources - used by Manifest
Resources NYI
+ if (resourcesSize > 0) {
+ Write (text.RVA () + resourcesOffset);
+ Write (resourcesSize);
+ } else {
+ WriteZeros (8);
+ }
// Strong Name Signature (RVA, size)
if (reserveStrongNameSignatureSpace) {
Write(text.RVA() + strongNameSigOffset);
@@ -3773,11 +3782,13 @@
private static readonly uint NoMetaData = 0x1;
uint nameIx = 0, hashIx = 0;
uint flags = 0;
+ protected string name;
internal FileRef(string name, byte[] hashBytes, bool metaData,
bool entryPoint, MetaData md) {
if (!metaData) flags = NoMetaData;
if (entryPoint) md.SetEntryPoint(this);
+ this.name = name;
nameIx = md.AddToStringsHeap(name);
hashIx = md.AddToBlobHeap(hashBytes);
tabIx = MDTable.File;
@@ -3796,6 +3807,10 @@
return 4 + md.StringsIndexSize() + md.BlobIndexSize();
}
+ internal sealed override void BuildTables(MetaData md) {
+ md.AddToTable(MDTable.File,this);
+ }
+
internal sealed override void Write(FileImage output) {
output.Write(flags);
output.StringsIndex(nameIx);
@@ -4382,48 +4397,71 @@
/**************************************************************************/
/// <summary>
- /// Descriptor for resources used in this PE file NOT YET IMPLEMENTED
+ /// Descriptor for resources used in this PE file
/// </summary>
public class ManifestResource : MetaDataElement
{
- private static readonly uint PublicResource = 0x1;
- private static readonly uint PrivateResource = 0x2;
+ public static readonly uint PublicResource = 0x1;
+ public static readonly uint PrivateResource = 0x2;
string mrName;
MetaDataElement rRef;
- int fileOffset;
+ uint fileOffset;
uint nameIx = 0;
uint flags = 0;
+ byte [] resourceBytes;
- public ManifestResource(string name, bool isPub, FileRef fileRef) {
- mrName = name;
- if (isPub) flags = PublicResource;
- else flags = PrivateResource;
+ public ManifestResource (string name, byte[] resBytes, uint flags) {
+ InitResource (name, flags);
+ this.resourceBytes = resBytes;
+ }
+
+ public ManifestResource(string name, uint flags, FileRef fileRef) {
+ InitResource (name, flags);
rRef = fileRef;
- tabIx = MDTable.ManifestResource;
- throw(new NotYetImplementedException("Manifest Resources "));
}
- public ManifestResource(string name, bool isPub, FileRef fileRef,
- int fileIx) {
- mrName = name;
- if (isPub) flags = PublicResource;
- else flags = PrivateResource;
+ public ManifestResource(string name, uint flags, FileRef fileRef,
+ uint fileIx) {
+ InitResource (name, flags);
rRef = fileRef;
fileOffset = fileIx;
}
- public ManifestResource(string name, bool isPub, AssemblyRef assemRef) {
- mrName = name;
- if (isPub) flags = PublicResource;
- else flags = PrivateResource;
+ public ManifestResource(string name, uint flags, AssemblyRef assemRef) {
+ InitResource (name, flags);
rRef = assemRef;
}
+ internal ManifestResource (ManifestResource mres) {
+ mrName = mres.mrName;
+ flags = mres.flags;
+ this.rRef = rRef;
+ this.fileOffset = fileOffset;
+ this.resourceBytes = resourceBytes;
+ }
+
+ private void InitResource (string name, uint flags) {
+ mrName = name;
+ this.flags = flags;
+ tabIx = MDTable.ManifestResource;
+ }
+
internal sealed override void BuildTables(MetaData md) {
if (done) return;
+ md.AddToTable (MDTable.ManifestResource, this);
nameIx = md.AddToStringsHeap(mrName);
+ if (resourceBytes != null) {
+ if (rRef != null)
+ throw new Exception("ERROR: Manifest Resource has byte value and
file reference");
+ fileOffset = md.AddResource(resourceBytes);
+ } else {
+ if (rRef == null)
+ throw new Exception("ERROR: Manifest Resource has no implementation
or value");
+ rRef.BuildTables (md);
+ }
+
done = true;
}
@@ -4440,6 +4478,11 @@
}
internal sealed override uint GetCodedIx(CIx code) { return 18; }
+
+ public string Name {
+ get { return mrName; }
+ set { mrName = value; }
+ }
}
/**************************************************************************/
@@ -4527,7 +4570,7 @@
MetaDataStream[] streams = new MetaDataStream[5];
uint numStreams = 5;
uint tildeTide = 0, tildePadding = 0, tildeStart = 0;
- uint numTables = 0;
+ uint numTables = 0, resourcesSize = 0;
ArrayList[] metaDataTables = new ArrayList[numMetaDataTables];
ArrayList byteCodes = new ArrayList();
uint codeSize = 0, codeStart, byteCodePadding = 0, metaDataSize = 0;
@@ -4543,6 +4586,7 @@
private TypeSpec[] systemTypeSpecs = new
TypeSpec[PrimitiveType.NumSystemTypes];
long mdStart;
private ArrayList cattr_list;
+ ArrayList resources;
internal MetaData(FileImage file) {
// tilde = new MetaDataStream(tildeName,false,0);
@@ -4713,6 +4757,14 @@
entryPoint = ep;
}
+ internal uint AddResource(byte[] resBytes) {
+ if (resources == null) resources = new ArrayList ();
+ resources.Add (resBytes);
+ uint offset = resourcesSize;
+ resourcesSize += (uint)resBytes.Length + 4;
+ return offset;
+ }
+
internal void AddData(DataConstant cVal) {
file.AddInitData(cVal);
}
@@ -4741,6 +4793,11 @@
return codeSize + byteCodePadding;
}
+ internal uint GetResourcesSize()
+ {
+ return resourcesSize;
+ }
+
internal uint StringsIndexSize() {
if (largeStrings) return 4;
return 2;
@@ -4903,6 +4960,7 @@
BuildTable(metaDataTables[(int)MDTable.GenericParam]);
BuildTable(metaDataTables[(int)MDTable.MethodSpec]);
BuildTable(metaDataTables[(int)MDTable.GenericParamConstraint]);
+ BuildTable(metaDataTables[(int)MDTable.ManifestResource]);
if (cattr_list != null) {
foreach (CustomAttribute cattr in cattr_list)
@@ -4962,6 +5020,15 @@
}
}
+ internal void WriteResources (FileImage output) {
+ if (resources == null) return;
+ for (int i = 0; i < resources.Count; i ++) {
+ byte [] resBytes = (byte []) resources [i];
+ output.Write ((uint) resBytes.Length);
+ output.Write (resBytes);
+ }
+ }
+
internal void WriteMetaData(FileImage output) {
this.output = output;
mdStart = output.Seek(0,SeekOrigin.Current);
@@ -6220,6 +6287,7 @@
private ClassDef moduleClass;
private ArrayList classRefList = new ArrayList();
private ArrayList classDefList = new ArrayList();
+ private ArrayList resources = new ArrayList ();
private Assembly thisAssembly;
private int corFlags = 1;
FileImage fileImage;
@@ -6476,6 +6544,7 @@
/// <param name="mr"></param>
public void AddManifestResource(ManifestResource mr) {
metaData.AddToTable(MDTable.ManifestResource,mr);
+ resources.Add (mr);
//mr.FixName(metaData);
}
@@ -6485,6 +6554,41 @@
}
/// <summary>
+ /// Add a managed resource from another assembly.
+ /// </summary>
+ /// <param name="resName">The name of the resource</param>
+ /// <param name="assem">The assembly where the resource is</param>
+ /// <param name="isPublic">Access for the resource</param>
+ public void AddExternalManagedResource (string resName, AssemblyRef assem,
uint flags) {
+ resources.Add (new ManifestResource (resName, flags, assem));
+ }
+
+ /// <summary>
+ /// Add a managed resource from another assembly.
+ /// </summary>
+ /// <param name="mr"></param>
+ /// <param name="isPublic"></param>
+ public void AddExternalManagedResource (ManifestResource mr) {
+ resources.Add (new ManifestResource (mr));
+ }
+ /// <summary>
+ /// Find a resource
+ /// </summary>
+ /// <param name="name">The name of the resource</param>
+ /// <returns>The resource with the name "name" or null </returns>
+ public ManifestResource GetResource (string name) {
+ for (int i = 0; i < resources.Count; i ++) {
+ if (((ManifestResource) resources [i]).Name == name)
+ return (ManifestResource) resources [i];
+ }
+ return null;
+ }
+
+ public ManifestResource [] GetResources() {
+ return (ManifestResource []) resources.ToArray (typeof
(ManifestResource));
+ }
+
+ /// <summary>
/// Write out the PEFile (the "bake" function)
/// </summary>
public void WritePEFile() { /* the "bake" function */
Modified: trunk/mcs/class/PEAPI/README.txt
===================================================================
--- trunk/mcs/class/PEAPI/README.txt 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/class/PEAPI/README.txt 2005-04-18 04:17:27 UTC (rev 43182)
@@ -29,3 +29,6 @@
encouraged to send feedback on missing features, bug reports etc. to assist
in this quest.
+Update (18th Apr 2005)
+
+Some portions of the code have been taken from PERWAPI
(http://www.plas.fit.qut.edu.au/perwapi/Default.aspx), which extends PEAPI. It
is developed by Diane Corney.
Modified: trunk/mcs/ilasm/codegen/ChangeLog
===================================================================
--- trunk/mcs/ilasm/codegen/ChangeLog 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/ilasm/codegen/ChangeLog 2005-04-18 04:17:27 UTC (rev 43182)
@@ -1,3 +1,9 @@
+2005-04-18 Ankit Jain <[EMAIL PROTECTED]>
+
+ * CodeGen.cs (CodeGen.AddManifestResource): Add a
+ ManifestResource to manifestResources ArrayList.
+ (CodeGen.Write): Add all resources to the pefile.
+
2005-04-12 Ankit Jain <[EMAIL PROTECTED]>
* CustomAttr.cs (ICustomAttrTarget): New interface.
Modified: trunk/mcs/ilasm/codegen/CodeGen.cs
===================================================================
--- trunk/mcs/ilasm/codegen/CodeGen.cs 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/ilasm/codegen/CodeGen.cs 2005-04-18 04:17:27 UTC (rev 43182)
@@ -49,6 +49,7 @@
private Hashtable global_method_table;
private ArrayList data_list;
private FileRef file_ref;
+ private ArrayList manifestResources;
private ArrayList defcont_list;
@@ -254,6 +255,13 @@
data_list.Add (datadef);
}
+ public void AddManifestResource (ManifestResource mr)
+ {
+ if (manifestResources == null)
+ manifestResources = new ArrayList ();
+ manifestResources.Add (mr);
+ }
+
public PEAPI.DataConstant GetDataConst (string name)
{
foreach (DataDef def in data_list) {
@@ -356,6 +364,11 @@
extern_table.Resolve (this);
type_manager.DefineAll ();
+ if (manifestResources != null) {
+ foreach (ManifestResource mr in
manifestResources)
+ pefile.AddManifestResource (mr);
+ }
+
foreach (FieldDef fielddef in
global_field_table.Values) {
fielddef.Define (this);
}
Modified: trunk/mcs/ilasm/parser/ChangeLog
===================================================================
--- trunk/mcs/ilasm/parser/ChangeLog 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/ilasm/parser/ChangeLog 2005-04-18 04:17:27 UTC (rev 43182)
@@ -1,3 +1,9 @@
+2005-04-18 Ankit Jain <[EMAIL PROTECTED]>
+
+ * ILParser.jay (manifestres_head): Read resource file and
+ add ManifestResource with CodeGen.
+ (manres_attr): Set visibility flag of the resource.
+
2005-04-12 Ankit Jain <[EMAIL PROTECTED]>
* ILParser.jay (class_decl, method_decl, prop_decl,
Modified: trunk/mcs/ilasm/parser/ILParser.jay
===================================================================
--- trunk/mcs/ilasm/parser/ILParser.jay 2005-04-18 03:26:31 UTC (rev 43181)
+++ trunk/mcs/ilasm/parser/ILParser.jay 2005-04-18 04:17:27 UTC (rev 43182)
@@ -2565,12 +2565,20 @@
manifestres_all : manifestres_head OPEN_BRACE manifestres_decls
CLOSE_BRACE
;
-manifestres_head : D_MRESOURCE manres_attr comp_name
+manifestres_head : D_MRESOURCE manres_attr comp_name
+ {
+ FileStream s = new FileStream ((string) $3,
FileMode.Open, FileAccess.Read);
+ byte [] buff = new byte [s.Length];
+ s.Read (buff, 0, (int) s.Length);
+ s.Close ();
+
+ codegen.AddManifestResource (new
ManifestResource ((string) $3, buff, ($2 == null) ? 0 : (uint) $2));
+ }
;
manres_attr : /* EMPTY */
- | manres_attr K_PUBLIC
- | manres_attr K_PRIVATE
+ | manres_attr K_PUBLIC { $$ =
ManifestResource.PublicResource; }
+ | manres_attr K_PRIVATE { $$ =
ManifestResource.PrivateResource; }
;
manifestres_decls : /* EMPTY */
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches