Replaced add64, add64u and add64ul with operators.

Change-Id: Ia537f83e15cb686f1b81b34d73596f4298b0a924
This commit is contained in:
Gerard
2013-11-11 19:17:03 +01:00
committed by Ben Gras
parent 288e6864c8
commit f1b0deacf3
21 changed files with 33 additions and 53 deletions

View File

@@ -33,8 +33,8 @@ void time_put(struct timespec *tsp)
u64_t hgfstime;
if (tsp != NULL) {
hgfstime = add64ul(mul64u(tsp->tv_sec, 10000000), tsp->tv_nsec / 100);
hgfstime = add64(hgfstime, time_offset);
hgfstime = mul64u(tsp->tv_sec, 10000000) + (tsp->tv_nsec / 100);
hgfstime += time_offset;
RPC_NEXT32 = ex64lo(hgfstime);
RPC_NEXT32 = ex64hi(hgfstime);

View File

@@ -61,7 +61,7 @@ int do_read()
count -= chunk;
off += chunk;
pos = add64u(pos, chunk);
pos += chunk;
}
if (r < 0)

View File

@@ -64,7 +64,7 @@ cp_grant_id_t *grantp;
count -= r;
off += r;
pos = add64u(pos, r);
pos += r;
}
if (r < 0)

View File

@@ -192,9 +192,8 @@ void procexit (char *UNUSED(name))
/* Calculate "small" difference. */
spent = sub64(stop, cprof_stk[cprof_stk_top].start_2);
cprof_stk[cprof_stk_top].slot->cycles =
add64(cprof_stk[cprof_stk_top].slot->cycles,
sub64(spent, cprof_stk[cprof_stk_top].spent_deeper));
cprof_stk[cprof_stk_top].slot->cycles +=
sub64(spent, cprof_stk[cprof_stk_top].spent_deeper);
/* Clear spent_deeper for call level we're leaving. */
cprof_stk[cprof_stk_top].spent_deeper = ((u64_t)(0));
@@ -220,8 +219,7 @@ void procexit (char *UNUSED(name))
spent = sub64(stop, cprof_stk[cprof_stk_top].start_1);
cprof_stk_top--; /* decrease stack */
if (cprof_stk_top >= 0) /* don't update non-existent level -1 */
cprof_stk[cprof_stk_top].spent_deeper =
add64(cprof_stk[cprof_stk_top].spent_deeper, spent);
cprof_stk[cprof_stk_top].spent_deeper += spent;
cprof_locked = 0;
}

View File

@@ -63,7 +63,7 @@ micro_delay(u32_t micros)
CALIBRATE;
/* We have to know when to end the delay. */
end = add64(now, mul64u(micros, calib_mhz));
end = now + mul64u(micros, calib_mhz);
/* If we have to wait for at least one HZ tick, use the regular
* tickdelay first. Round downwards on purpose, so the average

View File

@@ -21,7 +21,7 @@ static u64_t
set_time(struct timespec *tsp)
{
return add64u(mul64u(tsp->tv_sec, 1000000000), tsp->tv_nsec);
return mul64u(tsp->tv_sec, 1000000000) + tsp->tv_nsec;
}
/*