Date: Sun, 23 Mar 2008 20:31:45 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 138383 for review Message-ID: <200803232031.m2NKVjfJ002958@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=138383 Change 138383 by jb@jb_freebsd1 on 2008/03/23 20:30:47 Cleanup. Fix the data model default. Not sure what effect this would have had. Things seemed to work with it 'wrong'. :-/ Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#11 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#11 (text+ko) ==== @@ -108,20 +108,6 @@ void dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit)) { -#ifdef DOODAD - extern void *device_arena_contains(void *, size_t, size_t *); - caddr_t vaddr; - size_t len; - - for (vaddr = (caddr_t)kernelbase; vaddr < (caddr_t)KERNEL_TEXT; - vaddr += len) { - len = (caddr_t)KERNEL_TEXT - vaddr; - vaddr = device_arena_contains(vaddr, len, &len); - if (vaddr == NULL) - break; - (*func)((uintptr_t)vaddr, (uintptr_t)vaddr + len); - } -#endif (*func)(0, (uintptr_t) addr_PTmap); } @@ -163,7 +149,7 @@ dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_sync_func, NULL); } -#ifdef DOODAD +#ifdef notyet int (*dtrace_fasttrap_probe_ptr)(struct regs *); int (*dtrace_pid_probe_ptr)(struct regs *); int (*dtrace_return_probe_ptr)(struct regs *); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#2 (text+ko) ==== @@ -99,7 +99,7 @@ { int sz; dis86_t x; - uint_t mode = SIZE32; + uint_t mode = SIZE64; #if defined(sun) mode = (model == DATAMODEL_LP64) ? SIZE64 : SIZE32; @@ -122,33 +122,9 @@ return (sz); } -#ifdef DOODAD int -dtrace_instr_size_isa(uchar_t *instr, model_t model, int *rmindex) -{ - return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, model, rmindex)); -} -#endif - -int dtrace_instr_size(uchar_t *instr) { return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, DATAMODEL_NATIVE, NULL)); } - -#ifdef DOODAD -/*ARGSUSED*/ -int -instr_size(struct regs *rp, caddr_t *addrp, enum seg_rw rw) -{ - uchar_t instr[16]; /* maximum size instruction */ - caddr_t pc = (caddr_t)rp->r_pc; - - (void) copyin_nowatch(pc, (caddr_t)instr, sizeof (instr)); - - return (dtrace_dis_isize(instr, - rw == S_EXEC ? DIS_ISIZE_INSTR : DIS_ISIZE_OPERAND, - curproc->p_model, NULL)); -} -#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803232031.m2NKVjfJ002958>