Changes to support Haiku OS

Author: migueletto

pumpkin.sh

@@ -1,3 +1,4 @@
 PATH=./bin:$PATH
 export LD_LIBRARY_PATH=./bin
+export LIBRARY_PATH=$LIBRARY_PATH:%A/bin
 ./pumpkin -d 1 -f pumpkin.log -s libscriptlua ./script/pumpkin.lua

script/pumpkin.lua

@@ -48,6 +48,11 @@ if not lib then
   return
 end
 
+fullrefresh = false
+if pit.getenv("BE_HOST_CPU") then
+  fullrefresh = true
+end
+
 pit.mount("./vfs/", "/")
 
 pumpkin = pit.loadlib("libos")
@@ -58,6 +63,7 @@ pumpkin.start {
   width    = 1024,
   height   = 768,
   abgr     = abgr,
+  fullrefresh = fullrefresh,
   depth    = 16,
   hdepth   = lib.hdepth
 }

src/Launcher/Launcher.c

@@ -3050,6 +3050,9 @@ UInt32 PilotMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags)
     case 6:
       debug(DEBUG_INFO, PUMPKINOS, "Host OS is Kernel");
       break;
+    case 7:
+      debug(DEBUG_INFO, PUMPKINOS, "Host OS is Haiku");
+      break;
     default:
       debug(DEBUG_ERROR, PUMPKINOS, "Host OS is unknown");
       break;

src/Makefile

@@ -32,6 +32,10 @@ endif
 
 EXTRA_MODULES=$(UNICORN_MODULE) windows
 
+else ifeq ($(OSNAME),Haiku)
+
+EXTRA_MODULES=liblsdl2 haiku
+
 else ifeq ($(OSNAME),Emscripten)
 
 EMCC=$(shell which emcc)

src/common.mak

@@ -164,6 +164,16 @@ OSDEFS=$(MBITS) -DKERNEL $(RPI_DEFS) -DSOEXT=\"$(SOEXT)\"
 PILRCDEFS=-D KERNEL
 CC=gcc
 
+else ifeq ($(OSNAME),Haiku)
+SYS_OS=7
+EXTLIBS=-lnetwork
+SOEXT=.so
+LUAPLAT=posix
+OS=Haiku
+OSDEFS=$(MBITS) -DHAIKU -DSOEXT=\"$(SOEXT)\"
+CC=gcc
+FC=gfortran
+
 else
 $(error Unknown OS $(OSNAME))
 endif

src/haiku/Makefile

@@ -0,0 +1,12 @@
+include ../common.mak
+
+PROGRAM=$(ROOT)/pumpkin
+
+OBJS=main.o
+
+$(PROGRAM): $(OBJS)
+	@echo Linking pumpkin
+	@$(CC) -o $(PROGRAM) $(OBJS) -L$(BIN) -lpit -lpthread
+
+clean:
+	@rm -f $(PROGRAM) $(OBJS)

src/haiku/main.c

@@ -0,0 +1,7 @@
+#include <stdlib.h>
+
+#include "main.h"
+
+int main(int argc, char *argv[]) {
+  exit(pit_main(argc, argv, NULL, NULL));
+}

src/libpit/sys.c

@@ -45,14 +45,19 @@
 #include <sys/select.h>
 #include <sys/statvfs.h>
 #else
+#if !defined(HAIKU)
 #include <sys/syscall.h>
 #include <sys/vfs.h>
 #endif
+#endif
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
+#if defined(HAIKU)
+#include <OS.h>
+#endif
 #endif
 
 #include "sys.h"
@@ -537,6 +542,10 @@ uint32_t sys_get_tid(void) {
 #if defined(EMSCRIPTEN)
   return 0;
 #endif
+#if defined(HAIKU)
+  thread_id id = find_thread(NULL);
+  return id;
+#endif
 #if defined(KERNEL)
   return 0;
 #endif
@@ -2116,7 +2125,7 @@ int64_t sys_get_clock(void) {
   ticks.QuadPart *= 1000000;
   ticks.QuadPart /= ticks_per_second.QuadPart;
   ts = ticks.QuadPart;
-#elif defined(EMSCRIPTEN)
+#elif defined(EMSCRIPTEN) || defined(HAIKU)
   ts = gettime(CLOCK_MONOTONIC);
 #else
 #if _POSIX_TIMERS > 0

src/libpumpkin/tos/gemdos.h

@@ -38,7 +38,7 @@ typedef void *XATTR;
 typedef void *STAT;
 typedef void *POLLFD;
 typedef void *COOKIE;
-typedef void *timezone;
+typedef void *timezone_t;
 typedef void *MPB;
 typedef void *BPB;
 typedef void *MOUSE;

src/libpumpkin/tos/gemdos.txt

@@ -148,8 +148,8 @@
 338 int32_t Dreadlabel 3 char@* path char@* label int16_t length
 339 int32_t Dwritelabel 2 char@* path char@* label
 340 int32_t Ssystem 3 int16_t mode int32_t arg1 int32_t arg2
-341 int32_t Tgettimeofday 2 struct@timeval@* tv timezone@* tzp
-342 int32_t Tsettimeofday 2 struct@timeval@* tv timezone@* tzp
+341 int32_t Tgettimeofday 2 struct@timeval@* tv timezone_t@* tzp
+342 int32_t Tsettimeofday 2 struct@timeval@* tv timezone_t@* tzp
 343 int Tadjtime 2 struct@timeval@* delta struct@timeval@* olddelta
 344 int32_t Pgetpriority 2 int16_t which int16_t who
 345 int32_t Psetpriority 3 int16_t which int16_t who int16_t pri

src/libpumpkin/tos/gemdos_case.c

@@ -1646,7 +1646,7 @@
         struct g_timeval *tv = (struct g_timeval *)(memory + atv);
         valid |= (uint8_t *)tv >= data->memory && (uint8_t *)tv < data->memory + data->memorySize;
         uint32_t atzp = ARG32;
-        timezone *tzp = (timezone *)(memory + atzp);
+        timezone_t *tzp = (timezone_t *)(memory + atzp);
         valid |= (uint8_t *)tzp >= data->memory && (uint8_t *)tzp < data->memory + data->memorySize;
         int32_t res = 0;
         if (valid) {
@@ -1663,7 +1663,7 @@
         struct g_timeval *tv = (struct g_timeval *)(memory + atv);
         valid |= (uint8_t *)tv >= data->memory && (uint8_t *)tv < data->memory + data->memorySize;
         uint32_t atzp = ARG32;
-        timezone *tzp = (timezone *)(memory + atzp);
+        timezone_t *tzp = (timezone_t *)(memory + atzp);
         valid |= (uint8_t *)tzp >= data->memory && (uint8_t *)tzp < data->memory + data->memorySize;
         int32_t res = 0;
         if (valid) {

src/libpumpkin/tos/gemdos_impl.c

@@ -1122,12 +1122,12 @@ int32_t Ssystem(int16_t mode, int32_t arg1, int32_t arg2) {
   return 0;
 }
 
-int32_t Tgettimeofday(struct g_timeval *tv, timezone *tzp) {
+int32_t Tgettimeofday(struct g_timeval *tv, timezone_t *tzp) {
   debug(DEBUG_ERROR, "TOS", "Tgettimeofday not implemented");
   return 0;
 }
 
-int32_t Tsettimeofday(struct g_timeval *tv, timezone *tzp) {
+int32_t Tsettimeofday(struct g_timeval *tv, timezone_t *tzp) {
   debug(DEBUG_ERROR, "TOS", "Tsettimeofday not implemented");
   return 0;
 }

src/libpumpkin/tos/gemdos_proto.h

@@ -140,8 +140,8 @@ int32_t Shutdown(int32_t mode);
 int32_t Dreadlabel(char *path, char *label, int16_t length);
 int32_t Dwritelabel(char *path, char *label);
 int32_t Ssystem(int16_t mode, int32_t arg1, int32_t arg2);
-int32_t Tgettimeofday(struct g_timeval *tv, timezone *tzp);
-int32_t Tsettimeofday(struct g_timeval *tv, timezone *tzp);
+int32_t Tgettimeofday(struct g_timeval *tv, timezone_t *tzp);
+int32_t Tsettimeofday(struct g_timeval *tv, timezone_t *tzp);
 int Tadjtime(struct g_timeval *delta, struct g_timeval *olddelta);
 int32_t Pgetpriority(int16_t which, int16_t who);
 int32_t Psetpriority(int16_t which, int16_t who, int16_t pri);