Changeset 12665

Timestamp:

Aug 24, 2009, 1:03:43 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Purge some code intended to deal with running a PPC lisp
under Rosetta on an Intel-based Mac.

Location:

trunk/source/lisp-kernel

Files:

• lisp.h (modified) (1 diff)
• pmcl-kernel.c (modified) (4 diffs)
• ppc-exceptions.c (modified) (1 diff)

trunk/source/lisp-kernel/lisp.h

@@ -34 +34 @@
 
 extern Boolean use_mach_exception_handling;
-#ifdef DARWIN
-extern Boolean running_under_rosetta;
-#endif
 
 extern int page_size, log2_page_size;

trunk/source/lisp-kernel/pmcl-kernel.c

@@ -90 +90 @@
 #include <mach/port.h>
 #include <sys/sysctl.h>
-
-Boolean running_under_rosetta = false;
-
 #include <dlfcn.h>
 #endif
@@ -1475 +1472 @@
     exit(1);
   }
-#ifdef PPC
-#ifdef DARWIN
-  {
-    char *hosttype = getenv("HOSTTYPE");
-    if (hosttype && !strncmp("intel", hosttype, 5)) {
-      running_under_rosetta = true;
-      use_mach_exception_handling = false;
-      reserved_area_size = 1U << 30;
-    }
-  }
-#endif
-#endif
 #endif
 }
@@ -1969 +1954 @@
 xMakeDataExecutable(void *start, unsigned long nbytes)
 {
+#ifndef X86
   extern void flush_cache_lines();
   natural ustart = (natural) start, base, end;
@@ -1974 +1960 @@
   base = (ustart) & ~(cache_block_size-1);
   end = (ustart + nbytes + cache_block_size - 1) & ~(cache_block_size-1);
-#ifdef DARWIN
-  if (running_under_rosetta) {
-    /* We probably need to flush something's cache even if running
-       under Rosetta, but (a) this is agonizingly slow and (b) we're
-       dying before we get to the point where this would matter.
-    */
-    return;
-  }
-#endif
-#ifndef X86
   flush_cache_lines(base, (end-base)/cache_block_size, cache_block_size);
 #endif

trunk/source/lisp-kernel/ppc-exceptions.c

@@ -1852 +1852 @@
   xframe_list xframe_link;
 
-#ifdef DARWIN
-  if (running_under_rosetta) {
-    fprintf(dbgout, "signal handler: signal = %d, pc = 0x%08x\n", signum, xpPC(context));
-  }
-#endif
   if (!use_mach_exception_handling) {