Page MenuHomeFreeBSD
Differential D1370

Libxo needs to be in /lib for base utils.
ClosedPublic
Actions

Authored by alfred on Dec 25 2014, 2:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 18 2025, 12:00 PM
Unknown Object (File)
Jan 29 2025, 12:15 AM
Unknown Object (File)
Jan 24 2025, 11:49 PM
Unknown Object (File)
Jan 24 2025, 11:49 PM
Unknown Object (File)
Jan 24 2025, 11:48 PM
Unknown Object (File)
Jan 24 2025, 11:18 PM
Unknown Object (File)
Jan 19 2025, 8:49 PM
Unknown Object (File)
Dec 9 2024, 2:03 AM
View All Files
Subscribers
None

Details

Reviewers
jmg
marcel
gnn
adrian
Commits
rS276195: Move libxo to /lib

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

alfred updated this revision to Diff 2854.Dec 25 2014, 2:18 AM
alfred retitled this revision from to Libxo needs to be in /lib for base utils..
alfred updated this object.
alfred edited the test plan for this revision. (Show Details)
alfred added reviewers: marcel, adrian, gnn, jmg.Dec 25 2014, 2:19 AM
alfred closed this revision.Dec 25 2014, 3:16 AM
alfred updated this revision to Diff 2863.

Closed by commit rS276195 (authored by alfred).

Revision Contents
Changeset List

PathSize
head/
3 lines
lib/
libxo/
2 lines

Diff 2863

View Options

head/ObsoleteFiles.inc

Show All 12 Lines
#include <sys/dtrace.h> #include <sys/dtrace.h>
#include <cddl/dev/dtrace/dtrace_cddl.h> #include <cddl/dev/dtrace/dtrace_cddl.h>
#include <dis_tables.h> #include <dis_tables.h>
#include "kinst.h" #include "kinst.h"
#define KINST_PUSHL_RBP 0x55 #define KINST_PUSHL_RBP 0x55
#define KINST_POPL_RBP 0x5d
#define KINST_STI 0xfb #define KINST_STI 0xfb
#define KINST_POPF 0x9d #define KINST_POPF 0x9d
#define KINST_MODRM_MOD(b) (((b) & 0xc0) >> 6) #define KINST_MODRM_MOD(b) (((b) & 0xc0) >> 6)
#define KINST_MODRM_REG(b) (((b) & 0x38) >> 3) #define KINST_MODRM_REG(b) (((b) & 0x38) >> 3)
#define KINST_MODRM_RM(b) ((b) & 0x07) #define KINST_MODRM_RM(b) ((b) & 0x07)
#define KINST_SIB_SCALE(s) (((s) & 0xc0) >> 6) #define KINST_SIB_SCALE(s) (((s) & 0xc0) >> 6)
▲ Show 20 Lines • Show All 462 Lines • ▼ Show 20 Lines
int int
kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval, kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval,
void *opaque) void *opaque)
{ {
struct kinst_probe *kp; struct kinst_probe *kp;
dtrace_kinst_probedesc_t *pd; dtrace_kinst_probedesc_t *pd;
const char *func; const char *func;
int error, instrsize, n, off; int error, instrsize, n, off;
uint8_t *instr, *limit; uint8_t *instr, *limit, *tmp;
bool push_found, pop_found;
pd = opaque; pd = opaque;
func = symval->name; func = symval->name;
if (kinst_excluded(func)) if (kinst_excluded(func))
return (0); return (0);
if (strcmp(func, pd->kpd_func) != 0) if (strcmp(func, pd->kpd_func) != 0)
return (0); return (0);
instr = (uint8_t *)symval->value; instr = (uint8_t *)symval->value;
limit = (uint8_t *)symval->value + symval->size; limit = (uint8_t *)symval->value + symval->size;
if (instr >= limit) if (instr >= limit)
return (0); return (0);
/* /*
* Ignore functions not beginning with the usual function prologue. * Ignore functions not beginning with the usual function prologue.
markjUnsubmitted
Done
Inline Actions

The first sentence isn't really accurate anymore. I'd just replace the comment with something like, "refuse to instrument functions lacking the usual frame pointer manipulations since they might correspond to exception handlers."

markj: The first sentence isn't really accurate anymore. I'd just replace the comment with something…
* These might correspond to exception handlers with which we should not * These might correspond to exception handlers with which we should
* meddle. This does however exclude functions which can be safely * not meddle.
* traced, such as cpu_switch().
*/ */
if (*instr != KINST_PUSHL_RBP) tmp = instr;
push_found = pop_found = false;
while (tmp < limit) {
if (*tmp == KINST_PUSHL_RBP)
push_found = true;
else if (*tmp == KINST_POPL_RBP)
pop_found = true;
if (push_found && pop_found)
break;
tmp += dtrace_instr_size(tmp);
}
if (!push_found || !pop_found)
return (0); return (0);
n = 0; n = 0;
while (instr < limit) { while (instr < limit) {
instrsize = dtrace_instr_size(instr); instrsize = dtrace_instr_size(instr);
off = (int)(instr - (uint8_t *)symval->value); off = (int)(instr - (uint8_t *)symval->value);
if (pd->kpd_off != -1 && off != pd->kpd_off) { if (pd->kpd_off != -1 && off != pd->kpd_off) {
instr += instrsize; instr += instrsize;
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines
View Options

head/lib/libxo/Makefile

Show All 12 Lines
#include <sys/dtrace.h> #include <sys/dtrace.h>
#include <cddl/dev/dtrace/dtrace_cddl.h> #include <cddl/dev/dtrace/dtrace_cddl.h>
#include <dis_tables.h> #include <dis_tables.h>
#include "kinst.h" #include "kinst.h"
#define KINST_PUSHL_RBP 0x55 #define KINST_PUSHL_RBP 0x55
#define KINST_POPL_RBP 0x5d
#define KINST_STI 0xfb #define KINST_STI 0xfb
#define KINST_POPF 0x9d #define KINST_POPF 0x9d
#define KINST_MODRM_MOD(b) (((b) & 0xc0) >> 6) #define KINST_MODRM_MOD(b) (((b) & 0xc0) >> 6)
#define KINST_MODRM_REG(b) (((b) & 0x38) >> 3) #define KINST_MODRM_REG(b) (((b) & 0x38) >> 3)
#define KINST_MODRM_RM(b) ((b) & 0x07) #define KINST_MODRM_RM(b) ((b) & 0x07)
#define KINST_SIB_SCALE(s) (((s) & 0xc0) >> 6) #define KINST_SIB_SCALE(s) (((s) & 0xc0) >> 6)
▲ Show 20 Lines • Show All 462 Lines • ▼ Show 20 Lines
int int
kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval, kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval,
void *opaque) void *opaque)
{ {
struct kinst_probe *kp; struct kinst_probe *kp;
dtrace_kinst_probedesc_t *pd; dtrace_kinst_probedesc_t *pd;
const char *func; const char *func;
int error, instrsize, n, off; int error, instrsize, n, off;
uint8_t *instr, *limit; uint8_t *instr, *limit, *tmp;
bool push_found, pop_found;
pd = opaque; pd = opaque;
func = symval->name; func = symval->name;
if (kinst_excluded(func)) if (kinst_excluded(func))
return (0); return (0);
if (strcmp(func, pd->kpd_func) != 0) if (strcmp(func, pd->kpd_func) != 0)
return (0); return (0);
instr = (uint8_t *)symval->value; instr = (uint8_t *)symval->value;
limit = (uint8_t *)symval->value + symval->size; limit = (uint8_t *)symval->value + symval->size;
if (instr >= limit) if (instr >= limit)
return (0); return (0);
/* /*
* Ignore functions not beginning with the usual function prologue. * Ignore functions not beginning with the usual function prologue.
markjUnsubmitted
Done
Inline Actions

The first sentence isn't really accurate anymore. I'd just replace the comment with something like, "refuse to instrument functions lacking the usual frame pointer manipulations since they might correspond to exception handlers."

markj: The first sentence isn't really accurate anymore. I'd just replace the comment with something…
* These might correspond to exception handlers with which we should not * These might correspond to exception handlers with which we should
* meddle. This does however exclude functions which can be safely * not meddle.
* traced, such as cpu_switch().
*/ */
if (*instr != KINST_PUSHL_RBP) tmp = instr;
push_found = pop_found = false;
while (tmp < limit) {
if (*tmp == KINST_PUSHL_RBP)
push_found = true;
else if (*tmp == KINST_POPL_RBP)
pop_found = true;
if (push_found && pop_found)
break;
tmp += dtrace_instr_size(tmp);
}
if (!push_found || !pop_found)
return (0); return (0);
n = 0; n = 0;
while (instr < limit) { while (instr < limit) {
instrsize = dtrace_instr_size(instr); instrsize = dtrace_instr_size(instr);
off = (int)(instr - (uint8_t *)symval->value); off = (int)(instr - (uint8_t *)symval->value);
if (pd->kpd_off != -1 && off != pd->kpd_off) { if (pd->kpd_off != -1 && off != pd->kpd_off) {
instr += instrsize; instr += instrsize;
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines