From efd59e3f325dfcf4a797d830abf78eac3cd4a78d Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Thu, 25 Jan 2001 18:41:23 +0000
Subject: [PATCH] * config/alpha/tm-fbsd.h: Update copyright.
 (USE_STRUCT_CONVENTION): Define in terms of alphabsd_use_struct_convention. *
 config/alpha/fbsd.mt (TDEPFILES): Add alphafbsd-tdep.c. * alphafbsd-tdep.c:
 New file.

---
 gdb/ChangeLog              |  8 ++++++
 gdb/alphafbsd-tdep.c       | 53 ++++++++++++++++++++++++++++++++++++++
 gdb/config/alpha/fbsd.mt   |  2 +-
 gdb/config/alpha/tm-fbsd.h |  8 +++++-
 4 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 gdb/alphafbsd-tdep.c

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7a6525506c..0c6d5248be 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-25  Mark Kettenis  <kettenis@gnu.org>
+
+	* config/alpha/tm-fbsd.h: Update copyright.
+	(USE_STRUCT_CONVENTION): Define in terms of
+	alphabsd_use_struct_convention.
+	* config/alpha/fbsd.mt (TDEPFILES): Add alphafbsd-tdep.c.
+	* alphafbsd-tdep.c: New file.
+
 2001-01-24  Fernando Nasser  <fnasser@redhat.com>
 
 	* top.c (print_gdb_version): Update Copyright year.
diff --git a/gdb/alphafbsd-tdep.c b/gdb/alphafbsd-tdep.c
new file mode 100644
index 0000000000..e2d4749106
--- /dev/null
+++ b/gdb/alphafbsd-tdep.c
@@ -0,0 +1,53 @@
+/* Target-dependent code for FreeBSD/Alpha.
+   Copyright 2001 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "value.h"
+
+int
+alphafbsd_use_struct_convention (int gcc_p, struct type *type)
+{
+  enum type_code code;
+  int i;
+
+  /* All aggregate types that won't fit in a register must be returned
+     in memory.  */
+  if (TYPE_LENGTH (type) > REGISTER_SIZE)
+    return 1;
+
+  /* The only aggregate types that can be returned in a register are
+     structs and unions.  Arrays must be returned in memory.  */
+  code = TYPE_CODE (type);
+  if (code != TYPE_CODE_STRUCT && code != TYPE_CODE_UNION)
+    return 1;
+
+  /* We need to check if this struct/union is "integer" like.  For
+     this to be true, the offset of each adressable subfield must be
+     zero.  Note that bit fields are not addressable.  */
+  for (i = 0; i < TYPE_NFIELDS (type); i++)
+    {
+      /* If the field bitsize is non-zero, it isn't adressable.  */
+      if (TYPE_FIELD_BITPOS (type, i) != 0
+	  && TYPE_FIELD_BITSIZE (type, i) == 0)
+	return 1;
+    }
+
+  return 0;
+}
diff --git a/gdb/config/alpha/fbsd.mt b/gdb/config/alpha/fbsd.mt
index 6d33977c07..48e54fa818 100644
--- a/gdb/config/alpha/fbsd.mt
+++ b/gdb/config/alpha/fbsd.mt
@@ -1,3 +1,3 @@
 # Target: FreeBSD/Alpha
-TDEPFILES= alpha-tdep.o
+TDEPFILES= alpha-tdep.o alphafbsd-tdep.o
 TM_FILE= tm-fbsd.h
diff --git a/gdb/config/alpha/tm-fbsd.h b/gdb/config/alpha/tm-fbsd.h
index 73086e463e..315712c5bc 100644
--- a/gdb/config/alpha/tm-fbsd.h
+++ b/gdb/config/alpha/tm-fbsd.h
@@ -1,5 +1,5 @@
 /* Target-dependent definitions for FreeBSD/Alpha.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +23,12 @@
 
 #include "alpha/tm-alpha.h"
 
+/* FreeBSD uses the old gcc convention for struct returns.  */
+
+#undef USE_STRUCT_CONVENTION
+#define USE_STRUCT_CONVENTION(gcc_p, type) \
+  alphafbsd_use_struct_convention (gcc_p, type)
+
 /* Number of traps that happen between exec'ing the shell to run an
    inferior, and when we finally get to the inferior code.  The
    default is right for FreeBSD.  */