Changeset 320

Timestamp:

Jun 11, 2003, 8:14:40 PM (22 years ago)

Author:

bird

Message:

#456: icsdebug doesn't accept structs in C++ HLL mode.

File:

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

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

@@ -1106 +1106 @@
 
 
+/* 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
@@ -3332 +3390 @@
       }
 
+  /* 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. */