Changeset 101 for trunk/kernel/kern/core.c

Timestamp:

Jun 29, 2017, 4:44:52 PM (7 years ago)

Author:

alain

Message:

euh...

File:

• trunk/kernel/kern/core.c (modified) (4 diffs)

trunk/kernel/kern/core.c

@@ -57 +57 @@
         core->thread_idle       = NULL;
         core->fpu_owner         = NULL;
-        core->rand_last         =  hal_time_stamp() & 0xFFF;
+        core->rand_last         =  hal_get_cycles() & 0xFFF;
 
         sched_init( core );
@@ -66 +66 @@
 {
         uint32_t value  = ((core->rand_last * CONFIG_RDNG_PARAM_A) +
-                            CONFIG_RDNG_PARAM_C) ^ (hal_time_stamp() & 0xFFF);
+                            CONFIG_RDNG_PARAM_C) ^ (hal_get_cycles() & 0xFFF);
         core->rand_last = value;
         return value;
-}
-
-////////////////////////////////////////////////
-inline uint64_t core_get_cycles( core_t * core )
-{
-        uint32_t elapsed;
-        uint64_t cycles;
-        uint32_t time_stamp = core->time_stamp;
-        uint32_t time_now   = hal_time_stamp();
-
-        // compute number of elapsed cycles, taking into account 32 bits register wrap
-        if(time_now < time_stamp) elapsed = (0xFFFFFFFF - time_stamp) + time_now;
-        else                      elapsed = (time_now - time_stamp);
-
-        cycles = core->cycles + elapsed;
-
-        // update core time
-        core->time_stamp = time_now;
-        core->cycles     = cycles;
-        hal_wbflush();
-
-        return cycles;
 }
 
@@ -98 +76 @@
                     uint32_t * tm_us )
 {
-        // uint64_t cycles = core_get_cycles( core );
+        uint64_t cycles = hal_get_cycles();
 
-        // TODO ces deux ligne ne compilent pas : "undefined referenc to __udivdi3"
-
-        // *tm_ms = (cycles / CONFIG_CYCLES_PER_MS);
-        // *tm_us = (cycles % CONFIG_CYCLES_PER_MS) / (CONFIG_CYCLES_PER_MS / 1000000);
-
-        printk("\n[PANIC] in %s : not implemented yet\n", __FUNCTION__ );
+        *tm_s  = (cycles / CONFIG_CYCLES_PER_MS);
+        *tm_us = (cycles % CONFIG_CYCLES_PER_MS) / (CONFIG_CYCLES_PER_MS / 1000000);
 }
 
@@ -115 +89 @@
         uint64_t cycles     = core->cycles;
         uint32_t time_stamp = core->time_stamp;
-        uint32_t time_now   = hal_time_stamp();
+        uint32_t time_now   = hal_get_cycles();
 
         // compute number of elapsed cycles taking into account 32 bits register wrap