Changeset 7ca8b36b in mainline

Timestamp:

2006-05-21T14:32:28Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25bf215

Parents:

a33c990

Message:

Fixed mips bug fith TLS register not being properly saved on syscall context
switch.
Reverted SYS_IO, so that it could be used on machines without fb.

Files:

• arch/mips32/src/start.S (modified) (4 diffs)
• contrib/conf/gxemul.sh (modified) (1 diff)
• generic/src/syscall/syscall.c (modified) (2 diffs)

arch/mips32/src/start.S

@@ -223 +223 @@
         
         beqz $k0, syscall_shortcut
-        add $k0, 8            # Revert $k1 back to correct exc number
+        add $k0, 8            # Revert $k0 back to correct exc number
         
         REGISTERS_STORE_AND_EXC_RESET $sp
@@ -240 +240 @@
 #define SS_STATUS EOFFSET_STATUS
 #define SS_EPC    EOFFSET_EPC
+#define SS_K1     EOFFSET_K1
 syscall_shortcut:
         # We have a lot of space on the stack, with free use
@@ -245 +246 @@
         mfc0 $t0, $status
         sw $t1,SS_EPC($sp)  # Save EPC
+        sw $k1,SS_K1($sp)   # Save k1, which is not saved during context switch
         
         and $t2, $t0, REG_SAVE_MASK # Save only KSU,EXL,ERL,IE
@@ -271 +273 @@
         # restore epc+4
         lw $t0,SS_EPC($sp)
+        lw $k1,SS_K1($sp)
         addi $t0, $t0, 4
         mtc0 $t0, $epc

contrib/conf/gxemul.sh

@@ -2 +2 @@
 # Uspace addresses outside of normal memory (kernel has std. 8 or 16MB)
 # we place the pages at 24M
-        gxemul $@ -E testmips -X 0x81800000:../uspace/ns/ns 0x81900000:../uspace/kbd/kbd 0x81a00000:../uspace/init/init kernel.bin 
+        gxemul $@ -E testmips -X 0x81800000:../uspace/ns/ns 0x81900000:../uspace/kbd/kbd 0x81a00000:../uspace/fb/fb 0x81b00000:../uspace/init/init kernel.bin 

generic/src/syscall/syscall.c

@@ -48 +48 @@
 #include <sysinfo/sysinfo.h>
 
-static __native sys_io(int fd, const void * buf, size_t count) {
-        
-        return count; /*Syscall deprecated*/
+static __native sys_io(int fd, const void * buf, size_t count) 
+{
+//      return count; /*Syscall deprecated*/
         // TODO: buf sanity checks and a lot of other stuff ...
-/*
+
         size_t i;
         
@@ -58 +58 @@
                 putchar(((char *) buf)[i]);
         
-        return count;*/
+        return count;
 }