Changeset 624 for trunk/libs/mini-libc/stdio.c

Timestamp:

Mar 12, 2019, 1:37:38 PM (6 years ago)

Author:

alain

Message:

Fix several bugs to use the instruction MMU in kernel mode
in replacement of the instruction address extension register,
and remove the "kentry" segment.

This version is running on the tsar_generic_iob" platform.

One interesting bug: the cp0_ebase defining the kernel entry point
(for interrupts, exceptions and syscalls) must be initialized
early in kernel_init(), because the VFS initialisation done by
kernel_ini() uses RPCs, and RPCs uses Inter-Processor-Interrup.

File:

• trunk/libs/mini-libc/stdio.c (modified) (6 diffs)

trunk/libs/mini-libc/stdio.c

@@ -52 +52 @@
 
 ///////////////////////////////////////////////////
-static unsigned int xprintf( char         * string,
-                             unsigned int   length,
-                             const char   * format, 
-                             va_list      * args ) 
-{
-    unsigned int ps = 0;    // write index to the string buffer
-
-#define TO_STREAM(x) do { string[ps] = (x); ps++; if(ps==length) return 0xFFFFFFFF; } while(0);
+static int xprintf( char         * string,
+                    int            length,
+                    const char   * format, 
+                    va_list      * args ) 
+{
+    int ps = 0;    // write index to the string buffer
+
+#define TO_STREAM(x) do { string[ps] = (x); ps++; if(ps==length) return -1; } while(0);
 
 xprintf_text:
@@ -259 +259 @@
             default:       // unsupported argument type
             {
-                return 0xFFFFFFFF;
+                return -1;
             }
         }  // end switch on  argument type
@@ -326 +326 @@
 
     va_start( args, format );
-    count = xprintf( string , length , format , &args ); 
+    count = xprintf( string , (int)length , format , &args ); 
     va_end( args );
 
@@ -398 +398 @@
     char               string[4096];
     va_list            args;
-    unsigned int       count;
+    int                count;
+    int                writen;
     int                fd;
     
@@ -408 +409 @@
     va_end( args );
 
-    if ( count == 0xFFFFFFFF ) 
+    if ( count < 0 ) 
     {
         display_string( "fprintf : xprintf failure" );
@@ -421 +422 @@
         string[count] = 0;
 
-printf("\n[%s] fd = %d for string :\n", __FUNCTION__, fd, string );
-
-        return write( fd , &string , count );
+printf("\n[%s] fd = %d for string : %s\n", __FUNCTION__, fd, string );
+
+idbg();
+
+        // copy string to file
+        writen = write( fd , &string , count );
+
+        if( writen != count )
+        {
+            display_string( "fprintf : write failure" );
+            return -1;
+        }
+
+idbg();
+
+        return writen;
     }
 }  // end fprintf()