Deleted Added
full compact
37a38,39
> #include <libproc_compat.h>
>
42a45,49
> ftp->ftps_type = DTFTP_ENTRY;
> ftp->ftps_pc = (uintptr_t)symp->st_value;
> ftp->ftps_size = (size_t)symp->st_size;
> ftp->ftps_noffs = 1;
> ftp->ftps_offs[0] = 0;
44,45c51,57
< dt_dprintf("%s: unimplemented\n", __func__);
< return (DT_PROC_ERR);
---
> if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
> dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
> strerror(errno));
> return (dt_set_errno(dtp, errno));
> }
>
> return (1);
53,54c65,132
< dt_dprintf("%s: unimplemented\n", __func__);
< return (DT_PROC_ERR);
---
> uintptr_t temp;
> uint32_t *text;
> int i;
> int srdepth = 0;
>
> if ((text = malloc(symp->st_size + 4)) == NULL) {
> dt_dprintf("mr sparkle: malloc() failed\n");
> return (DT_PROC_ERR);
> }
>
> if (Pread(P, text, symp->st_size, symp->st_value) != symp->st_size) {
> dt_dprintf("mr sparkle: Pread() failed\n");
> free(text);
> return (DT_PROC_ERR);
> }
>
> /*
> * Leave a dummy instruction in the last slot to simplify edge
> * conditions.
> */
> text[symp->st_size / 4] = 0;
>
> ftp->ftps_type = DTFTP_RETURN;
> ftp->ftps_pc = symp->st_value;
> ftp->ftps_size = symp->st_size;
> ftp->ftps_noffs = 0;
>
> for (i = 0; i < symp->st_size / 4; i++) {
>
> if ((text[i] & 0xfc000001) != 0x48000000 &&
> text[i] != 0x4e800020)
> continue;
>
> /*
> * Check for a jump within this function. If it's outside this
> * function then it's a tail-call, so a return point.
> */
> if ((text[i] & 0xfc000000) == 0x48000000) {
> temp = (text[i] & 0x03fffffc);
> /* Bit 30 denotes an absolute address. */
> if (!(text[i] & 0x02)) {
> temp += symp->st_value + i * 4;
> }
> else {
> /* Sign extend the absolute address. */
> if (temp & 0x02000000) {
> temp |= (UINTPTR_MAX - 0x03ffffff);
> }
> }
> if (temp >= symp->st_value &&
> temp <= (symp->st_value + symp->st_size))
> continue;
> }
> dt_dprintf("return at offset %x\n", i * 4);
> ftp->ftps_offs[ftp->ftps_noffs++] = i * 4;
> }
>
> free(text);
> if (ftp->ftps_noffs > 0) {
> if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
> dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
> strerror(errno));
> return (dt_set_errno(dtp, errno));
> }
> }
>
>
> return (ftp->ftps_noffs);
61a140,141
> if (off & 0x3)
> return (DT_PROC_ALIGN);
63,64c143,155
< dt_dprintf("%s: unimplemented\n", __func__);
< return (DT_PROC_ERR);
---
> ftp->ftps_type = DTFTP_OFFSETS;
> ftp->ftps_pc = (uintptr_t)symp->st_value;
> ftp->ftps_size = (size_t)symp->st_size;
> ftp->ftps_noffs = 1;
> ftp->ftps_offs[0] = off;
>
> if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
> dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
> strerror(errno));
> return (dt_set_errno(dtp, errno));
> }
>
> return (1);
71a163
> ulong_t i;
73,74c165,196
< dt_dprintf("%s: unimplemented\n", __func__);
< return (DT_PROC_ERR);
---
> ftp->ftps_type = DTFTP_OFFSETS;
> ftp->ftps_pc = (uintptr_t)symp->st_value;
> ftp->ftps_size = (size_t)symp->st_size;
> ftp->ftps_noffs = 0;
>
> /*
> * If we're matching against everything, just iterate through each
> * instruction in the function, otherwise look for matching offset
> * names by constructing the string and comparing it against the
> * pattern.
> */
> if (strcmp("*", pattern) == 0) {
> for (i = 0; i < symp->st_size; i += 4) {
> ftp->ftps_offs[ftp->ftps_noffs++] = i;
> }
> } else {
> char name[sizeof (i) * 2 + 1];
>
> for (i = 0; i < symp->st_size; i += 4) {
> (void) sprintf(name, "%lx", i);
> if (gmatch(name, pattern))
> ftp->ftps_offs[ftp->ftps_noffs++] = i;
> }
> }
>
> if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
> dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
> strerror(errno));
> return (dt_set_errno(dtp, errno));
> }
>
> return (ftp->ftps_noffs);