From 6b2b72f070cb1ffb1d6f7221bc628243ae9da352 Mon Sep 17 00:00:00 2001 From: David Jones Date: Thu, 1 Mar 2007 19:33:19 +0000 Subject: [PATCH] Mps: untested! removing linux-specific stack scanner and making it share with freebsd/darwin. Copied from Perforce Change: 161875 ServerID: perforce.ravenbrook.com --- mps/code/lii3eg.gmk | 2 +- mps/code/lii4gc.gmk | 2 +- mps/code/sslii3.c | 101 -------------------------------------------- 3 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 mps/code/sslii3.c diff --git a/mps/code/lii3eg.gmk b/mps/code/lii3eg.gmk index 49a02390988..2a42bac661e 100644 --- a/mps/code/lii3eg.gmk +++ b/mps/code/lii3eg.gmk @@ -13,7 +13,7 @@ THREADLIB = -lpthread PFMDEFS = -D_REENTRANT MPMPF = ${THREADSRC} vmli.c \ - protli.c protlii3.c proti3.c prmci3li.c sslii3.c span.c + protli.c protlii3.c proti3.c prmci3li.c ssixi3.c span.c SWPF = than.c vmli.c protsw.c prmcan.c ssan.c LIBS = -lm ${THREADLIB} diff --git a/mps/code/lii4gc.gmk b/mps/code/lii4gc.gmk index d428eec61c5..74845348759 100644 --- a/mps/code/lii4gc.gmk +++ b/mps/code/lii4gc.gmk @@ -11,7 +11,7 @@ THREADLIB = -lpthread PFMDEFS = -D_REENTRANT MPMPF = ${THREADSRC} vmli.c \ - protli.c protlii3.c proti3.c prmci3li.c sslii3.c span.c + protli.c protlii3.c proti3.c prmci3li.c ssixi3.c span.c SWPF = than.c vmli.c protsw.c prmcan.c ssan.c LIBS = -lm ${THREADLIB} diff --git a/mps/code/sslii3.c b/mps/code/sslii3.c deleted file mode 100644 index 565872c1ab6..00000000000 --- a/mps/code/sslii3.c +++ /dev/null @@ -1,101 +0,0 @@ -/* sslii3.c: LINUX/INTEL STACK SCANNING - * - * $Id$ - * Copyright (c) 2001 Ravenbrook Limited. See end of file for license. - * - * This scans the stack and fixes the registers which may contain - * roots. See - * - * The registers edi, esi, ebx are the registers defined to be preserved - * across function calls and therefore may contain roots. - * These are pushed on the stack for scanning. - * - * SOURCES - * - * .source.callees.saves: Set of callee-saved registers taken from - * CALL_USED_REGISTERS in /config/i386/i386.h. - * - * ASSUMPTIONS - * - * .assume.align: The stack pointer is assumed to be aligned on a word - * boundary. - * - * .assume.asm.stack: The compiler must not do wacky things with the - * stack pointer around a call since we need to ensure that the - * callee-save regs are visible during TraceScanArea. - * - * .assume.asm.order: The volatile modifier should prevent movement - * of code, which might break .assume.asm.stack. - * - */ - - -#include "mpm.h" - -SRCID(sslii3, "$Id$"); - - -/* .assume.asm.order */ -#define ASMV(x) __asm__ volatile (x) - - -Res StackScan(ScanState ss, Addr *stackBot) -{ - Addr *stackTop; - Res res; - - /* .assume.asm.stack */ - ASMV("push %ebx"); /* These registers are callee-saved */ - ASMV("push %esi"); /* and so may contain roots. They are pushed */ - ASMV("push %edi"); /* for scanning. See .source.callees.saves. */ - ASMV("mov %%esp, %0" : "=r" (stackTop) :); /* stackTop = esp */ - - AVER(AddrIsAligned((Addr)stackTop, sizeof(Addr))); /* .assume.align */ - res = TraceScanArea(ss, stackTop, stackBot); - - ASMV("add $12, %esp"); /* pop 3 regs to restore the stack pointer */ - - return res; -} - - -/* C. COPYRIGHT AND LICENSE - * - * Copyright (C) 2001-2002 Ravenbrook Limited . - * All rights reserved. This is an open source license. Contact - * Ravenbrook for commercial licensing options. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Redistributions in any form must be accompanied by information on how - * to obtain complete source code for this software and any accompanying - * software that uses this software. The source code must either be - * included in the distribution or be available for no more than the cost - * of distribution plus a nominal fee, and must be freely redistributable - * under reasonable conditions. For an executable file, complete source - * code means the source code for all modules it contains. It does not - * include source code for modules or files that typically accompany the - * major components of the operating system on which the executable file - * runs. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - * PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */