儲存庫 kStuff 的更動 24

時間撮記:

2009-2-8 下午01:58:54 (16 年 以前)

作者:

bird

訊息:

darwin porting.

位置:

trunk

檔案:

• Config.kmk (修改) (3 筆差異)
• Makefile.kmk (修改) (1 筆差異)
• kHlp/Bare/Makefile.kup (新增)
• kHlp/Bare/kHlpBareThread.c (修改) (2 筆差異)
• kHlp/Bare/kHlpSys-darwin.c (新增)
• kHlp/Makefile.kmk (修改) (4 筆差異)
• kLdr/kLdrDyldSem.c (修改) (1 筆差異)
• kLdr/kLdrModLX.c (修改) (1 筆差異)

trunk/Config.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2006-2007 knut st. osmundsen <[email protected]>
+# Copyright (c) 2006-2008 knut st. osmundsen <[email protected]>
 #
 # This file is part of kStuff.
@@ -34 +34 @@
 #
 TEMPLATE_kStuff = kStuff Template
-TEMPLATE_kStuff_TOOL             = GCC3
-TEMPLATE_kStuff_TOOL.darwin      = GCC4MACHO
-TEMPLATE_kStuff_TOOL.os2         = GCC3OMF
-TEMPLATE_kStuff_TOOL.solaris     = GCC3PLAIN
+TEMPLATE_kStuff_TOOL             = GXX3
+TEMPLATE_kStuff_TOOL.darwin      = GXX4MACHO
+TEMPLATE_kStuff_TOOL.os2         = GXX3OMF
+TEMPLATE_kStuff_TOOL.solaris     = GXX3PLAIN
 TEMPLATE_kStuff_TOOL.win.x86     = VCC70
 TEMPLATE_kStuff_TOOL.win.amd64   = VCC80AMD64
@@ -82 +82 @@
 endif
 
-TEMPLATE_kStuff_CXXFLAGS.darwin  = -g -fno-common
-TEMPLATE_kStuff_CXXFLAGS.freebsd = -g
-TEMPLATE_kStuff_CXXFLAGS.linux   = -g
-TEMPLATE_kStuff_CXXFLAGS.os2     = -g
+TEMPLATE_kStuff_CXXFLAGS.darwin  = -g -fno-exceptions -fno-common
+TEMPLATE_kStuff_CXXFLAGS.freebsd = -g -fno-exceptions
+TEMPLATE_kStuff_CXXFLAGS.linux   = -g -fno-exceptions
+TEMPLATE_kStuff_CXXFLAGS.os2     = -g -fno-exceptions
 TEMPLATE_kStuff_CXXFLAGS.win     = -Zi -Zl -W3 -GF -GR-
 TEMPLATE_kStuff_CXXFLAGS.win.x86 = -MD

trunk/Makefile.kmk

@@ -34 +34 @@
 
 include $(PATH_SUB_CURRENT)/kHlp/Makefile.kmk
-include $(PATH_SUB_CURRENT)/kProfiler2/Makefile.kmk
+ifn1of ($(KBUILD_TARGET), darwin)
+ include $(PATH_SUB_CURRENT)/kProfiler2/Makefile.kmk
+endif
 
 LIBRARIES += kStuffStatic

trunk/kHlp/Bare/kHlpBareThread.c

@@ -37 +37 @@
 
 #if K_OS == K_OS_DARWIN
+# include <mach/mach_time.h>
 
 #elif K_OS == K_OS_LINUX
@@ -59 +60 @@
 {
 #if K_OS == K_OS_DARWIN
-    /** @todo mach_wait_until, see gen/nanosleep.c. */
-    usleep(cMillies * 1000);
+    static struct mach_timebase_info   s_Info;
+    static KBOOL                s_fNanoseconds = K_UNKNOWN;
+    KU64 uNow = mach_absolute_time();
+    KU64 uDeadline;
+    KU64 uPeriod;
+
+    if (s_fNanoseconds == K_UNKNOWN)
+    {
+        if (mach_timebase_info(&s_Info))
+            s_fNanoseconds = K_TRUE; /* the easy way out */
+        else if (s_Info.denom == s_Info.numer)
+            s_fNanoseconds = K_TRUE;
+        else
+            s_fNanoseconds = K_FALSE;
+    }
+
+    uPeriod = (KU64)cMillies * 1000 * 1000;
+    if (!s_fNanoseconds)
+        uPeriod = (double)uPeriod * s_Info.denom / s_Info.numer; /* Use double to avoid 32-bit trouble. */
+    uDeadline = uNow + uPeriod;
+    mach_wait_until(uDeadline);
 
 #elif K_OS == K_OS_LINUX

trunk/kHlp/Makefile.kmk

@@ -65 +65 @@
         Generic/kHlpInt2Ascii.c \
         \
-    Generic/kHlpGetEnvUZ.c \
+        Generic/kHlpGetEnvUZ.c \
         \
         Generic/kHlpGetExt.c \
@@ -78 +78 @@
         Bare/kHlpBareProcess.c \
         Bare/kHlpBareThread.c \
+
+kHlpBareStatic_SOURCES.darwin = \
+        Bare/kHlpSys-darwin.c
 
 #
@@ -99 +102 @@
         Generic/kHlpInt2Ascii.c \
         \
-    Generic/kHlpGetEnvUZ.c \
+        Generic/kHlpGetEnvUZ.c \
         \
         Generic/kHlpGetExt.c \
@@ -111 +114 @@
         CRT/kHlpCRTString.cpp \
 
+kHlpCRTStatic_SOURCES.darwin = \
+        Bare/kHlpSys-darwin.c
+
 
 # Generate the rules

trunk/kLdr/kLdrDyldSem.c

@@ -40 +40 @@
 #if K_OS == K_OS_DARWIN
 # include <mach/mach.h>
+# undef mach_task_self  /* don't use the macro (if we're using bare helpers ) */
 
 #elif K_OS == K_OS_OS2

trunk/kLdr/kLdrModLX.c

@@ -339 +339 @@
 
     pModLX->offHdr = offNewHdr >= 0 ? offNewHdr : 0;
-    pModLX->Hdr = Hdr;
+    kHlpMemCopy(&pModLX->Hdr, &Hdr, sizeof(Hdr));
 
     pModLX->pbLoaderSection = K_ALIGN_P(pMod->pszFilename + pMod->cchFilename + 1, 16);