diff options
| author | avg <avg@FreeBSD.org> | 2014-02-17 13:02:09 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2014-02-17 13:02:09 +0000 |
| commit | 0c979fc23f757e73bbaa22215ceb8d5afaf15b8b (patch) | |
| tree | aa75fb31c7af3b5051930d36ec796bd1da7af5db /sys/cddl/contrib/opensolaris/uts | |
| parent | b46715eb45c047352cfcbd2055652d72d46e5deb (diff) | |
| download | FreeBSD-src-0c979fc23f757e73bbaa22215ceb8d5afaf15b8b.zip FreeBSD-src-0c979fc23f757e73bbaa22215ceb8d5afaf15b8b.tar.gz | |
MFC r257143: Fix a couple of bugs in the fasttrap emulation of a "push %rbp"
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c b/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c index 65991af..99157a1 100644 --- a/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c +++ b/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c @@ -104,6 +104,7 @@ uwrite(proc_t *p, void *kaddr, size_t len, uintptr_t uaddr) #define r_rip r_eip #define r_rflags r_eflags #define r_rsp r_esp +#define r_rbp r_ebp #endif /* @@ -1381,29 +1382,27 @@ fasttrap_pid_probe(struct reg *rp) case FASTTRAP_T_PUSHL_EBP: { int ret = 0; - uintptr_t addr = 0; #ifdef __amd64 if (p->p_model == DATAMODEL_NATIVE) { - addr = rp->r_rsp - sizeof (uintptr_t); - ret = fasttrap_sulword((void *)addr, &rp->r_rsp); + rp->r_rsp -= sizeof (uintptr_t); + ret = fasttrap_sulword(&rp->r_rbp, (void *)rp->r_rsp); } else { #endif #ifdef __i386__ - addr = rp->r_rsp - sizeof (uint32_t); - ret = fasttrap_suword32((void *)addr, &rp->r_rsp); + rp->r_rsp -= sizeof (uint32_t); + ret = fasttrap_suword32(&rp->r_rbp, (void *)rp->r_rsp); #endif #ifdef __amd64 } #endif if (ret == -1) { - fasttrap_sigsegv(p, curthread, addr); + fasttrap_sigsegv(p, curthread, rp->r_rsp); new_pc = pc; break; } - rp->r_rsp = addr; new_pc = pc + tp->ftt_size; break; } |
