Changeset 116 for trunk

Timestamp:

Aug 26, 2010, 12:49:45 PM (15 years ago)

Author:

dmik

Message:

hotspot: Fixed a typo in 4115: The fix should be applied in the outer loop.

File:

• trunk/openjdk/hotspot/src/os/os2/vm/os_os2.cpp (modified) (1 diff)

trunk/openjdk/hotspot/src/os/os2/vm/os_os2.cpp

@@ -82 +82 @@
     os2_QSLREC *pLibRec = pPtrRec->pLibRec;
     while (pLibRec) {
+        // It happens that for some modules ctObj is > 0 but pbjInfo is
+        // NULL. This seems to be an OS/2 FP13 bug. Here is the solution I
+        // found in the Odin32 sources (kernel32/winimagepe2lx.cpp):
+        if (pLibRec->ctObj > 0 && pLibRec->pObjInfo == NULL) {
+            pLibRec->pObjInfo = (os2_QSLOBJREC *)
+                ((char*) pLibRec
+                 + ((sizeof(os2_QSLREC)                         /* size of the lib record */
+                     + pLibRec->ctImpMod * sizeof(os2_USHORT)   /* size of the array of imported modules */
+                     + strlen((char*)pLibRec->pName) + 1        /* size of the filename */
+                     + 3) & ~3));                               /* the size is align on 4 bytes boundrary */
+            pLibRec->pNextRec = (os2_PVOID *)((char *)pLibRec->pObjInfo
+                                              + sizeof(os2_QSLOBJREC) * pLibRec->ctObj);
+        }
         if (pLibRec->hmte == hmte) {
             // mark as already walked
             pLibRec->hmte = os2_NULLHANDLE;
             st->print("  %s\n", pLibRec->pName);
-            // It happens that for some modules ctObj is > 0 but pbjInfo is
-            // NULL. This seems to be an OS/2 FP13 bug. Here is the solution I
-            // found in the Odin32 sources (kernel32/winimagepe2lx.cpp):
-            if (pLibRec->ctObj > 0 && pLibRec->pObjInfo == NULL) {
-                pLibRec->pObjInfo = (os2_QSLOBJREC *)
-                    ((char*) pLibRec
-                     + ((sizeof(os2_QSLREC)                         /* size of the lib record */
-                         + pLibRec->ctImpMod * sizeof(os2_USHORT)   /* size of the array of imported modules */
-                         + strlen((char*)pLibRec->pName) + 1        /* size of the filename */
-                         + 3) & ~3));                               /* the size is align on 4 bytes boundrary */
-                pLibRec->pNextRec = (os2_PVOID *)((char *)pLibRec->pObjInfo
-                                                  + sizeof(os2_QSLOBJREC) * pLibRec->ctObj);
-            }
             for (ULONG i = 0; i < pLibRec->ctObj; ++i) {
                 if (pLibRec->pObjInfo[i].oaddr)