mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-16 08:10:43 -08:00
Merging in ep changes from branch mmdevel_sw_eq
Copied from Perforce Change: 17371 ServerID: perforce.ravenbrook.com
This commit is contained in:
Nick Barnes
parent
e803c3c49c
commit
63aa9ee311
7 changed files with 44 additions and 29 deletions
|
|
@ -1,5 +1,9 @@
|
|||
@REM impl.bat.hqbuild
|
||||
@REM $HopeName: MMsrc!hqbuild:tools:hqbuild.bat(trunk.1) $
|
||||
<<<<<<< /u/nickb/mm/merge/trunk/src/hqbuild:tools:hqbuild.bat
|
||||
@REM $HopeName: MMsrc!hqbuild:tools:hqbuild.bat(trunk.2) $
|
||||
=======
|
||||
@REM $HopeName: MMsrc!hqbuild:tools:hqbuild.bat(MMdevel_sw_eq.2) $
|
||||
>>>>>>> 1.2.5.2
|
||||
@REM Copyright (C) 1996 Harlequin Group, all rights reserved
|
||||
@REM Called by SWIG autobuild system
|
||||
@
|
||||
|
|
@ -9,4 +13,4 @@ SET PATH=%MSVCNT%\bin;%PATH%
|
|||
SET LIB=%MSVCNT%\lib
|
||||
SET INCLUDE=%MSVCNT%\include
|
||||
@REM Silently throw away all but first argument
|
||||
nmake /f %1.nmk
|
||||
nmake /f %1.nmk %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* impl.c.qs: QUICKSORT
|
||||
*
|
||||
* $HopeName: MMsrc!qs.c(trunk.8) $
|
||||
* $HopeName: MMsrc!qs.c(trunk.9) $
|
||||
*
|
||||
* Copyright (C) 1995,1996 Harlequin Group, all rights reserved
|
||||
*
|
||||
|
|
@ -370,7 +370,7 @@ go(void *p, size_t s)
|
|||
UNUSED(p);
|
||||
UNUSED(s);
|
||||
|
||||
die(mps_pool_create(&mpool, space, mps_class_mv(),
|
||||
die(mps_pool_create(&mpool, space, mps_class_mv(),
|
||||
(size_t)65536, sizeof(QSCellStruct) * 1000,
|
||||
(size_t)65536), "MVCreate");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* impl.c.ring: RING IMPLEMENTATION
|
||||
*
|
||||
* $HopeName: MMsrc!ring.c(trunk.3) $
|
||||
* $HopeName: MMsrc!ring.c(trunk.4) $
|
||||
* Copyright (C) 1995,1996 Harlequin Group, all rights reserved.
|
||||
*
|
||||
* .readership: Any MPS developer.
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
#include "mpm.h"
|
||||
|
||||
|
||||
SRCID(ring, "$HopeName: MMsrc!ring.c(trunk.3) $");
|
||||
SRCID(ring, "$HopeName: MMsrc!ring.c(trunk.4) $");
|
||||
|
||||
|
||||
/* RingCheck, RingCheckSingle -- check the validity of a ring node
|
||||
|
|
@ -88,6 +88,15 @@ void (RingAppend)(Ring ring, Ring new)
|
|||
}
|
||||
|
||||
|
||||
/* RingInsert -- add a ring node to the start of a ring
|
||||
*/
|
||||
|
||||
void (RingInsert)(Ring ring, Ring new)
|
||||
{
|
||||
RingInsert(ring, new); /* impl.h.mpm.ring.insert */
|
||||
}
|
||||
|
||||
|
||||
/* RingRemove -- remove a node from a ring
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
# ==== S7PPAC MPW MAKE FILE ====
|
||||
#
|
||||
# $HopeName$
|
||||
<<<<<<< /u/nickb/mm/merge/trunk/src/s7ppac:Makefile
|
||||
# $HopeName: MMsrc!s7ppac:Makefile(trunk.2) $
|
||||
=======
|
||||
# $HopeName: MMsrc!s7ppac:Makefile(MMdevel_sw_eq.6) $
|
||||
>>>>>>> 1.2.6.6
|
||||
#
|
||||
# Copyright (C) 1996 Harlequin Group, all rights reserved
|
||||
#
|
||||
|
|
@ -18,7 +22,7 @@
|
|||
# BuildProgram -d Variety clean
|
||||
|
||||
COptions = -ansi strict -proto strict -typecheck strict -w error ¶
|
||||
-d TARGET_VAR_{Variety} -d TARGET_VM_RM -sym full
|
||||
-d TARGET_VAR_{Variety} -d TARGET_ARENA_CLIENT -sym full
|
||||
|
||||
":" Ä "::"
|
||||
|
||||
|
|
@ -27,12 +31,12 @@ OSffx = .c.{Variety}.o
|
|||
{OSffx} Ä .c
|
||||
MrC {DepDir}{Default}.c -o {TargDir}{Default}{OSffx} {COptions}
|
||||
|
||||
mmsw_{Variety}.o Ä assert{OSffx} ring{OSffx} liban{OSffx} mpm{OSffx} ¶
|
||||
arenavm{OSffx} space{OSffx} pool{OSffx} poolmfs{OSffx} ¶
|
||||
mmsw_{Variety}.o Ä assert{OSffx} ring{OSffx} mpm{OSffx} ¶
|
||||
arenacl{OSffx} space{OSffx} pool{OSffx} poolmfs{OSffx} ¶
|
||||
poolmv{OSffx} root{OSffx} format{OSffx} buffer{OSffx} ¶
|
||||
lockan{OSffx} ref{OSffx} trace{OSffx} than{OSffx} ¶
|
||||
protan{OSffx} shield{OSffx} mpsi{OSffx} ld{OSffx} ¶
|
||||
vmrm{OSffx} ssan{OSffx}
|
||||
protsw{OSffx} shield{OSffx} mpsisw{OSffx} ld{OSffx} ¶
|
||||
ssan{OSffx} poolepdl{OSffx}
|
||||
PPCLink {Deps} -xm l -o {Targ} -sym on
|
||||
|
||||
cleanall Ä
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# BUILD FOR SOLARIS/SPARC/GCC PLATFORM
|
||||
#
|
||||
# $HopeName: MMsrc!sospgc.gmk(trunk.5) $
|
||||
# $HopeName: MMsrc!sospgc.gmk(trunk.6) $
|
||||
# Copyright (C) 1995,1997 Harlequin Group, all rights reserved
|
||||
#
|
||||
# This is the GNU makefile for platform.sospgc.
|
||||
|
|
@ -19,10 +19,9 @@ AMC = amc.c
|
|||
LO = lo.c
|
||||
MRG = poolmrg.c
|
||||
DW = fmtdy.c dw.c
|
||||
SW = assert.c ring.c mpsliban.c mpm.c \
|
||||
arenavm.c vmrm.c space.c pool.c poolmfs.c \
|
||||
SW = assert.c ring.c mpm.c arenacl.c space.c pool.c poolmfs.c \
|
||||
poolmv.c root.c format.c buffer.c lockan.c ref.c \
|
||||
trace.c than.c protso.c shield.c mpsi.c ld.c ssan.c
|
||||
trace.c than.c protsw.c shield.c mpsisw.c ld.c ssan.c poolepdl.c
|
||||
LIBS = -lm
|
||||
|
||||
TESTLIB = testlib.c
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# BUILD FOR SUNOS/SPARC/GCC PLATFORM
|
||||
#
|
||||
# $HopeName: MMsrc!suspgc.gmk(trunk.21) $
|
||||
# $HopeName: MMsrc!suspgc.gmk(trunk.22) $
|
||||
# Copyright (C) 1995,1997 Harlequin Group, all rights reserved
|
||||
#
|
||||
# This is the GNU makefile for platform.suspgc.
|
||||
|
|
@ -18,10 +18,9 @@ AMC = amc.c
|
|||
LO = lo.c
|
||||
MRG = poolmrg.c
|
||||
DW = fmtdy.c dw.c
|
||||
SW = assert.c ring.c mpsliban.c mpm.c \
|
||||
arenavm.c vmrm.c space.c pool.c poolmfs.c \
|
||||
SW = assert.c ring.c mpm.c arenacl.c space.c pool.c poolmfs.c \
|
||||
poolmv.c root.c format.c buffer.c lockan.c ref.c \
|
||||
trace.c than.c protsu.c shield.c mpsi.c ld.c ssan.c
|
||||
trace.c than.c protsw.c shield.c mpsisw.c ld.c ssan.c poolepdl.c
|
||||
|
||||
TESTLIB = testlib.c
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* impl.c.vmo1: VIRTUAL MEMORY MAPPING FOR DIGITAL UNIX
|
||||
*
|
||||
* $HopeName: MMsrc!vmo1.c(trunk.1) $
|
||||
* $HopeName: MMsrc!vmo1.c(trunk.2) $
|
||||
* Copyright (C) 1995,1997 Harlequin Group, all rights reserved
|
||||
*
|
||||
* Readership: Any MPS developer
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
/* for getpagesize(2),close(2) */
|
||||
#include <unistd.h>
|
||||
|
||||
SRCID(vmo1, "$HopeName: MMsrc!vmo1.c(trunk.1) $");
|
||||
SRCID(vmo1, "$HopeName: MMsrc!vmo1.c(trunk.2) $");
|
||||
|
||||
|
||||
/* Fix unprototyped system calls
|
||||
|
|
@ -127,7 +127,7 @@ Res VMCreate(Space *spaceReturn, Size size, Addr base)
|
|||
/* Map in a page to store the descriptor on. */
|
||||
addr = mmap(0, (size_t)SizeAlignUp(sizeof(SpaceStruct), align),
|
||||
PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE | MAP_VARIABLE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE | MAP_VARIABLE,
|
||||
-1, 0);
|
||||
if(addr == (void *)-1) {
|
||||
int e = errno;
|
||||
|
|
@ -146,8 +146,8 @@ Res VMCreate(Space *spaceReturn, Size size, Addr base)
|
|||
|
||||
/* See .assume.not-last. */
|
||||
addr = mmap(0, (size_t)size,
|
||||
PROT_NONE, MAP_FILE | MAP_SHARED | MAP_VARIABLE,
|
||||
none_fd, 0);
|
||||
PROT_NONE, MAP_FILE | MAP_SHARED | MAP_VARIABLE,
|
||||
none_fd, 0);
|
||||
if(addr == (void *)-1) {
|
||||
int e = errno;
|
||||
AVER(e == ENOMEM); /* .assume.mmap.err */
|
||||
|
|
@ -242,9 +242,9 @@ Res VMMap(Space space, Addr base, Addr limit)
|
|||
size = AddrOffset(base, limit);
|
||||
|
||||
if(mmap((void *)base, (size_t)size,
|
||||
PROT_READ | PROT_WRITE | PROT_EXEC,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED,
|
||||
-1, 0) == (void *)-1) {
|
||||
PROT_READ | PROT_WRITE | PROT_EXEC,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED,
|
||||
-1, 0) == (void *)-1) {
|
||||
AVER(errno == ENOMEM); /* .assume.mmap.err */
|
||||
return ResMEMORY;
|
||||
}
|
||||
|
|
@ -275,7 +275,7 @@ void VMUnmap(Space space, Addr base, Addr limit)
|
|||
/* see design.mps.vmo1.fun.unmap.offset */
|
||||
addr = mmap((void *)base, (size_t)size,
|
||||
PROT_NONE, MAP_FILE | MAP_SHARED | MAP_FIXED,
|
||||
vm->none_fd, (off_t)AddrOffset(vm->base, base));
|
||||
vm->none_fd, (off_t)AddrOffset(vm->base, base));
|
||||
AVER(addr != (void *)-1);
|
||||
|
||||
vm->mapped -= size;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue