X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fi386-darwin-tdep.c;h=a1c226ba66fa81fbf6cd55b9db8ed06317081583;hb=9e35d4996169bc7fa833e8449585d517b8ccc5f8;hp=2e3fe9eb506ad65cff58d6a366e064429ea78f48;hpb=0b30217134add051e159a192066a1e568ebd837f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c index 2e3fe9eb50..a1c226ba66 100644 --- a/gdb/i386-darwin-tdep.c +++ b/gdb/i386-darwin-tdep.c @@ -1,5 +1,5 @@ /* Darwin support for GDB, the GNU debugger. - Copyright 1997-2002, 2005, 2008-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2020 Free Software Foundation, Inc. Contributed by Apple Computer, Inc. @@ -23,23 +23,19 @@ #include "inferior.h" #include "gdbcore.h" #include "target.h" -#include "floatformat.h" #include "symtab.h" #include "regcache.h" -#include "libbfd.h" #include "objfiles.h" #include "i387-tdep.h" #include "i386-tdep.h" #include "osabi.h" #include "ui-out.h" -#include "symtab.h" -#include "frame.h" -#include "gdb_assert.h" #include "i386-darwin-tdep.h" #include "solib.h" #include "solib-darwin.h" #include "dwarf2-frame.h" +#include /* Offsets into the struct i386_thread_state where we'll find the saved regs. From and i386-tdep.h. */ @@ -56,7 +52,7 @@ int i386_darwin_thread_state_reg_offset[] = 10 * 4, /* EIP */ 9 * 4, /* EFLAGS */ 11 * 4, /* CS */ - 8, /* SS */ + 8 * 4, /* SS */ 12 * 4, /* DS */ 13 * 4, /* ES */ 14 * 4, /* FS */ @@ -108,7 +104,7 @@ darwin_dwarf_signal_frame_p (struct gdbarch *gdbarch, return i386_sigtramp_p (this_frame); } -/* Check wether TYPE is a 128-bit vector (__m128, __m128d or __m128i). */ +/* Check whether TYPE is a 128-bit vector (__m128, __m128d or __m128i). */ static int i386_m128_p (struct type *type) @@ -141,8 +137,12 @@ i386_darwin_arg_type_alignment (struct type *type) int i; int res = 4; for (i = 0; i < TYPE_NFIELDS (type); i++) - res = max (res, - i386_darwin_arg_type_alignment (TYPE_FIELD_TYPE (type, i))); + { + int align + = i386_darwin_arg_type_alignment (TYPE_FIELD_TYPE (type, i)); + + res = std::max (res, align); + } return res; } /* 2. The caller aligns nonvector arguments to 4-byte boundaries. */ @@ -153,7 +153,8 @@ static CORE_ADDR i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) + function_call_return_method return_method, + CORE_ADDR struct_addr) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -169,7 +170,7 @@ i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function, int args_space = 0; int num_m128 = 0; - if (struct_return) + if (return_method == return_method_struct) { if (write_pass) { @@ -189,20 +190,18 @@ i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function, if (write_pass) { const gdb_byte *val = value_contents_all (args[i]); - regcache_raw_write - (regcache, I387_MM0_REGNUM(tdep) + num_m128, val); + regcache->raw_write (I387_MM0_REGNUM(tdep) + num_m128, val); } num_m128++; } else { - int len = TYPE_LENGTH (arg_type); - int align = i386_darwin_arg_type_alignment (arg_type); - - args_space = align_up (args_space, align); + args_space = align_up (args_space, + i386_darwin_arg_type_alignment (arg_type)); if (write_pass) write_memory (sp + args_space, - value_contents_all (args[i]), len); + value_contents_all (args[i]), + TYPE_LENGTH (arg_type)); /* The System V ABI says that: @@ -211,7 +210,7 @@ i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function, depending on the size of the argument." This makes sure the stack stays word-aligned. */ - args_space += align_up (len, 4); + args_space += align_up (TYPE_LENGTH (arg_type), 4); } } @@ -229,10 +228,10 @@ i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function, /* Finally, update the stack pointer... */ store_unsigned_integer (buf, 4, byte_order, sp); - regcache_cooked_write (regcache, I386_ESP_REGNUM, buf); + regcache->cooked_write (I386_ESP_REGNUM, buf); /* ...and fake a frame pointer. */ - regcache_cooked_write (regcache, I386_EBP_REGNUM, buf); + regcache->cooked_write (I386_EBP_REGNUM, buf); /* MarkK wrote: This "+ 8" is all over the place: (i386_frame_this_id, i386_sigtramp_frame_this_id, @@ -287,8 +286,9 @@ i386_mach_o_osabi_sniffer (bfd *abfd) return GDB_OSABI_UNKNOWN; } +void _initialize_i386_darwin_tdep (); void -_initialize_i386_darwin_tdep (void) +_initialize_i386_darwin_tdep () { gdbarch_register_osabi_sniffer (bfd_arch_unknown, bfd_target_mach_o_flavour, i386_mach_o_osabi_sniffer);