oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Message type for SYS_TRACE

Browse Source 
Change-Id: Ib579fab949b76797ea7d6cb5ff4ae3d9b32f630c
This commit is contained in:
Lionel Sambuc 2014-05-23 10:09:09 +02:00
parent c59c5caceb
commit 333fd250f5
3 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/minix/ipc.h
View File

@ -819,6 +819,23 @@ typedef struct {
} mess_krn_lsys_sys_times; } mess_krn_lsys_sys_times;
_ASSERT_MSG_SIZE(mess_krn_lsys_sys_times); _ASSERT_MSG_SIZE(mess_krn_lsys_sys_times);
typedef struct {
int request;
endpoint_t endpt;
vir_bytes address;
long int data;
uint8_t padding[40];
} mess_lsys_krn_sys_trace;
_ASSERT_MSG_SIZE(mess_lsys_krn_sys_trace);
typedef struct {
long int data;
uint8_t padding[52];
} mess_krn_lsys_sys_trace;
_ASSERT_MSG_SIZE(mess_krn_lsys_sys_trace);
typedef struct { typedef struct {
endpoint_t src_endpt; endpoint_t src_endpt;
int segment; int segment;
@ -1526,6 +1543,7 @@ typedef struct {
mess_krn_lsys_sys_getwhoami m_krn_lsys_sys_getwhoami; mess_krn_lsys_sys_getwhoami m_krn_lsys_sys_getwhoami;
mess_krn_lsys_sys_irqctl m_krn_lsys_sys_irqctl; mess_krn_lsys_sys_irqctl m_krn_lsys_sys_irqctl;
mess_krn_lsys_sys_times m_krn_lsys_sys_times; mess_krn_lsys_sys_times m_krn_lsys_sys_times;
mess_krn_lsys_sys_trace m_krn_lsys_sys_trace;
mess_krn_lsys_sys_umap m_krn_lsys_sys_umap; mess_krn_lsys_sys_umap m_krn_lsys_sys_umap;
mess_krn_lsys_sys_vumap m_krn_lsys_sys_vumap; mess_krn_lsys_sys_vumap m_krn_lsys_sys_vumap;
@ -1615,6 +1633,7 @@ typedef struct {
mess_lsys_krn_sys_stime m_lsys_krn_sys_stime; mess_lsys_krn_sys_stime m_lsys_krn_sys_stime;
mess_lsys_krn_sys_settime m_lsys_krn_sys_settime; mess_lsys_krn_sys_settime m_lsys_krn_sys_settime;
mess_lsys_krn_sys_times m_lsys_krn_sys_times; mess_lsys_krn_sys_times m_lsys_krn_sys_times;
mess_lsys_krn_sys_trace m_lsys_krn_sys_trace;
mess_lsys_krn_sys_umap m_lsys_krn_sys_umap; mess_lsys_krn_sys_umap m_lsys_krn_sys_umap;
mess_lsys_krn_sys_vdevio m_lsys_krn_sys_vdevio; mess_lsys_krn_sys_vdevio m_lsys_krn_sys_vdevio;
mess_lsys_krn_sys_vumap m_lsys_krn_sys_vumap; mess_lsys_krn_sys_vumap m_lsys_krn_sys_vumap;

46
kernel/system/do_trace.c
View File

@ -2,10 +2,11 @@
* m_type: SYS_TRACE * m_type: SYS_TRACE
* *
* The parameters for this kernel call are: * The parameters for this kernel call are:
* m2_i1: CTL_ENDPT process that is traced * m_lsys_krn_sys_trace.endpt process that is traced
* m2_i2: CTL_REQUEST trace request * m_lsys_krn_sys_trace.request trace request
* m2_l1: CTL_ADDRESS address at traced process' space * m_lsys_krn_sys_trace.address address at traced process' space
* m2_l2: CTL_DATA data to be written or returned here * m_lsys_krn_sys_trace.data data to be written
* m_krn_lsys_sys_trace.data data to be returned
*/ */
#include "kernel/system.h" #include "kernel/system.h"
@ -44,10 +45,10 @@ int do_trace(struct proc * caller, message * m_ptr)
*/ */
register struct proc *rp; register struct proc *rp;
vir_bytes tr_addr = (vir_bytes) m_ptr->CTL_ADDRESS; vir_bytes tr_addr = m_ptr->m_lsys_krn_sys_trace.address;
long tr_data = m_ptr->CTL_DATA; long tr_data = m_ptr->m_lsys_krn_sys_trace.data;
int tr_request = m_ptr->CTL_REQUEST; int tr_request = m_ptr->m_lsys_krn_sys_trace.request;
int tr_proc_nr_e = m_ptr->CTL_ENDPT, tr_proc_nr; int tr_proc_nr_e = m_ptr->m_lsys_krn_sys_trace.endpt, tr_proc_nr;
unsigned char ub; unsigned char ub;
int i; int i;
@ -93,19 +94,19 @@ int do_trace(struct proc * caller, message * m_ptr)
case T_GETINS: /* return value from instruction space */ case T_GETINS: /* return value from instruction space */
COPYFROMPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long)); COPYFROMPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long));
m_ptr->CTL_DATA = tr_data; m_ptr->m_lsys_krn_sys_trace.data = tr_data;
break; break;
case T_GETDATA: /* return value from data space */ case T_GETDATA: /* return value from data space */
COPYFROMPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long)); COPYFROMPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long));
m_ptr->CTL_DATA= tr_data; m_ptr->m_lsys_krn_sys_trace.data= tr_data;
break; break;
case T_GETUSER: /* return value from process table */ case T_GETUSER: /* return value from process table */
if ((tr_addr & (sizeof(long) - 1)) != 0) return(EFAULT); if ((tr_addr & (sizeof(long) - 1)) != 0) return(EFAULT);
if (tr_addr <= sizeof(struct proc) - sizeof(long)) { if (tr_addr <= sizeof(struct proc) - sizeof(long)) {
m_ptr->CTL_DATA = *(long *) ((char *) rp + (int) tr_addr); m_ptr->m_lsys_krn_sys_trace.data = *(long *) ((char *) rp + (int) tr_addr);
break; break;
} }
@ -117,17 +118,17 @@ int do_trace(struct proc * caller, message * m_ptr)
if (tr_addr > sizeof(struct priv) - sizeof(long)) return(EFAULT); if (tr_addr > sizeof(struct priv) - sizeof(long)) return(EFAULT);
m_ptr->CTL_DATA = *(long *) ((char *) rp->p_priv + (int) tr_addr); m_ptr->m_lsys_krn_sys_trace.data = *(long *) ((char *) rp->p_priv + (int) tr_addr);
break; break;
case T_SETINS: /* set value in instruction space */ case T_SETINS: /* set value in instruction space */
COPYTOPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long)); COPYTOPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long));
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
case T_SETDATA: /* set value in data space */ case T_SETDATA: /* set value in data space */
COPYTOPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long)); COPYTOPROC(tr_addr, (vir_bytes) &tr_data, sizeof(long));
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
case T_SETUSER: /* set value in process table */ case T_SETUSER: /* set value in process table */
@ -147,14 +148,13 @@ int do_trace(struct proc * caller, message * m_ptr)
i == (int) &((struct proc *) 0)->p_reg.fs || i == (int) &((struct proc *) 0)->p_reg.fs ||
i == (int) &((struct proc *) 0)->p_reg.ss) i == (int) &((struct proc *) 0)->p_reg.ss)
return(EFAULT); return(EFAULT);
#endif
#if defined(__i386__)
if (i == (int) &((struct proc *) 0)->p_reg.psw) if (i == (int) &((struct proc *) 0)->p_reg.psw)
/* only selected bits are changeable */ /* only selected bits are changeable */
SETPSW(rp, tr_data); SETPSW(rp, tr_data);
else else
*(reg_t *) ((char *) &rp->p_reg + i) = (reg_t) tr_data; *(reg_t *) ((char *) &rp->p_reg + i) = (reg_t) tr_data;
#else #elif defined(__arm__)
if (i == (int) &((struct proc *) 0)->p_reg.psr) { if (i == (int) &((struct proc *) 0)->p_reg.psr) {
/* only selected bits are changeable */ /* only selected bits are changeable */
SET_USR_PSR(rp, tr_data); SET_USR_PSR(rp, tr_data);
@ -162,7 +162,7 @@ int do_trace(struct proc * caller, message * m_ptr)
*(reg_t *) ((char *) &rp->p_reg + i) = (reg_t) tr_data; *(reg_t *) ((char *) &rp->p_reg + i) = (reg_t) tr_data;
} }
#endif #endif
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
case T_DETACH: /* detach tracer */ case T_DETACH: /* detach tracer */
@ -171,30 +171,30 @@ int do_trace(struct proc * caller, message * m_ptr)
/* fall through */ /* fall through */
case T_RESUME: /* resume execution */ case T_RESUME: /* resume execution */
RTS_UNSET(rp, RTS_P_STOP); RTS_UNSET(rp, RTS_P_STOP);
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
case T_STEP: /* set trace bit */ case T_STEP: /* set trace bit */
rp->p_misc_flags |= MF_STEP; rp->p_misc_flags |= MF_STEP;
RTS_UNSET(rp, RTS_P_STOP); RTS_UNSET(rp, RTS_P_STOP);
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
case T_SYSCALL: /* trace system call */ case T_SYSCALL: /* trace system call */
rp->p_misc_flags |= MF_SC_TRACE; rp->p_misc_flags |= MF_SC_TRACE;
RTS_UNSET(rp, RTS_P_STOP); RTS_UNSET(rp, RTS_P_STOP);
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
case T_READB_INS: /* get value from instruction space */ case T_READB_INS: /* get value from instruction space */
COPYFROMPROC(tr_addr, (vir_bytes) &ub, 1); COPYFROMPROC(tr_addr, (vir_bytes) &ub, 1);
m_ptr->CTL_DATA = ub; m_ptr->m_krn_lsys_sys_trace.data = ub;
break; break;
case T_WRITEB_INS: /* set value in instruction space */ case T_WRITEB_INS: /* set value in instruction space */
ub = (unsigned char) (tr_data & 0xff); ub = (unsigned char) (tr_data & 0xff);
COPYTOPROC(tr_addr, (vir_bytes) &ub, 1); COPYTOPROC(tr_addr, (vir_bytes) &ub, 1);
m_ptr->CTL_DATA = 0; m_ptr->m_krn_lsys_sys_trace.data = 0;
break; break;
default: default:

10
lib/libsys/sys_trace.c
View File

@ -8,11 +8,11 @@ long addr, *data_p;
message m; message m;
int r; int r;
m.CTL_ENDPT = proc_ep; m.m_lsys_krn_sys_trace.endpt = proc_ep;
m.CTL_REQUEST = req; m.m_lsys_krn_sys_trace.request = req;
m.CTL_ADDRESS = addr; m.m_lsys_krn_sys_trace.address = addr;
if (data_p) m.CTL_DATA = *data_p; if (data_p) m.m_lsys_krn_sys_trace.data = *data_p;
r = _kernel_call(SYS_TRACE, &m); r = _kernel_call(SYS_TRACE, &m);
if (data_p) *data_p = m.CTL_DATA; if (data_p) *data_p = m.m_krn_lsys_sys_trace.data;
return(r); return(r);
} }