[dotgnu-pnet-commits] pnet ChangeLog image/java_loader.c image/member...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      07/06/01 07:35:35

Modified files:
        .              : ChangeLog 
        image          : java_loader.c member.c meta_writer.c 
                         pecoff_loader.c 

Log message:
        Fix more signed bitfield assignments for gcc 4.2.0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3464&r2=1.3465
http://cvs.savannah.gnu.org/viewcvs/pnet/image/java_loader.c?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/image/member.c?cvsroot=dotgnu-pnet&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pnet/image/meta_writer.c?cvsroot=dotgnu-pnet&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pnet/image/pecoff_loader.c?cvsroot=dotgnu-pnet&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3464
retrieving revision 1.3465
diff -u -b -r1.3464 -r1.3465
--- ChangeLog   31 May 2007 15:19:05 -0000      1.3464
+++ ChangeLog   1 Jun 2007 07:35:34 -0000       1.3465
@@ -1,3 +1,8 @@
+2007-06-01  Klaus Treichel  <address@hidden>
+
+       * image/java_loader.c, image/member.c, image/meta_writer.c,
+       image/pecoff_loader.c: Fix more signed bitfield assignments for gcc 
4.2.0.
+
 2007-05-31  Klaus Treichel  <address@hidden>
 
        * engine/ilverify.c: Fix the verifier.

Index: image/java_loader.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/java_loader.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- image/java_loader.c 15 May 2003 04:51:47 -0000      1.9
+++ image/java_loader.c 1 Jun 2007 07:35:35 -0000       1.10
@@ -66,7 +66,7 @@
                                                 (unsigned long)length, 
&(image->mapAddress),
                                                 &(image->mapLength), 
&(image->data)))
        {
-               image->mapped = 1;
+               image->mapped = -1;
        }
        else
        {

Index: image/member.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/member.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- image/member.c      8 Sep 2004 09:29:46 -0000       1.29
+++ image/member.c      1 Jun 2007 07:35:35 -0000       1.30
@@ -555,7 +555,7 @@
                code->javaLocals = (int)(IL_BREAD_UINT16(addr + 2));
                code->headerSize = 12;
                code->localVarSig = 0;
-               code->initLocals = 1;
+               code->initLocals = -1;
                code->moreSections = 0;
                addr += 8;
                len -= 8;
@@ -578,7 +578,7 @@
                temp = (ILUInt32)(IL_BREAD_UINT16(addr));
                if(temp != 0)
                {
-                       code->moreSections = 1;
+                       code->moreSections = -1;
                }
 
                /* Ready to go */
@@ -605,8 +605,8 @@
                {
                        return 0;
                }
-               code->moreSections = ((*addr & 0x08) != 0);
-               code->initLocals = ((*addr & 0x10) != 0);
+               code->moreSections = ((*addr & 0x08) ? -1 : 0);
+               code->initLocals = ((*addr & 0x10) ? -1 : 0);
                code->maxStack = (ILUInt32)(IL_READ_UINT16(addr + 2));
                code->codeLen = (ILUInt32)(IL_READ_UINT32(addr + 4));
                localVars = (ILToken)(IL_READ_UINT32(addr + 8));

Index: image/meta_writer.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/meta_writer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- image/meta_writer.c 29 Jul 2004 04:37:27 -0000      1.14
+++ image/meta_writer.c 1 Jun 2007 07:35:35 -0000       1.15
@@ -1496,7 +1496,7 @@
        if(image->stringPoolSize > 65535)
        {
                sizeFlags |= IL_META_SIZE_FLAG_STRREF;
-               image->strRefBig = 1;
+               image->strRefBig = -1;
        }
        else
        {
@@ -1505,7 +1505,7 @@
        if(image->blobPoolSize > 65535)
        {
                sizeFlags |= IL_META_SIZE_FLAG_BLOBREF;
-               image->blobRefBig = 1;
+               image->blobRefBig = -1;
        }
        else
        {
@@ -1514,7 +1514,7 @@
        if(image->tokenCount[IL_META_TOKEN_MODULE >> 24] > (65535 / 3))
        {
                sizeFlags |= IL_META_SIZE_FLAG_GUIDREF;
-               image->guidRefBig = 1;
+               image->guidRefBig = -1;
        }
        else
        {

Index: image/pecoff_loader.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/pecoff_loader.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- image/pecoff_loader.c       9 Jun 2005 07:59:59 -0000       1.23
+++ image/pecoff_loader.c       1 Jun 2007 07:35:35 -0000       1.24
@@ -915,11 +915,11 @@
        (*image)->loadFlags = flags;
        (*image)->type = (isOBJ ? IL_IMAGETYPE_OBJ :
                                                (isDLL ? IL_IMAGETYPE_DLL : 
IL_IMAGETYPE_EXE));
-       (*image)->secure = ((flags & IL_LOADFLAG_INSECURE) == 0);
-       (*image)->hadNative = hadNative;
-       (*image)->only32Bit = only32Bit;
-       (*image)->mapped = isMapped;
-       (*image)->inPlace = isInPlace;
+       (*image)->secure = ((flags & IL_LOADFLAG_INSECURE) ? 0 : -1);
+       (*image)->hadNative = hadNative ? -1 : 0;
+       (*image)->only32Bit = only32Bit ? -1 : 0;
+       (*image)->mapped = isMapped ? -1 : 0;
+       (*image)->inPlace = isInPlace ? -1 : 0;
        (*image)->map = map;
        (*image)->data = data;
        (*image)->len = (maxAddress - minAddress);
@@ -938,7 +938,7 @@
        (*image)->rsrcSize = rsrcSize;
 
        /* Mark the metadata as loading so that we can detect TypeRef recursion 
*/
-       (*image)->loading = 1;
+       (*image)->loading = -1;
        ++(context->redoLevel);
 
        /* Load the meta information from the image */