Module Name: src
Committed By: ozaki-r
Date: Wed Mar 5 02:00:24 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/dtrace/arm: dtrace_isa.c
Log Message:
Use uint32_t instead of u_int32_t
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.1 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.2
--- src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.1 Fri Jun 21 19:16:00 2013
+++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c Wed Mar 5 02:00:24 2014
@@ -68,7 +68,7 @@ void
dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
uint32_t *intrpc)
{
- u_int32_t *frame, *lastframe;
+ uint32_t *frame, *lastframe;
int scp_offset;
int depth = 0;
pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller;
@@ -78,16 +78,16 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
aframes++;
- frame = (u_int32_t *)__builtin_frame_address(0);;
+ frame = (uint32_t *)__builtin_frame_address(0);;
lastframe = NULL;
scp_offset = -(get_pc_str_offset() >> 2);
while ((frame != NULL) && (depth < pcstack_limit)) {
db_addr_t scp;
#if 0
- u_int32_t savecode;
+ uint32_t savecode;
int r;
- u_int32_t *rp;
+ uint32_t *rp;
#endif
/*
@@ -109,7 +109,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
}
#if 0
- savecode = ((u_int32_t *)scp)[scp_offset];
+ savecode = ((uint32_t *)scp)[scp_offset];
if ((savecode & 0x0e100000) == 0x08000000) {
/* Looks like an STM */
rp = frame - 4;
@@ -128,7 +128,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
break; /* Top of stack */
lastframe = frame;
- frame = (u_int32_t *)(frame[FR_RFP]);
+ frame = (uint32_t *)(frame[FR_RFP]);
if (INKERNEL((int)frame)) {
/* staying in kernel */
@@ -177,20 +177,20 @@ dtrace_getarg(int arg, int aframes)
int
dtrace_getstackdepth(int aframes)
{
- u_int32_t *frame, *lastframe;
+ uint32_t *frame, *lastframe;
int scp_offset;
int depth = 1;
- frame = (u_int32_t *)__builtin_frame_address(0);;
+ frame = (uint32_t *)__builtin_frame_address(0);;
lastframe = NULL;
scp_offset = -(get_pc_str_offset() >> 2);
while (frame != NULL) {
db_addr_t scp;
#if 0
- u_int32_t savecode;
+ uint32_t savecode;
int r;
- u_int32_t *rp;
+ uint32_t *rp;
#endif
/*
@@ -208,7 +208,7 @@ dtrace_getstackdepth(int aframes)
break; /* Top of stack */
lastframe = frame;
- frame = (u_int32_t *)(frame[FR_RFP]);
+ frame = (uint32_t *)(frame[FR_RFP]);
if (INKERNEL((int)frame)) {
/* staying in kernel */
