HOST=native - Fixes for new syscalls

[tpg/acess2.git] / AcessNative / acesskernel_src / syscalls.c

diff --git a/AcessNative/acesskernel_src/syscalls.c b/AcessNative/acesskernel_src/syscalls.c
index d14a1d9..f19fe69 100644 (file)
--- a/AcessNative/acesskernel_src/syscalls.c
+++ b/AcessNative/acesskernel_src/syscalls.c
@@ -4,7 +4,7 @@
  *
  * Syscall Distribution
  */
-#define DEBUG  0
+#define DEBUG  1
 #include <acess.h>
 #include <threads.h>
 #include <events.h>
@@ -30,7 +30,7 @@ typedef int   (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int
        a3 = *(_t3*)Args;Args+=sizeof(_t3);\
        a4 = *(_t4*)Args;Args+=sizeof(_t4);\
        a5 = *(_t5*)Args;Args+=sizeof(_t5);\
-       LOG("SYSCALL5 '%s' %p %p %p %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2,(intptr_t)a3,(intptr_t)a4,(intptr_t)a5);\
+       LOG("SYSCALL6 '%s' %p %p %p %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2,(intptr_t)a3,(intptr_t)a4,(intptr_t)a5);\
        _call\
 }
 #define SYSCALL5(_name, _fmtstr, _t0, _t1, _t2, _t3, _t4, _call) int _name(Uint*Errno,const char*Fmt,void*Args,int*Sizes){\
@@ -89,7 +89,7 @@ typedef int   (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int
 }
 
 // === CODE ===
-int Syscall_Null(Uint*Errno, const char *Format, void *Args, int *Sizes)
+int Syscall_Null(Uint *Errno, const char *Format, void *Args, int *Sizes)
 {
        return 0;
 }
@@ -100,7 +100,9 @@ SYSCALL1(Syscall_Exit, "i", int,
 );
 
 SYSCALL2(Syscall_Open, "si", const char *, int,
-       return VFS_Open(a0, a1|VFS_OPENFLAG_USER);
+       int rv = VFS_Open(a0, a1|VFS_OPENFLAG_USER);
+       if(rv == -1)    *Errno = errno;
+       return rv;
 );
 SYSCALL1(Syscall_Close, "i", int,
        VFS_Close(a0);
@@ -111,12 +113,19 @@ SYSCALL3(Syscall_Read, "iid", int, int, void *,
                Log_Warning("Syscalls", "Read - %i < %i", Sizes[2], a1);
                return -1;
        }
-       return VFS_Read(a0, a1, a2);
+       size_t rv = VFS_Read(a0, a1, a2);
+       if(rv == -1)    *Errno = errno;
+       return rv;
 );
 SYSCALL3(Syscall_Write, "iid", int, int, const void *,
-       if( Sizes[2] < a1 )
+       if( Sizes[2] < a1 ) {
+               Log_Warning("Syscalls", "Write - %i < %i", Sizes[2], a1);
+               *Errno = EINVAL;
                return -1;
-       return VFS_Write(a0, a1, a2);
+       }
+       size_t rv = VFS_Write(a0, a1, a2);
+       if(rv == -1)    *Errno = errno;
+       return rv;
 );
 SYSCALL3(Syscall_Seek, "iIi", int, int64_t, int,
        return VFS_Seek(a0, a1, a2);
@@ -129,7 +138,7 @@ SYSCALL3(Syscall_IOCtl, "iid", int, int, void *,
 );
 SYSCALL3(Syscall_FInfo, "idi", int, void *, int,
        if( Sizes[1] < sizeof(tFInfo)+a2*sizeof(tVFS_ACL)) {
-               LOG("offsetof(size) = %i", offsetof(tFInfo, size));
+               //LOG("offsetof(size) = %i", offsetof(tFInfo, size));
                LOG("Bad size %i < %i", Sizes[1], sizeof(tFInfo)+a2*sizeof(tVFS_ACL));
                *Errno = -EINVAL;
                return -1;
@@ -273,12 +282,15 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
         int    argListLen = 0;
         int    i, retVal;
        tRequestHeader  *ret;
-        int    retValueCount = 1;
-        int    retDataLen = sizeof(Uint64);
+        int    retValueCount;
+        int    retDataLen;
        void    *returnData[Request->NParams];
         int    argSizes[Request->NParams];
        Uint    ret_errno = 0;
        
+       // Clear errno (Acess verson) at the start of the request
+       errno = 0;
+       
        // Sanity check
        if( Request->CallID >= ciNumSyscalls ) {
                Log_Notice("Syscalls", "Unknown syscall number %i", Request->CallID);
@@ -289,7 +301,11 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
                Log_Notice("Syscalls", "Unimplemented syscall %i", Request->CallID);
                return NULL;
        }
-       
+
+       // Init return count/size
+       retValueCount = 2;
+       retDataLen = sizeof(Uint64) + sizeof(Uint32);   
+
        // Get size of argument list
        for( i = 0; i < Request->NParams; i ++ )
        {
@@ -310,12 +326,19 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
                case ARG_TYPE_DATA:
                        formatString[i] = 'd';
                        argListLen += sizeof(void*);
+                       // Prepare the return values
+                       if( Request->Params[i].Flags & ARG_FLAG_RETURN )
+                       {
+                               retDataLen += Request->Params[i].Length;
+                               retValueCount ++;
+                       }
                        break;
                case ARG_TYPE_STRING:
                        formatString[i] = 's';
                        argListLen += sizeof(char*);
                        break;
                default:
+                       Log_Error("Syscalls", "Unknown param type %i", Request->Params[i].Type);
                        return NULL;    // ERROR!
                }
        }
@@ -356,13 +379,6 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
                        // Data gets special handling, because only it can be returned to the user
                        // (ARG_TYPE_DATA is a pointer)
                        case ARG_TYPE_DATA:
-                               // Prepare the return values
-                               if( Request->Params[i].Flags & ARG_FLAG_RETURN )
-                               {
-                                       retDataLen += Request->Params[i].Length;
-                                       retValueCount ++;
-                               }
-                               
                                // Check for non-resident data
                                if( Request->Params[i].Length == 0 )
                                {
@@ -392,9 +408,17 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
                        }
                }
                
+               // --- Perform request
                retVal = caSyscalls[Request->CallID](&ret_errno, formatString, argListData, argSizes);
        }
        
+       // ---------- Return
+       
+       if( ret_errno == 0 && errno != 0 ) {
+               ret_errno = errno;
+               LOG("errno = %i", errno);
+       }
+       
        // Allocate the return
        size_t  msglen = sizeof(tRequestHeader) + retValueCount * sizeof(tRequestValue) + retDataLen;
        ret = malloc(msglen);
@@ -411,9 +435,18 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
        *(Uint64*)inData = retVal;
        inData += sizeof(Uint64);
        
+       // Static Uint32 errno value
+       ret->Params[1].Type = ARG_TYPE_INT32;
+       ret->Params[1].Flags = 0;
+       ret->Params[1].Length = sizeof(Uint32);
+       *(Uint32*)inData = ret_errno;
+       inData += sizeof(Uint32);
+
+       LOG("Ret: %llx, errno=%i", retVal, ret_errno);  
+
        //Log_Debug("Syscalls", "Return 0x%llx", retVal);
        
-       retValueCount = 1;
+       retValueCount = 2;
        for( i = 0; i < Request->NParams; i ++ )
        {
                if( Request->Params[i].Type != ARG_TYPE_DATA )  continue;
@@ -434,9 +467,7 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
                retValueCount ++;
        }
        
-       *ReturnLength = sizeof(tRequestHeader)
-               + retValueCount * sizeof(tRequestValue)
-               + retDataLen;
+       *ReturnLength = ret->MessageLength;
        
        return ret;
 }