carbon emacs 20071020 (ppc & intel) build did work

carbon emacs 20071020 (ppc & intel) build did work

[William Xu]

In http://article.gmane.org/gmane.emacs.bugs/16900, i mentioned that
carbon emacs(on ppc) built on 20071020 was working fine. Today, i just
tried `cvs update -D 20071020' on my macbook(namely, intel platform), it
also works ! I'm mailing with it now. I think this could narrow down the
causes of the slow responsiveness in the HEAD.

,----[ M-x emacs-version ]
| GNU Emacs 23.0.50.1 (i386-apple-darwin9.1.0, Carbon Version 1.6.0) of 2007-11-18 on zen
`----

Besides cvs update to 20071020, i have applied some necessary patches:

- res_init issue: I think just disable it on macosx should be okay.

- unexmacosx.c issue: by mituharu, i wonder why this has not been
  committed into the trunk yet...(since around 20071101)

Here's the patch:

Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.232
diff -u -r1.232 configure
--- configure	17 Oct 2007 15:58:05 -0000	1.232
+++ configure	18 Nov 2007 07:33:35 -0000
@@ -2396,11 +2396,11 @@
     # Define CPP as follows to make autoconf work correctly.
     CPP="${CC-cc} -E -no-cpp-precomp"
     # Use fink packages if available.
-    if test -d /sw/include && test -d /sw/lib; then
-      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-      CPP="${CPP} ${GCC_TEST_OPTIONS}"
-      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-    fi
+  #  if test -d /sw/include && test -d /sw/lib; then
+  #    GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+  #    CPP="${CPP} ${GCC_TEST_OPTIONS}"
+  #    NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+  #  fi
   ;;

   ## AT&T 3b2, 3b5, 3b15, 3b20
Index: src/process.c
===================================================================
RCS file: /sources/emacs/emacs/src/process.c,v
retrieving revision 1.523
diff -u -r1.523 process.c
--- src/process.c	19 Oct 2007 10:28:55 -0000	1.523
+++ src/process.c	18 Nov 2007 07:33:39 -0000
@@ -2683,6 +2683,7 @@
 \f
 /* A version of request_sigio suitable for a record_unwind_protect.  */

+#ifdef __ultrix__
 static Lisp_Object
 unwind_request_sigio (dummy)
      Lisp_Object dummy;
@@ -2691,6 +2692,7 @@
     request_sigio ();
   return Qnil;
 }
+#endif

 /* Create a network stream/datagram client/server process.  Treated
    exactly like a normal process when reading and writing.  Primary
@@ -3091,7 +3093,7 @@
       hints.ai_protocol = 0;

 #ifdef HAVE_RES_INIT
-      res_init ();
+      // res_init ();
 #endif

       ret = getaddrinfo (SDATA (host), portstring, &hints, &res);
@@ -3141,7 +3143,7 @@
       QUIT;

 #ifdef HAVE_RES_INIT
-      res_init ();
+      // res_init ();
 #endif

       host_info_ptr = gethostbyname (SDATA (host));
Index: src/unexmacosx.c
===================================================================
RCS file: /sources/emacs/emacs/src/unexmacosx.c,v
retrieving revision 1.23
diff -u -r1.23 unexmacosx.c
--- src/unexmacosx.c	26 Jul 2007 05:27:58 -0000	1.23
+++ src/unexmacosx.c	18 Nov 2007 07:33:40 -0000
@@ -450,8 +450,13 @@
 	   p -= sizeof (int))
 	if (*(((int *) p)-1))
 	  break;
+      printf("pagesize=%d, p = %d, ranges->address = %d, p - ranges.. = %d\n",
+              pagesize, p, ranges->address, p- ranges->address);
       filesize = ROUNDUP_TO_PAGE_BOUNDARY (p - ranges->address);
-      assert (filesize <= ranges->size);
+      printf("filesize = %d, ranges->size = %d\n", filesize, ranges->size);
+      // assert (filesize <= ranges->size);
+      if(filesize > ranges->size)
+        filesize = ROUNDUP_TO_PAGE_BOUNDARY (ranges->size) - pagesize;

       unexec_regions[num_unexec_regions].filesize = filesize;
       unexec_regions[num_unexec_regions++].range = *ranges;
@@ -503,11 +508,19 @@
 {
   int i, n;
   unexec_region_info r;
+  vm_size_t padsize;

   qsort (unexec_regions, num_unexec_regions, sizeof (unexec_regions[0]),
 	 &unexec_regions_sort_compare);
   n = 0;
   r = unexec_regions[0];
+  padsize = r.range.address & (pagesize - 1);
+  if (padsize)
+    {
+      r.range.address -= padsize;
+      r.range.size += padsize;
+      r.filesize += padsize;
+    }
   for (i = 1; i < num_unexec_regions; i++)
     {
       if (r.range.address + r.range.size == unexec_regions[i].range.address
@@ -520,6 +533,17 @@
 	{
 	  unexec_regions[n++] = r;
 	  r = unexec_regions[i];
+	  padsize = r.range.address & (pagesize - 1);
+	  if (padsize)
+	    {
+	      if ((unexec_regions[n-1].range.address
+		   + unexec_regions[n-1].range.size) == r.range.address)
+		unexec_regions[n-1].range.size -= padsize;
+
+	      r.range.address -= padsize;
+	      r.range.size += padsize;
+	      r.filesize += padsize;
+	    }
 	}
     }
   unexec_regions[n++] = r;
@@ -562,6 +586,11 @@
     case LC_TWOLEVEL_HINTS:
       printf ("LC_TWOLEVEL_HINTS");
       break;
+#ifdef LC_UUID
+    case LC_UUID:
+      printf ("LC_UUID          ");
+      break;
+#endif
     default:
       printf ("unknown          ");
     }

-- 
William