Changeset 12665


Ignore:
Timestamp:
Aug 24, 2009, 8:03:43 PM (10 years ago)
Author:
rme
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lisp-kernel/lisp.h

    r12095 r12665  
    3434
    3535extern Boolean use_mach_exception_handling;
    36 #ifdef DARWIN
    37 extern Boolean running_under_rosetta;
    38 #endif
    3936
    4037extern int page_size, log2_page_size;
  • trunk/source/lisp-kernel/pmcl-kernel.c

    r12425 r12665  
    9090#include <mach/port.h>
    9191#include <sys/sysctl.h>
    92 
    93 Boolean running_under_rosetta = false;
    94 
    9592#include <dlfcn.h>
    9693#endif
     
    14751472    exit(1);
    14761473  }
    1477 #ifdef PPC
    1478 #ifdef DARWIN
    1479   {
    1480     char *hosttype = getenv("HOSTTYPE");
    1481     if (hosttype && !strncmp("intel", hosttype, 5)) {
    1482       running_under_rosetta = true;
    1483       use_mach_exception_handling = false;
    1484       reserved_area_size = 1U << 30;
    1485     }
    1486   }
    1487 #endif
    1488 #endif
    14891474#endif
    14901475}
     
    19691954xMakeDataExecutable(void *start, unsigned long nbytes)
    19701955{
     1956#ifndef X86
    19711957  extern void flush_cache_lines();
    19721958  natural ustart = (natural) start, base, end;
     
    19741960  base = (ustart) & ~(cache_block_size-1);
    19751961  end = (ustart + nbytes + cache_block_size - 1) & ~(cache_block_size-1);
    1976 #ifdef DARWIN
    1977   if (running_under_rosetta) {
    1978     /* We probably need to flush something's cache even if running
    1979        under Rosetta, but (a) this is agonizingly slow and (b) we're
    1980        dying before we get to the point where this would matter.
    1981     */
    1982     return;
    1983   }
    1984 #endif
    1985 #ifndef X86
    19861962  flush_cache_lines(base, (end-base)/cache_block_size, cache_block_size);
    19871963#endif
  • trunk/source/lisp-kernel/ppc-exceptions.c

    r11659 r12665  
    18521852  xframe_list xframe_link;
    18531853
    1854 #ifdef DARWIN
    1855   if (running_under_rosetta) {
    1856     fprintf(dbgout, "signal handler: signal = %d, pc = 0x%08x\n", signum, xpPC(context));
    1857   }
    1858 #endif
    18591854  if (!use_mach_exception_handling) {
    18601855   
Note: See TracChangeset for help on using the changeset viewer.