Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use int64 functions consistently

Browse Source 
Instead of manipulating the u64_t type directly, use the
ex64hi()/ex64lo()/make64() functions.
This commit is contained in:
Arun Thomas
2010-11-07 23:35:29 +00:00
parent a575be430d
commit aaaad89244
8 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/ansi/malloc-debug.c
View File

@@ -126,7 +126,7 @@ static struct block *block_alloc(size_t size)
read_tsc_64(&tsc);
totalsize = block_get_totalsize(size);
page_index_max = (ptr_max - ptr_min - totalsize) / PAGE_SIZE;
page_index = (page_index_max > 0) ? (tsc.lo % page_index_max) : 0;
page_index = (page_index_max > 0) ? (ex64lo(tsc) % page_index_max) : 0;
ptr = ptr_min + page_index * PAGE_SIZE;
/* allocate block */

10
lib/libsys/profile.c
View File

@@ -170,12 +170,14 @@ PUBLIC void procentry (char *name)
PUBLIC void procexit (char *UNUSED(name))
{
u64_t stop, spent;
u32_t tsc_lo, tsc_hi;
/* Procexit is not reentrant. */
if (cprof_locked) return; else cprof_locked = 1;
/* First thing: read CPU cycle count into local variable. */
read_tsc(&stop.hi, &stop.lo);
read_tsc(&tsc_hi, &tsc_lo);
stop = make64(tsc_lo, tsc_hi);
/* Only continue if sane. */
if (control.err) return;
@@ -210,7 +212,8 @@ PUBLIC void procexit (char *UNUSED(name))
*/
/* Read CPU cycle count. */
read_tsc(&stop.hi, &stop.lo);
read_tsc(&tsc_hi, &tsc_lo);
stop = make64(tsc_lo, tsc_hi);
/* Calculate "big" difference. */
spent = sub64(stop, cprof_stk[cprof_stk_top].start_1);
@@ -263,8 +266,7 @@ PRIVATE void clear_tbl()
memset(cprof_tbl[i].cpath, '\0', CPROF_CPATH_MAX_LEN);
cprof_tbl[i].next = 0;
cprof_tbl[i].calls = 0;
cprof_tbl[i].cycles.lo = 0;
cprof_tbl[i].cycles.hi = 0;
cprof_tbl[i].cycles = make64(0, 0);
}
}