Merge jmallett@'s n64 work into HEAD - changeset 2
Update libc Makefiles. Add makecontext implementation. Changes from http://svn.freebsd.org/base/user/jmallett/octeon Approved by: rrs(mentor), jmallett
This commit is contained in:
parent
915421bba4
commit
9279d32a64
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=209233
@ -51,7 +51,12 @@ NOASM=
|
||||
.include "${.CURDIR}/posix1e/Makefile.inc"
|
||||
.if ${MACHINE_ARCH} != "amd64" && \
|
||||
${MACHINE_ARCH} != "ia64" && \
|
||||
${MACHINE_ARCH} != "sparc64"
|
||||
${MACHINE_ARCH} != "sparc64" && \
|
||||
${MACHINE_ARCH} != "mips"
|
||||
.include "${.CURDIR}/quad/Makefile.inc"
|
||||
.endif
|
||||
.if ${MACHINE_ARCH} == "mips" && \
|
||||
(!defined(TARGET_ABI) || ${TARGET_ABI} == "o32")
|
||||
.include "${.CURDIR}/quad/Makefile.inc"
|
||||
.endif
|
||||
.include "${.CURDIR}/regex/Makefile.inc"
|
||||
|
@ -1,8 +1,6 @@
|
||||
# $NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $
|
||||
# $FreeBSD$
|
||||
|
||||
SOFTFLOAT_BITS=32
|
||||
|
||||
CFLAGS+=-DSOFTFLOAT
|
||||
|
||||
MDSRCS+= machdep_ldisd.c
|
||||
|
@ -24,13 +24,9 @@ FBSD_1.0 {
|
||||
sigsetjmp;
|
||||
siglongjmp;
|
||||
htonl;
|
||||
__htonl;
|
||||
htons;
|
||||
__htons;
|
||||
ntohl;
|
||||
__ntohl;
|
||||
ntohs;
|
||||
__ntohs;
|
||||
vfork;
|
||||
brk;
|
||||
cerror; /* XXX - Should this be .cerror (see sys/cerror.S)? */
|
||||
|
@ -6,4 +6,4 @@ SRCS+= infinity.c fabs.c ldexp.c modf.c
|
||||
# SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
|
||||
# fpsetround.c fpsetsticky.c
|
||||
|
||||
SRCS+= _set_tp.c _setjmp.S makecontext.c setjmp.S signalcontext.c sigsetjmp.S
|
||||
SRCS+= _ctx_start.S _set_tp.c _setjmp.S makecontext.c setjmp.S signalcontext.c sigsetjmp.S
|
||||
|
41
lib/libc/mips/gen/_ctx_start.S
Normal file
41
lib/libc/mips/gen/_ctx_start.S
Normal file
@ -0,0 +1,41 @@
|
||||
/*-
|
||||
* Copyright (c) 2010 Juli Mallett.
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR 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.
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
/*
|
||||
* XXX gp?
|
||||
*/
|
||||
ENTRY(_ctx_start)
|
||||
jalr t9
|
||||
|
||||
move a0, s0
|
||||
PTR_LA t9, _ctx_done
|
||||
jalr t9
|
||||
|
||||
break 0
|
||||
END(_ctx_start)
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: makecontext.c,v 1.3 2003/01/19 08:53:36 matt Exp $ */
|
||||
/* $NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
@ -15,13 +15,6 @@
|
||||
* 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. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
@ -39,48 +32,92 @@
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: makecontext.c,v 1.3 2003/01/19 08:53:36 matt Exp $");
|
||||
__RCSID("$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $");
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <ucontext.h>
|
||||
#include <sys/param.h>
|
||||
#include <machine/regnum.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <ucontext.h>
|
||||
|
||||
__weak_reference(__makecontext, makecontext);
|
||||
|
||||
void _ctx_done(ucontext_t *);
|
||||
void _ctx_start(void);
|
||||
|
||||
void
|
||||
makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
|
||||
__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
|
||||
{
|
||||
/* XXXMIPS: Implement me */
|
||||
#if 0
|
||||
__greg_t *gr = ucp->uc_mcontext.__gregs;
|
||||
uintptr_t *sp;
|
||||
mcontext_t *mc;
|
||||
register_t *sp;
|
||||
int i;
|
||||
va_list ap;
|
||||
|
||||
void __resumecontext(void);
|
||||
/*
|
||||
* XXX/juli
|
||||
* We need an mc_len or mc_flags like other architectures
|
||||
* so that we can mark a context as invalid. Store it in
|
||||
* mc->mc_regs[ZERO] perhaps?
|
||||
*/
|
||||
if (argc < 0 || argc > 6 || ucp == NULL ||
|
||||
ucp->uc_stack.ss_sp == NULL ||
|
||||
ucp->uc_stack.ss_size < MINSIGSTKSZ)
|
||||
return;
|
||||
mc = &ucp->uc_mcontext;
|
||||
|
||||
/* LINTED uintptr_t is safe */
|
||||
sp = (uintptr_t *)
|
||||
sp = (register_t *)
|
||||
((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
|
||||
/* LINTED uintptr_t is safe */
|
||||
#if defined(__mips_o32) || defined(__mips_o64)
|
||||
sp -= (argc >= 4 ? argc : 4); /* Make room for >=4 arguments. */
|
||||
sp = (uintptr_t *)
|
||||
((uintptr_t)sp & ~0x7); /* Align on double-word boundary. */
|
||||
sp = (register_t *)
|
||||
((uintptr_t)sp & ~0x7); /* Align on double-word boundary. */
|
||||
#elif defined(__mips_n32) || defined(__mips_n64)
|
||||
sp -= (argc > 8 ? argc - 8 : 0); /* Make room for > 8 arguments. */
|
||||
sp = (register_t *)
|
||||
((uintptr_t)sp & ~0xf); /* Align on quad-word boundary. */
|
||||
#endif
|
||||
|
||||
gr[_REG_SP] = (__greg_t)sp;
|
||||
gr[_REG_RA] = (__greg_t)__resumecontext;
|
||||
gr[_REG_T9] = (__greg_t)func; /* required for .abicalls */
|
||||
gr[_REG_EPC] = (__greg_t)func;
|
||||
mc->mc_regs[SP] = (intptr_t)sp;
|
||||
mc->mc_regs[S0] = (intptr_t)ucp;
|
||||
mc->mc_regs[T9] = (intptr_t)func;
|
||||
mc->mc_pc = (intptr_t)_ctx_start;
|
||||
|
||||
/* Construct argument list. */
|
||||
va_start(ap, argc);
|
||||
#if defined(__mips_o32) || defined(__mips_o64)
|
||||
/* Up to the first four arguments are passed in $a0-3. */
|
||||
for (i = 0; i < argc && i < 4; i++)
|
||||
/* LINTED uintptr_t is safe */
|
||||
gr[_REG_A0 + i] = va_arg(ap, uintptr_t);
|
||||
/* LINTED register_t is safe */
|
||||
mc->mc_regs[A0 + i] = va_arg(ap, register_t);
|
||||
/* Pass remaining arguments on the stack above the $a0-3 gap. */
|
||||
for (sp += 4; i < argc; i++)
|
||||
/* LINTED uintptr_t is safe */
|
||||
*sp++ = va_arg(ap, uintptr_t);
|
||||
va_end(ap);
|
||||
sp += i;
|
||||
#endif
|
||||
#if defined(__mips_n32) || defined(__mips_n64)
|
||||
/* Up to the first 8 arguments are passed in $a0-7. */
|
||||
for (i = 0; i < argc && i < 8; i++)
|
||||
/* LINTED register_t is safe */
|
||||
mc->mc_regs[A0 + i] = va_arg(ap, register_t);
|
||||
/* Pass remaining arguments on the stack above the $a0-3 gap. */
|
||||
#endif
|
||||
/* Pass remaining arguments on the stack above the $a0-3 gap. */
|
||||
for (; i < argc; i++)
|
||||
/* LINTED uintptr_t is safe */
|
||||
*sp++ = va_arg(ap, register_t);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void
|
||||
_ctx_done(ucontext_t *ucp)
|
||||
{
|
||||
|
||||
if (ucp->uc_link == NULL)
|
||||
exit(0);
|
||||
else {
|
||||
setcontext((const ucontext_t *)ucp->uc_link);
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
MDASM= Ovfork.S brk.S cerror.S exect.S \
|
||||
fork.S pipe.S ptrace.S sbrk.S shmat.S syscall.S
|
||||
fork.S pipe.S ptrace.S sbrk.S syscall.S
|
||||
|
||||
# Don't generate default code for these syscalls:
|
||||
NOASM= break.o exit.o ftruncate.o getlogin.o lseek.o mmap.o \
|
||||
|
Loading…
Reference in New Issue
Block a user