Changeset 324 for trunk/src

Timestamp:

Jun 11, 2003, 11:10:35 PM (22 years ago)

Author:

bird

Message:

#456: Changed structure handling in C++ mode to the prefered to write class on output instead struct_to_class wrapping loop.

File:

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

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

@@ -1188 +1188 @@
 
 
-/* Turn a struct into a class-struct to make icsdebug happy.
-   Yeah, we could've done this on output too, but this is somewhat easier
-   I belive. */
-
-static void struct_to_classstruct (struct type *tp)
-{
-  struct type t, *t1, **list, **types;
-  struct field *fields;
-  int i, n;
-
-  n = tp->d.struc.count;
-  if (n == 0)
-    list = NULL;
-  else
-    {
-      if (tp->d.struc.fields->tag != ty_fields
-          || tp->d.struc.fields->d.fields.count != n)
-        {
-          warning ("Invalid struct field list");
-          return;
-        }
-      fields = tp->d.struc.fields->d.fields.list;
-      if (tp->d.struc.types->tag != ty_types
-          || tp->d.struc.types->d.types.count != n)
-        {
-          warning ("Invalid struct types list");
-          return;
-        }
-      types = tp->d.struc.types->d.types.list;
-      list = xmalloc (n * sizeof (*list));
-      for (i = 0; i < n; ++i)
-        {
-          t.tag = ty_member;
-          t.index = -1;
-          t.d.member.type = types[i];
-          t.d.member.offset = fields[i].offset;
-          t.d.member.flags = VIS_PUBLIC;
-          t.d.member.name = fields[i].name;
-          t.d.member.sname = NULL;
-          list[i] = type_add (&t);
-        }
-    }
-
-  t.tag = ty_types;
-  t.index = -1;
-  t.d.types.count = n;
-  t.d.types.list = list;
-  t1 = type_add (&t);
-
-  t = *tp;
-  tp->tag = ty_class;
-  tp->d.class.members = t1;
-  tp->d.class.size = t.d.struc.size;
-  tp->d.class.count = t.d.struc.count;
-  tp->d.class.name = t.d.struc.name;
-}
-
-
 /* Build and return the internal representation of the `long long'
    type.  As IPMD doesn't know about `long long' we use the following
@@ -2450 +2392 @@
 
     case ty_struc:
-      tt_start (0x79, 0x00);    /* Structure/Union */
-      tt_dword (tp->d.struc.size);
-      tt_word (tp->d.struc.count);
-      patch1 = tt.size;
-      tt_index (0);
-      tt_index (0);
-      tt_name (tp->d.struc.name);
-      tt_end ();
-      *hll = tp->index = hll_type_index++;
-      if (tp->d.struc.types == NULL && tp->d.struc.fields == NULL)
-        {
-          ti_1 = 0;
-          ti_2 = 1;
+    {
+      struct field *fields = NULL;
+      struct type **types = NULL;
+      int           cFields = tp->d.struc.count;
+
+      if (    tp->d.struc.fields
+          &&  tp->d.struc.fields->tag == ty_fields
+          &&  tp->d.struc.fields->d.fields.count == cFields)
+          fields = tp->d.struc.fields->d.fields.list;
+      if (   tp->d.struc.types
+          && tp->d.struc.types->tag == ty_types
+          && tp->d.struc.types->d.types.count == cFields)
+          types = tp->d.struc.types->d.types.list;
+
+      if (cplusplus_flag && ((types && fields) || !cFields))
+        {
+          struct type   t;
+          struct type **list;
+          int           i;
+          *hll = tp->index = hll_type_index++;
+          tt_start (0x40, 0x01);      /* Class is-struct */
+          tt_dword (tp->d.struc.size);
+          tt_word (tp->d.struc.count);
+          patch1 = tt.size;
+          tt_word (0);                /* Members */
+          tt_enc (tp->d.struc.name);  /* Class name */
+          tt_end ();
+
+          list = xmalloc (cFields * sizeof (*list));
+          for (i = 0; i < cFields; ++i)
+            {
+              t.tag             = ty_member;
+              t.index           = -1;
+              t.d.member.type   = types[i];
+              t.d.member.offset = fields[i].offset;
+              t.d.member.flags  = VIS_PUBLIC;
+              t.d.member.name   = fields[i].name;
+              t.d.member.sname  = NULL;
+              list[i] = type_add (&t);
+            }
+
+          t.tag = ty_types;
+          t.index = -1;
+          t.d.types.count = cFields;
+          t.d.types.list = list;
+          t1 = type_add (&t);
+
+          make_type (t1, &ti_1);
+          buffer_patch_word (&tt, patch1, ti_1);
         }
       else
         {
-          make_type (tp->d.struc.types, &ti_1);
-          make_type (tp->d.struc.fields, &ti_2);
-        }
-      buffer_patch_word (&tt, patch1+1, ti_1);
-      buffer_patch_word (&tt, patch1+4, ti_2);
-      break;
+          tt_start (0x79, 0x00);    /* Structure/Union */
+          tt_dword (tp->d.struc.size);
+          tt_word (tp->d.struc.count);
+          patch1 = tt.size;
+          tt_index (0);
+          tt_index (0);
+          tt_name (tp->d.struc.name);
+          tt_end ();
+          *hll = tp->index = hll_type_index++;
+          if (tp->d.struc.types == NULL && tp->d.struc.fields == NULL)
+            {
+              ti_1 = 0;
+              ti_2 = 1;
+            }
+          else
+            {
+              make_type (tp->d.struc.types, &ti_1);
+              make_type (tp->d.struc.fields, &ti_2);
+            }
+          buffer_patch_word (&tt, patch1+1, ti_1);
+          buffer_patch_word (&tt, patch1+4, ti_2);
+        }
+      break;
+    }
 
     case ty_class:
@@ -3486 +3482 @@
       }
 
-  /* hack/experiment to make icsdebug fancy our stuff. */
-
-  if (cplusplus_flag)
-    for (t1 = type_head; t1 != NULL; t1 = t1->next)
-      if (t1->tag == ty_struc)
-         struct_to_classstruct (t1);
-
-
   /* Provide information about the compiler. */