dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[dotgnu-pnet-commits] pnet ChangeLog image/writer.c profiles/compact ...


From: Klaus Treichel
Subject: [dotgnu-pnet-commits] pnet ChangeLog image/writer.c profiles/compact ...
Date: Fri, 20 Jul 2007 20:11:55 +0000

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      07/07/20 20:11:55

Modified files:
        .              : ChangeLog 
        image          : writer.c 
        profiles       : compact compact-fp full full-tl kernel 
                         kernel-fp tiny 
        samples        : phone.il 

Log message:
        Use the default metadata version string from the profile used.
        Add a ctor and reformat the generic sample phone.il.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3479&r2=1.3480
http://cvs.savannah.gnu.org/viewcvs/pnet/image/writer.c?cvsroot=dotgnu-pnet&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/compact?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/compact-fp?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/full?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/full-tl?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/kernel?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/kernel-fp?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/tiny?cvsroot=dotgnu-pnet&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pnet/samples/phone.il?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3479
retrieving revision 1.3480
diff -u -b -r1.3479 -r1.3480
--- ChangeLog   17 Jul 2007 17:30:28 -0000      1.3479
+++ ChangeLog   20 Jul 2007 20:11:54 -0000      1.3480
@@ -1,3 +1,17 @@
+2007-07-20  Klaus Treichel  <address@hidden>
+
+       * image/writer.c: Get the default metadata version string from the 
profile
+       used.
+
+       * profiles/compact, profiles/compact-fp, profiles/kernel,
+       profiles/kernel-fp, profiles/tiny: Set the framework major version
+       supported to 1. Add the default metadata version string v1.1.4322 .
+
+       * profiles/full, profiles/full-tl: Add the default metadata version 
string
+       v2.0.50727 .
+
+       * samples/phone.il: Reformat the sample and add a .ctor.
+
 2007-07-17  Klaus Treichel  <address@hidden>
 
        * ilalink/link_class.c, ilalink/link_method.c, ilasm/ilasm_build.c: Add 
the

Index: image/writer.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/writer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- image/writer.c      2 Aug 2004 11:58:24 -0000       1.18
+++ image/writer.c      20 Jul 2007 20:11:54 -0000      1.19
@@ -30,10 +30,11 @@
 
 /*
  * Default version data to embed in the metadata header.
- * Must be padded to a multiple of 4 in size.
+ * It will be padded with NULL bytes to a multiple of 4 in size.
+ * There has to be at least one NULL byte at the end.
  */
-#define        VERSION_STRING          "v1.1.4322\0\0\0"
-#define        VERSION_STRING_LEN      12
+#define        VERSION_STRING          IL_VERSION_METADATA "\0\0\0"
+#define        VERSION_STRING_LEN      ((sizeof(IL_VERSION_METADATA) + 3) & ~3)
 
 void _ILWBufferListInit(ILWBufferList *list)
 {

Index: profiles/compact
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/compact,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- profiles/compact    16 Mar 2007 17:23:56 -0000      1.9
+++ profiles/compact    20 Jul 2007 20:11:54 -0000      1.10
@@ -105,8 +105,10 @@
 IL_CONFIG_ECMA=y
 
 # Major CLR/Framework Version to support (1 .. 3)
-IL_VERSION_MAJOR=3
+IL_VERSION_MAJOR=1
 
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v1.1.4322"

Index: profiles/compact-fp
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/compact-fp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- profiles/compact-fp 16 Mar 2007 17:23:56 -0000      1.9
+++ profiles/compact-fp 20 Jul 2007 20:11:55 -0000      1.10
@@ -104,8 +104,10 @@
 IL_CONFIG_ECMA=y
 
 # Major CLR/Framework Version to support (1 .. 3)
-IL_VERSION_MAJOR=3
+IL_VERSION_MAJOR=1
 
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v1.1.4322"

Index: profiles/full
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/full,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- profiles/full       16 Mar 2007 17:23:56 -0000      1.9
+++ profiles/full       20 Jul 2007 20:11:55 -0000      1.10
@@ -109,3 +109,6 @@
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v2.0.50727"
+

Index: profiles/full-tl
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/full-tl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- profiles/full-tl    16 Mar 2007 17:23:56 -0000      1.4
+++ profiles/full-tl    20 Jul 2007 20:11:55 -0000      1.5
@@ -109,3 +109,5 @@
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v2.0.50727"

Index: profiles/kernel
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/kernel,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- profiles/kernel     16 Mar 2007 17:23:56 -0000      1.9
+++ profiles/kernel     20 Jul 2007 20:11:55 -0000      1.10
@@ -104,8 +104,10 @@
 IL_CONFIG_ECMA=y
 
 # Major CLR/Framework Version to support (1 .. 3)
-IL_VERSION_MAJOR=3
+IL_VERSION_MAJOR=1
 
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v1.1.4322"

Index: profiles/kernel-fp
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/kernel-fp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- profiles/kernel-fp  16 Mar 2007 17:23:56 -0000      1.9
+++ profiles/kernel-fp  20 Jul 2007 20:11:55 -0000      1.10
@@ -104,8 +104,10 @@
 IL_CONFIG_ECMA=y
 
 # Major CLR/Framework Version to support (1 .. 3)
-IL_VERSION_MAJOR=3
+IL_VERSION_MAJOR=1
 
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v1.1.4322"

Index: profiles/tiny
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/profiles/tiny,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- profiles/tiny       16 Mar 2007 17:23:56 -0000      1.5
+++ profiles/tiny       20 Jul 2007 20:11:55 -0000      1.6
@@ -101,8 +101,10 @@
 IL_CONFIG_ECMA=y
 
 # Major CLR/Framework Version to support (1 .. 3)
-IL_VERSION_MAJOR=3
+IL_VERSION_MAJOR=1
 
 # Minor CLR/Framework Version to support
 IL_VERSION_MINOR=0
 
+# Default version string to store in the metadata
+IL_VERSION_METADATA="v1.1.4322"

Index: samples/phone.il
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/samples/phone.il,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- samples/phone.il    8 Jul 2007 20:13:39 -0000       1.1
+++ samples/phone.il    20 Jul 2007 20:11:55 -0000      1.2
@@ -1,52 +1,74 @@
 .assembly extern mscorlib {}
 .assembly Phone {}
  
-.class private Phone`2<([mscorlib]System.Object) K,
-([mscorlib]System.Object) V>
-extends [mscorlib]System.Object {
-.field private int32 hi
-.field private !0[] keys
-.field private !1[] vals
-.method public instance void Add(!0 k, !1 v) {
-.maxstack 4
-.locals init (int32 temp)
-ldarg.0
-ldfld !0[] class Phone`2<!0,!1>::keys
-ldarg.0
-dup
-ldfld int32 class Phone`2<!0,!1>::hi
-ldc.i4.1
-add
-dup
-stloc.0
-stfld int32 class Phone`2<!0,!1>::hi
-ldloc.0
-ldarg.1
-stelem !0
-ldarg.0
-ldfld !1[] class Phone`2<!0,!1>::vals
-ldarg.0
-ldfld int32 class Phone`2<!0,!1>::hi
-ldarg.2
-stelem !1
-ret
-} // end of Method Add
+.class private Phone`2<([mscorlib]System.Object) K, ([mscorlib]System.Object) 
V>
+                                               extends [mscorlib]System.Object
+{
+       .field private int32 hi
+       .field private !0[] keys
+       .field private !1[] vals
+
+       .method public rtspecialname specialname instance void .ctor() cil 
managed
+       {
+               .maxstack 2
+               ldarg.0
+               call instance void [mscorlib]System.Object::.ctor()
+               ldarg.0
+               ldc.i4.M1
+               stfld int32 class Phone`2<!0, !1>::hi
+               ldarg.0
+               ldc.i4.1
+               newarr !0
+               stfld !0[] class Phone`2<!0, !1>::keys
+               ldarg.0
+               ldc.i4.1
+               newarr !1
+               stfld !1[] class Phone`2<!0, !1>::vals
+               ret
+       }
+
+       .method public instance void Add(!0 k, !1 v)
+       {
+               .maxstack 4
+               .locals init (int32 temp)
+               ldarg.0
+               ldfld !0[] class Phone`2<!0,!1>::keys
+               ldarg.0
+               dup
+               ldfld int32 class Phone`2<!0,!1>::hi
+               ldc.i4.1
+               add
+               dup
+               stloc.0
+               stfld int32 class Phone`2<!0,!1>::hi
+               ldloc.0
+               ldarg.1
+               stelem !0
+               ldarg.0
+               ldfld !1[] class Phone`2<!0,!1>::vals
+               ldarg.0
+               ldfld int32 class Phone`2<!0,!1>::hi
+               ldarg.2
+               stelem !1
+               ret
+       } // end of Method Add
 } // end of class Phone
-.class App extends [mscorlib]System.Object {
-.method static void Main() {
-.entrypoint
-.maxstack 3
-.locals init (class Phone`2<string,int32> temp)
-.locals init (class Phone`2<string,int32> temp)
-newobj instance void class
-Phone`2<string,int32>::.ctor()
-stloc.0
-ldloc.0
-ldstr "Jim"
-ldc.i4.7
-callvirt instance void class
-Phone`2<string,int32>::Add(!0, !1)
-ret
-} // end of method Main
+
+.class App extends [mscorlib]System.Object
+{
+       .method static void Main()
+       {
+               .entrypoint
+               .maxstack 3
+               .locals init (class Phone`2<string,int32> temp)
+               .locals init (class Phone`2<string,int32> temp)
+               newobj instance void class Phone`2<string,int32>::.ctor()
+               stloc.0
+               ldloc.0
+               ldstr "Jim"
+               ldc.i4.7
+               callvirt instance void class Phone`2<string,int32>::Add(!0, !1)
+               ret
+       } // end of method Main
 } // end of class App
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]