Changeset 23519

Timestamp:

02/20/08 12:36:39 (10 months ago)

Author:

zarzycki@…

Message:

Make launchd compile 64-bit. It still doesn't work. What remains is
malloc()/free() problems (in launchd_unix_ipc.c???).

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (1 diff)
• launchd_runtime.c (modified) (8 diffs)
• launchd_runtime.h (modified) (1 diff)
• launchd_runtime_kill.c (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -4287 +4287 @@
         }
 
-#if defined (__ppc__)
+#if defined (__ppc__) || defined(__ppc64__)
         f = PPC_THREAD_STATE64;
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
         f = x86_THREAD_STATE;
 #elif defined(__arm__)

trunk/launchd/src/launchd_runtime.c

@@ -114 +114 @@
 static void do_file_init(void) __attribute__((constructor));
 static mach_timebase_info_data_t tbi;
+static uint64_t tbi_safe_math_max;
 static double tbi_float_val;
 
@@ -1079 +1080 @@
                 }
 
-                runtime_ktrace(RTKT_LAUNCHD_MACH_IPC|DBG_FUNC_START, bufRequest->Head.msgh_local_port, bufRequest->Head.msgh_id, (int)the_demux);
+                runtime_ktrace(RTKT_LAUNCHD_MACH_IPC|DBG_FUNC_START, bufRequest->Head.msgh_local_port, bufRequest->Head.msgh_id, (long)the_demux);
 
                 if (the_demux(&bufRequest->Head, &bufReply->Head) == FALSE) {
@@ -1328 +1329 @@
         /* This syscall returns EINVAL when the trace isn't enabled. */
         if (do_apple_internal_logging) {
-                syscall(180, code, 0, 0, 0, (int)ra);
+                syscall(180, code, 0, 0, 0, (long)ra);
         }
 }
@@ -1339 +1340 @@
         /* This syscall returns EINVAL when the trace isn't enabled. */
         if (do_apple_internal_logging) {
-                syscall(180, code, 0, 0, 0, (int)ra);
+                syscall(180, code, 0, 0, 0, (long)ra);
         }
 }
 
 INTERNAL_ABI void
-runtime_ktrace(runtime_ktrace_code_t code, int a, int b, int c)
+runtime_ktrace(runtime_ktrace_code_t code, long a, long b, long c)
 {
         void *ra = __builtin_extract_return_addr(__builtin_return_address(0));
@@ -1350 +1351 @@
         /* This syscall returns EINVAL when the trace isn't enabled. */
         if (do_apple_internal_logging) {
-                syscall(180, code, a, b, c, (int)ra);
+                syscall(180, code, a, b, c, (long)ra);
         }
 }
@@ -1613 +1614 @@
         if (tbi.numer != tbi.denom) {
 #endif
-                if (o < INT32_MAX) {
+#ifdef __LP64__
+                __uint128_t tmp = o;
+                tmp *= tbi.numer;
+                tmp /= tbi.denom;
+                o = tmp;
+#else
+                if (o <= tbi_safe_math_max) {
                         o *= tbi.numer;
                         o /= tbi.denom;
@@ -1621 +1628 @@
                         o = d;
                 }
+#endif
         }
 
@@ -1634 +1642 @@
         tbi_float_val = tbi.numer;
         tbi_float_val /= tbi.denom;
+        tbi_safe_math_max = UINT64_MAX / tbi.numer;
 
         if (getpid() == 1) {

trunk/launchd/src/launchd_runtime.h

@@ -164 +164 @@
 INTERNAL_ABI void runtime_ktrace1(runtime_ktrace_code_t code);
 INTERNAL_ABI void runtime_ktrace0(runtime_ktrace_code_t code);
-INTERNAL_ABI void runtime_ktrace(runtime_ktrace_code_t code, int a, int b, int c);
+INTERNAL_ABI void runtime_ktrace(runtime_ktrace_code_t code, long a, long b, long c);
 
 

trunk/launchd/src/launchd_runtime_kill.c

@@ -19 +19 @@
  */
 
-#if !defined(__LP64__) && !defined(__arm__)
-#define _NONSTD_SOURCE 1
+#if defined(__LP64__)
+/* ??? No way to get the old behavior */
 #define old_kill(x, y) kill(x, y)
-#define old_killpg(x, y) killpg(x, y)
-#else
+#define old_killpg(x, y) kill(-(x), y)
+#elif defined(__arm__)
 /* ??? No blessed way to get the old behavior */
 extern int __kill(int, int, int);
 #define old_kill(x, y) __kill(x, y, 0)
 #define old_killpg(x, y) __kill(-(x), y, 0)
+#else
+#define _NONSTD_SOURCE 1
+#define old_kill(x, y) kill(x, y)
+#define old_killpg(x, y) killpg(x, y)
 #endif
 #include <signal.h>