AcessNative - Wine equivalent for Acess

- Allows native Acess applications to be run on Windows/Linux
- Uses large parts of the main kernel, reducing code duplication
- Still incomplete, will use SDL for video, and a UDP server for
  User->Kernel requests.

diff --git a/AcessNative/acesskernel_src/Details.txt b/AcessNative/acesskernel_src/Details.txt
new file mode 100644 (file)
index 0000000..bd20953
--- /dev/null
+++ b/AcessNative/acesskernel_src/Details.txt
@@ -0,0 +1,7 @@
+Provides Acess Kernel services\r
+- UDP Server listening on 127.0.0.1:2766 (0XACE)\r
+ > See ld-acess.so_src/syscalls for the spec\r
+- Starts acess applications\r
+ > Provides kernel loader services and loads libacess\r
+- Provides "vterms" / control panel\r
+- Cross platform (GTK?/SDL)
\ No newline at end of file

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
new file mode 100644 (file)
index 0000000..d7bfcb8
--- /dev/null
+++ b/AcessNative/acesskernel_src/Makefile
@@ -0,0 +1,43 @@
+# AcessNative Server\r
+# Makefile\r
+\r
+ifeq ($(PLATFORM),)\r
+       PLATFORM := lin\r
+endif\r
+\r
+KERNEL_SRC = ../../Kernel/\r
+\r
+KERNEL_OBJ := logging.o adt.o\r
+KERNEL_OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o vfs/nodecache.o vfs/mount.o\r
+KERNEL_OBJ += vfs/fs/root.o vfs/fs/devfs.o\r
+KERNEL_OBJ += drv/vterm.o drv/fifo.o\r
+\r
+OBJ := main.o video.o keyboard.o mouse.o nativefs.o vfs_handle.o\r
+OBJ += $(addprefix $(KERNEL_SRC),$(KERNEL_OBJ))\r
+\r
+OBJ := $(addsuffix .$(PLATFORM),$(OBJ))\r
+\r
+CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/\r
+CFLAGS += -Wall\r
+LDFLAGS += -lSDL -lSDLmain\r
+\r
+ifeq ($(PLATFORM),win)\r
+       BIN := ../AcessKernel.exe\r
+endif\r
+ifeq ($(PLATFORM),lin)\r
+       BIN := ../AcessKernel\r
+       CFLAGS +=\r
+endif\r
+\r
+.PHONY: all clean\r
+\r
+all: $(BIN)\r
+\r
+clean:\r
+       $(RM) $(BIN) $(OBJ)\r
+\r
+$(BIN): $(OBJ)\r
+       $(CC) $(LDFLAGS) -o $@ $(OBJ)\r
+\r
+%.o.$(PLATFORM): %.c\r
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)\r

diff --git a/AcessNative/acesskernel_src/include/arch.h b/AcessNative/acesskernel_src/include/arch.h
new file mode 100644 (file)
index 0000000..e985789
--- /dev/null
+++ b/AcessNative/acesskernel_src/include/arch.h
@@ -0,0 +1,37 @@
+/**
+ */
+#ifndef _ARCH_H_
+#define _ARCH_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#define        _MODULE_NAME_   "NativeKernel"
+
+#define BITS   (sizeof(intptr_t)*8)
+
+typedef uint8_t        Uint8;
+typedef uint16_t       Uint16;
+typedef uint32_t       Uint32;
+typedef uint64_t       Uint64;
+
+typedef int8_t Sint8;
+typedef int16_t        Sint16;
+typedef int32_t        Sint32;
+typedef int64_t        Sint64;
+
+typedef intptr_t       Uint;
+
+typedef intptr_t       tVAddr;
+typedef intptr_t       tPAddr;
+
+struct sShortSpinlock
+{
+        int    Lock;
+};
+
+#define SHORTLOCK(...)
+#define SHORTREL(...)
+
+#endif
+

diff --git a/AcessNative/acesskernel_src/include/heap.h b/AcessNative/acesskernel_src/include/heap.h
new file mode 100644 (file)
index 0000000..2052559
--- /dev/null
+++ b/AcessNative/acesskernel_src/include/heap.h
@@ -0,0 +1,8 @@
+/**
+ */
+#ifndef _HEAP_H_
+#define _HEAP_H_
+
+// NOP (stdlib.h defines the heap functions)
+
+#endif

diff --git a/AcessNative/acesskernel_src/keyboard.c b/AcessNative/acesskernel_src/keyboard.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c
new file mode 100644 (file)
index 0000000..45e6aa0
--- /dev/null
+++ b/AcessNative/acesskernel_src/main.c
@@ -0,0 +1,52 @@
+/*
+ * Acess2 Native Kernel
+ * - Acess kernel emulation on another OS using SDL and UDP
+ *
+ * Kernel Main
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <SDL/SDL.h>
+
+int main(int argc, char *argv[])
+{
+       return 0;
+}
+
+void LogF(const char *Fmt, ...)
+{
+       va_list args;
+       va_start(args, Fmt);
+       vprintf(Fmt, args);
+       va_end(args);
+}
+
+void Log(const char *Fmt, ...)
+{
+       va_list args;
+       printf("Log: ");
+       va_start(args, Fmt);
+       vprintf(Fmt, args);
+       va_end(args);
+       printf("\n");
+}
+
+void Warning(const char *Fmt, ...)
+{
+       va_list args;
+       printf("Warning: ");
+       va_start(args, Fmt);
+       vprintf(Fmt, args);
+       va_end(args);
+       printf("\n");
+}
+
+int CheckMem(void *Mem, int Count)
+{
+       return 1;
+}
+
+int CheckString(const char *String)
+{
+       return 1;
+}

diff --git a/AcessNative/acesskernel_src/mouse.c b/AcessNative/acesskernel_src/mouse.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/AcessNative/acesskernel_src/nativefs.c b/AcessNative/acesskernel_src/nativefs.c
new file mode 100644 (file)
index 0000000..71774e2
--- /dev/null
+++ b/AcessNative/acesskernel_src/nativefs.c
@@ -0,0 +1,17 @@
+/*\r
+ * Acess2 Native Kernel\r
+ * - Acess kernel emulation on another OS using SDL and UDP\r
+ *\r
+ * nativefs.c\r
+ * - Host filesystem access\r
+ */\r
+#include <acess.h>\r
+#include <vfs.h>\r
+\r
+// === GLOBALS ===\r
+\r
+// === CODE ===\r
+tVFS_Node *Native_Mount(const char *Device, const char **Arguments)\r
+{\r
+       return NULL;\r
+}\r

diff --git a/AcessNative/acesskernel_src/vfs_handle.c b/AcessNative/acesskernel_src/vfs_handle.c
new file mode 100644 (file)
index 0000000..aab30fc
--- /dev/null
+++ b/AcessNative/acesskernel_src/vfs_handle.c
@@ -0,0 +1,115 @@
+/*
+ * Acess2 VFS
+ * - AllocHandle, GetHandle
+ */
+#define DEBUG  0
+#include <acess.h>
+#include "vfs.h"
+#include "vfs_int.h"
+#include "vfs_ext.h"
+
+// === CONSTANTS ===
+#define MAX_KERNEL_FILES       128
+#define MAX_USER_FILES 64
+
+// === PROTOTYPES ===
+tVFS_Handle    *VFS_GetHandle(int FD);
+ int   VFS_AllocHandle(int FD, tVFS_Node *Node, int Mode);
+
+typedef struct sUserHandles
+{
+       struct sUserHandles     *Next;
+        int    PID;
+       tVFS_Handle     Handles[MAX_USER_FILES];
+}      tUserHandles;
+
+// === GLOBALS ===
+tUserHandles   *gpUserHandles = NULL;
+tVFS_Handle    gaKernelHandles[MAX_KERNEL_FILES];
+
+// === CODE ===
+/**
+ * \fn tVFS_Handle *VFS_GetHandle(int FD)
+ * \brief Gets a pointer to the handle information structure
+ */
+tVFS_Handle *VFS_GetHandle(int FD)
+{
+       tVFS_Handle     *h;
+       
+       //Log_Debug("VFS", "VFS_GetHandle: (FD=0x%x)", FD);
+       
+       if(FD < 0)      return NULL;
+       
+       if(FD & VFS_KERNEL_FLAG) {
+               FD &= (VFS_KERNEL_FLAG - 1);
+               if(FD >= MAX_KERNEL_FILES)      return NULL;
+               h = &gaKernelHandles[ FD ];
+       }
+       else {
+               tUserHandles    *ent;
+                int    pid = Threads_GetPID();
+               for( ent = gpUserHandles; ent; ent = ent->Next ) {
+                       if( ent->PID == pid )   break;
+                       if( ent->PID > pid ) {
+                               Log_Error("VFS", "PID %i does not have a handle list", pid);
+                               return NULL;
+                       }
+               }
+               if(FD >= CFGINT(CFG_VFS_MAXFILES))      return NULL;
+               h = &ent->Handles[ FD ];
+       }
+       
+       if(h->Node == NULL)     return NULL;
+       //Log_Debug("VFS", "VFS_GetHandle: RETURN %p", h);
+       return h;
+}
+
+int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode)
+{
+        int    i;
+       
+       // Check for a user open
+       if(bIsUser)
+       {
+               tUserHandles    *ent, *prev;
+                int    pid = Threads_GetPID();
+               for( ent = gpUserHandles; ent; prev = ent, ent = ent->Next ) {
+                       if( ent->PID == pid )   break;
+                       if( ent->PID > pid )    break;
+               }
+               if( ent->PID > pid ) {
+                       ent = calloc( 1, sizeof(tUserHandles) );
+                       if( prev ) {
+                               ent->Next = prev->Next;
+                               prev->Next = ent;
+                       }
+                       else {
+                               ent->Next = gpUserHandles;
+                               gpUserHandles = ent;
+                       }
+               }
+               // Get a handle
+               for(i=0;i<CFGINT(CFG_VFS_MAXFILES);i++)
+               {
+                       if(ent->Handles[i].Node)        continue;
+                       ent->Handles[i].Node = Node;
+                       ent->Handles[i].Position = 0;
+                       ent->Handles[i].Mode = Mode;
+                       return i;
+               }
+       }
+       else
+       {
+               // Get a handle
+               for(i=0;i<MAX_KERNEL_FILES;i++)
+               {
+                       if(gaKernelHandles[i].Node)     continue;
+                       gaKernelHandles[i].Node = Node;
+                       gaKernelHandles[i].Position = 0;
+                       gaKernelHandles[i].Mode = Mode;
+                       return i|VFS_KERNEL_FLAG;
+               }
+       }
+       
+       return -1;
+}

diff --git a/AcessNative/acesskernel_src/video.c b/AcessNative/acesskernel_src/video.c
new file mode 100644 (file)
index 0000000..e69de29