diff options
author | Fred Fish <fnf@specifix.com> | 1993-04-29 07:07:39 +0000 |
---|---|---|
committer | Fred Fish <fnf@specifix.com> | 1993-04-29 07:07:39 +0000 |
commit | 7efb57c33d3a34339e53ed959d42e1e21c938ca2 (patch) | |
tree | 4f3721162f566308e7ea6928a0ac8521932e909f | |
parent | 3602ba816321c98552a25ed520495e8c6443909c (diff) | |
download | gdb-7efb57c33d3a34339e53ed959d42e1e21c938ca2.zip gdb-7efb57c33d3a34339e53ed959d42e1e21c938ca2.tar.gz gdb-7efb57c33d3a34339e53ed959d42e1e21c938ca2.tar.bz2 |
* defs.h (CC_HAS_LONG_LONG): Set up to define CC_HAS_LONG_LONG
when compiling with gcc, but disable it for now. See comment.
* defs.h (LONGEST): Define as either "long" or "long long"
based on CC_HAS_LONG_LONG.
* defs.h (longest_to_int): Use CC_HAS_LONG_LONG to control
how longest_to_int is defined.
* c-valprint.c (c_val_print): Call print_longest.
* expprint.c (dump_expression): Use PRINTF_HAS_LONG_LONG
instead of LONG_LONG.
* {printcmd.c, gdbtypes.h} (LONG_LONG): Replace usages with
CC_HAS_LONG_LONG.
* printcmd.c (print_scalar_formatted): Call print_longest
and let it figure out what to do for PRINTF_HAS_LONG_LONG.
* typeprint.c (print_type_scalar): Call print_longest and let
it figure out what to do for PRINTF_HAS_LONG_LONG.
* valprint.c (val_print_type_code_int): Call print_longest
and let it figure out what to do for PRINTF_HAS_LONG_LONG.
* stabsread.c (LONG_LONG): Replace usages with CC_HAS_LONG_LONG.
* value.h (struct value): Replace usage of LONG_LONG with
CC_HAS_LONG_LONG.
* value.h (print_longest): Add prototype.
* values.c (LONG_LONG): Replace usages with CC_HAS_LONG_LONG.
* values.c (unpack_double): Collapse code that was unnecessarily
dependent on CC_HAS_LONG_LONG. Use LONGEST instead of direct types.
* values.c (value_from_longest): Remove dependency on
CC_HAS_LONG_LONG and just use LONGEST.
* solib.c (solib_map_sections): Use bfd_get_filename
to access filename field.
* solib.c (clear_solib): Save filename and free it later, after
bfd_close, since bfd_close may reference it. Use bfd_get_filename
to access the field.
* config/convex/xm-convex.h (LONG_LONG): Replace with
CC_HAS_LONG_LONG. Add define for PRINTF_HAS_LONG_LONG.
* doc/gdbint.texinfo (LONG_LONG): Replace with CC_HAS_LONG_LONG.
Add PRINTF_HAS_LONG_LONG references.
-rw-r--r-- | gdb/ChangeLog | 38 | ||||
-rw-r--r-- | gdb/c-valprint.c | 6 | ||||
-rw-r--r-- | gdb/defs.h | 63 | ||||
-rw-r--r-- | gdb/gdbtypes.h | 8 | ||||
-rw-r--r-- | gdb/stabsread.c | 4 | ||||
-rw-r--r-- | gdb/typeprint.c | 12 | ||||
-rw-r--r-- | gdb/valprint.c | 247 | ||||
-rw-r--r-- | gdb/value.h | 17 | ||||
-rw-r--r-- | gdb/values.c | 25 |
9 files changed, 308 insertions, 112 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cc20be4..20912d4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,41 @@ +Thu Apr 29 00:03:59 1993 Fred Fish (fnf@cygnus.com) + + * defs.h (CC_HAS_LONG_LONG): Set up to define CC_HAS_LONG_LONG + when compiling with gcc, but disable it for now. See comment. + * defs.h (LONGEST): Define as either "long" or "long long" + based on CC_HAS_LONG_LONG. + * defs.h (longest_to_int): Use CC_HAS_LONG_LONG to control + how longest_to_int is defined. + * c-valprint.c (c_val_print): Call print_longest. + * expprint.c (dump_expression): Use PRINTF_HAS_LONG_LONG + instead of LONG_LONG. + * {printcmd.c, gdbtypes.h} (LONG_LONG): Replace usages with + CC_HAS_LONG_LONG. + * printcmd.c (print_scalar_formatted): Call print_longest + and let it figure out what to do for PRINTF_HAS_LONG_LONG. + * typeprint.c (print_type_scalar): Call print_longest and let + it figure out what to do for PRINTF_HAS_LONG_LONG. + * valprint.c (val_print_type_code_int): Call print_longest + and let it figure out what to do for PRINTF_HAS_LONG_LONG. + * stabsread.c (LONG_LONG): Replace usages with CC_HAS_LONG_LONG. + * value.h (struct value): Replace usage of LONG_LONG with + CC_HAS_LONG_LONG. + * value.h (print_longest): Add prototype. + * values.c (LONG_LONG): Replace usages with CC_HAS_LONG_LONG. + * values.c (unpack_double): Collapse code that was unnecessarily + dependent on CC_HAS_LONG_LONG. Use LONGEST instead of direct types. + * values.c (value_from_longest): Remove dependency on + CC_HAS_LONG_LONG and just use LONGEST. + * solib.c (solib_map_sections): Use bfd_get_filename + to access filename field. + * solib.c (clear_solib): Save filename and free it later, after + bfd_close, since bfd_close may reference it. Use bfd_get_filename + to access the field. + * config/convex/xm-convex.h (LONG_LONG): Replace with + CC_HAS_LONG_LONG. Add define for PRINTF_HAS_LONG_LONG. + * doc/gdbint.texinfo (LONG_LONG): Replace with CC_HAS_LONG_LONG. + Add PRINTF_HAS_LONG_LONG references. + Wed Apr 28 06:11:38 1993 Jim Kingdon (kingdon@cygnus.com) * inflow.c (kill_command), infcmd.c (attach_command), diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 1a3151b..14deef8 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -304,11 +304,7 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse, } else { -#ifdef LONG_LONG - fprintf_filtered (stream, "%lld", val); -#else - fprintf_filtered (stream, "%ld", val); -#endif + print_longest (stream, 'd', 0, val); } break; @@ -506,29 +506,48 @@ enum val_prettyprint #define TARGET_PTR_BIT TARGET_INT_BIT #endif -/* Convert a LONGEST to an int. This is used in contexts (e.g. number - of arguments to a function, number in a value history, register - number, etc.) where the value must not be larger than can fit - in an int. */ -#if !defined (longest_to_int) -#if defined (LONG_LONG) -#define longest_to_int(x) (((x) > INT_MAX || (x) < INT_MIN) \ - ? (error ("Value out of range."),0) : (int) (x)) -#else /* No LONG_LONG. */ -/* Assume sizeof (int) == sizeof (long). */ -#define longest_to_int(x) ((int) (x)) -#endif /* No LONG_LONG. */ -#endif /* No longest_to_int. */ - -/* This should not be a typedef, because "unsigned LONGEST" needs - to work. LONG_LONG is defined if the host has "long long". */ +/* Default to support for "long long" if the host compiler being used is gcc. + Config files must define CC_HAS_LONG_LONG to use other host compilers + that are capable of supporting "long long", and to cause gdb to use that + support. Not defining CC_HAS_LONG_LONG will suppress use of "long long" + regardless of what compiler is used. + + FIXME: For now, automatic selection of "long long" as the default when + gcc is used is disabled, pending further testing. Concerns include the + impact on gdb performance and the universality of bugfree long long + support on platforms that do have gcc. Compiling with FORCE_LONG_LONG + will select "long long" use for testing purposes. -fnf */ + +#ifndef CC_HAS_LONG_LONG +# if defined (__GNUC__) && defined (FORCE_LONG_LONG) /* See FIXME above */ +# define CC_HAS_LONG_LONG 1 +# endif +#endif + +/* LONGEST should not be a typedef, because "unsigned LONGEST" needs to work. + CC_HAS_LONG_LONG is defined if the host compiler supports "long long" + variables and we wish to make use of that support. */ #ifndef LONGEST -# ifdef LONG_LONG -# define LONGEST long long -# else -# define LONGEST long -# endif +# ifdef CC_HAS_LONG_LONG +# define LONGEST long long +# else +# define LONGEST long +# endif +#endif + +/* Convert a LONGEST to an int. This is used in contexts (e.g. number of + arguments to a function, number in a value history, register number, etc.) + where the value must not be larger than can fit in an int. */ + +#ifndef longest_to_int +# ifdef CC_HAS_LONG_LONG +# define longest_to_int(x) (((x) > INT_MAX || (x) < INT_MIN) \ + ? (error ("Value out of range."),0) : (int) (x)) +# else + /* Assume sizeof (int) == sizeof (long). */ +# define longest_to_int(x) ((int) (x)) +# endif #endif /* If we picked up a copy of CHAR_BIT from a configuration file @@ -653,7 +672,7 @@ strsignal PARAMS ((int)); #ifndef PSIGNAL_IN_SIGNAL_H extern void -psignal PARAMS ((unsigned, char *)); +psignal PARAMS ((unsigned, const char *)); #endif /* For now, we can't include <stdlib.h> because it conflicts with diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index a28bf90..39a20b0 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -511,19 +511,19 @@ extern struct type *builtin_type_chill_long; extern struct type *builtin_type_chill_ulong; extern struct type *builtin_type_chill_real; -/* LONG_LONG is defined if the host has "long long". */ +/* CC_HAS_LONG_LONG is defined if the host has "long long". */ -#ifdef LONG_LONG +#ifdef CC_HAS_LONG_LONG #define BUILTIN_TYPE_LONGEST builtin_type_long_long #define BUILTIN_TYPE_UNSIGNED_LONGEST builtin_type_unsigned_long_long -#else /* not LONG_LONG. */ +#else /* not CC_HAS_LONG_LONG. */ #define BUILTIN_TYPE_LONGEST builtin_type_long #define BUILTIN_TYPE_UNSIGNED_LONGEST builtin_type_unsigned_long -#endif /* not LONG_LONG. */ +#endif /* not CC_HAS_LONG_LONG. */ /* Maximum and minimum values of built-in types */ diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 9b475bd..17d76d1 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -2966,7 +2966,7 @@ read_range_type (pp, typenums, objfile) *dbx_lookup_type (rangenums) == lookup_fundamental_type (objfile, FT_INTEGER))) { /* an unsigned type */ -#ifdef LONG_LONG +#ifdef CC_HAS_LONG_LONG if (n3 == - sizeof (long long)) return (lookup_fundamental_type (objfile, FT_UNSIGNED_LONG_LONG)); #endif @@ -2984,7 +2984,7 @@ read_range_type (pp, typenums, objfile) if (n3 == (unsigned char)~0L) return (lookup_fundamental_type (objfile, FT_UNSIGNED_CHAR)); } -#ifdef LONG_LONG +#ifdef CC_HAS_LONG_LONG else if (n3 == 0 && n2 == -sizeof (long long)) return (lookup_fundamental_type (objfile, FT_LONG_LONG)); #endif diff --git a/gdb/typeprint.c b/gdb/typeprint.c index 52ac311..85be5e9 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -198,20 +198,12 @@ print_type_scalar (type, val, stream) } else { -#ifdef LONG_LONG - fprintf_filtered (stream, "%lld", val); -#else - fprintf_filtered (stream, "%ld", val); -#endif + print_longest (stream, 'd', 0, val); } break; case TYPE_CODE_INT: -#ifdef LONG_LONG - fprintf_filtered (stream, TYPE_UNSIGNED (type) ? "%llu" : "%lld", val); -#else - fprintf_filtered (stream, TYPE_UNSIGNED (type) ? "%u" : "%d", val); -#endif + print_longest (stream, TYPE_UNSIGNED (type) ? 'u' : 'd', 0, val); break; case TYPE_CODE_CHAR: diff --git a/gdb/valprint.c b/gdb/valprint.c index c363746..6988c5c 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -263,14 +263,8 @@ val_print_type_code_int (type, valaddr, stream) if (len <= sizeof (LONGEST)) { /* We can print it in decimal. */ - fprintf_filtered - (stream, -#if defined (LONG_LONG) - "%llu", -#else - "%lu", -#endif - unpack_long (BUILTIN_TYPE_LONGEST, first_addr)); + print_longest (stream, 'u', 0, + unpack_long (BUILTIN_TYPE_LONGEST, first_addr)); } else { @@ -291,17 +285,130 @@ val_print_type_code_int (type, valaddr, stream) #ifdef PRINT_TYPELESS_INTEGER PRINT_TYPELESS_INTEGER (stream, type, unpack_long (type, valaddr)); #else - fprintf_filtered (stream, TYPE_UNSIGNED (type) ? -#if defined (LONG_LONG) - "%llu" : "%lld", -#else - "%u" : "%d", -#endif - unpack_long (type, valaddr)); + print_longest (stream, TYPE_UNSIGNED (type) ? 'u' : 'd', 0, + unpack_long (type, valaddr)); #endif } } +/* Print a number according to FORMAT which is one of d,u,x,o,b,h,w,g. + The raison d'etre of this function is to consolidate printing of LONG_LONG's + into this one function. Some platforms have long longs but don't have a + printf() that supports "ll" in the format string. We handle these by seeing + if the number is actually a long, and if not we just bail out and print the + number in hex. The format chars b,h,w,g are from + print_scalar_formatted(). USE_LOCAL says whether or not to call the + local formatting routine to get the format. */ + +void +print_longest (stream, format, use_local, val_long) + FILE *stream; + char format; + int use_local; + LONGEST val_long; +{ +#if defined (CC_HAS_LONG_LONG) && !defined (PRINTF_HAS_LONG_LONG) + long vtop, vbot; + + vtop = val_long >> (sizeof (long) * HOST_CHAR_BIT); + vbot = (long) val_long; + + if ((format == 'd' && (val_long < INT_MIN || val_long > INT_MAX)) + || ((format == 'u' || format == 'x') && val_long > UINT_MAX)) + { + fprintf_filtered (stream, "0x%x%08x", vtop, vbot); + return; + } +#endif + +#ifdef PRINTF_HAS_LONG_LONG + switch (format) + { + case 'd': + fprintf_filtered (stream, + use_local ? local_decimal_format_custom ("ll") + : "%lld", + val_long); + break; + case 'u': + fprintf_filtered (stream, "%llu", val_long); + break; + case 'x': + fprintf_filtered (stream, + use_local ? local_hex_format_custom ("ll") + : "%llx", + val_long); + break; + case 'o': + fprintf_filtered (stream, + use_local ? local_octal_format_custom ("ll") + : "%llo", + break; + case 'b': + fprintf_filtered (stream, local_hex_format_custom ("02ll"), val_long); + break; + case 'h': + fprintf_filtered (stream, local_hex_format_custom ("04ll"), val_long); + break; + case 'w': + fprintf_filtered (stream, local_hex_format_custom ("08ll"), val_long); + break; + case 'g': + fprintf_filtered (stream, local_hex_format_custom ("016ll"), val_long); + break; + default: + abort (); + } +#else /* !PRINTF_HAS_LONG_LONG */ + /* In the following it is important to coerce (val_long) to a long. It does + nothing if !LONG_LONG, but it will chop off the top half (which we know + we can ignore) if the host supports long longs. */ + + switch (format) + { + case 'd': + fprintf_filtered (stream, + use_local ? local_decimal_format_custom ("l") + : "%ld", + (long) val_long); + break; + case 'u': + fprintf_filtered (stream, "%lu", (unsigned long) val_long); + break; + case 'x': + fprintf_filtered (stream, + use_local ? local_hex_format_custom ("l") + : "%lx", + (long) val_long); + break; + case 'o': + fprintf_filtered (stream, + use_local ? local_octal_format_custom ("l") + : "%lo", + (long) val_long); + break; + case 'b': + fprintf_filtered (stream, local_hex_format_custom ("02l"), + (long) val_long); + break; + case 'h': + fprintf_filtered (stream, local_hex_format_custom ("04l"), + (long) val_long); + break; + case 'w': + fprintf_filtered (stream, local_hex_format_custom ("08l"), + (long) val_long); + break; + case 'g': + fprintf_filtered (stream, local_hex_format_custom ("016l"), + (long) val_long); + break; + default: + abort (); + } +#endif /* !PRINTF_HAS_LONG_LONG */ +} + /* Print a floating point value of type TYPE, pointed to in GDB by VALADDR, on STREAM. */ @@ -550,17 +657,46 @@ value_print_array_elements (val, stream, format, pretty) } } +/* Print a string from the inferior, starting at ADDR and printing up to LEN + characters, to STREAM. If LEN is zero, printing stops at the first null + byte, otherwise printing proceeds (including null bytes) until either + print_max or LEN characters have been printed. + + Always fetch print_max+1 characters, even though LA_PRINT_STRING might want + to print more or fewer (with repeated characters). This is so that we + don't spend forever fetching if we print a long string consisting of the + same character repeated. Also so we can do it all in one memory operation, + which is faster. However, this will be slower if print_max is set high, + e.g. if you set print_max to 1000, not only will it take a long time to + fetch short strings, but if you are near the end of the address space, it + might not work. + + If the number of characters we actually print is limited because of hitting + print_max, when LEN would have explicitly or implicitly (in the case of a + null terminated string with another non-null character available to print) + allowed us to print more, we print ellipsis ("...") after the printed string + to indicate that more characters were available to print but that we were + limited by print_max. To do this correctly requires that we always fetch + one more than the number of characters we could potentially print, so that + if we do print the maximum number, we can tell whether or not a null byte + would have been the next character, in the case of C style strings. + For non-C style strings, only the value of LEN is pertinent in deciding + whether or not to print ellipsis. + + FIXME: If LEN is nonzero and less than print_max, we could get away + with only fetching the specified number of characters from the inferior. */ + int -val_print_string (addr, stream) +val_print_string (addr, len, stream) CORE_ADDR addr; + unsigned int len; FILE *stream; { - int first_addr_err; + int first_addr_err = 0; /* Nonzero if first address out of bounds */ + int force_ellipsis = 0; /* Force ellipsis to be printed if nonzero */ int errcode; unsigned char c; char *string; - int force_ellipses; - unsigned int i = 0; /* Number of characters printed. */ /* Get first character. */ errcode = target_read_memory (addr, (char *)&c, 1); @@ -569,53 +705,58 @@ val_print_string (addr, stream) /* First address out of bounds. */ first_addr_err = 1; } - else + else if (print_max < UINT_MAX) { - first_addr_err = 0; - /* A real string. */ - string = (char *) alloca (print_max); + string = (char *) alloca (print_max + 1); + memset (string, 0, print_max + 1); - /* If the loop ends by us hitting print_max characters, - we need to have elipses at the end. */ - force_ellipses = 1; - - /* This loop always fetches print_max characters, even - though LA_PRINT_STRING might want to print more or fewer - (with repeated characters). This is so that - we don't spend forever fetching if we print - a long string consisting of the same character - repeated. Also so we can do it all in one memory - operation, which is faster. However, this will be - slower if print_max is set high, e.g. if you set - print_max to 1000, not only will it take a long - time to fetch short strings, but if you are near - the end of the address space, it might not work. */ QUIT; - errcode = target_read_memory (addr, string, print_max); + errcode = target_read_memory (addr, string, print_max + 1); if (errcode != 0) { - /* Try reading just one character. If that succeeds, - assume we hit the end of the address space, but - the initial part of the string is probably safe. */ + /* Try reading just one character. If that succeeds, assume we hit + the end of the address space, but the initial part of the string + is probably safe. */ char x[1]; errcode = target_read_memory (addr, x, 1); } - if (errcode != 0) - force_ellipses = 0; - else - for (i = 0; i < print_max; i++) - if (string[i] == '\0') + if (len == 0) + { + /* When the length is unspecified, such as when printing C style + null byte terminated strings, then scan the string looking for + the terminator in the first print_max characters. If a terminator + is found, then it determines the length, otherwise print_max + determines the length. */ + for (;len < print_max; len++) { - force_ellipses = 0; - break; + if (string[len] == '\0') + { + break; + } + } + /* If the first unprinted character is not the null terminator, set + the flag to force ellipses. This is true whether or not we broke + out of the above loop because we found a terminator, or whether + we simply hit the limit on how many characters to print. */ + if (string[len] != '\0') + { + force_ellipsis = 1; } + } + else if (len > print_max) + { + /* Printing less than the number of characters actually requested + always makes us print ellipsis. */ + len = print_max; + force_ellipsis = 1; + } QUIT; if (addressprint) { fputs_filtered (" ", stream); } - LA_PRINT_STRING (stream, string, i, force_ellipses); + LA_PRINT_STRING (stream, string, len, force_ellipsis); } if (errcode != 0) @@ -624,16 +765,16 @@ val_print_string (addr, stream) { fprintf_filtered (stream, (" <Address 0x%x out of bounds>" + first_addr_err), - addr + i); + addr + len); } else { - error ("Error reading memory address 0x%x: %s.", addr + i, + error ("Error reading memory address 0x%x: %s.", addr + len, safe_strerror (errcode)); } } fflush (stream); - return (i); + return (len); } #if 0 diff --git a/gdb/value.h b/gdb/value.h index e7c65dd..15b5053 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -102,7 +102,7 @@ struct value union { long contents[1]; double force_double_align; -#ifdef LONG_LONG +#ifdef CC_HAS_LONG_LONG long long force_longlong_align; #endif } aligner; @@ -272,6 +272,12 @@ extern value value_string PARAMS ((char *ptr, int len)); extern value +value_array PARAMS ((int lowbound, int highbound, value *elemvec)); + +extern value +value_concat PARAMS ((value arg1, value arg2)); + +extern value value_binop PARAMS ((value arg1, value arg2, enum exp_opcode op)); extern value @@ -420,9 +426,6 @@ extern int unop_user_defined_p PARAMS ((enum exp_opcode op, value arg1)); extern int -typecmp PARAMS ((int staticp, struct type *t1[], value t2[])); - -extern int destructor_name_p PARAMS ((const char *name, const struct type *type)); #define value_free(val) free ((PTR)val) @@ -475,6 +478,10 @@ baseclass_addr PARAMS ((struct type *type, int index, char *valaddr, value *valuep, int *errp)); extern void +print_longest PARAMS ((FILE *stream, char format, int use_local, + LONGEST value)); + +extern void print_floating PARAMS ((char *valaddr, struct type *type, FILE *stream)); extern int @@ -487,7 +494,7 @@ val_print PARAMS ((struct type *type, char *valaddr, CORE_ADDR address, int recurse, enum val_prettyprint pretty)); extern int -val_print_string PARAMS ((CORE_ADDR addr, FILE *stream)); +val_print_string PARAMS ((CORE_ADDR addr, unsigned int len, FILE *stream)); /* FIXME: Assumes equivalence of "struct frame_info *" and "FRAME" */ extern void diff --git a/gdb/values.c b/gdb/values.c index 58c19bf..c4a04ff 100644 --- a/gdb/values.c +++ b/gdb/values.c @@ -637,7 +637,7 @@ unpack_long (type, valaddr) SWAP_TARGET_AND_HOST (&retval, sizeof (retval)); return retval; } -#ifdef LONG_LONG +#ifdef CC_HAS_LONG_LONG if (len == sizeof (long long)) { unsigned long long retval; @@ -685,7 +685,7 @@ unpack_long (type, valaddr) return retval; } -#ifdef LONG_LONG +#ifdef CC_HAS_LONG_LONG if (len == sizeof (long long)) { long long retval; @@ -717,6 +717,15 @@ unpack_long (type, valaddr) SWAP_TARGET_AND_HOST (&retval, len); return retval; } +#ifdef CC_HAS_LONG_LONG + else if (len == sizeof(long long)) + { + unsigned long long retval; + memcpy (&retval, valaddr, len); + SWAP_TARGET_AND_HOST (&retval, len); + return retval; + } +#endif } else if (code == TYPE_CODE_MEMBER) error ("not implemented: member types in unpack_long"); @@ -775,11 +784,7 @@ unpack_double (type, valaddr, invp) } else if (nosign) { /* Unsigned -- be sure we compensate for signed LONGEST. */ -#ifdef LONG_LONG - return (unsigned long long) unpack_long (type, valaddr); -#else - return (unsigned long ) unpack_long (type, valaddr); -#endif + return (unsigned LONGEST) unpack_long (type, valaddr); } else { /* Signed -- we are OK with unpack_long. */ return unpack_long (type, valaddr); @@ -1393,10 +1398,8 @@ value_from_longest (type, num) * (int *) VALUE_CONTENTS_RAW (val) = num; else if (len == sizeof (long)) * (long *) VALUE_CONTENTS_RAW (val) = num; -#ifdef LONG_LONG - else if (len == sizeof (long long)) - * (long long *) VALUE_CONTENTS_RAW (val) = num; -#endif + else if (len == sizeof (LONGEST)) + * (LONGEST *) VALUE_CONTENTS_RAW (val) = num; else error ("Integer type encountered with unexpected data length."); } |