aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTristan Gingold <gingold@adacore.com>2012-04-02 13:48:49 +0000
committerTristan Gingold <gingold@adacore.com>2012-04-02 13:48:49 +0000
commitcf9bb588b31c141fce2c153df81d26fbd5c271d1 (patch)
tree85eee46ac88a75e31599591eeb5a80109d9598a8 /gdb
parent170923983d5c290d2293e9b937cfe60b26bf67e0 (diff)
downloadgdb-cf9bb588b31c141fce2c153df81d26fbd5c271d1.zip
gdb-cf9bb588b31c141fce2c153df81d26fbd5c271d1.tar.gz
gdb-cf9bb588b31c141fce2c153df81d26fbd5c271d1.tar.bz2
2012-04-02 Tristan Gingold <gingold@adacore.com>
* i386-darwin-nat.c (i386_darwin_fetch_inferior_registers): Use the STATE32 api for i386 state. (i386_darwin_store_inferior_registers): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/i386-darwin-nat.c36
2 files changed, 24 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc3a5a0..c3ebf99 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2012-04-02 Tristan Gingold <gingold@adacore.com>
+ * i386-darwin-nat.c (i386_darwin_fetch_inferior_registers): Use
+ the STATE32 api for i386 state.
+ (i386_darwin_store_inferior_registers): Likewise.
+
+2012-04-02 Tristan Gingold <gingold@adacore.com>
+
* i386-darwin-tdep.c (i386_darwin_thread_state_reg_offset): Fix
SS offset.
* i386-darwin-nat.c (i386_darwin_fetch_inferior_registers): Fix
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index 21e0c80..1a757e4 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -103,13 +103,13 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
{
if (regno == -1 || regno < I386_NUM_GREGS)
{
- i386_thread_state_t gp_regs;
- unsigned int gp_count = i386_THREAD_STATE_COUNT;
+ x86_thread_state32_t gp_regs;
+ unsigned int gp_count = x86_THREAD_STATE32_COUNT;
kern_return_t ret;
int i;
ret = thread_get_state
- (current_thread, i386_THREAD_STATE, (thread_state_t) & gp_regs,
+ (current_thread, x86_THREAD_STATE32, (thread_state_t) &gp_regs,
&gp_count);
if (ret != KERN_SUCCESS)
{
@@ -129,12 +129,12 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
if (regno == -1
|| (regno >= I386_ST0_REGNUM && regno < I386_SSE_NUM_REGS))
{
- i386_float_state_t fp_regs;
- unsigned int fp_count = i386_FLOAT_STATE_COUNT;
+ x86_float_state32_t fp_regs;
+ unsigned int fp_count = x86_FLOAT_STATE32_COUNT;
kern_return_t ret;
ret = thread_get_state
- (current_thread, i386_FLOAT_STATE, (thread_state_t) & fp_regs,
+ (current_thread, x86_FLOAT_STATE32, (thread_state_t) &fp_regs,
&fp_count);
if (ret != KERN_SUCCESS)
{
@@ -216,13 +216,13 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
{
if (regno == -1 || regno < I386_NUM_GREGS)
{
- i386_thread_state_t gp_regs;
+ x86_thread_state32_t gp_regs;
kern_return_t ret;
- unsigned int gp_count = i386_THREAD_STATE_COUNT;
+ unsigned int gp_count = x86_THREAD_STATE32_COUNT;
int i;
ret = thread_get_state
- (current_thread, i386_THREAD_STATE, (thread_state_t) & gp_regs,
+ (current_thread, x86_THREAD_STATE32, (thread_state_t) &gp_regs,
&gp_count);
MACH_CHECK_ERROR (ret);
@@ -232,29 +232,29 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
(regcache, i,
(char *)&gp_regs + i386_darwin_thread_state_reg_offset[i]);
- ret = thread_set_state (current_thread, i386_THREAD_STATE,
- (thread_state_t) & gp_regs,
- i386_THREAD_STATE_COUNT);
+ ret = thread_set_state (current_thread, x86_THREAD_STATE32,
+ (thread_state_t) &gp_regs,
+ x86_THREAD_STATE32_COUNT);
MACH_CHECK_ERROR (ret);
}
if (regno == -1
|| (regno >= I386_ST0_REGNUM && regno < I386_SSE_NUM_REGS))
{
- i386_float_state_t fp_regs;
- unsigned int fp_count = i386_FLOAT_STATE_COUNT;
+ x86_float_state32_t fp_regs;
+ unsigned int fp_count = x86_FLOAT_STATE32_COUNT;
kern_return_t ret;
ret = thread_get_state
- (current_thread, i386_FLOAT_STATE, (thread_state_t) & fp_regs,
+ (current_thread, x86_FLOAT_STATE32, (thread_state_t) & fp_regs,
&fp_count);
MACH_CHECK_ERROR (ret);
i387_collect_fxsave (regcache, regno, &fp_regs.__fpu_fcw);
- ret = thread_set_state (current_thread, i386_FLOAT_STATE,
- (thread_state_t) & fp_regs,
- i386_FLOAT_STATE_COUNT);
+ ret = thread_set_state (current_thread, x86_FLOAT_STATE32,
+ (thread_state_t) &fp_regs,
+ x86_FLOAT_STATE32_COUNT);
MACH_CHECK_ERROR (ret);
}
}