Changeset 101 for trunk/hal

Timestamp:

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

Author:

alain

Message:

euh...

Location:

trunk/hal

Files:

• generic/hal_special.h (modified) (2 diffs)
• tsar_mips32/core/hal_do_exceptions.c (modified) (1 diff)
• tsar_mips32/core/hal_exception.c (modified) (1 diff)
• tsar_mips32/core/hal_special.c (modified) (2 diffs)
• tsar_mips32/drivers/soclib_hba.c (modified) (1 diff)
• x86_64/core/hal_special.c (modified) (1 diff)

trunk/hal/generic/hal_special.h

@@ -2 +2 @@
  * hal_special.h - Generic Special Registers Access API definition.
  *
- * Authors   Ghassan Almaless (2008,2009,2010,2011,2012)
- *           Alain Greiner    (2016,2017)
+ * Authors   Alain Greiner    (2016,2017)
  *
  * Copyright (c)  UPMC Sorbonne Universites
@@ -44 +43 @@
 
 /*****************************************************************************************
- * This function returns the content of the calling core cycles counter.
- * This cycle counter is reset when the core is initialised (at reboot).
- * If the hardware counter is not a 64 bits register, this function is in charge
- * of handling overflow. 
+ * This function returns the content of the calling core private cycles counter.
+ * This cycle counter is reset when the core is initialised (at each boot).
+ * If the hardware counter is not a 64 bits register, this function must handle overflow.
  ****************************************************************************************/
-uint64_t hal_time_stamp();
+uint64_t hal_get_cycles();
 
 /*****************************************************************************************

trunk/hal/tsar_mips32/core/hal_do_exceptions.c

@@ -354 +354 @@
         except_dmsg("====================================================================\n");
         except_dmsg("Kernel Panic: thread %x in process %x on core %x at cycle %d\n",
-                this->trdid , process->pid , gid , hal_time_stamp() );
+                this->trdid , process->pid , gid , hal_get_cycles() );
 
         except_dmsg("Processor State:\n");

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -153 +153 @@
     printk("\n====================================================================\n");
         printk("  thread %x / process %x / core %x / cycle %d\n",
-           this->trdid , this->process->pid , this->core->gid , hal_time_stamp() );
+           this->trdid , this->process->pid , this->core->gid , hal_get_cycles() );
 
         printk("  - Processor State:\n");

trunk/hal/tsar_mips32/core/hal_special.c

@@ -2 +2 @@
  * hal_special.c - implementation of Generic Special Register Access API for TSAR-MIPS32
  * 
- * Author  Ghassan Almaless (2008,2009,2010,2011,2012)
- *         Alain Greiner    (2016)
+ * Author    Alain Greiner (2016,2017)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -26 +25 @@
 #include <hal_types.h>
 #include <hal_special.h>
+#include <core.h>
+#include <thread.h>
 
 /****  Forward declarations ****/
 
 struct thread_s;
+
 
 ///////////////////

trunk/hal/tsar_mips32/drivers/soclib_hba.c

@@ -289 +289 @@
             ioc_dmsg("INFO in %s : thread %x at cycle %d\n",
             __FUNCTION__ , hal_remote_lw( XPTR( client_cxy , &client_ptr->trdid ) ) ,
-            hal_time_stamp() );
+            hal_get_cycles() );
         }
     }

trunk/hal/x86_64/core/hal_special.c

@@ -73 +73 @@
 }
 
-uint32_t hal_time_stamp()
+uint32_t hal_get_cycles()
 {
         return (uint32_t)rdtsc(); // XXX will be fixed soon