diff options
| -rw-r--r-- | gdb/i386-tdep.c | 12 | ||||
| -rw-r--r-- | gdb/i386v-nat.c | 3 | ||||
| -rw-r--r-- | gdb/i387-tdep.c | 11 |
3 files changed, 12 insertions, 14 deletions
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index e6ee9ce..4b2471f 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -22,7 +22,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "inferior.h" #include "gdbcore.h" #include "target.h" +<<<<<<< i386-tdep.c +#include "floatformat.h" +||||||| 1.26 +======= #include "symtab.h" +>>>>>>> 1.27 static long i386_get_frame_setup PARAMS ((int)); @@ -618,12 +623,11 @@ i386_extract_return_value(type, regbuf, valbuf) { if (TYPE_CODE_FLT == TYPE_CODE(type)) { - extern struct ext_format ext_format_i387; double d; /* 387 %st(0), gcc uses this */ - ieee_extended_to_double (&ext_format_i387, - ®buf[REGISTER_BYTE(FP0_REGNUM)], - &d); + floatformat_to_double (&floatformat_i387_ext, + ®buf[REGISTER_BYTE(FP0_REGNUM)], + &d); store_floating (valbuf, TYPE_LENGTH (type), d); } else diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c index 3e16d31..1a6213a 100644 --- a/gdb/i386v-nat.c +++ b/gdb/i386v-nat.c @@ -41,11 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <sys/reg.h> #endif -#include "ieee-float.h" +#include "floatformat.h" #include "target.h" -extern struct ext_format ext_format_i387; /* this table must line up with REGISTER_NAMES in tm-i386v.h */ /* symbols like 'EAX' come from <sys/reg.h> */ diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c index 1e5da17..3cec3ab 100644 --- a/gdb/i387-tdep.c +++ b/gdb/i387-tdep.c @@ -22,12 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "inferior.h" #include "language.h" #include "gdbcore.h" -#include "ieee-float.h" - -struct ext_format ext_format_i387 = { -/* tot sbyte smask expbyte manbyte */ - 10, 9, 0x80, 9,8, 4,0 /* i387 */ -}; +#include "floatformat.h" /* FIXME: Eliminate these routines when we have the time to change all the callers. */ @@ -37,7 +32,7 @@ i387_to_double (from, to) char *from; char *to; { - ieee_extended_to_double (&ext_format_i387, from, (double *)to); + floatformat_to_double (&floatformat_i387_ext, from, (double *)to); } void @@ -45,7 +40,7 @@ double_to_i387 (from, to) char *from; char *to; { - double_to_ieee_extended (&ext_format_i387, (double *)from, to); + floatformat_from_double (&floatformat_i387_ext, (double *)from, to); } void |