Changeset 321

Timestamp:

Jun 11, 2003, 9:44:08 PM (22 years ago)

Author:

bird

Message:

#456: forward referenced structures fix (spooky). <,<<,> and >> operator fixes.

File:

• trunk/src/emx/src/emxomf/stabshll.c (modified) (9 diffs, 1 prop)

trunk/src/emx/src/emxomf/stabshll.c

@@ -21 +21 @@
 
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
@@ -31 +34 @@
 #include "stabshll.h"
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /* Field ID values for the type table. */
 
@@ -80 +87 @@
 #define STRUC_FORWARD   0x01    /* Structure declared forward */
 
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
 enum type_tag
 {
@@ -259 +270 @@
 #pragma pack()
 
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
 /* This variable points to the next character of a stabs type being
    parsed. */
@@ -351 +366 @@
 /* kso #456 2003-06-11: Reversed quiet workaround. */
 #define no_warning warning
+
+
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static void parse_typedef (int *index);
+
+
 
 
@@ -910 +933 @@
 
 #endif
+
+
+/**
+ * Tries to complete a struct forward reference.
+ *
+ * @returns 0 on success
+ * @returns 1 on failure.
+ * @param   tp  Pointer to the struct/class to complete.
+ * @remark  Nasy hack for strstreambuf.
+ */
+static int try_complete_struct(const struct type *tp)
+{
+    int         cch;
+    const char *pszName;
+    int         i;
+
+    if (tp->tag == ty_struc)
+        return 0;
+    if (tp->d.struc.flags != STRUC_FORWARD)
+        return 1;
+
+    pszName = tp->d.struc.name;
+    cch = strlen(pszName);
+    for (i = 0; i < sym_count; ++i)
+        switch (sym_ptr[i].n_type)
+        {
+            case N_LSYM:
+            case N_LCSYM:
+            case N_GSYM:
+            case N_PSYM:
+            case N_RSYM:
+            case N_STSYM:
+            case N_FUN:
+                if (    !memcmp(str_ptr + sym_ptr[i].n_un.n_strx, pszName, cch)
+                    &&  *(char*)(str_ptr + sym_ptr[i].n_un.n_strx + cch) == ':'
+                    )
+                {
+                    parse_typedef(&i);
+                    return 1;
+                } /* if */
+        } /* switch */
+
+    return 0;
+}
+
 
 
@@ -955 +1023 @@
     case ty_stabs_ref:
 
+      #if 0
       /* This should not happen. */
 
       no_warning ("stabs type %d not defined", tp->d.stabs_ref);
+
       return 4;
+      #else
+      /* This seems to happen although it shouldn't... Try do something at least. */
+
+      tp = follow_refs (tp);
+      if (!tp)
+        {
+          no_warning ("stabs type %d not defined", tp->d.stabs_ref);
+          return 4;
+        }
+      return type_size (tp);
+      #endif
 
     case ty_alias:
@@ -977 +1058 @@
       /* The size of a structure is stored in the type structure. */
 
-      if (tp->d.struc.flags & STRUC_FORWARD)
-        {
-          no_warning ("size of incomplete structure %s is unknown",
-                   tp->d.struc.name);
+      if (   tp->d.struc.flags & STRUC_FORWARD
+          && try_complete_struct(tp))
+        {
+          no_warning ("size of incomplete structure %s is unknown (off %ld)\n stabs: %s",
+                      tp->d.struc.name, parse_ptr - parse_start, parse_start);
           return 0;
         }
@@ -1378 +1460 @@
         {
           case '<':
+            #if 0
+            /* workaround for "operator<::" and "operator<::"
+             *  */
+            if (!cNesting  || (psz[1] == ':' && psz[2] == ':'))
+                return psz + 1;
+            if (!cNesting  || (psz[1] == '<' && psz[2] == ':' && psz[3] == ':'))
+                return psz + 2;
+            #else
+            /* general and faster check: < or > followed by : means the end. */
+            #endif
+            if (psz[1] == ':')
+              return psz + 1;
             cNesting++;
             break;
           case '>':
+            if (psz[1] == ':')
+              return psz + 1;
             cNesting--;
             break;