projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a new 'info proc files' subcommand of 'info proc'.
[deliverable/binutils-gdb.git]
/
gdb
/
i386-darwin-tdep.c
diff --git
a/gdb/i386-darwin-tdep.c
b/gdb/i386-darwin-tdep.c
index 25a5e5090881b6aba6ae159abe791e909f37afd5..5a1807ae4d655747beda600ada7b6a154546c21a 100644
(file)
--- a/
gdb/i386-darwin-tdep.c
+++ b/
gdb/i386-darwin-tdep.c
@@
-1,6
+1,5
@@
/* Darwin support for GDB, the GNU debugger.
/* Darwin support for GDB, the GNU debugger.
- Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1997-2018 Free Software Foundation, Inc.
Contributed by Apple Computer, Inc.
Contributed by Apple Computer, Inc.
@@
-24,23
+23,19
@@
#include "inferior.h"
#include "gdbcore.h"
#include "target.h"
#include "inferior.h"
#include "gdbcore.h"
#include "target.h"
-#include "floatformat.h"
#include "symtab.h"
#include "regcache.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 "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 "i386-darwin-tdep.h"
#include "solib.h"
#include "solib-darwin.h"
#include "dwarf2-frame.h"
+#include <algorithm>
/* Offsets into the struct i386_thread_state where we'll find the saved regs.
From <mach/i386/thread_status.h> and i386-tdep.h. */
/* Offsets into the struct i386_thread_state where we'll find the saved regs.
From <mach/i386/thread_status.h> and i386-tdep.h. */
@@
-57,7
+52,7
@@
int i386_darwin_thread_state_reg_offset[] =
10 * 4, /* EIP */
9 * 4, /* EFLAGS */
11 * 4, /* CS */
10 * 4, /* EIP */
9 * 4, /* EFLAGS */
11 * 4, /* CS */
- 8
,
/* SS */
+ 8
* 4,
/* SS */
12 * 4, /* DS */
13 * 4, /* ES */
14 * 4, /* FS */
12 * 4, /* DS */
13 * 4, /* ES */
14 * 4, /* FS */
@@
-142,8
+137,12
@@
i386_darwin_arg_type_alignment (struct type *type)
int i;
int res = 4;
for (i = 0; i < TYPE_NFIELDS (type); i++)
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. */
return res;
}
/* 2. The caller aligns nonvector arguments to 4-byte boundaries. */
@@
-190,20
+189,18
@@
i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
if (write_pass)
{
const gdb_byte *val = value_contents_all (args[i]);
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
{
}
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,
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:
/* The System V ABI says that:
@@
-212,7
+209,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. */
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);
}
}
}
}
@@
-230,10
+227,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);
/* 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. */
/* ...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,
/* MarkK wrote: This "+ 8" is all over the place:
(i386_frame_this_id, i386_sigtramp_frame_this_id,
This page took
0.038115 seconds
and
4
git commands to generate.