diff options
| author | Roland McGrath <roland@redhat.com> | 2008-01-30 13:30:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:50 +0100 |
| commit | 7122ec8158b0f88befd94f4da8feae2c8d08d1b4 (patch) | |
| tree | 17aa91add10e04cf27e93ba2b673fcb651ed39ba /arch/x86/kernel/step.c | |
| parent | 5f76cb1f6c42e7575256595f85b8b97d84ec669e (diff) | |
x86: single_step: share code
This removes the single-step code from ptrace_32.c and uses the step.c code
shared with the 64-bit kernel. The two versions of the code were nearly
identical already, so the shared code has only a couple of simple #ifdef's.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/step.c')
| -rw-r--r-- | arch/x86/kernel/step.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index 6a93b93f91f1..6732272e3479 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c @@ -5,12 +5,24 @@ #include <linux/mm.h> #include <linux/ptrace.h> +#ifdef CONFIG_X86_32 +static +#endif unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs) { unsigned long addr, seg; +#ifdef CONFIG_X86_64 addr = regs->rip; seg = regs->cs & 0xffff; +#else + addr = regs->eip; + seg = regs->xcs & 0xffff; + if (regs->eflags & X86_EFLAGS_VM) { + addr = (addr & 0xffff) + (seg << 4); + return addr; + } +#endif /* * We'll assume that the code segments in the GDT @@ -69,12 +81,14 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs) case 0xf0: case 0xf2: case 0xf3: continue; +#ifdef CONFIG_X86_64 case 0x40 ... 0x4f: if (regs->cs != __USER_CS) /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ continue; +#endif /* CHECKME: f2, f3 */ |