Ignore:
Timestamp:
Feb 12, 2019, 1:15:47 PM (3 years ago)
Author:
alain
Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/hal/tsar_mips32/drivers/soclib_tty.c

    r570 r619  
    131131#endif
    132132
     133#if( DEBUG_HAL_TXT_TX || DEBUG_HAL_TXT_RX )
     134thread_t * this = CURRENT_THREAD;
     135#endif
     136
    133137    // get TXT device cluster and pointers
    134138    xptr_t     dev_xp = (xptr_t)hal_remote_l64( XPTR( th_cxy , &th_ptr->txt_cmd.dev_xp ) );
     
    160164
    161165#if DEBUG_HAL_TXT_TX
    162 uint32_t tx_cycle = (uint32_t)hal_get_cycles();
     166uint32_t   tx_cycle = (uint32_t)hal_get_cycles();
    163167if( DEBUG_HAL_TXT_TX < tx_cycle )
    164 printk("\n[DBG] %s : thread %x put character <%c> to TXT%d_TX fifo / cycle %d\n",
    165 __FUNCTION__, CURRENT_THREAD, byte, channel, tx_cycle );
     168printk("\n[%s] thread[%x,%x] put character <%c> to TXT%d_TX fifo / cycle %d\n",
     169__FUNCTION__, this->process->pid, this->trdid, byte, channel, tx_cycle );
    166170#endif
    167171                // write byte to FIFO
     
    195199    }
    196200    ///////////////////////////
    197     else if( type == TXT_READ )       // read bytes from TTY_RX FIFO   
     201    else if( type == TXT_READ )       // read several bytes from TTY_RX FIFO   
    198202    {
    199203        fifo = &tty_rx_fifo[channel];
     
    211215uint32_t rx_cycle = (uint32_t)hal_get_cycles();
    212216if( DEBUG_HAL_TXT_RX < rx_cycle )
    213 printk("\n[DBG] %s : thread %x get character <%c> from TXT%d_RX fifo / cycle %d\n",
    214 __FUNCTION__, CURRENT_THREAD, byte, channel, rx_cycle );
     217printk("\n[%s] thread[%x,%x] get character <%c> from TXT%d_RX fifo / cycle %d\n",
     218__FUNCTION__, this->process->pid, this->trdid, byte, channel, rx_cycle );
    215219#endif
    216220                // update FIFO state
     
    328332#if DEBUG_HAL_TXT_RX
    329333if( DEBUG_HAL_TXT_RX < rx_cycle )
    330 printk("\n[DBG] %s : read ^Z character from TXT%d\n", __FUNCTION__, channel );
     334printk("\n[%s] read ^Z character from TXT%d\n", __FUNCTION__, channel );
    331335#endif
    332336                // get pointers on TXT owner process in owner cluster
     
    381385#if DEBUG_HAL_TXT_RX
    382386if( DEBUG_HAL_TXT_RX < rx_cycle )
    383 printk("\n[DBG] %s : read ^C character from TXT%d\n", __FUNCTION__, channel );
     387printk("\n[%s] read ^C character from TXT%d\n", __FUNCTION__, channel );
    384388#endif
    385389                // get pointer on TXT owner process in owner cluster
     
    434438#if DEBUG_HAL_TXT_RX
    435439if( DEBUG_HAL_TXT_RX < rx_cycle )
    436 printk("\n[DBG] %s : put character <%c> to TXT%d_RX fifo\n",
     440printk("\n[%s] put character <%c> to TXT%d_RX fifo\n",
    437441__FUNCTION__, byte, channel );
    438442#endif
     
    481485#if DEBUG_HAL_TXT_TX
    482486if( DEBUG_HAL_TXT_TX < tx_cycle )
    483 printk("\n[DBG] %s : get character <%c> from TXT%d_TX fifo\n",
     487printk("\n[%s] get character <%c> from TXT%d_TX fifo\n",
    484488__FUNCTION__, byte, channel );
    485489#endif
Note: See TracChangeset for help on using the changeset viewer.