Changeset 455 for soft/giet_vm/giet_common/utils.c

Timestamp:

Dec 5, 2014, 3:34:16 PM (10 years ago)

Author:

alain

Message:

Introducing the tty0.c/tty0.h files defining access function to TTY0 (including the _printf().
Introducing the locks.c/locks.h files defining two types of spin-lock (with and without a waiting queue).

File:

• soft/giet_vm/giet_common/utils.c (modified) (3 diffs)

soft/giet_vm/giet_common/utils.c

@@ -6 +6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 // The utils.c and utils.h files are part of the GIET-VM nano-kernel.
-// They define more or less the GIET-VM HAL (Hardware Abstraction Layer),
-// and contains various utility functions, that can be used by both the 
-// boot code and the kernel code.
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <utils.h>
+#include <tty0.h>
 #include <giet_config.h>
 #include <hard_config.h>
@@ -411 +409 @@
 }
 
-///////////////////////////////////////////////////////////////////////////////////
-//                      Locks access functions
-///////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////
-void _get_lock( giet_lock_t* lock ) 
-{
-    register unsigned int* plock = &(lock->value);
-
-#if NO_HARD_CC
-
-    register unsigned int delay  = (_get_proctime() ^ _get_procid() << 4) & 0xFF;
-    if (delay == 0) delay = 0x80;
-
-    asm volatile (
-            "_lock_llsc:             \n"
-            "    ll   $2,    0(%0)       \n" /* $2 <= lock current value         */
-            "    bnez $2,    _lock_delay \n" /* delay if lock already taken      */
-            "    li   $3,    1           \n" /* $3 <= argument for sc            */
-            "    sc   $3,    0(%0)       \n" /* try to set lock                  */
-            "    bnez $3,    _lock_ok    \n" /* exit if atomic                   */
-            "    _lock_delay:            \n"
-            "    move $4,    %1          \n" /* $4 <= delay                      */
-            "    _lock_loop:             \n"
-            "    addi $4,    $4,    -1   \n" /* $4 <= $4 - 1                     */
-            "    bnez $4,    _lock_loop  \n" /* test end delay                   */
-            "    nop                     \n"
-            "    j           _lock_llsc  \n" /* retry                            */
-            "    nop                     \n"
-            "    _lock_ok:               \n"
-            :
-            :"r"(plock), "r"(delay)
-            :"$2", "$3", "$4", "memory");
-#else
-
-    asm volatile (
-            "_lock_llsc:                 \n"
-            "    lw   $2,    0(%0)       \n" /* $2 <= lock current value         */
-            "    bnez $2,    _lock_llsc  \n" /* retry if lock already taken      */
-            "    nop                     \n"
-            "    ll   $2,    0(%0)       \n" /* ll_buffer <= lock current value  */
-            "    bnez $2,    _lock_llsc  \n" /* retry if lock already taken      */
-            "    li   $3,    1           \n" /* $3 <= argument for sc            */
-            "    sc   $3,    0(%0)       \n" /* try to set lock                  */
-            "    beqz $3,    _lock_llsc  \n" /* retry if sc failure              */
-            "    nop                     \n"
-            :
-            :"r"(plock)
-            :"$2", "$3", "memory");
-#endif
-
-}
-
-///////////////////////////////////////
-void _release_lock( giet_lock_t* lock ) 
-{
-    asm volatile ( "sync\n" ::: "memory" ); 
-    // sync is necessary because of the TSAR consistency model 
-    lock->value = 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////
-//           Access functions to kernel terminal TTY0
-///////////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////
-void _puts( char* string ) 
-{
-    unsigned int n = 0;
-
-    while ( string[n] > 0 )
-    {
-        // test status register
-        while ( (_tty_get_register( 0, TTY_STATUS ) & 0x2) );
-
-        // write one byte
-        if ( string[n] == '\n') {
-            _tty_set_register( 0, TTY_WRITE, (unsigned int)'\r' );
-        }
-        _tty_set_register( 0, TTY_WRITE, (unsigned int)string[n] );
-        n++;
-    }
-}
-
-//////////////////////////////
-void _putx( unsigned int val )
-{
-    static const char HexaTab[] = "0123456789ABCDEF";
-    char buf[11];
-    unsigned int c;
-
-    buf[0] = '0';
-    buf[1] = 'x';
-    buf[10] = 0;
-
-    for (c = 0; c < 8; c++) 
-    { 
-        buf[9 - c] = HexaTab[val & 0xF];
-        val = val >> 4;
-    }
-    _puts( buf );
-}
-
-////////////////////////////////////
-void _putl( unsigned long long val )
-{
-    static const char HexaTab[] = "0123456789ABCDEF";
-    char buf[19];
-    unsigned int c;
-
-    buf[0] = '0';
-    buf[1] = 'x';
-    buf[18] = 0;
-
-    for (c = 0; c < 16; c++) 
-    { 
-        buf[17 - c] = HexaTab[(unsigned int)val & 0xF];
-        val = val >> 4;
-    }
-    _puts( buf );
-}
-
-//////////////////////////////
-void _putd( unsigned int val ) 
-{
-    static const char DecTab[] = "0123456789";
-    char buf[11];
-    unsigned int i;
-    unsigned int first = 0;
-
-    buf[10] = 0;
-
-    for (i = 0; i < 10; i++) 
-    {
-        if ((val != 0) || (i == 0)) 
-        {
-            buf[9 - i] = DecTab[val % 10];
-            first = 9 - i;
-        }
-        else 
-        {
-            break;
-        }
-        val /= 10;
-    }
-    _puts( &buf[first] );
-}
-
-/////////////////////////
-void _getc( char*  byte )
-{
-    // test status register
-    while ( _tty_get_register( 0, TTY_STATUS ) == 0 );
-
-    // read one byte
-    *byte = (char)_tty_get_register( 0, TTY_READ );
-}
 
 
@@ -767 +608 @@
     _puts(",");
     _putd( lpid );
-    _puts("] exit at cycle");
+    _puts("] exit at cycle ");
     _putd( _get_proctime() );
     _puts(" ...\n");