X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fm2-lang.c;h=720082433f24a6d869e1641bcb4bd9a2d9814c07;hb=d14573e31eb6c22006d00de0be5336cfbc69257a;hp=8d2f2a58e231b2c497fb1d74e082bfb48ee759f0;hpb=043b05b26b6562d9a20d260954a66de46089408b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index 8d2f2a58e2..720082433f 100644
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -15,7 +15,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "symtab.h"
@@ -26,6 +26,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "m2-lang.h"
 #include "c-lang.h"
 
+static struct type *m2_create_fundamental_type PARAMS ((struct objfile *, int));
+static void m2_printstr PARAMS ((GDB_FILE *, char *, unsigned int, int));
+static void m2_printchar PARAMS ((int, GDB_FILE *));
+static void emit_char PARAMS ((int, GDB_FILE *, int));
+
 /* Print the character C on STREAM as part of the contents of a literal
    string whose delimiter is QUOTER.  Note that that format for printing
    characters and strings is language specific.
@@ -330,19 +335,25 @@ m2_create_fundamental_type (objfile, typeid)
 			  0, "long double", objfile);
 	break;
       case FT_COMPLEX:
-	type = init_type (TYPE_CODE_FLT,
-			  TARGET_COMPLEX_BIT / TARGET_CHAR_BIT,
+	type = init_type (TYPE_CODE_COMPLEX,
+			  2 * TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
 			  0, "complex", objfile);
+	TYPE_TARGET_TYPE (type)
+	  = m2_create_fundamental_type (objfile, FT_FLOAT);
 	break;
       case FT_DBL_PREC_COMPLEX:
-	type = init_type (TYPE_CODE_FLT,
-			  TARGET_DOUBLE_COMPLEX_BIT / TARGET_CHAR_BIT,
+	type = init_type (TYPE_CODE_COMPLEX,
+			  2 * TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
 			  0, "double complex", objfile);
+	TYPE_TARGET_TYPE (type)
+	  = m2_create_fundamental_type (objfile, FT_DBL_PREC_FLOAT);
 	break;
       case FT_EXT_PREC_COMPLEX:
-	type = init_type (TYPE_CODE_FLT,
-			  TARGET_DOUBLE_COMPLEX_BIT / TARGET_CHAR_BIT,
+	type = init_type (TYPE_CODE_COMPLEX,
+			  2 * TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT,
 			  0, "long double complex", objfile);
+	TYPE_TARGET_TYPE (type)
+	  = m2_create_fundamental_type (objfile, FT_EXT_PREC_FLOAT);
 	break;
       }
   return (type);
@@ -372,6 +383,15 @@ static const struct op_print m2_op_print_tab[] = {
     {"<",   BINOP_LESS, PREC_ORDER, 0},
     {"^",   UNOP_IND, PREC_PREFIX, 0},
     {"@",   BINOP_REPEAT, PREC_REPEAT, 0},
+    {"CAP", UNOP_CAP, PREC_BUILTIN_FUNCTION, 0},
+    {"CHR", UNOP_CHR, PREC_BUILTIN_FUNCTION, 0},
+    {"ORD", UNOP_ORD, PREC_BUILTIN_FUNCTION, 0},
+    {"FLOAT",UNOP_FLOAT, PREC_BUILTIN_FUNCTION, 0},
+    {"HIGH", UNOP_HIGH, PREC_BUILTIN_FUNCTION, 0},
+    {"MAX", UNOP_MAX, PREC_BUILTIN_FUNCTION, 0},
+    {"MIN", UNOP_MIN, PREC_BUILTIN_FUNCTION, 0},
+    {"ODD", UNOP_ODD, PREC_BUILTIN_FUNCTION, 0},
+    {"TRUNC", UNOP_TRUNC, PREC_BUILTIN_FUNCTION, 0},
     {NULL,  0, 0, 0}
 };
 
@@ -383,7 +403,7 @@ struct type *builtin_type_m2_card;
 struct type *builtin_type_m2_real;
 struct type *builtin_type_m2_bool;
 
-struct type ** const (m2_builtin_types[]) = 
+struct type ** CONST_PTR (m2_builtin_types[]) = 
 {
   &builtin_type_m2_char,
   &builtin_type_m2_int,
@@ -401,6 +421,7 @@ const struct language_defn m2_language_defn = {
   type_check_on,
   m2_parse,			/* parser */
   m2_error,			/* parser error function */
+  evaluate_subexp_standard,
   m2_printchar,			/* Print character constant */
   m2_printstr,			/* function to print string constant */
   m2_create_fundamental_type,	/* Create fundamental type in this language */
@@ -412,6 +433,9 @@ const struct language_defn m2_language_defn = {
   {"%ld",    "",   "d",  ""},	/* Decimal format info */
   {"0%lXH",  "0",  "X",  "H"},	/* Hex format info */
   m2_op_print_tab,		/* expression operators for printing */
+  0,				/* arrays are first-class (not c-style) */
+  0,				/* String lower bound */
+  &builtin_type_m2_char,	/* Type of string elements */ 
   LANG_MAGIC
 };